From 60c1b5e023d49a7eaa777082dc32726ef7cb396b Mon Sep 17 00:00:00 2001 From: Alessio Treglia Date: Fri, 9 Apr 2010 12:41:39 +0200 Subject: Imported Debian patch 0.9.10-1 --- debian/README.source | 13 ++++ debian/changelog | 88 ++++++++++++++++++++++++++ debian/compat | 1 + debian/control | 36 +++++++++++ debian/copyright | 30 +++++++++ debian/patches/01_lpi.patch | 38 +++++++++++ debian/patches/11_thunderbird_workaround.patch | 34 ++++++++++ debian/patches/series | 1 + debian/rules | 14 ++++ debian/source_simple-scan.py | 14 ++++ debian/watch | 2 + 11 files changed, 271 insertions(+) create mode 100644 debian/README.source create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/patches/01_lpi.patch create mode 100644 debian/patches/11_thunderbird_workaround.patch create mode 100644 debian/patches/series create mode 100755 debian/rules create mode 100644 debian/source_simple-scan.py create mode 100644 debian/watch diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..beee95f --- /dev/null +++ b/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 diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..b58e986 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,88 @@ +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 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..484ce39 --- /dev/null +++ b/debian/control @@ -0,0 +1,36 @@ +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 + +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. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..445d10d --- /dev/null +++ b/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’. diff --git a/debian/patches/01_lpi.patch b/debian/patches/01_lpi.patch new file mode 100644 index 0000000..0ace6ef --- /dev/null +++ b/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-0.9.10.orig/configure.ac ++++ simple-scan-0.9.10/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-0.9.10.orig/src/ui.c ++++ simple-scan-0.9.10/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" +@@ -1308,6 +1309,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->preview_box = GTK_WIDGET (gtk_builder_get_object (builder, "preview_vbox")); + ui->priv->preview_area = GTK_WIDGET (gtk_builder_get_object (builder, "preview_area")); diff --git a/debian/patches/11_thunderbird_workaround.patch b/debian/patches/11_thunderbird_workaround.patch new file mode 100644 index 0000000..2d5a938 --- /dev/null +++ b/debian/patches/11_thunderbird_workaround.patch @@ -0,0 +1,34 @@ +## Description: add some description +## Origin/Author: add some origin or author +## Bug: bug URL +Index: simple-scan-0.9.10/src/simple-scan.c +=================================================================== +--- simple-scan-0.9.10.orig/src/simple-scan.c 2010-03-26 12:53:11.355296101 +1100 ++++ simple-scan-0.9.10/src/simple-scan.c 2010-03-26 12:53:08.325311353 +1100 +@@ -343,7 +343,7 @@ + /* NOTE: I'm not sure if this is a 100% safe strategy to use g_file_open_tmp(), close and + * use the filename but it appears to work in practise */ + +- filename = g_strdup_printf ("%s-XXXXXX.%s", prefix, extension); ++ filename = g_strdup_printf ("%sXXXXXX.%s", prefix, extension); + fd = g_file_open_tmp (filename, &path, &error); + g_free (filename); + if (fd < 0) { +@@ -371,7 +371,7 @@ + gchar *path; + + /* Open a temporary file */ +- path = get_temporary_filename ("scanned-document", "pdf"); ++ path = get_temporary_filename ("scan", "pdf"); + if (path) { + GFile *file; + +@@ -389,7 +389,7 @@ + gchar *path; + GFile *file; + +- path = get_temporary_filename ("scanned-document", "jpg"); ++ path = get_temporary_filename ("scan", "jpg"); + if (!path) { + saved = FALSE; + break; diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..2d543b4 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +11_thunderbird_workaround.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..51e928e --- /dev/null +++ b/debian/rules @@ -0,0 +1,14 @@ +#!/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 diff --git a/debian/source_simple-scan.py b/debian/source_simple-scan.py new file mode 100644 index 0000000..f889cde --- /dev/null +++ b/debian/source_simple-scan.py @@ -0,0 +1,14 @@ +'''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') + +def add_info(report): + attach_hardware(report) + attach_file_if_exists(report, LOG_FILE, 'SimpleScanLog') diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..43e6029 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://people.ubuntu.com/~robert-ancell/simple-scan/simple-scan-(.*)\.tar\.gz -- cgit v1.2.3