diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | debian/changelog | 513 | ||||
| -rw-r--r-- | debian/compat | 1 | ||||
| -rw-r--r-- | debian/control | 62 | ||||
| -rw-r--r-- | debian/copyright | 32 | ||||
| -rw-r--r-- | debian/gbp.conf | 3 | ||||
| -rw-r--r-- | debian/patches/01-zlib.patch | 28 | ||||
| -rw-r--r-- | debian/patches/series | 2 | ||||
| -rwxr-xr-x | debian/rules | 49 | ||||
| -rw-r--r-- | debian/simple-scan.bug-script | 59 | ||||
| -rw-r--r-- | debian/simple-scan.install | 3 | ||||
| -rw-r--r-- | debian/simple-scan.lintian-overrides | 5 | ||||
| -rw-r--r-- | debian/source/format | 1 | ||||
| -rw-r--r-- | debian/source_simple-scan.py | 23 | ||||
| -rw-r--r-- | debian/upstream/metadata | 6 | ||||
| -rw-r--r-- | debian/watch | 2 |
16 files changed, 792 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..37c7f74 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +.bzr +.bzrignore +.pc diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..c969479 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,513 @@ +simple-scan (3.17.90-1) unstable; urgency=low + + * New upstream release: + - Default to PDF when saving in all cases. + - Always show file format options and use a combo box to fit better + into dialog. + - Detect HP scanners and install drivers using PackageKit if found. + - If SANE detects no scanners but we see USB IDs of Brother, Epson + or Samsung scanners then prompt the user to go to their website + to install drivers. + - Use GUsb instead of GUdev. + - Fix error dialogs not showing. + * debian/control: + - Add to Build-Depends: + + libgusb-dev + + libpackagekit-glib2-dev + - Remove from Build-Depends: + + libgudev-1.0-dev + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Wed, 19 Aug 2015 17:44:26 +0200 + +simple-scan (3.17.4-1) unstable; urgency=medium + + * New upstream release: + - Build appdata in a separate directory. + - Update translations. + - Stop using gnome-common, use autotools directly. + * New debian/upstream/metadata: + - Add some DEP-12 upstream metadata. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Sat, 25 Jul 2015 10:26:45 +0200 + +simple-scan (3.17.1-1) unstable; urgency=medium + + * New upstream release: + - Make appdata translatable and add screenshot. + * Enable tests at build time which previously resulted in an FTBFS: + - debian/control: Add libxml2-utils to Build-Depends. + - debian/rules: Remove dummy override_dh_auto_test. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Wed, 06 May 2015 14:12:42 +0200 + +simple-scan (3.16.1.1-1) unstable; urgency=low + + * New upstream release. + - Fix invalid po/Makefile.in.in. + - Fix save button being inactive on pages restored after a crash. + - Fix logic for adding blank page on page removal (Closes: #782172). + * debian/simple-scan.bug-script: + - Add a user query to include debug information to the bug report. + - Add 'lsusb -v' to include all detected USB hardware. + - Add 'scanimage -L' to include all detected scanners. + - Replace ~/ with /home/${USER}/ to include the correct log file. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Tue, 14 Apr 2015 07:00:06 +0200 + +simple-scan (3.15.91-1) unstable; urgency=low + + * New upstream release. + - Update translations. + - Don't use GtkHeaderBar in LXDE, MATE (Closes: #756913). + * Rewrite license text in debian/copyright. + * debian/control: + - Add python-rsvg to Build-Depends in order to compare SVG files + before and after being optimized with dh_scour during build. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Sun, 08 Mar 2015 11:52:36 +0100 + +simple-scan (3.15.4-1) unstable; urgency=medium + + * New upstream release. + * debian/patches: + - Remove 005-keywords_desktop.patch, applied upstream. + - Refresh 01-zlib.patch. + * debian/control: + - Change architecture to linux-any since simple-scan build-depends + on libgudev-1.0-dev which is part of the systemd source package. + * debian/rules: + - Remove old style hardening tags. + - Remove useless comments. + * debian/source/options: + - Removed because xz is now standard compression. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Mon, 19 Jan 2015 12:45:02 +0100 + +simple-scan (3.15.3-1) unstable; urgency=medium + + * New upstream release. + * Add year 2015 to debian/copyright. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Mon, 05 Jan 2015 16:08:36 +0100 + +simple-scan (3.15.2-1) unstable; urgency=medium + + * New upstream release. + * debian/control: + - Add libgdk-pixbuf2.0-dev (>=2.31.1) to + Build-Depends (Requested by upstream release). + * New debian/simple-scan.lintian-overrides: + - Override privacy-breach-generic false positives. + See Debian bug #762753. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Mon, 01 Dec 2014 10:52:19 +0100 + +simple-scan (3.15.1-1) unstable; urgency=medium + + * New upstream release: + - Updated translations. + * debian/simple-scan.bug-script: + - Correct typo. (Closes: #764700) + * debian/control: + - For missing icons gnome-icon-theme-symbolic removed + from Depends. (Closes: #761292) + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Tue, 28 Oct 2014 09:38:02 +0100 + +simple-scan (3.14.0-1) unstable; urgency=medium + + * New upstream release: + - Version bump. + * debian/control: + - Replace Depends gnome-icon-theme with + gnome-icon-theme-symbolic | adwaita-icon-theme + to display missing icons (Closes: #761292). + Thanks to Pascal Dormeau <pdormeau@free.fr>! + - Bump Standards-Version to 3.9.6 (no changes required). + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Wed, 24 Sep 2014 16:04:22 +0200 + +simple-scan (3.13.92-1) UNRELEASED; urgency=medium + + * New upstream release. + - Updated translations. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Tue, 16 Sep 2014 11:38:05 +0200 + +simple-scan (3.13.91-1) unstable; urgency=medium + + * New upstream release. + - Updated translations. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Sun, 31 Aug 2014 08:37:44 +0200 + +simple-scan (3.13.90-1) unstable; urgency=medium + + * New upstream release. + * debian/control: + - Change Vcs-Browser to cgit. + * New debian/patches/015-keywords_desktop.patch: + - Add missing Keywords entry to the .desktop file. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Mon, 18 Aug 2014 19:42:34 +0200 + +simple-scan (3.13.4.2-1) unstable; urgency=medium + + * New maintainer (Closes: #720540). + * New upstream release: + - Refresh debian/patches/01-zlib.patch + * debian/control: + - Set myself as maintainer. + - Bump Standards-Version to 3.9.5 (no changes required). + - Update Build-Depends: + + valac <= 0.16 will be removed. Therefore change + valac release to >= 0.22 (Closes: #739167, #755204). + + Remove unused lsb-release (Closes: #737536). + - Add dbus-x11 to Depends for package simple-scan since simple-scan + needs dbus even on headless systems (Closes: #750392). + - Remove the upstream Vcs-Bzr. + * Add debian/source/options: + - Set compression to xz & compression-level to 9 to save space. + * Add debian/simple-scan.bug-script to automatically add logfiles to + bug reports. + * debian/copyright: + - Add myself to the list of authors for debian/*. + - Update copyright years for 2014. + * debian/rules: + - Enable hardening. + - Install NEWS as upstream changelog. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Sat, 19 Jul 2014 11:08:59 +0200 + +simple-scan (3.12.0-1) unstable; urgency=low + + * QA upload. + * Set Maintainer to Debian QA Group. + * New upstream release. + * Refresh patches. + * Drop build dependency on sqlite3, no longer needed. + + -- Alessio Treglia <alessio@debian.org> Thu, 10 Apr 2014 15:39:34 +0100 + +simple-scan (3.10.0-1) unstable; urgency=low + + * New upstream release. + * Refresh patches. + * Build-depend on libsqlite3-dev. + * Update debian/watch as latest release is being published as XZ file. + + -- Alessio Treglia <alessio@debian.org> Sat, 05 Oct 2013 15:33:01 +0100 + +simple-scan (3.6.1-1) unstable; urgency=low + + * Upload to unstable. + * New upstream release: + - Fix scan no longer working after an ADF scan completes. + - Fix erroneous warning about failing to set ADF source. + + -- Alessio Treglia <alessio@debian.org> Mon, 13 May 2013 08:59:05 +0100 + +simple-scan (3.6.0-2) experimental; urgency=low + + * Drop build-depend on gconf2. (Closes: #698251) + * Use dh_autoreconf instead of calling autoreconf before the configure. + * Properly purge the symlink to gnome-doc-utils.make once the build's + completed. + + -- Alessio Treglia <alessio@debian.org> Wed, 16 Jan 2013 00:03:37 +0000 + +simple-scan (3.6.0-1) experimental; urgency=low + + * New upstream release. + * Add -DBG package. (Closes: #687213) + * Fix Vcs tags. + * Bump debhelper compatibility. + * Bump Standards. + + -- Alessio Treglia <alessio@debian.org> Tue, 15 Jan 2013 00:51:40 +0000 + +simple-scan (3.4.2-1) unstable; urgency=low + + * New upstream bugfix release. + * Remove 02-file-filter-labels.patch, applied upstream. + * Generate with Vala 0.16. (Closes: #675664) + * Enable hardening flags. + + -- Alessio Treglia <alessio@debian.org> Sun, 03 Jun 2012 01:01:58 +0200 + +simple-scan (3.4.1-3) unstable; urgency=low + + * Drop 20-lpi.patch as launchpad-integration has been removed from Ubuntu. + Thanks to Jeremy Bicha for the great work. (Closes: #673780) + + -- Alessio Treglia <alessio@debian.org> Mon, 21 May 2012 14:48:40 +0200 + +simple-scan (3.4.1-2) unstable; urgency=low + + * Fix save dialog filter incorrect names. Thanks to Jeremy Bicha + for reporting this. (Closes: #673593) (LP: #876135) + + -- Alessio Treglia <alessio@debian.org> Mon, 21 May 2012 01:33:47 +0200 + +simple-scan (3.4.1-1) unstable; urgency=low + + * New upstream bugfix release. + * Install apport file on Debian systems too. + + -- Alessio Treglia <alessio@debian.org> Fri, 20 Apr 2012 12:08:03 +0200 + +simple-scan (3.4.0-1) unstable; urgency=low + + * New upstream release. + * Refresh patches. + * Build-dep on libcolord-dev. + * Replace gnome-doc-utils build-dependency with yelp-tool. + * Update debian/watch. + * Refresh debian/copyright. + * Bump Standards. + + -- Alessio Treglia <alessio@debian.org> Wed, 04 Apr 2012 21:14:45 +0200 + +simple-scan (3.2.1-1) unstable; urgency=low + + * New upstream release. + + -- Alessio Treglia <alessio@debian.org> Wed, 07 Dec 2011 12:49:05 +0100 + +simple-scan (3.2.0-1) unstable; urgency=low + + * Upload to unstable. + * New upstream release + * Fix watch file. + + -- Alessio Treglia <alessio@debian.org> Fri, 07 Oct 2011 18:14:05 +0200 + +simple-scan (3.1.5-1) experimental; urgency=low + + * New upstream release: + - Fix compile warnings + - Port to Vala + - Port to GTK3 + - Port to GDBus + - Port to GSettings + - Port to colord + * debian/control: + - Port build-deps to Vala. + * Refresh patches. + * debian/watch: Look for *.bz2 tarballs. + + -- Alessio Treglia <alessio@debian.org> Tue, 30 Aug 2011 12:58:27 +0200 + +simple-scan (2.32.0.2-2) unstable; urgency=low + + * Build-depend on libjpeg-dev instead of libjpeg62-dev (Closes: #634633). + * Bump Standards. + + -- Alessio Treglia <alessio@debian.org> Tue, 19 Jul 2011 13:14:46 +0200 + +simple-scan (2.32.0.2-1) unstable; urgency=low + + * New upstream release: + - Add binary comment as recommended in PDF spec. + - Add comments about other PDF/A features. + - Update translations. + * debian/gbp.conf: Set compression to bzip2. + * Add debian/source/local-options file. + + -- Alessio Treglia <alessio@debian.org> Thu, 21 Apr 2011 16:38:02 +0200 + +simple-scan (2.32.0.1-2) unstable; urgency=low + + * Upload to unstable. + * Set 3.0 (quilt) as packaging definitive format. + * Handle distribution specific patches. + * Revert previous changes in debian/rules, + Ubuntu-specific patches are now properly handled. + * Build with scour for SVG optimization. + * Build-depend on autotools-dev. + * On Ubuntu, install the apport package hook. + + -- Alessio Treglia <alessio@debian.org> Wed, 16 Mar 2011 12:50:20 +0100 + +simple-scan (2.32.0.1-1) experimental; urgency=low + + * New upstream release. + * Update debian/gbp.conf. + + -- Alessio Treglia <alessio@debian.org> Tue, 26 Oct 2010 17:18:13 +0200 + +simple-scan (2.32.0-1) experimental; urgency=low + + * New upstream release. + * Add Vcs-Bzr field to make Robert Ancell happy. + * Switch back to format 1.0 + * Change tarball compression. + + -- Alessio Treglia <alessio@debian.org> Thu, 30 Sep 2010 11:21:17 +0200 + +simple-scan (2.31.91-1) experimental; urgency=low + + * Imported Upstream version 2.31.91 + * Refresh 01_lpi.patch. + + -- Alessio Treglia <alessio@debian.org> Tue, 31 Aug 2010 01:03:07 +0200 + +simple-scan (2.31.90.2-1) unstable; urgency=low + + * New upstream bugfix release. + + -- Alessio Treglia <alessio@debian.org> Tue, 17 Aug 2010 11:02:56 +0200 + +simple-scan (2.31.90.1-1) unstable; urgency=low + + * New upstream release. + * Remove DMUA field. + * Update Standards to 3.9.1. + * Drop Recommends on imagemagick. + * Build-Depends on zlib2g-dev, libjpeg62-dev. + * Update watch file. + * Refresh 01_lpi.patch patch. + * Switch to 3.0 (quilt) format. + * Add debian/gbp.conf,.gitignore files. + * Update changelog. + * Fix debian/control. + * Install gnome-doc-utils.make. + * Add zlib patch. + * debian/gbp.conf: Set tarball compression to bzip2. + * Change my email address. + + -- Alessio Treglia <alessio@debian.org> Sun, 15 Aug 2010 12:45:16 +0200 + +simple-scan (2.31.1-1) unstable; urgency=low + + * New upstream release. + * All patches have been applied upstream. + * debian/source_simple-scan.py: Sync with Ubuntu. + + -- Alessio Treglia <quadrispro@ubuntu.com> Thu, 13 May 2010 20:42:09 +0200 + +simple-scan (1.0.3-1) unstable; urgency=low + + * New upstream release. + - Set resolution on ImageMagick generated PDFs (LP: #564106). + * debian/patches/10-set_supported_flags.patch: + - Set duplex and batch-scan flags if supported by driver (LP: #566759). + * Set format to 1.0. + + -- Alessio Treglia <quadrispro@ubuntu.com> Thu, 22 Apr 2010 15:18:11 +0200 + +simple-scan (1.0.2-1) unstable; urgency=low + + * New upstream release. + + -- Alessio Treglia <quadrispro@ubuntu.com> Fri, 16 Apr 2010 17:45:41 +0200 + +simple-scan (1.0.0-2) unstable; urgency=low + + * debian/control: Revert last change of Build-Depends field, the previous + situation was preferable and even correct (Closes: #577821). + + -- Alessio Treglia <quadrispro@ubuntu.com> Wed, 14 Apr 2010 23:55:43 +0200 + +simple-scan (1.0.0-1) unstable; urgency=low + + * New upstream stable release. + * debian/rules: + - Call intltool-update to generate a PO template (LP: #551470). + * Drop debian/patches/11_thunderbird_workaround.patch patch, applied + upstream. + * Refresh 01_lpi.patch patch. + * debian/control: + - udev is not available on kfreebsd-*,hurd architectures. + - Add Vcs-{Git,Browser} tags. + + -- Alessio Treglia <quadrispro@ubuntu.com> Wed, 14 Apr 2010 12:54:33 +0200 + +simple-scan (0.9.10-1) unstable; urgency=low + + * New upstream release. + * debian/control: + - Build-depend on libdbus-glib-1-dev. + - Recommend imagemagick. + * debian/patches/11_thunderbird_workaround.patch: + - Workaround Thunderbird/Icedove mail bug. + + -- Alessio Treglia <quadrispro@ubuntu.com> Fri, 09 Apr 2010 12:41:39 +0200 + +simple-scan (0.9.9-1) unstable; urgency=low + + * New upstream release. + * Refresh patches. + + -- Alessio Treglia <quadrispro@ubuntu.com> Mon, 15 Mar 2010 17:32:51 +0100 + +simple-scan (0.9.7-1) unstable; urgency=low + + * New upstream release. + + -- Alessio Treglia <quadrispro@ubuntu.com> Tue, 09 Mar 2010 07:25:04 +0100 + +simple-scan (0.9.6-1) unstable; urgency=low + + * New upstream release. + * debian/rules: Call autoreconf before calling the configure script. + * Bump versioned build-dep on debhelper. + * Remove 99_autotools.patch. + * Build-Depends on gnome-common. + + -- Alessio Treglia <quadrispro@ubuntu.com> Mon, 08 Mar 2010 14:58:35 +0100 + +simple-scan (0.9.5-1) unstable; urgency=low + + * New upstream release. + * Include apport hook without installing it in order to mimize the delta + between Debian and Ubuntu. + * Add README.source to document how-to patch the sources. + + -- Alessio Treglia <quadrispro@ubuntu.com> Thu, 18 Feb 2010 11:38:37 +0100 + +simple-scan (0.9.3-1) unstable; urgency=low + + * New upstream release. + * Bump standards. + * Build-depend on libgudev-1.0-dev,gnome-doc-utils. + * Drop manpages from the packaging, upstream now provides them. + * Add quilt support. + * Provide ubuntu-specific patches without applying them in order to + minimze the delta. + + -- Alessio Treglia <quadrispro@ubuntu.com> Tue, 16 Feb 2010 00:46:46 +0100 + +simple-scan (0.8.1-3) unstable; urgency=low + + * Append --as-needed to LDFLAGS to avoid excessive dependencies; + thanks to Martin Pitt for reporting this (LP: #512048). + + -- Alessio Treglia <quadrispro@ubuntu.com> Mon, 25 Jan 2010 00:49:34 +0100 + +simple-scan (0.8.1-2) unstable; urgency=low + + * Update debian/copyright. + * debian/control: + - No need to build-depend on debhelper >= 7.0.50. + + -- Alessio Treglia <quadrispro@ubuntu.com> Wed, 20 Jan 2010 11:26:17 +0100 + +simple-scan (0.8.1-1) unstable; urgency=low + + * New upstream release. + + -- Alessio Treglia <quadrispro@ubuntu.com> Wed, 20 Jan 2010 10:59:36 +0100 + +simple-scan (0.8.0-1) unstable; urgency=low + + * New upstream release. + * Allow DM uploads. + + -- Alessio Treglia <quadrispro@ubuntu.com> Wed, 23 Dec 2009 11:26:30 +0100 + +simple-scan (0.7.6-1) unstable; urgency=low + + * Initial release (Closes: #561790). + + -- Alessio Treglia <quadrispro@ubuntu.com> Mon, 21 Dec 2009 00:31:16 +0100 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..3147f1d --- /dev/null +++ b/debian/control @@ -0,0 +1,62 @@ +Source: simple-scan +Section: gnome +Priority: optional +Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net> +Standards-Version: 3.9.6 +Build-Depends: + debhelper (>= 9), + dh-autoreconf, + gnome-pkg-tools (>= 0.10), + intltool, + libcairo2-dev, + libcolord-dev, + libdbus-glib-1-dev, + libglib2.0-dev (>= 2.32), + libgtk-3-dev, + libgdk-pixbuf2.0-dev (>=2.31.1), +# libgudev-1.0-dev, + libgusb-dev, + libjpeg-dev, + libpackagekit-glib2-dev, + libsane-dev, + libxml2-utils, + python-rsvg, + python-scour, + libsqlite3-dev, + valac (>= 0.22), + yelp-tools, + zlib1g-dev (>= 1.2.7) +Homepage: https://launchpad.net/simple-scan +Vcs-Git: git://anonscm.debian.org/collab-maint/simple-scan.git +Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/simple-scan.git + +Package: simple-scan +Architecture: linux-any +Depends: + dbus-x11 (>= 1.6), + adwaita-icon-theme, + xdg-utils, + ${misc:Depends}, + ${shlibs:Depends} +Description: Simple Scanning Utility + Simple Scan is an easy-to-use application, designed to let users + connect their scanner and quickly have the image/document in an + appropriate format. + . + Simple Scan is basically a frontend for SANE - which is the same + backend as XSANE uses. This means that all existing scanners will + work and the interface is well tested. + +Package: simple-scan-dbg +Section: debug +Priority: extra +Architecture: linux-any +Depends: + simple-scan (= ${binary:Version}), + ${misc:Depends} +Description: Simple Scanning Utility - debugging symbols + Simple Scan is an easy-to-use application, designed to let users + connect their scanner and quickly have the image/document in an + appropriate format. + . + This package provides the debugging symbols for simple-scan. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..0e0e9bf --- /dev/null +++ b/debian/copyright @@ -0,0 +1,32 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Simple Scan +Upstream-Contact: Robert Ancell <robert.ancell@canonical.com> +Source: https://launchpad.net/simple-scan/+download + +Files: * +Copyright: 2009-2015 Canonical Ltd +License: GPL-3+ + +Files: debian/* +Copyright: + 2009-2012 Alessio Treglia <alessio@debian.org> + 2009 Robert Ancell <robert.ancell@canonical.com> + 2014-2015 Jörg Frings-Fürst <debian@jff-webhosting.net> +License: GPL-3+ + +License: GPL-3+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/> + . + On Debian systems, the complete text of the GNU General + Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..d0c1355 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,3 @@ +[DEFAULT] +pristine-tar = True +compression = xz diff --git a/debian/patches/01-zlib.patch b/debian/patches/01-zlib.patch new file mode 100644 index 0000000..9491a70 --- /dev/null +++ b/debian/patches/01-zlib.patch @@ -0,0 +1,28 @@ +Description: add zlib +Last-Update: 2015-01-19 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/configure.ac +=================================================================== +--- trunk.orig/configure.ac ++++ trunk/configure.ac +@@ -38,6 +38,7 @@ AM_CONDITIONAL(HAVE_COLORD, test $have_c + + AC_CHECK_HEADERS([sane/sane.h],[],[AC_MSG_ERROR([SANE not found])]) + AC_CHECK_HEADERS([sane/saneopts.h],[],[AC_MSG_ERROR([SANE not found])]) ++AC_CHECK_HEADERS([zlib.h],[],[AC_MSG_ERROR([ZLib not found])]) + + dnl ########################################################################### + dnl Documentation +Index: trunk/src/Makefile.am +=================================================================== +--- trunk.orig/src/Makefile.am ++++ trunk/src/Makefile.am +@@ -47,6 +47,7 @@ simple_scan_LDADD = \ + $(SIMPLE_SCAN_LIBS) \ + $(COLORD_LIBS) \ + -lsane \ ++ -lz \ + -lm + + CLEANFILES = \ diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..a5643ae --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +#005-keywords_desktop.patch +01-zlib.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..7a6360d --- /dev/null +++ b/debian/rules @@ -0,0 +1,49 @@ +#!/usr/bin/make -f + +# +# 2014-07-22 Jörg Frings-Fürst <debian@jff-webhosting.net> +# +# - enable hardening +# - install NEWS as upstream changelog +# +# 2015-01-19 Jörg Frings-Fürst <debian@jff-webhosting.net> +# +# - remove old style hardening. +# - remove useless comments. +# +# 2015-04-29 Jörg Frings-Fürst <debian@jff-webhosting.net> +# +# - remove override_dh_auto_test +# + +# +# Hardening +# +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +%: + dh $@ --with=autoreconf,scour + +# Autoreconf due to 01_lpi.patch +override_dh_autoreconf: + [ -e gnome-doc-utils.make ] || \ + ln -s /usr/share/gnome-doc-utils/gnome-doc-utils.make + dh_autoreconf + +override_dh_auto_clean: + dh_auto_clean + [ ! -h gnome-doc-utils.make ] || \ + rm gnome-doc-utils.make + +override_dh_auto_build: + cd po; intltool-update -p + dh_auto_build + +override_dh_strip: + dh_strip -psimple-scan --dbg-package=simple-scan-dbg + +override_dh_installdocs: + dh_installdocs --link-doc=simple-scan + +override_dh_installchangelogs: + dh_installchangelogs NEWS diff --git a/debian/simple-scan.bug-script b/debian/simple-scan.bug-script new file mode 100644 index 0000000..ddfbfcf --- /dev/null +++ b/debian/simple-scan.bug-script @@ -0,0 +1,59 @@ +#!/bin/bash + +cat <<EOF + +Providing additional information can help diagnose problems with simple-scan. +Specifically, this would include: +- Your personal simple-scan log file. +- The list of your usb devices. +- A list of detected scanners. + +If this information is not relevant for your bug report or you have privacy +concerns, please choose no. + +EOF + +yesno "Do you want to provide additional information [Y|n]? " yep +[ "$REPLY" = yep ] || exit 0 + + +REPORTBUG_VERSION=$(dpkg-query -f '${source:Version}' -W reportbug) +#LOG_FILE="~/.cache/simple-scan/simple-scan.log" +LOG_FILE="/home/${USER}/.cache/simple-scan/simple-scan.log" + +# Depending on whether reportbug is new enough, we either write the output of +# our various commands to a file and attach them to the report (this needs +# reportbug ≥ 6.5.0) or just write them to the body of the bug report. +if dpkg --compare-versions "$REPORTBUG_VERSION" ge "6.5.0"; then + + # We don’t clean up this directory because there is no way to know when + # reportbug finished running, and reportbug needs the files around. + # Given that those are just a couple of kilobytes in size and people + # generally don’t file a lot of bugs, I don’t think it’s a big deal. + DIR=$(mktemp -d) + + echo "-- BEGIN ATTACHMENTS --" >&3 + + # + # logfile + # + if [ -f ${LOG_FILE} ]; then + cat ${LOG_FILE} >$DIR/logfile.user + echo "$DIR/logfile.user" >&3 + fi + + # + # scanimage -L + # + scanimage -L >$DIR/scanimage.user + echo "$DIR/scanimage.user" >&3 + + # + # lsusb + # + lsusb -v >$DIR/lsusb.user + echo "$DIR/lsusb.user" >&3 + + + echo "-- END ATTACHMENTS --" >&3 +fi diff --git a/debian/simple-scan.install b/debian/simple-scan.install new file mode 100644 index 0000000..b7d9a09 --- /dev/null +++ b/debian/simple-scan.install @@ -0,0 +1,3 @@ +debian/source_simple-scan.py usr/share/apport/package-hooks/ +usr/bin +usr/share diff --git a/debian/simple-scan.lintian-overrides b/debian/simple-scan.lintian-overrides new file mode 100644 index 0000000..bcc578d --- /dev/null +++ b/debian/simple-scan.lintian-overrides @@ -0,0 +1,5 @@ +# +# Override this false positve error: +# (See Debian bug #762753) +# +privacy-breach-generic diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/source_simple-scan.py b/debian/source_simple-scan.py new file mode 100644 index 0000000..6fab46c --- /dev/null +++ b/debian/source_simple-scan.py @@ -0,0 +1,23 @@ +'''apport package hook for simple-scan + +(c) 2010 Canonical Ltd. +Author: Robert Ancell <robert.ancell@canonical.com> +''' + +import os.path +from apport.hookutils import * + +LOG_FILE = os.path.expanduser('~/.cache/simple-scan/simple-scan.log') +driver_packages = ['libsane', 'libsane-extras', 'hplip', 'hpoj'] + +def add_info(report): + attach_hardware(report) + versions = '' + for package in driver_packages: + try: + version = packaging.get_version(package) + except ValueError: + version = 'N/A' + versions += '%s %s\n' % (package, version) + report['DriverPackageVersions'] = versions + attach_file_if_exists(report, LOG_FILE, 'SimpleScanLog') diff --git a/debian/upstream/metadata b/debian/upstream/metadata new file mode 100644 index 0000000..abbb658 --- /dev/null +++ b/debian/upstream/metadata @@ -0,0 +1,6 @@ +Bug-Database: https://bugs.launchpad.net/simple-scan +Bug-Submit: https://bugs.launchpad.net/simple-scan/+filebug +Contact: https://launchpad.net/~simple-scan-team +Name: simple-scan +Repository: http://bazaar.launchpad.net/~simple-scan-team/simple-scan/trunk +Repository-Browse: http://bazaar.launchpad.net/~simple-scan-team/simple-scan/trunk/files diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..9d546c6 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +https://launchpad.net/simple-scan/+download .*/simple-scan-([0-9.]+)\.tar\.xz |