--- simple-scan-0.9.10.orig/debian/compat +++ simple-scan-0.9.10/debian/compat @@ -0,0 +1 @@ +7 --- simple-scan-0.9.10.orig/debian/install +++ simple-scan-0.9.10/debian/install @@ -0,0 +1 @@ +debian/source_simple-scan.py usr/share/apport/package-hooks/ --- simple-scan-0.9.10.orig/debian/copyright +++ simple-scan-0.9.10/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-0.9.10.orig/debian/changelog +++ simple-scan-0.9.10/debian/changelog @@ -0,0 +1,168 @@ +simple-scan (0.9.10-0ubuntu4) lucid; urgency=low + + * debian/patches/11_thunderbird_workaround.patch: + - Workaround thunderbird email bug + + -- Robert Ancell Fri, 26 Mar 2010 12:53:13 +1100 + +simple-scan (0.9.10-0ubuntu3) lucid; urgency=low + + * debian/patches/10_save_toolbar_tooltip.patch: + - Add missing patch + + -- Robert Ancell Fri, 26 Mar 2010 09:24:34 +1100 + +simple-scan (0.9.10-0ubuntu2) lucid; urgency=low + + * debian/patches/10_save_toolbar_tooltip.patch: + - Add missing tooltip (uploaded old tarball) + + -- Robert Ancell Fri, 26 Mar 2010 09:04:57 +1100 + +simple-scan (0.9.10-0ubuntu1) lucid; urgency=low + + * New upstream release: + - Change default scan direction to top-to-bottom + - Call sane_cancel after each document, not duing multi page scans + (LP: #536864) + - Set X-GNOME-Gettext-Domain in .desktop file (LP: #538977) + - Fix memory leak in page_set_scan_area() + - Fix read buffering when reading large images + - Fix moving crop on pages after first (LP: #542830) + - Load color profiles for scanner and save them in output files + - Fix broken logic in picking nearest supported scan resolution + (LP: #545807) + - Add save button back into toolbar (LP: #543384) + - Put text beside crop toolbutton (LP: #543384) + - Merge document type into scan menu (LP: #543384) + * debian/control: + - Build-depend on libdput-glib-1-dev + + -- Robert Ancell Thu, 25 Mar 2010 12:42:38 +1100 + +simple-scan (0.9.9-0ubuntu1) lucid; urgency=low + + * New upstream relase: (LP: #539011) + - Fix crop rotation + - Improve crop outline so visible on more scanned documents + - Make preferences window fixed size + - Add page size selection (LP: #536882) + + -- Robert Ancell Mon, 15 Mar 2010 21:36:44 +1100 + +simple-scan (0.9.8-0ubuntu1) lucid; urgency=low + + * New upstream release: + - Open page in image viewer when double clicking on it + - Use custom crop icon for crop toolbutton + - Use Gtk theme when painting focus on selected page + - Added scan sources seen on propietary brother3 driver + - Explicitly set flatbed source as not all drivers support automatic sources + - Add preferences options for which page side to scan (LP: #536864) + - Reduce shading on crop overlay + - Remove save and preferences buttons from toolbar + - Make crop toolbar button a toggle + - Fix bugs in crop resizing + - Compress PDF images + * debian/control: + - Recommend imagemagick (used to compress PDF images) + + -- Robert Ancell Mon, 15 Mar 2010 12:18:03 +1100 + +simple-scan (0.9.7-0ubuntu1) lucid; urgency=low + + * New upstream release: + - Fix crash when deleting page from multi-page document (LP: #534697) + - Add icon into help dialog + - Update misleading description of PNG in help file + + -- Robert Ancell Tue, 09 Mar 2010 11:50:36 +1100 + +simple-scan (0.9.6-1ubuntu1) lucid; urgency=low + + * New upstream release: + - Show PDF files by default in save dialog (LP: #530827) + - Set default save location to Documents directory + - Remember save location + - Attach JPEG files when emailing photos (LP: #529394) + - Make stop button only sensitive when scanning (LP: #524820) + - Correctly store default page orientation for first page (LP: #530848) + - Optimise rendering + - Show page throbber for pages following the first one + - Fix bug where selecting scan before devices are detected would sometime + fail + - Don't move focus to selected page when moving the scrollbar + - Make sure USB scanners are automatically selected when plugging in + + -- Robert Ancell Fri, 05 Mar 2010 22:03:38 +1100 + +simple-scan (0.9.5-1ubuntu1) lucid; urgency=low + + * Re-sync with debian unstable (LP: #523740), Ubuntu-specific changes: + * debian/patches/01_lpi.patch: + - Add Launchpad integration + * debian/rules: + - Disable dh_auto_test to prevent FTBFS + - Run autoreconf before build + * debian/install: + - Install apport hook. + * debian/control: + - Bump versioned build-dependency on debhelper + - Build-depend on gnome-common, liblaunchpad-integration-dev + + -- Robert Ancell Fri, 19 Feb 2010 09:44:17 +1100 + +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-0.9.10.orig/debian/source_simple-scan.py +++ simple-scan-0.9.10/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') --- simple-scan-0.9.10.orig/debian/watch +++ simple-scan-0.9.10/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://people.ubuntu.com/~robert-ancell/simple-scan/simple-scan-(.*)\.tar\.gz --- simple-scan-0.9.10.orig/debian/rules +++ simple-scan-0.9.10/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 --- simple-scan-0.9.10.orig/debian/control +++ simple-scan-0.9.10/debian/control @@ -0,0 +1,39 @@ +Source: simple-scan +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Alessio Treglia +DM-Upload-Allowed: yes +Standards-Version: 3.8.4 +Build-Depends: debhelper (>= 7.0.50~), + quilt (>= 0.46-7~), + gnome-common, + gnome-pkg-tools (>= 0.10), + gnome-doc-utils (>= 0.3.2), + libglib2.0-dev, + libgtk2.0-dev, + libgconf2-dev, + libcairo2-dev, + libgudev-1.0-dev, + libdbus-glib-1-dev, + libsane-dev, + intltool, + liblaunchpad-integration-dev +Homepage: https://launchpad.net/simple-scan +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/simple-scan/ubuntu + +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-0.9.10.orig/debian/README.source +++ simple-scan-0.9.10/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-0.9.10.orig/debian/patches/10_save_toolbar_tooltip.patch +++ simple-scan-0.9.10/debian/patches/10_save_toolbar_tooltip.patch @@ -0,0 +1,15 @@ +## Description: add some description +## Origin/Author: add some origin or author +## Bug: bug URL +Index: simple-scan-0.9.10/data/simple-scan.ui +=================================================================== +--- simple-scan-0.9.10.orig/data/simple-scan.ui 2010-03-26 09:04:56.712817730 +1100 ++++ simple-scan-0.9.10/data/simple-scan.ui 2010-03-26 09:04:55.032782344 +1100 +@@ -382,6 +382,7 @@ + + + True ++ Save document to a file + True + Save + True --- simple-scan-0.9.10.orig/debian/patches/11_thunderbird_workaround.patch +++ simple-scan-0.9.10/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; --- simple-scan-0.9.10.orig/debian/patches/series +++ simple-scan-0.9.10/debian/patches/series @@ -0,0 +1,3 @@ +01_lpi.patch +10_save_toolbar_tooltip.patch +11_thunderbird_workaround.patch --- simple-scan-0.9.10.orig/debian/patches/01_lpi.patch +++ simple-scan-0.9.10/debian/patches/01_lpi.patch @@ -0,0 +1,38 @@ +## Description: add some description +## Origin/Author: add some origin or author +## Bug: bug URL +Index: simple-scan-0.9.10/configure.ac +=================================================================== +--- simple-scan-0.9.10.orig/configure.ac 2010-03-25 12:45:42.000000000 +1100 ++++ simple-scan-0.9.10/configure.ac 2010-03-25 12:48:23.906737712 +1100 +@@ -33,6 +33,7 @@ + cairo-pdf + dbus-glib-1 + gudev-1.0 ++ launchpad-integration + ]) + + AC_CHECK_HEADERS([sane/sane.h],[],[AC_MSG_ERROR([SANE not found])]) +Index: simple-scan-0.9.10/src/ui.c +=================================================================== +--- simple-scan-0.9.10.orig/src/ui.c 2010-03-25 12:09:18.000000000 +1100 ++++ simple-scan-0.9.10/src/ui.c 2010-03-25 12:48:23.906737712 +1100 +@@ -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 @@ + } + 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"));