15 files changed, 460 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..845ca06
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.pc
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..58dd514
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,276 @@
+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..7f8f011
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..435791e
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,45 @@
+Source: simple-scan
+Section: gnome
+Priority: optional
+Maintainer: Alessio Treglia <alessio@debian.org>
+Standards-Version: 3.9.3
+Build-Depends:
+ autotools-dev,
+ debhelper (>= 7.0.50~),
+ gnome-common,
+ gnome-pkg-tools (>= 0.10),
+ intltool,
+ libcairo2-dev,
+ libcolord-dev,
+ libdbus-glib-1-dev,
+ libgconf2-dev,
+ libglib2.0-dev,
+ libgtk-3-dev,
+ libgudev-1.0-dev,
+ libjpeg-dev,
+ libsane-dev,
+ lsb-release,
+ python-scour,
+ valac-0.14 | valac (>= 0.13.0),
+ yelp-tools,
+ zlib1g-dev
+Homepage: https://launchpad.net/simple-scan
+Vcs-Git: git://git.debian.org/collab-maint/simple-scan.git
+Vcs-Browser: http://git.debian.org/?p=collab-maint/simple-scan.git
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/simple-scan/ubuntu
+
+Package: simple-scan
+Architecture: any
+Depends:
+ gnome-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.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..bfb882f
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,31 @@
+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-2011 Canonical Ltd
+License: GPL-3+
+
+Files: debian/*
+Copyright:
+ 2009-2012, Alessio Treglia <alessio@debian.org>
+ 2009, Robert Ancell <robert.ancell@canonical.com>
+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.
+Comment:
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-3’.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..cec628c
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+pristine-tar = True
diff --git a/debian/patches/01-zlib.patch b/debian/patches/01-zlib.patch
new file mode 100644
index 0000000..6314ec4
--- /dev/null
+++ b/debian/patches/01-zlib.patch
@@ -0,0 +1,25 @@
+---
+ configure.ac    |    1 +
+ src/Makefile.am |    1 +
+ 2 files changed, 2 insertions(+)
+
+--- simple-scan.orig/configure.ac
++++ simple-scan/configure.ac
+@@ -39,6 +39,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])])
+ AC_CHECK_HEADERS([jpeglib.h],[],[AC_MSG_ERROR([libjpeg not found])])
+ 
+ dnl ###########################################################################
+--- simple-scan.orig/src/Makefile.am
++++ simple-scan/src/Makefile.am
+@@ -40,6 +40,7 @@ simple_scan_LDADD = \
+ 	$(COLORD_LIBS) \
+ 	-lsane \
+ 	-ljpeg \
++	-lz \
+ 	-lm
+ 
+ CLEANFILES = \
diff --git a/debian/patches/02-file-filter-labels.patch b/debian/patches/02-file-filter-labels.patch
new file mode 100644
index 0000000..c195bfc
--- /dev/null
+++ b/debian/patches/02-file-filter-labels.patch
@@ -0,0 +1,28 @@
+Description: Fix file filter's name shown by the Save dialogs.
+From: https://launchpad.net/bugs/876135
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=673593
+---
+ src/ui.vala |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- simple-scan.orig/src/ui.vala
++++ simple-scan/src/ui.vala
+@@ -351,14 +351,14 @@ public class SimpleScan
+ 
+         /* Filter to only show images by default */
+         var filter = new Gtk.FileFilter ();
+-        filter.set_name (/* Save dialog: Filter name to show only image files */
+-                         _("Image Files"));
++        filter.set_filter_name (/* Save dialog: Filter name to show only image files */
++                                _("Image Files"));
+         filter.add_pixbuf_formats ();
+         filter.add_mime_type ("application/pdf");
+         save_dialog.add_filter (filter);
+         filter = new Gtk.FileFilter ();
+-        filter.set_name (/* Save dialog: Filter name to show all files */
+-                         _("All Files"));
++        filter.set_filter_name (/* Save dialog: Filter name to show all files */
++                                _("All Files"));
+         filter.add_pattern ("*");
+         save_dialog.add_filter (filter);
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0aab875
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01-zlib.patch
+02-file-filter-labels.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..8f3cd40
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,20 @@
+#!/usr/bin/make -f 
+
+LDFLAGS+=-Wl,--as-needed
+
+%:
+	dh $@ --with scour
+
+# Fixes FTBFS
+override_dh_auto_test:
+
+# Autoreconf due to 01_lpi.patch
+override_dh_auto_configure:
+	[ -e gnome-doc-utils.make ] || \
+	ln -s /usr/share/gnome-doc-utils/gnome-doc-utils.make
+	autoreconf -f -i -s
+	dh_auto_configure
+
+override_dh_auto_build:
+	cd po; intltool-update -p
+	dh_auto_build
diff --git a/debian/simple-scan.install b/debian/simple-scan.install
new file mode 100644
index 0000000..63d50cc
--- /dev/null
+++ b/debian/simple-scan.install
@@ -0,0 +1 @@
+debian/source_simple-scan.py usr/share/apport/package-hooks/
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/local-options b/debian/source/local-options
new file mode 100644
index 0000000..9cdfca9
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1,2 @@
+unapply-patches
+abort-on-upstream-changes
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/watch b/debian/watch
new file mode 100644
index 0000000..4d5a871
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+https://launchpad.net/simple-scan/+download .*/simple-scan-([0-9.]+)\.tar\.gz