From cce8437bfbdb21e2b97025de6721c78f6d4654fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 23 Jul 2014 18:18:19 +0200 Subject: Imported Upstream version 3.13.4.2 --- debian/changelog | 332 ------------------------------------------- debian/compat | 1 - debian/control | 58 -------- debian/copyright | 31 ---- debian/gbp.conf | 3 - debian/patches/01-zlib.patch | 25 ---- debian/patches/series | 1 - debian/rules | 35 ----- debian/simple-scan.install | 3 - debian/source/format | 1 - debian/source/local-options | 2 - debian/source_simple-scan.py | 23 --- debian/watch | 2 - 13 files changed, 517 deletions(-) delete mode 100644 debian/changelog delete mode 100644 debian/compat delete mode 100644 debian/control delete mode 100644 debian/copyright delete mode 100644 debian/gbp.conf delete mode 100644 debian/patches/01-zlib.patch delete mode 100644 debian/patches/series delete mode 100755 debian/rules delete mode 100644 debian/simple-scan.install delete mode 100644 debian/source/format delete mode 100644 debian/source/local-options delete mode 100644 debian/source_simple-scan.py delete mode 100644 debian/watch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index e31993c..0000000 --- a/debian/changelog +++ /dev/null @@ -1,332 +0,0 @@ -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 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 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 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 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 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 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 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 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 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 Wed, 04 Apr 2012 21:14:45 +0200 - -simple-scan (3.2.1-1) unstable; urgency=low - - * New upstream release. - - -- Alessio Treglia 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 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 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 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 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 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 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 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 Tue, 31 Aug 2010 01:03:07 +0200 - -simple-scan (2.31.90.2-1) unstable; urgency=low - - * New upstream bugfix release. - - -- Alessio Treglia 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 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 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 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index ec63514..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/debian/control b/debian/control deleted file mode 100644 index 95313a7..0000000 --- a/debian/control +++ /dev/null @@ -1,58 +0,0 @@ -Source: simple-scan -Section: gnome -Priority: optional -Maintainer: Debian QA Group -Standards-Version: 3.9.4 -Build-Depends: - debhelper (>= 9~), - dh-autoreconf, - gnome-common, - gnome-pkg-tools (>= 0.10), - intltool, - libcairo2-dev, - libcolord-dev, - libdbus-glib-1-dev, - libglib2.0-dev, - libgtk-3-dev, - libgudev-1.0-dev, - libjpeg-dev, - libsane-dev, - lsb-release, - python-scour, - valac-0.16 | valac (>= 0.14.0), - yelp-tools, - zlib1g-dev -Homepage: https://launchpad.net/simple-scan -Vcs-Git: git://anonscm.debian.org/collab-maint/simple-scan.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?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. - -Package: simple-scan-dbg -Section: debug -Priority: extra -Architecture: 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 deleted file mode 100644 index bfb882f..0000000 --- a/debian/copyright +++ /dev/null @@ -1,31 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: Simple Scan -Upstream-Contact: Robert Ancell -Source: https://launchpad.net/simple-scan/+download - -Files: * -Copyright: 2009-2011 Canonical Ltd -License: GPL-3+ - -Files: debian/* -Copyright: - 2009-2012, 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. -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 . diff --git a/debian/gbp.conf b/debian/gbp.conf deleted file mode 100644 index d0c1355..0000000 --- a/debian/gbp.conf +++ /dev/null @@ -1,3 +0,0 @@ -[DEFAULT] -pristine-tar = True -compression = xz diff --git a/debian/patches/01-zlib.patch b/debian/patches/01-zlib.patch deleted file mode 100644 index 2014c82..0000000 --- a/debian/patches/01-zlib.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- - configure.ac | 1 + - src/Makefile.am | 1 + - 2 files changed, 2 insertions(+) - ---- simple-scan.orig/configure.ac -+++ simple-scan/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 ---- simple-scan.orig/src/Makefile.am -+++ simple-scan/src/Makefile.am -@@ -46,6 +46,7 @@ simple_scan_LDADD = \ - $(SIMPLE_SCAN_LIBS) \ - $(COLORD_LIBS) \ - -lsane \ -+ -lz \ - -lm - - CLEANFILES = \ diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index f505775..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -01-zlib.patch diff --git a/debian/rules b/debian/rules deleted file mode 100755 index 7abb6da..0000000 --- a/debian/rules +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/make -f - -export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) -export CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) -export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) -export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) - -LDFLAGS+=-Wl,--as-needed - -%: - dh $@ --with=autoreconf,scour - -# Fixes FTBFS -override_dh_auto_test: - -# 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 diff --git a/debian/simple-scan.install b/debian/simple-scan.install deleted file mode 100644 index b7d9a09..0000000 --- a/debian/simple-scan.install +++ /dev/null @@ -1,3 +0,0 @@ -debian/source_simple-scan.py usr/share/apport/package-hooks/ -usr/bin -usr/share diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index 163aaf8..0000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/debian/source/local-options b/debian/source/local-options deleted file mode 100644 index 9cdfca9..0000000 --- a/debian/source/local-options +++ /dev/null @@ -1,2 +0,0 @@ -unapply-patches -abort-on-upstream-changes diff --git a/debian/source_simple-scan.py b/debian/source_simple-scan.py deleted file mode 100644 index 6fab46c..0000000 --- a/debian/source_simple-scan.py +++ /dev/null @@ -1,23 +0,0 @@ -'''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') diff --git a/debian/watch b/debian/watch deleted file mode 100644 index 9d546c6..0000000 --- a/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -https://launchpad.net/simple-scan/+download .*/simple-scan-([0-9.]+)\.tar\.xz -- cgit v1.2.3