--- simple-scan-2.31.1.orig/debian/changelog +++ simple-scan-2.31.1/debian/changelog @@ -0,0 +1,133 @@ +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 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 Thu, 22 Apr 2010 15:18:11 +0200 + +simple-scan (1.0.2-1) unstable; urgency=low + + * New upstream release. + + -- Alessio Treglia 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 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 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 Fri, 09 Apr 2010 12:41:39 +0200 + +simple-scan (0.9.9-1) unstable; urgency=low + + * New upstream release. + * Refresh patches. + + -- Alessio Treglia Mon, 15 Mar 2010 17:32:51 +0100 + +simple-scan (0.9.7-1) unstable; urgency=low + + * New upstream release. + + -- Alessio Treglia 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 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 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 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 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 Wed, 20 Jan 2010 11:26:17 +0100 + +simple-scan (0.8.1-1) unstable; urgency=low + + * New upstream release. + + -- Alessio Treglia 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 Wed, 23 Dec 2009 11:26:30 +0100 + +simple-scan (0.7.6-1) unstable; urgency=low + + * Initial release (Closes: #561790). + + -- Alessio Treglia Mon, 21 Dec 2009 00:31:16 +0100 --- simple-scan-2.31.1.orig/debian/source_simple-scan.py +++ simple-scan-2.31.1/debian/source_simple-scan.py @@ -0,0 +1,23 @@ +'''apport package hook for simple-scan + +(c) 2010 Canonical Ltd. +Author: Robert Ancell +''' + +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') --- simple-scan-2.31.1.orig/debian/watch +++ simple-scan-2.31.1/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://people.ubuntu.com/~robert-ancell/simple-scan/simple-scan-(.*)\.tar\.gz --- simple-scan-2.31.1.orig/debian/control +++ simple-scan-2.31.1/debian/control @@ -0,0 +1,38 @@ +Source: simple-scan +Section: gnome +Priority: optional +Maintainer: Alessio Treglia +DM-Upload-Allowed: yes +Standards-Version: 3.8.4 +Build-Depends: debhelper (>= 7.0.50~), + quilt (>= 0.46-7~), + gnome-pkg-tools (>= 0.10), + gnome-doc-utils (>= 0.3.2), + gnome-common, + libglib2.0-dev, + libgtk2.0-dev, + libgconf2-dev, + libcairo2-dev, + libgudev-1.0-dev, + libdbus-glib-1-dev, + libsane-dev, + intltool +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 + +Package: simple-scan +Architecture: any +Depends: ${shlibs:Depends}, + gnome-icon-theme, + xdg-utils, + ${misc:Depends} +Recommends: imagemagick +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. --- simple-scan-2.31.1.orig/debian/rules +++ simple-scan-2.31.1/debian/rules @@ -0,0 +1,18 @@ +#!/usr/bin/make -f + +LDFLAGS+=-Wl,--as-needed + +%: + dh --with quilt $@ + +# Fixes FTBFS +override_dh_auto_test: + +# Autoreconf due to 01_lpi.patch +override_dh_auto_configure: + autoreconf -f -i -s + dh_auto_configure + +override_dh_auto_build: + cd po; intltool-update -p + dh_auto_build --- simple-scan-2.31.1.orig/debian/copyright +++ simple-scan-2.31.1/debian/copyright @@ -0,0 +1,30 @@ +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=59 +Name: Simple Scan +Maintainer: Robert Ancell +Source: http://people.ubuntu.com/~robert-ancell/simple-scan/ + +Files: * +Copyright: 2009, Canonical Ltd +License: GPL-3+ + +Files: debian/* +Copyright: + 2009-2010, Alessio Treglia + 2009, Robert Ancell +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 . +X-Comment: On Debian systems, the complete text of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL-3’. --- simple-scan-2.31.1.orig/debian/compat +++ simple-scan-2.31.1/debian/compat @@ -0,0 +1 @@ +7 --- simple-scan-2.31.1.orig/debian/README.source +++ simple-scan-2.31.1/debian/README.source @@ -0,0 +1,13 @@ +simple-scan for Debian +--------------- + + This package uses quilt to manage all modifications to the upstream + source. Changes are stored in the source package as diffs in + debian/patches and applied during the build. + + To read how to properly use quilt, please refer to the official + documentation available at: + + /usr/share/doc/quilt/README.source + + -- Alessio Treglia Thu, 18 Feb 2010 11:38:37 +0100 --- simple-scan-2.31.1.orig/debian/source/format +++ simple-scan-2.31.1/debian/source/format @@ -0,0 +1 @@ +1.0 --- simple-scan-2.31.1.orig/debian/patches/01_lpi.patch +++ simple-scan-2.31.1/debian/patches/01_lpi.patch @@ -0,0 +1,38 @@ +Origin: Ubuntu +Description: Add launchpad-integration support. +--- + configure.ac | 1 + + src/ui.c | 5 +++++ + 2 files changed, 6 insertions(+) + +--- simple-scan.orig/configure.ac ++++ simple-scan/configure.ac +@@ -33,6 +33,7 @@ PKG_CHECK_MODULES(SIMPLE_SCAN, [ + cairo-pdf + dbus-glib-1 + gudev-1.0 ++ launchpad-integration + ]) + + AC_CHECK_HEADERS([sane/sane.h],[],[AC_MSG_ERROR([SANE not found])]) +--- simple-scan.orig/src/ui.c ++++ simple-scan/src/ui.c +@@ -16,6 +16,7 @@ + #include + #include + #include // TEMP: Needed for close() in get_temporary_filename() ++#include + + #include "ui.h" + #include "book-view.h" +@@ -1316,6 +1317,10 @@ ui_load (SimpleScan *ui) + } + gtk_builder_connect_signals (builder, ui); + ++ /* Add Launchpad integration */ ++ launchpad_integration_set_sourcepackagename ("simple-scan"); ++ launchpad_integration_add_items (GTK_WIDGET (gtk_builder_get_object (builder, "help_menu")), 1, TRUE, TRUE); ++ + ui->priv->window = GTK_WIDGET (gtk_builder_get_object (builder, "simple_scan_window")); + ui->priv->main_vbox = GTK_WIDGET (gtk_builder_get_object (builder, "main_vbox")); + ui->priv->page_delete_menuitem = GTK_WIDGET (gtk_builder_get_object (builder, "page_delete_menuitem")); --- simple-scan-2.31.1.orig/debian/patches/series +++ simple-scan-2.31.1/debian/patches/series @@ -0,0 +1 @@ +# Empty