From 29e1afc27d885e6dbd3312fc2827b5f9acd58cec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 8 Sep 2018 15:42:20 +0200 Subject: d/control: Change Vcs-* to point to the new repository --- debian/changelog | 2 ++ debian/control | 4 ++-- debian/files | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) delete mode 100644 debian/files diff --git a/debian/changelog b/debian/changelog index 07a7da7..fc89ff6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ sane-frontends (1.0.14-13) UNRELEASED; urgency=medium * debian/watch: - Switch to gitlab. + * debian/control: + - Change Vcs-* to point to the new repository. * Change to my new email address. * Migrate to debhelper 11: - Change debian/compat to 11. diff --git a/debian/control b/debian/control index c42df42..04e3db4 100644 --- a/debian/control +++ b/debian/control @@ -10,8 +10,8 @@ Build-Depends: libgtk2.0-dev, libsane-dev (>= 1.0.11-3), Homepage: http://www.sane-project.org -Vcs-Git: git://anonscm.debian.org/collab-maint/sane-frontends.git -Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/sane-frontends.git +Vcs-Git: git://jff.email/opt/git/sane-frontends.git +Vcs-Browser: https://jff.email/cgit/sane-frontends.git Package: sane Architecture: any diff --git a/debian/files b/debian/files deleted file mode 100644 index 0081bd9..0000000 --- a/debian/files +++ /dev/null @@ -1 +0,0 @@ -sane-frontends_1.0.14-12_source.buildinfo graphics optional -- cgit v1.2.3 From d92a195a4a01537ac457b992a684091db7d87e99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 8 Sep 2018 15:52:16 +0200 Subject: d/changelog: Remove trailing whitespaces --- debian/changelog | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index fc89ff6..a412c55 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ sane-frontends (1.0.14-13) UNRELEASED; urgency=medium * debian/watch: - Switch to gitlab. + * debian/changelog: + - Remove trailing whitespaces. * debian/control: - Change Vcs-* to point to the new repository. * Change to my new email address. @@ -50,7 +52,7 @@ sane-frontends (1.0.14-10) unstable; urgency=medium - Add Vcs-* to new git repository. * debian/compat: - Change from 5 to 9. - * New debian/source/format + * New debian/source/format - Set to "3.0 (quilt)". * Convert patches from dpatch to quilt. * Rewrite debian/copyright. @@ -304,10 +306,10 @@ sane-frontends (1.0.8-2) unstable; urgency=low sane-frontends (1.0.8-1) unstable; urgency=low * New upstream release. New frontend scanadf, focusing on scanners with - automatic document feeders. + automatic document feeders. -- Kevin Dalley Sun, 6 Oct 2002 18:14:23 -0700 - + sane-frontends (1.0.7-2.1) unstable; urgency=medium * Non-Maintainer Upload. @@ -367,7 +369,7 @@ sane (1.0.1-1999-10-21-12) frozen unstable; urgency=low sane (1.0.1-1999-10-21-11) frozen unstable; urgency=low * Add Build-Depends to control files for sane and sane-gimp1.1 (closes: - #60923). + #60923). -- Kevin Dalley Mon, 27 Mar 2000 03:16:55 -0800 @@ -508,11 +510,11 @@ sane (1.00-1) unstable; urgency=low sane (0.74-2) unstable; urgency=low - * temporarily comment out artec in dll.conf, due to bad interaction with + * temporarily comment out artec in dll.conf, due to bad interaction with Umax scanner. If artec is used as a scanner, uncomment artec from - dll.conf + dll.conf * automatically generates conffiles, thanks for - Roman.Hodek@informatik.uni-erlangen.de (fixes bug #26545) + Roman.Hodek@informatik.uni-erlangen.de (fixes bug #26545) * fixes problem with creation of /usr/share/sane during build process (bug #26314) @@ -557,7 +559,7 @@ sane (0.70-1) unstable; urgency=low UMAX backend * add patches 2-5 to SnapScan backend which allows other scanners - to work + to work -- Kevin Dalley Sat, 31 Jan 1998 17:32:53 -0800 @@ -566,7 +568,7 @@ sane (0.69-2) unstable; urgency=low * correct umax-scanner.h so that Astra 1200S is legal -- Kevin Dalley Sun, 25 Jan 1998 09:44:45 -0800 - + sane (0.69-1) unstable; urgency=low * update to version 0.69 of sane -- cgit v1.2.3 From 034931fa0fd5781df6a89ecc577a5b6e06e2c86e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 8 Sep 2018 15:55:29 +0200 Subject: Remove autotools.dev --- debian/changelog | 2 ++ debian/control | 1 - debian/rules | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a412c55..9b2c8b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ sane-frontends (1.0.14-13) UNRELEASED; urgency=medium * Migrate to debhelper 11: - Change debian/compat to 11. - Bump minimum debhelper version in debian/control to >= 11. + - Remove Build-Depend autotools.dev in debian/control. + - Remove --with autotools-dev from debian/rules. * Declare compliance with Debian Policy 4.2.1 (No changes needed). -- Jörg Frings-Fürst Sat, 08 Sep 2018 15:03:19 +0200 diff --git a/debian/control b/debian/control index 04e3db4..0480eaf 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,6 @@ Priority: optional Maintainer: Jörg Frings-Fürst Standards-Version: 4.2.1 Build-Depends: - autotools-dev, debhelper (>= 11), libgimp2.0-dev (>= 2.0.0), libgtk2.0-dev, diff --git a/debian/rules b/debian/rules index 4aa0e6b..63a03ce 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: - dh $@ --with autotools-dev + dh $@ override_dh_strip: dh_strip --dbg-package=sane-dbg -- cgit v1.2.3 From 9a1e75ec1feb43bd0c6564fadb46724d9a2f860a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 8 Sep 2018 16:01:59 +0200 Subject: d/control: Remove trailing whitespaces --- debian/changelog | 3 +-- debian/control | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9b2c8b4..af1653f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ sane-frontends (1.0.14-13) UNRELEASED; urgency=medium - Remove trailing whitespaces. * debian/control: - Change Vcs-* to point to the new repository. + - Remove trailing whitespaces. * Change to my new email address. * Migrate to debhelper 11: - Change debian/compat to 11. @@ -610,5 +611,3 @@ sane (0.67-1) unstable; urgency=low * first Debian release of sane -- Kevin Dalley Tue, 18 Nov 1997 21:38:41 -0800 - - diff --git a/debian/control b/debian/control index 0480eaf..86b66d2 100644 --- a/debian/control +++ b/debian/control @@ -40,7 +40,7 @@ Package: sane-dbg Section: debug Priority: extra Architecture: any -Depends: +Depends: ${misc:Depends}, sane (= ${binary:Version}) Description: scanner graphical frontends (debug symbols) -- cgit v1.2.3 From 3a58ef095a8ebfcdd64b2f477ebb4365504d46d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 8 Sep 2018 16:31:31 +0200 Subject: Remove obsolete package sane-dbg --- debian/changelog | 5 +++++ debian/control | 27 --------------------------- debian/rules | 3 --- debian/sane.dirs | 1 - debian/sane.install | 2 -- 5 files changed, 5 insertions(+), 33 deletions(-) diff --git a/debian/changelog b/debian/changelog index af1653f..010fb77 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,10 @@ sane-frontends (1.0.14-13) UNRELEASED; urgency=medium * debian/control: - Change Vcs-* to point to the new repository. - Remove trailing whitespaces. + * debian/sane.dirs: + - Remove usr/share/sane. + * debian/sane.install: + - Remove usr/share/sane/* and usr/bin/*. * Change to my new email address. * Migrate to debhelper 11: - Change debian/compat to 11. @@ -14,6 +18,7 @@ sane-frontends (1.0.14-13) UNRELEASED; urgency=medium - Remove Build-Depend autotools.dev in debian/control. - Remove --with autotools-dev from debian/rules. * Declare compliance with Debian Policy 4.2.1 (No changes needed). + * Remove obsolete package sane-dbg. -- Jörg Frings-Fürst Sat, 08 Sep 2018 15:03:19 +0200 diff --git a/debian/control b/debian/control index 86b66d2..5ea643d 100644 --- a/debian/control +++ b/debian/control @@ -35,30 +35,3 @@ Description: scanner graphical frontends operating systems, including GNU/Linux, OS/2, Win32 and various Unices and is available under the GNU General Public License (commercial applications and backends are welcome, too, however). - -Package: sane-dbg -Section: debug -Priority: extra -Architecture: any -Depends: - ${misc:Depends}, - sane (= ${binary:Version}) -Description: scanner graphical frontends (debug symbols) - This package includes : - o xscanimage, a scanner graphical frontend with GIMP 2.0 support - o scanadf, a command-line frontend for scanners with Automatic Document Feeder - o xcam, for acquiring images continuously from cameras. - . - An alternative to xscanimage called xsane is packaged separately. - . - The scanner frontends use SANE. SANE stands for "Scanner Access Now - Easy" and is an application programming interface (API) that provides - standardized access to any raster image scanner hardware (flatbed - scanner, hand-held scanner, video- and still-cameras, frame-grabbers, - etc.). The SANE standard is free and its discussion and development are - open to everybody. The current source code is written to support several - operating systems, including GNU/Linux, OS/2, Win32 and various Unices - and is available under the GNU General Public License (commercial - applications and backends are welcome, too, however). - . - This package contains the debugging symbols for the SANE frontends. diff --git a/debian/rules b/debian/rules index 63a03ce..e3a8c6e 100755 --- a/debian/rules +++ b/debian/rules @@ -6,6 +6,3 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: dh $@ - -override_dh_strip: - dh_strip --dbg-package=sane-dbg diff --git a/debian/sane.dirs b/debian/sane.dirs index 48002d8..a356f1d 100644 --- a/debian/sane.dirs +++ b/debian/sane.dirs @@ -1,2 +1 @@ usr/lib/gimp/2.0/plug-ins -usr/share/sane diff --git a/debian/sane.install b/debian/sane.install index d90bab2..d40d673 100644 --- a/debian/sane.install +++ b/debian/sane.install @@ -1,3 +1 @@ debian/xscanimage-icon-32x32-2.xpm usr/share/sane -usr/share/sane/* -usr/bin/* -- cgit v1.2.3 From 57bb316c674c533d40bdcc823e5f469b895cb396 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 8 Sep 2018 16:33:42 +0200 Subject: usr/share/sane/* --- debian/changelog | 2 ++ debian/copyright | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 010fb77..9e2e907 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ sane-frontends (1.0.14-13) UNRELEASED; urgency=medium * debian/control: - Change Vcs-* to point to the new repository. - Remove trailing whitespaces. + * debian/copyright: + - Use secure copyright format URI. * debian/sane.dirs: - Remove usr/share/sane. * debian/sane.install: diff --git a/debian/copyright b/debian/copyright index 9129abe..369504b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: sane-backends Upstream-Contact: Source: ftp://ftp.sane-project.org/pub/sane/ @@ -15,7 +15,7 @@ License: GPL-2+ with sane exception Files: debian/* Copyright: 1997-2002 Kevin Dalley 2002-2009 Julien BLACHE - 2014-2017 Jörg Frings-Fürst + 2014-2018 Jörg Frings-Fürst License: GPL-2+ with sane exception Files: include/*.h -- cgit v1.2.3 From ac5d58282438345b4d12a24334efcc0299c15165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 8 Sep 2018 16:42:06 +0200 Subject: d/copyright: Update Source --- debian/changelog | 1 + debian/copyright | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9e2e907..f4cecea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ sane-frontends (1.0.14-13) UNRELEASED; urgency=medium - Remove trailing whitespaces. * debian/copyright: - Use secure copyright format URI. + - Update source. * debian/sane.dirs: - Remove usr/share/sane. * debian/sane.install: diff --git a/debian/copyright b/debian/copyright index 369504b..c7965da 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,7 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: sane-backends -Upstream-Contact: -Source: ftp://ftp.sane-project.org/pub/sane/ +Upstream-Contact: +Source: https://gitlab.com/sane-project Files: * Copyright: 1995 Spencer Kimball -- cgit v1.2.3 From 267f9007f6f0142853ba5f99f3f72a58f8fb857f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 8 Sep 2018 19:05:34 +0200 Subject: Rename patches and remove not used debian/patches/scanadf-sigchld.diff --- debian/changelog | 1 + debian/patches/0100-xcam.c_dead_code.patch | 25 ++++++++ debian/patches/0105-scanadf_options_fix.patch | 42 +++++++++++++ debian/patches/0110-cap_always_settable.patch | 17 ++++++ debian/patches/0115-xcam_off_by_one.patch | 15 +++++ debian/patches/0120-word_list_fix.patch | 38 ++++++++++++ debian/patches/0125-scanadf-SIGCHLD.patch | 19 ++++++ debian/patches/0130-gimp_init.patch | 30 +++++++++ .../patches/0135-xscanimage_c-out-of-bounds.patch | 18 ++++++ debian/patches/01_xcam.c_dead_code.patch | 25 -------- debian/patches/02_xcam_man_typo.patch | 35 ----------- debian/patches/03_scanadf_options_fix.patch | 42 ------------- debian/patches/04_cap_always_settable.patch | 17 ------ debian/patches/05_xcam_off_by_one.patch | 15 ----- debian/patches/0600-xcam_man_typo.patch | 35 +++++++++++ debian/patches/0605-manpages-typo.patch | 71 ++++++++++++++++++++++ debian/patches/06_word_list_fix.patch | 38 ------------ .../patches/100_xscanimage_c-out-of-bounds.patch | 18 ------ debian/patches/20_scanadf-SIGCHLD.patch | 19 ------ debian/patches/25_manpages-typo.patch | 71 ---------------------- debian/patches/30_gimp_init.patch | 30 --------- debian/patches/scanadf-sigchld.diff | 11 ---- debian/patches/series | 20 +++--- 23 files changed, 321 insertions(+), 331 deletions(-) create mode 100644 debian/patches/0100-xcam.c_dead_code.patch create mode 100644 debian/patches/0105-scanadf_options_fix.patch create mode 100644 debian/patches/0110-cap_always_settable.patch create mode 100644 debian/patches/0115-xcam_off_by_one.patch create mode 100644 debian/patches/0120-word_list_fix.patch create mode 100644 debian/patches/0125-scanadf-SIGCHLD.patch create mode 100644 debian/patches/0130-gimp_init.patch create mode 100644 debian/patches/0135-xscanimage_c-out-of-bounds.patch delete mode 100644 debian/patches/01_xcam.c_dead_code.patch delete mode 100644 debian/patches/02_xcam_man_typo.patch delete mode 100644 debian/patches/03_scanadf_options_fix.patch delete mode 100644 debian/patches/04_cap_always_settable.patch delete mode 100644 debian/patches/05_xcam_off_by_one.patch create mode 100644 debian/patches/0600-xcam_man_typo.patch create mode 100644 debian/patches/0605-manpages-typo.patch delete mode 100644 debian/patches/06_word_list_fix.patch delete mode 100644 debian/patches/100_xscanimage_c-out-of-bounds.patch delete mode 100644 debian/patches/20_scanadf-SIGCHLD.patch delete mode 100644 debian/patches/25_manpages-typo.patch delete mode 100644 debian/patches/30_gimp_init.patch delete mode 100644 debian/patches/scanadf-sigchld.diff diff --git a/debian/changelog b/debian/changelog index f4cecea..fa9827c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ sane-frontends (1.0.14-13) UNRELEASED; urgency=medium - Remove usr/share/sane. * debian/sane.install: - Remove usr/share/sane/* and usr/bin/*. + * Rename patches and remove not used debian/patches/scanadf-sigchld.diff. * Change to my new email address. * Migrate to debhelper 11: - Change debian/compat to 11. diff --git a/debian/patches/0100-xcam.c_dead_code.patch b/debian/patches/0100-xcam.c_dead_code.patch new file mode 100644 index 0000000..f90bc6b --- /dev/null +++ b/debian/patches/0100-xcam.c_dead_code.patch @@ -0,0 +1,25 @@ +Author: +Description: Remove dead code in src/xcam.c::load_defaults() +Index: trunk/src/xcam.c +=================================================================== +--- trunk.orig/src/xcam.c ++++ trunk/src/xcam.c +@@ -536,16 +536,14 @@ static void + load_defaults (int silent) + { + char filename[PATH_MAX]; +- int fd; + + DBG (DBG_debug, "xcam, load_defaults: enter\n"); + if (make_default_filename (sizeof (filename), filename, dialog->dev_name) + < 0) + return; +- if (fd < 0) +- return; ++ + load_settings (filename, silent); +- sanei_load_values (fd, dialog->dev); ++ + DBG (DBG_debug, "xcam, load_defaults: exit\n"); + } + diff --git a/debian/patches/0105-scanadf_options_fix.patch b/debian/patches/0105-scanadf_options_fix.patch new file mode 100644 index 0000000..8c1b0c7 --- /dev/null +++ b/debian/patches/0105-scanadf_options_fix.patch @@ -0,0 +1,42 @@ +Author: +Description: Get option descriptor 0 before getting the value for option 0. +Index: trunk/src/scanadf.c +=================================================================== +--- trunk.orig/src/scanadf.c ++++ trunk/src/scanadf.c +@@ -550,15 +550,33 @@ fetch_options (SANE_Device * device) + const SANE_Option_Descriptor * opt; + SANE_Int num_dev_options; + int i, option_count; ++ SANE_Status status; + + /* and now build the full table of long options: */ + +- sane_control_option (device, 0, SANE_ACTION_GET_VALUE, &num_dev_options, 0); ++ opt = sane_get_option_descriptor (device, 0); ++ if (opt == NULL) ++ { ++ fprintf (stderr, "Could not get option descriptor for option 0\n"); ++ exit (1); ++ } ++ ++ status = sane_control_option (device, 0, SANE_ACTION_GET_VALUE, &num_dev_options, 0); ++ if (status != SANE_STATUS_GOOD) ++ { ++ fprintf (stderr, "Could not get value for option 0: %s\n", sane_strstatus (status)); ++ exit (1); ++ } + + option_count = 0; +- for (i = 0; i < num_dev_options; ++i) ++ for (i = 1; i < num_dev_options; ++i) + { + opt = sane_get_option_descriptor (device, i); ++ if (opt == NULL) ++ { ++ fprintf (stderr, "Could not get option descriptor for option %d\n", i); ++ exit (1); ++ } + + if (!SANE_OPTION_IS_SETTABLE (opt->cap)) + continue; diff --git a/debian/patches/0110-cap_always_settable.patch b/debian/patches/0110-cap_always_settable.patch new file mode 100644 index 0000000..aef60f1 --- /dev/null +++ b/debian/patches/0110-cap_always_settable.patch @@ -0,0 +1,17 @@ +Author: +Description: Remove check for SANE_CAP_ALWAYS_SETTABLE; the flag is not part +of the standard and has been removed upstream in SANE 1.0.20. +Index: trunk/src/gtkglue.c +=================================================================== +--- trunk.orig/src/gtkglue.c ++++ trunk/src/gtkglue.c +@@ -1476,8 +1476,7 @@ gsg_set_sensitivity (GSGDialog * dialog, + || opt->type == SANE_TYPE_GROUP || !dialog->element[i].widget) + continue; + +- if (!(opt->cap & SANE_CAP_ALWAYS_SETTABLE)) +- gtk_widget_set_sensitive (dialog->element[i].widget, sensitive); ++ gtk_widget_set_sensitive (dialog->element[i].widget, sensitive); + } + } + diff --git a/debian/patches/0115-xcam_off_by_one.patch b/debian/patches/0115-xcam_off_by_one.patch new file mode 100644 index 0000000..0b91cc4 --- /dev/null +++ b/debian/patches/0115-xcam_off_by_one.patch @@ -0,0 +1,15 @@ +Author: +Description: Fix an off-by-one. +Index: trunk/src/xcam.c +=================================================================== +--- trunk.orig/src/xcam.c ++++ trunk/src/xcam.c +@@ -1287,7 +1287,7 @@ save_frame_button (GtkWidget * widget, g + + /* test for pnm formats */ + strncpy (testfilename, preferences.filename, sizeof (testfilename)); +- testfilename[sizeof (testfilename)] = 0; ++ testfilename[sizeof (testfilename) - 1] = 0; + g_strreverse (testfilename); + if (!((!strncmp (testfilename, "mnp.", 4)) || + (!strncmp (testfilename, "mgp.", 4)) || diff --git a/debian/patches/0120-word_list_fix.patch b/debian/patches/0120-word_list_fix.patch new file mode 100644 index 0000000..683e745 --- /dev/null +++ b/debian/patches/0120-word_list_fix.patch @@ -0,0 +1,38 @@ +Author: +Description: Fix word list handling when current value is not part of the list. +Index: trunk/src/gtkglue.c +=================================================================== +--- trunk.orig/src/gtkglue.c ++++ trunk/src/gtkglue.c +@@ -913,6 +913,7 @@ panel_build (GSGDialog * dialog) + char **str_list; + int i, j; + int num_vector_opts = 0, *vector_opts; ++ SANE_Bool val_in_list; + + main_hbox = gtk_hbox_new (FALSE, 2); + +@@ -1073,13 +1074,23 @@ panel_build (GSGDialog * dialog) + case SANE_CONSTRAINT_WORD_LIST: + /* use a "list-selection" widget */ + num_words = opt->constraint.word_list[0]; ++ if (num_words == 0) ++ { ++ fprintf (stderr, "panel_build: empty word list!\n"); ++ break; ++ } ++ val_in_list = SANE_FALSE; + str_list = malloc ((num_words + 1) * sizeof (str_list[0])); + for (j = 0; j < num_words; ++j) + { ++ if (opt->constraint.word_list[j + 1] == val) ++ val_in_list = SANE_TRUE; + sprintf (str, "%d", opt->constraint.word_list[j + 1]); + str_list[j] = strdup (str); + } + str_list[j] = 0; ++ if (!val_in_list) ++ val = opt->constraint.word_list[1]; + sprintf (str, "%d", val); + option_menu_new (parent, title, str_list, str, elem, + dialog->tooltips, opt->desc, diff --git a/debian/patches/0125-scanadf-SIGCHLD.patch b/debian/patches/0125-scanadf-SIGCHLD.patch new file mode 100644 index 0000000..ab91534 --- /dev/null +++ b/debian/patches/0125-scanadf-SIGCHLD.patch @@ -0,0 +1,19 @@ +Description: Sets SIGCHLD to SIG_DFL before execle(). +Author: Jakub Wilk +Origin: http://www.opengroup.org/onlinepubs/009695399/functions/exec.html +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=596232 +Last-Update: 2014-12-03 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/src/scanadf.c +=================================================================== +--- trunk.orig/src/scanadf.c ++++ trunk/src/scanadf.c +@@ -1213,6 +1213,7 @@ scan_it_raw (const char *fname, SANE_Boo + + case 0: + /* in child process */ ++ signal(SIGCHLD, SIG_DFL); + sprintf(cmd, "%s '%s'", script, fname); + /* system(cmd); */ + execle(script, script, fname, NULL, environ); diff --git a/debian/patches/0130-gimp_init.patch b/debian/patches/0130-gimp_init.patch new file mode 100644 index 0000000..08c81f1 --- /dev/null +++ b/debian/patches/0130-gimp_init.patch @@ -0,0 +1,30 @@ +Description: Enable GIMP interface +Author: Jörg Frings-Fürst +Bug: https://alioth.debian.org/tracker/index.php?func=detail&aid=313616&group_id=30186&atid=410366 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=682540 +Forwarded: https://alioth.debian.org/tracker/index.php?func=detail&aid=313616&group_id=30186&atid=410366 +Last-Update: 2015-05-09 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/src/xscanimage.c +=================================================================== +--- trunk.orig/src/xscanimage.c ++++ trunk/src/xscanimage.c +@@ -320,7 +320,7 @@ query (void) + "Andy Beck, Tristan Tarrant, and David Mosberger", + "8th June 1997", + "/File/Acquire/xscanimage/Device dialog...", +- "RGB, GRAY", ++ 0, + GIMP_EXTENSION, + nargs, nreturn_vals, args, return_vals); + +@@ -365,7 +365,7 @@ query (void) + "interface.", + "Andy Beck, Tristan Tarrant, and David Mosberger", + "Andy Beck, Tristan Tarrant, and David Mosberger", +- "8th June 1997", mpath, "RGB, GRAY", GIMP_EXTENSION, ++ "8th June 1997", mpath, 0, GIMP_EXTENSION, + nargs, nreturn_vals, args, return_vals); + } + sane_exit (); diff --git a/debian/patches/0135-xscanimage_c-out-of-bounds.patch b/debian/patches/0135-xscanimage_c-out-of-bounds.patch new file mode 100644 index 0000000..2249f5a --- /dev/null +++ b/debian/patches/0135-xscanimage_c-out-of-bounds.patch @@ -0,0 +1,18 @@ +Description: Correct out-of-bounds +Author: Jörg Frings-Fürst +Last-Update: 2014-12-03 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/src/xscanimage.c +=================================================================== +--- trunk.orig/src/xscanimage.c ++++ trunk/src/xscanimage.c +@@ -1284,7 +1284,7 @@ scan_dialog (GtkWidget * widget, gpointe + { /* We are running in standalone mode */ + /* test for pnm formats */ + strncpy (testfilename, preferences.filename, sizeof (testfilename)); +- testfilename[sizeof (testfilename)] = 0; ++ testfilename[sizeof (testfilename) - 1] = 0; + g_strreverse (testfilename); + if (!((!strncmp (testfilename, "mnp.", 4)) || + (!strncmp (testfilename, "mgp.", 4)) || diff --git a/debian/patches/01_xcam.c_dead_code.patch b/debian/patches/01_xcam.c_dead_code.patch deleted file mode 100644 index f90bc6b..0000000 --- a/debian/patches/01_xcam.c_dead_code.patch +++ /dev/null @@ -1,25 +0,0 @@ -Author: -Description: Remove dead code in src/xcam.c::load_defaults() -Index: trunk/src/xcam.c -=================================================================== ---- trunk.orig/src/xcam.c -+++ trunk/src/xcam.c -@@ -536,16 +536,14 @@ static void - load_defaults (int silent) - { - char filename[PATH_MAX]; -- int fd; - - DBG (DBG_debug, "xcam, load_defaults: enter\n"); - if (make_default_filename (sizeof (filename), filename, dialog->dev_name) - < 0) - return; -- if (fd < 0) -- return; -+ - load_settings (filename, silent); -- sanei_load_values (fd, dialog->dev); -+ - DBG (DBG_debug, "xcam, load_defaults: exit\n"); - } - diff --git a/debian/patches/02_xcam_man_typo.patch b/debian/patches/02_xcam_man_typo.patch deleted file mode 100644 index 2421dc8..0000000 --- a/debian/patches/02_xcam_man_typo.patch +++ /dev/null @@ -1,35 +0,0 @@ -Author: -Description: Fix various typos in xcam.man. -Index: trunk/doc/xcam.man -=================================================================== ---- trunk.orig/doc/xcam.man -+++ trunk/doc/xcam.man -@@ -1,4 +1,4 @@ --.TH xcam 1 "11 April 2005" -+.TH xcam 1 "19 February 2008" - .IX xcam - .SH NAME - xcam - a graphical camera frontend for SANE -@@ -12,7 +12,7 @@ xcam - a graphical camera frontend for S - .B xcam - provides a graphical user-interface to control an image - acquisition device such as a flatbed scanner or a camera. It allows --scanning invidual images and can be invoked directly from the command-line. -+scanning individual images and can be invoked directly from the command-line. - - .B xcam - acts as a stand-alone program that saves acquired images in a suitable -@@ -43,12 +43,11 @@ will output its version number. - .PP - The - .B --help (-h) --.B xcam - flag prints a short summary of options. - .PP - .TP - .B SANE_DEBUG_XCAM --This environment variable controls the debug level xscanimage. Higher -+This environment variable controls the debug level of xcam. Higher - debug levels increase the verbosity of the output. - - Value Descsription diff --git a/debian/patches/03_scanadf_options_fix.patch b/debian/patches/03_scanadf_options_fix.patch deleted file mode 100644 index 8c1b0c7..0000000 --- a/debian/patches/03_scanadf_options_fix.patch +++ /dev/null @@ -1,42 +0,0 @@ -Author: -Description: Get option descriptor 0 before getting the value for option 0. -Index: trunk/src/scanadf.c -=================================================================== ---- trunk.orig/src/scanadf.c -+++ trunk/src/scanadf.c -@@ -550,15 +550,33 @@ fetch_options (SANE_Device * device) - const SANE_Option_Descriptor * opt; - SANE_Int num_dev_options; - int i, option_count; -+ SANE_Status status; - - /* and now build the full table of long options: */ - -- sane_control_option (device, 0, SANE_ACTION_GET_VALUE, &num_dev_options, 0); -+ opt = sane_get_option_descriptor (device, 0); -+ if (opt == NULL) -+ { -+ fprintf (stderr, "Could not get option descriptor for option 0\n"); -+ exit (1); -+ } -+ -+ status = sane_control_option (device, 0, SANE_ACTION_GET_VALUE, &num_dev_options, 0); -+ if (status != SANE_STATUS_GOOD) -+ { -+ fprintf (stderr, "Could not get value for option 0: %s\n", sane_strstatus (status)); -+ exit (1); -+ } - - option_count = 0; -- for (i = 0; i < num_dev_options; ++i) -+ for (i = 1; i < num_dev_options; ++i) - { - opt = sane_get_option_descriptor (device, i); -+ if (opt == NULL) -+ { -+ fprintf (stderr, "Could not get option descriptor for option %d\n", i); -+ exit (1); -+ } - - if (!SANE_OPTION_IS_SETTABLE (opt->cap)) - continue; diff --git a/debian/patches/04_cap_always_settable.patch b/debian/patches/04_cap_always_settable.patch deleted file mode 100644 index aef60f1..0000000 --- a/debian/patches/04_cap_always_settable.patch +++ /dev/null @@ -1,17 +0,0 @@ -Author: -Description: Remove check for SANE_CAP_ALWAYS_SETTABLE; the flag is not part -of the standard and has been removed upstream in SANE 1.0.20. -Index: trunk/src/gtkglue.c -=================================================================== ---- trunk.orig/src/gtkglue.c -+++ trunk/src/gtkglue.c -@@ -1476,8 +1476,7 @@ gsg_set_sensitivity (GSGDialog * dialog, - || opt->type == SANE_TYPE_GROUP || !dialog->element[i].widget) - continue; - -- if (!(opt->cap & SANE_CAP_ALWAYS_SETTABLE)) -- gtk_widget_set_sensitive (dialog->element[i].widget, sensitive); -+ gtk_widget_set_sensitive (dialog->element[i].widget, sensitive); - } - } - diff --git a/debian/patches/05_xcam_off_by_one.patch b/debian/patches/05_xcam_off_by_one.patch deleted file mode 100644 index 0b91cc4..0000000 --- a/debian/patches/05_xcam_off_by_one.patch +++ /dev/null @@ -1,15 +0,0 @@ -Author: -Description: Fix an off-by-one. -Index: trunk/src/xcam.c -=================================================================== ---- trunk.orig/src/xcam.c -+++ trunk/src/xcam.c -@@ -1287,7 +1287,7 @@ save_frame_button (GtkWidget * widget, g - - /* test for pnm formats */ - strncpy (testfilename, preferences.filename, sizeof (testfilename)); -- testfilename[sizeof (testfilename)] = 0; -+ testfilename[sizeof (testfilename) - 1] = 0; - g_strreverse (testfilename); - if (!((!strncmp (testfilename, "mnp.", 4)) || - (!strncmp (testfilename, "mgp.", 4)) || diff --git a/debian/patches/0600-xcam_man_typo.patch b/debian/patches/0600-xcam_man_typo.patch new file mode 100644 index 0000000..2421dc8 --- /dev/null +++ b/debian/patches/0600-xcam_man_typo.patch @@ -0,0 +1,35 @@ +Author: +Description: Fix various typos in xcam.man. +Index: trunk/doc/xcam.man +=================================================================== +--- trunk.orig/doc/xcam.man ++++ trunk/doc/xcam.man +@@ -1,4 +1,4 @@ +-.TH xcam 1 "11 April 2005" ++.TH xcam 1 "19 February 2008" + .IX xcam + .SH NAME + xcam - a graphical camera frontend for SANE +@@ -12,7 +12,7 @@ xcam - a graphical camera frontend for S + .B xcam + provides a graphical user-interface to control an image + acquisition device such as a flatbed scanner or a camera. It allows +-scanning invidual images and can be invoked directly from the command-line. ++scanning individual images and can be invoked directly from the command-line. + + .B xcam + acts as a stand-alone program that saves acquired images in a suitable +@@ -43,12 +43,11 @@ will output its version number. + .PP + The + .B --help (-h) +-.B xcam + flag prints a short summary of options. + .PP + .TP + .B SANE_DEBUG_XCAM +-This environment variable controls the debug level xscanimage. Higher ++This environment variable controls the debug level of xcam. Higher + debug levels increase the verbosity of the output. + + Value Descsription diff --git a/debian/patches/0605-manpages-typo.patch b/debian/patches/0605-manpages-typo.patch new file mode 100644 index 0000000..2bc246b --- /dev/null +++ b/debian/patches/0605-manpages-typo.patch @@ -0,0 +1,71 @@ +Description: Correct typos in manpages +Author: Jörg Frings-Fürst +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=612686 +Last-Update: 2014-12-03 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/doc/scanadf.man +=================================================================== +--- trunk.orig/doc/scanadf.man ++++ trunk/doc/scanadf.man +@@ -162,7 +162,7 @@ information about the parameters of the + + .PP + If the +-.B --scipt-wait ++.B --script-wait + option is given, scanadf will wait until all scan-scripts have been finished before + exiting. That will be useful if scanadf is used in conjunction with tools to modify + the scanned images. +@@ -210,7 +210,7 @@ invoke + via a command-line of the form: + .PP + .RS +-scanadf --help --device ++scanadf \-\-help \-\-device + .I dev + .RE + .PP +@@ -256,12 +256,12 @@ work at this time are: + .br + .B sane-hp + - Hewlett Packard scanners. A patch to the sane-hp backend +-is necessary. The --scantype=ADF option must be specified (earlier +-versions of the backend used the --scan-from-adf option, instead). ++is necessary. The \-\-scantype=ADF option must be specified (earlier ++versions of the backend used the \-\-scan-from-adf option, instead). + .br + .B sane-umax + - UMAX scanners. Support exists in build 12 and later. +-The --source="Automatic Document Feeder" option must be specified. ++The \-\-source="Automatic Document Feeder" option must be specified. + .br + .RE + +Index: trunk/doc/xscanimage.man +=================================================================== +--- trunk.orig/doc/xscanimage.man ++++ trunk/doc/xscanimage.man +@@ -15,7 +15,7 @@ xscanimage \- scan an image + .B xscanimage + provides a graphical user-interface to control an image + acquisition device such as a flatbed scanner or a camera. It allows +-previewing and scanning invidual images and can be invoked either ++previewing and scanning individual images and can be invoked either + directly from the command-line or through The GIMP image manipulation + program. In the former case, + .B xscanimage +@@ -45,11 +45,11 @@ simply copy it to one of the + plug-ins directories. If you want to conserve disk-space, you can + create a symlink instead. For example, for gimp-1.0.x the command + .PP +-ln -s @BINDIR@/xscanimage ~/.gimp/plug-ins/ ++ln \-s @BINDIR@/xscanimage ~/.gimp/plug-ins/ + .PP + and for gimp-1.2.x the command + .PP +-ln -s @BINDIR@/xscanimage ~/.gimp-1.2/plug-ins/ ++ln \-s @BINDIR@/xscanimage ~/.gimp-1.2/plug-ins/ + .PP + adds a symlink for the + .B xscanimage diff --git a/debian/patches/06_word_list_fix.patch b/debian/patches/06_word_list_fix.patch deleted file mode 100644 index 683e745..0000000 --- a/debian/patches/06_word_list_fix.patch +++ /dev/null @@ -1,38 +0,0 @@ -Author: -Description: Fix word list handling when current value is not part of the list. -Index: trunk/src/gtkglue.c -=================================================================== ---- trunk.orig/src/gtkglue.c -+++ trunk/src/gtkglue.c -@@ -913,6 +913,7 @@ panel_build (GSGDialog * dialog) - char **str_list; - int i, j; - int num_vector_opts = 0, *vector_opts; -+ SANE_Bool val_in_list; - - main_hbox = gtk_hbox_new (FALSE, 2); - -@@ -1073,13 +1074,23 @@ panel_build (GSGDialog * dialog) - case SANE_CONSTRAINT_WORD_LIST: - /* use a "list-selection" widget */ - num_words = opt->constraint.word_list[0]; -+ if (num_words == 0) -+ { -+ fprintf (stderr, "panel_build: empty word list!\n"); -+ break; -+ } -+ val_in_list = SANE_FALSE; - str_list = malloc ((num_words + 1) * sizeof (str_list[0])); - for (j = 0; j < num_words; ++j) - { -+ if (opt->constraint.word_list[j + 1] == val) -+ val_in_list = SANE_TRUE; - sprintf (str, "%d", opt->constraint.word_list[j + 1]); - str_list[j] = strdup (str); - } - str_list[j] = 0; -+ if (!val_in_list) -+ val = opt->constraint.word_list[1]; - sprintf (str, "%d", val); - option_menu_new (parent, title, str_list, str, elem, - dialog->tooltips, opt->desc, diff --git a/debian/patches/100_xscanimage_c-out-of-bounds.patch b/debian/patches/100_xscanimage_c-out-of-bounds.patch deleted file mode 100644 index 2249f5a..0000000 --- a/debian/patches/100_xscanimage_c-out-of-bounds.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Correct out-of-bounds -Author: Jörg Frings-Fürst -Last-Update: 2014-12-03 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/src/xscanimage.c -=================================================================== ---- trunk.orig/src/xscanimage.c -+++ trunk/src/xscanimage.c -@@ -1284,7 +1284,7 @@ scan_dialog (GtkWidget * widget, gpointe - { /* We are running in standalone mode */ - /* test for pnm formats */ - strncpy (testfilename, preferences.filename, sizeof (testfilename)); -- testfilename[sizeof (testfilename)] = 0; -+ testfilename[sizeof (testfilename) - 1] = 0; - g_strreverse (testfilename); - if (!((!strncmp (testfilename, "mnp.", 4)) || - (!strncmp (testfilename, "mgp.", 4)) || diff --git a/debian/patches/20_scanadf-SIGCHLD.patch b/debian/patches/20_scanadf-SIGCHLD.patch deleted file mode 100644 index ab91534..0000000 --- a/debian/patches/20_scanadf-SIGCHLD.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: Sets SIGCHLD to SIG_DFL before execle(). -Author: Jakub Wilk -Origin: http://www.opengroup.org/onlinepubs/009695399/functions/exec.html -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=596232 -Last-Update: 2014-12-03 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/src/scanadf.c -=================================================================== ---- trunk.orig/src/scanadf.c -+++ trunk/src/scanadf.c -@@ -1213,6 +1213,7 @@ scan_it_raw (const char *fname, SANE_Boo - - case 0: - /* in child process */ -+ signal(SIGCHLD, SIG_DFL); - sprintf(cmd, "%s '%s'", script, fname); - /* system(cmd); */ - execle(script, script, fname, NULL, environ); diff --git a/debian/patches/25_manpages-typo.patch b/debian/patches/25_manpages-typo.patch deleted file mode 100644 index 2bc246b..0000000 --- a/debian/patches/25_manpages-typo.patch +++ /dev/null @@ -1,71 +0,0 @@ -Description: Correct typos in manpages -Author: Jörg Frings-Fürst -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=612686 -Last-Update: 2014-12-03 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/doc/scanadf.man -=================================================================== ---- trunk.orig/doc/scanadf.man -+++ trunk/doc/scanadf.man -@@ -162,7 +162,7 @@ information about the parameters of the - - .PP - If the --.B --scipt-wait -+.B --script-wait - option is given, scanadf will wait until all scan-scripts have been finished before - exiting. That will be useful if scanadf is used in conjunction with tools to modify - the scanned images. -@@ -210,7 +210,7 @@ invoke - via a command-line of the form: - .PP - .RS --scanadf --help --device -+scanadf \-\-help \-\-device - .I dev - .RE - .PP -@@ -256,12 +256,12 @@ work at this time are: - .br - .B sane-hp - - Hewlett Packard scanners. A patch to the sane-hp backend --is necessary. The --scantype=ADF option must be specified (earlier --versions of the backend used the --scan-from-adf option, instead). -+is necessary. The \-\-scantype=ADF option must be specified (earlier -+versions of the backend used the \-\-scan-from-adf option, instead). - .br - .B sane-umax - - UMAX scanners. Support exists in build 12 and later. --The --source="Automatic Document Feeder" option must be specified. -+The \-\-source="Automatic Document Feeder" option must be specified. - .br - .RE - -Index: trunk/doc/xscanimage.man -=================================================================== ---- trunk.orig/doc/xscanimage.man -+++ trunk/doc/xscanimage.man -@@ -15,7 +15,7 @@ xscanimage \- scan an image - .B xscanimage - provides a graphical user-interface to control an image - acquisition device such as a flatbed scanner or a camera. It allows --previewing and scanning invidual images and can be invoked either -+previewing and scanning individual images and can be invoked either - directly from the command-line or through The GIMP image manipulation - program. In the former case, - .B xscanimage -@@ -45,11 +45,11 @@ simply copy it to one of the - plug-ins directories. If you want to conserve disk-space, you can - create a symlink instead. For example, for gimp-1.0.x the command - .PP --ln -s @BINDIR@/xscanimage ~/.gimp/plug-ins/ -+ln \-s @BINDIR@/xscanimage ~/.gimp/plug-ins/ - .PP - and for gimp-1.2.x the command - .PP --ln -s @BINDIR@/xscanimage ~/.gimp-1.2/plug-ins/ -+ln \-s @BINDIR@/xscanimage ~/.gimp-1.2/plug-ins/ - .PP - adds a symlink for the - .B xscanimage diff --git a/debian/patches/30_gimp_init.patch b/debian/patches/30_gimp_init.patch deleted file mode 100644 index 08c81f1..0000000 --- a/debian/patches/30_gimp_init.patch +++ /dev/null @@ -1,30 +0,0 @@ -Description: Enable GIMP interface -Author: Jörg Frings-Fürst -Bug: https://alioth.debian.org/tracker/index.php?func=detail&aid=313616&group_id=30186&atid=410366 -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=682540 -Forwarded: https://alioth.debian.org/tracker/index.php?func=detail&aid=313616&group_id=30186&atid=410366 -Last-Update: 2015-05-09 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/src/xscanimage.c -=================================================================== ---- trunk.orig/src/xscanimage.c -+++ trunk/src/xscanimage.c -@@ -320,7 +320,7 @@ query (void) - "Andy Beck, Tristan Tarrant, and David Mosberger", - "8th June 1997", - "/File/Acquire/xscanimage/Device dialog...", -- "RGB, GRAY", -+ 0, - GIMP_EXTENSION, - nargs, nreturn_vals, args, return_vals); - -@@ -365,7 +365,7 @@ query (void) - "interface.", - "Andy Beck, Tristan Tarrant, and David Mosberger", - "Andy Beck, Tristan Tarrant, and David Mosberger", -- "8th June 1997", mpath, "RGB, GRAY", GIMP_EXTENSION, -+ "8th June 1997", mpath, 0, GIMP_EXTENSION, - nargs, nreturn_vals, args, return_vals); - } - sane_exit (); diff --git a/debian/patches/scanadf-sigchld.diff b/debian/patches/scanadf-sigchld.diff deleted file mode 100644 index fe84f08..0000000 --- a/debian/patches/scanadf-sigchld.diff +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/src/scanadf.c b/src/scanadf.c ---- a/src/scanadf.c -+++ b/src/scanadf.c -@@ -1195,6 +1195,7 @@ - - case 0: - /* in child process */ -+ signal(SIGCHLD, SIG_DFL); - sprintf(cmd, "%s '%s'", script, fname); - /* system(cmd); */ - execle(script, script, fname, NULL, environ); diff --git a/debian/patches/series b/debian/patches/series index bb24e0e..64afa25 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,11 +1,11 @@ 0001-fix_missing_sane-config.patch -30_gimp_init.patch -25_manpages-typo.patch -01_xcam.c_dead_code.patch -02_xcam_man_typo.patch -03_scanadf_options_fix.patch -04_cap_always_settable.patch -05_xcam_off_by_one.patch -06_word_list_fix.patch -20_scanadf-SIGCHLD.patch -100_xscanimage_c-out-of-bounds.patch +0100-xcam.c_dead_code.patch +0105-scanadf_options_fix.patch +0110-cap_always_settable.patch +0115-xcam_off_by_one.patch +0120-word_list_fix.patch +0125-scanadf-SIGCHLD.patch +0130-gimp_init.patch +0135-xscanimage_c-out-of-bounds.patch +0600-xcam_man_typo.patch +0605-manpages-typo.patch -- cgit v1.2.3 From f7d4dbd5924d34a7bf43dfc3adbeb584287f9cf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 8 Sep 2018 19:15:48 +0200 Subject: New README.source to explain the branching model used --- debian/README.source | 18 ++++++++++++++++++ debian/changelog | 1 + 2 files changed, 19 insertions(+) create mode 100644 debian/README.source diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..a62f7b9 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,18 @@ +Hello, + +now I use the branching model from Vincent Driessen[1]. + +I use the gitflow-avh[2]. with the Documentation[3]. +The Debian package can be found here[4]. + +Please upload unattended uploads use a branch feature/. + + +Many thanks. + + -- Jörg Frings-Fürst Fri, 02 Jun 2017 19:00:40 +0200 + +[1] http://nvie.com/posts/a-successful-git-branching-model/ +[2] https://github.com/petervanderdoes/gitflow-avh +[3] https://github.com/petervanderdoes/gitflow-avh/wiki +[4] https://tracker.debian.org/pkg/git-flow diff --git a/debian/changelog b/debian/changelog index fa9827c..9a47b69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ sane-frontends (1.0.14-13) UNRELEASED; urgency=medium - Remove usr/share/sane/* and usr/bin/*. * Rename patches and remove not used debian/patches/scanadf-sigchld.diff. * Change to my new email address. + * New README.source to explain the branching model used. * Migrate to debhelper 11: - Change debian/compat to 11. - Bump minimum debhelper version in debian/control to >= 11. -- cgit v1.2.3 From 4ab0587bb40c07c4a2167635b2103419d74a232f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 8 Sep 2018 19:25:08 +0200 Subject: Rewrite d/changelog --- debian/changelog | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9a47b69..d270334 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,15 @@ sane-frontends (1.0.14-13) UNRELEASED; urgency=medium + * Change to my new email address. + * New README.source to explain the branching model used. + * Migrate to debhelper 11: + - Change debian/compat to 11. + - Bump minimum debhelper version in debian/control to >= 11. + - Remove Build-Depend autotools.dev in debian/control. + - Remove --with autotools-dev from debian/rules. + * Declare compliance with Debian Policy 4.2.1 (No changes needed). + * Remove obsolete package sane-dbg. + * Rename patches and remove not used debian/patches/scanadf-sigchld.diff. * debian/watch: - Switch to gitlab. * debian/changelog: @@ -14,16 +24,6 @@ sane-frontends (1.0.14-13) UNRELEASED; urgency=medium - Remove usr/share/sane. * debian/sane.install: - Remove usr/share/sane/* and usr/bin/*. - * Rename patches and remove not used debian/patches/scanadf-sigchld.diff. - * Change to my new email address. - * New README.source to explain the branching model used. - * Migrate to debhelper 11: - - Change debian/compat to 11. - - Bump minimum debhelper version in debian/control to >= 11. - - Remove Build-Depend autotools.dev in debian/control. - - Remove --with autotools-dev from debian/rules. - * Declare compliance with Debian Policy 4.2.1 (No changes needed). - * Remove obsolete package sane-dbg. -- Jörg Frings-Fürst Sat, 08 Sep 2018 15:03:19 +0200 -- cgit v1.2.3 From 16a4948c7243ab0e228780b3a2b9aea97900f32a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 8 Sep 2018 19:34:32 +0200 Subject: Remove outdated minimum version for libgimp2.0-dev and libsane-dev --- debian/changelog | 5 +++-- debian/control | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index d270334..c1fc88a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -sane-frontends (1.0.14-13) UNRELEASED; urgency=medium +sane-frontends (1.0.14-13) unstable; urgency=medium * Change to my new email address. * New README.source to explain the branching model used. @@ -17,6 +17,7 @@ sane-frontends (1.0.14-13) UNRELEASED; urgency=medium * debian/control: - Change Vcs-* to point to the new repository. - Remove trailing whitespaces. + - Remove outdated minimum version for libgimp2.0-dev and libsane-dev. * debian/copyright: - Use secure copyright format URI. - Update source. @@ -25,7 +26,7 @@ sane-frontends (1.0.14-13) UNRELEASED; urgency=medium * debian/sane.install: - Remove usr/share/sane/* and usr/bin/*. - -- Jörg Frings-Fürst Sat, 08 Sep 2018 15:03:19 +0200 + -- Jörg Frings-Fürst Sat, 08 Sep 2018 19:34:09 +0200 sane-frontends (1.0.14-12) unstable; urgency=medium diff --git a/debian/control b/debian/control index 5ea643d..4176c93 100644 --- a/debian/control +++ b/debian/control @@ -5,9 +5,9 @@ Maintainer: Jörg Frings-Fürst Standards-Version: 4.2.1 Build-Depends: debhelper (>= 11), - libgimp2.0-dev (>= 2.0.0), + libgimp2.0-dev, libgtk2.0-dev, - libsane-dev (>= 1.0.11-3), + libsane-dev Homepage: http://www.sane-project.org Vcs-Git: git://jff.email/opt/git/sane-frontends.git Vcs-Browser: https://jff.email/cgit/sane-frontends.git -- cgit v1.2.3