Your message dated Wed, 15 Apr 2015 10:00:09 +0000 with message-id <[email protected]> and subject line Bug#670380: fixed in sane-frontends 1.0.14-10 has caused the Debian Bug report #670380, regarding [PATCH] sane-frontends: Helping to update to packaging format 3.0 to be marked as done.
This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact [email protected] immediately.) -- 670380: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=670380 Debian Bug Tracking System Contact [email protected] with problems
--- Begin Message ---Package: sane-frontends Severity: wishlist Tags: patch Hi, The dpatch patch management system has been deprecated for some time. The Lintian currently flags use of dpatch packages as an error. The new 3.0 packaging format is an improved version which, among other things, contains patch management built-in. For more information, see: http://wiki.debian.org/Projects/DebSrc3.0 I had some free time; see attached patch to migrate to new package format. Note that all files in debian/patches/* are canocalized to *.patch. Let me know if there is anything that needs adjusting or if it is ok to upload this version in a NMU in case you are working on other issues needing attention. Thanks, Jari>From 139dadfeb1a84aa36090cca4d0671d8c9f03a100 Mon Sep 17 00:00:00 2001 From: Jari Aalto <[email protected]> Date: Wed, 25 Apr 2012 08:24:11 +0300 Subject: [PATCH] format-3.0 Organization: Private Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Signed-off-by: Jari Aalto <[email protected]> --- debian/changelog | 11 +++++++++++ debian/compat | 2 +- debian/control | 7 +++---- debian/copyright | 2 +- debian/patches/00list | 7 ------- ...cam.c_dead_code.dpatch => 01-xcam.c-dead-code.patch} | 8 ++------ .../{02_xcam_man_typo.dpatch => 02-xcam-man-typo.patch} | 8 ++------ ..._options_fix.dpatch => 03-scanadf-options-fix.patch} | 8 ++------ ...ays_settable.dpatch => 04-cap-always-settable.patch} | 10 +++------- ..._xcam_off_by_one.dpatch => 05-xcam-off-by-one.patch} | 8 ++------ .../{06_word_list_fix.dpatch => 06-word-list-fix.patch} | 8 ++------ debian/patches/series | 7 +++++++ debian/rules | 15 ++++++++------- debian/source/format | 1 + 14 files changed, 45 insertions(+), 57 deletions(-) delete mode 100644 debian/patches/00list rename debian/patches/{01_xcam.c_dead_code.dpatch => 01-xcam.c-dead-code.patch} (73%) rename debian/patches/{02_xcam_man_typo.dpatch => 02-xcam-man-typo.patch} (84%) rename debian/patches/{03_scanadf_options_fix.dpatch => 03-scanadf-options-fix.patch} (83%) rename debian/patches/{04_cap_always_settable.dpatch => 04-cap-always-settable.patch} (63%) rename debian/patches/{05_xcam_off_by_one.dpatch => 05-xcam-off-by-one.patch} (74%) rename debian/patches/{06_word_list_fix.dpatch => 06-word-list-fix.patch} (83%) create mode 100644 debian/patches/series create mode 100644 debian/source/format diff --git a/debian/changelog b/debian/changelog index 8e5d929..9c2f7d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +sane-frontends (1.0.14-9.1) unstable; urgency=low + + * Non-maintainer upload. + * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt". + * Update to Standards-Version to 3.9.3 and debhelper to 9. + * Add build-arch and build-indep targets; use dh_prep in rules file. + * Fix copyright-refers-to-symlink-license (Lintian). + * Fix binary-control-field-duplicates-source (Lintian). + + -- Jari Aalto <[email protected]> Wed, 25 Apr 2012 08:23:18 +0300 + sane-frontends (1.0.14-9) unstable; urgency=low * debian/control: diff --git a/debian/compat b/debian/compat index 7ed6ff8..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +9 diff --git a/debian/control b/debian/control index b6c7ba5..9b98c05 100644 --- a/debian/control +++ b/debian/control @@ -2,13 +2,12 @@ Source: sane-frontends Section: graphics Priority: optional Maintainer: Julien BLACHE <[email protected]> -Standards-Version: 3.8.3 -Build-Depends: debhelper (>= 5), dpatch, libgimp2.0-dev (>= 2.0.0), libgtk2.0-dev, libsane-dev (>= 1.0.11-3), autotools-dev +Standards-Version: 3.9.3 +Build-Depends: debhelper (>= 9), libgimp2.0-dev (>= 2.0.0), libgtk2.0-dev, libsane-dev (>= 1.0.11-3), autotools-dev Package: sane -Section: graphics Architecture: any -Depends: ${shlibs:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Suggests: gimp Description: scanner graphical frontends This package includes : diff --git a/debian/copyright b/debian/copyright index 8c5b2d6..5ec1380 100644 --- a/debian/copyright +++ b/debian/copyright @@ -33,4 +33,4 @@ License: On Debian systems, a copy of the GNU General Public License (GPL) is available -in the file /usr/share/common-licenses/GPL. +in the file /usr/share/common-licenses/GPL-2. diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index d65c845..0000000 --- a/debian/patches/00list +++ /dev/null @@ -1,7 +0,0 @@ -01_xcam.c_dead_code -02_xcam_man_typo -03_scanadf_options_fix -04_cap_always_settable -05_xcam_off_by_one -06_word_list_fix - diff --git a/debian/patches/01_xcam.c_dead_code.dpatch b/debian/patches/01-xcam.c-dead-code.patch similarity index 73% rename from debian/patches/01_xcam.c_dead_code.dpatch rename to debian/patches/01-xcam.c-dead-code.patch index 41a33e0..74da12d 100644 --- a/debian/patches/01_xcam.c_dead_code.dpatch +++ b/debian/patches/01-xcam.c-dead-code.patch @@ -1,10 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_xcam.c_dead_code.dpatch by <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Remove dead code in src/xcam.c::load_defaults() +From: <[email protected]> +Subject: Remove dead code in src/xcam.c::load_defaults() -@DPATCH@ diff -urNad sane-frontends-1.0.14~/src/xcam.c sane-frontends-1.0.14/src/xcam.c --- sane-frontends-1.0.14~/src/xcam.c 2005-09-20 19:30:01.000000000 +0200 +++ sane-frontends-1.0.14/src/xcam.c 2005-09-20 19:30:59.289245755 +0200 diff --git a/debian/patches/02_xcam_man_typo.dpatch b/debian/patches/02-xcam-man-typo.patch similarity index 84% rename from debian/patches/02_xcam_man_typo.dpatch rename to debian/patches/02-xcam-man-typo.patch index cd35ecc..d9a9d30 100644 --- a/debian/patches/02_xcam_man_typo.dpatch +++ b/debian/patches/02-xcam-man-typo.patch @@ -1,10 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_xcam_man_typo.dpatch by <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix various typos in xcam.man. +From: <[email protected]> +Subject: Fix various typos in xcam.man. -@DPATCH@ diff -urNad sane-frontends-1.0.14~/doc/xcam.man sane-frontends-1.0.14/doc/xcam.man --- sane-frontends-1.0.14~/doc/xcam.man 2008-03-01 15:30:54.000000000 +0100 +++ sane-frontends-1.0.14/doc/xcam.man 2008-03-01 15:32:35.802703418 +0100 diff --git a/debian/patches/03_scanadf_options_fix.dpatch b/debian/patches/03-scanadf-options-fix.patch similarity index 83% rename from debian/patches/03_scanadf_options_fix.dpatch rename to debian/patches/03-scanadf-options-fix.patch index 4c1b8cb..a8717dd 100644 --- a/debian/patches/03_scanadf_options_fix.dpatch +++ b/debian/patches/03-scanadf-options-fix.patch @@ -1,10 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 03_scanadf_options_fix.dpatch by <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Get option descriptor 0 before getting the value for option 0. +From: <[email protected]> +Subject: Get option descriptor 0 before getting the value for option 0. -@DPATCH@ diff -urNad sane-frontends-1.0.14~/src/scanadf.c sane-frontends-1.0.14/src/scanadf.c --- sane-frontends-1.0.14~/src/scanadf.c 2005-09-18 13:51:00.000000000 +0200 +++ sane-frontends-1.0.14/src/scanadf.c 2008-08-05 12:00:14.826083326 +0200 diff --git a/debian/patches/04_cap_always_settable.dpatch b/debian/patches/04-cap-always-settable.patch similarity index 63% rename from debian/patches/04_cap_always_settable.dpatch rename to debian/patches/04-cap-always-settable.patch index e812c3d..229829b 100644 --- a/debian/patches/04_cap_always_settable.dpatch +++ b/debian/patches/04-cap-always-settable.patch @@ -1,11 +1,7 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 04_cap_always_settable.dpatch by <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Remove check for SANE_CAP_ALWAYS_SETTABLE; the flag is not part -## DP: of the standard and has been removed upstream in SANE 1.0.20. +From: <[email protected]> +Subject: 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. -@DPATCH@ diff -urNad sane-frontends-1.0.14~/src/gtkglue.c sane-frontends-1.0.14/src/gtkglue.c --- sane-frontends-1.0.14~/src/gtkglue.c 2005-04-16 15:12:07.000000000 +0200 +++ sane-frontends-1.0.14/src/gtkglue.c 2009-06-26 13:32:04.997585725 +0200 diff --git a/debian/patches/05_xcam_off_by_one.dpatch b/debian/patches/05-xcam-off-by-one.patch similarity index 74% rename from debian/patches/05_xcam_off_by_one.dpatch rename to debian/patches/05-xcam-off-by-one.patch index deb56a0..c175e9c 100644 --- a/debian/patches/05_xcam_off_by_one.dpatch +++ b/debian/patches/05-xcam-off-by-one.patch @@ -1,10 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 05_xcam_off_by_one.dpatch by <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix an off-by-one. +From: <[email protected]> +Subject: Fix an off-by-one. -@DPATCH@ diff -urNad sane-frontends-1.0.14~/src/xcam.c sane-frontends-1.0.14/src/xcam.c --- sane-frontends-1.0.14~/src/xcam.c 2009-06-26 13:50:19.000000000 +0200 +++ sane-frontends-1.0.14/src/xcam.c 2009-06-26 13:50:47.774585321 +0200 diff --git a/debian/patches/06_word_list_fix.dpatch b/debian/patches/06-word-list-fix.patch similarity index 83% rename from debian/patches/06_word_list_fix.dpatch rename to debian/patches/06-word-list-fix.patch index 90d223c..76dc1d8 100644 --- a/debian/patches/06_word_list_fix.dpatch +++ b/debian/patches/06-word-list-fix.patch @@ -1,10 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 06_word_list_fix.dpatch by <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix word list handling when current value is not part of the list. +From: <[email protected]> +Subject: Fix word list handling when current value is not part of the list. -@DPATCH@ diff -urNad sane-frontends-1.0.14~/src/gtkglue.c sane-frontends-1.0.14/src/gtkglue.c --- sane-frontends-1.0.14~/src/gtkglue.c 2009-11-14 10:46:03.248492255 +0100 +++ sane-frontends-1.0.14/src/gtkglue.c 2009-11-14 10:46:07.941492660 +0100 diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..bb889cb --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,7 @@ +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 + diff --git a/debian/rules b/debian/rules index 2db7de8..649bb24 100755 --- a/debian/rules +++ b/debian/rules @@ -5,9 +5,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# Include dpatch rules -include /usr/share/dpatch/dpatch.make - # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -35,8 +32,12 @@ config.status: autotools-stamp configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info --datadir=\$${prefix}/share + +build-arch: build +build-indep: build + build: build-stamp -build-stamp: patch-stamp config.status +build-stamp: config.status dh_testdir # Add here commands to compile the package. @@ -44,7 +45,7 @@ build-stamp: patch-stamp config.status touch build-stamp -clean: real-clean unpatch +clean: real-clean real-clean: dh_testdir dh_testroot @@ -61,7 +62,7 @@ real-clean: install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs # Add here commands to install the package into debian/sane @@ -97,4 +98,4 @@ binary-arch: build install dh_builddeb binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install patch unpatch real-clean autotools +.PHONY: build clean binary-indep binary-arch binary install real-clean autotools diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- 1.7.10
--- End Message ---
--- Begin Message ---Source: sane-frontends Source-Version: 1.0.14-10 We believe that the bug you reported is fixed in the latest version of sane-frontends, which is due to be installed in the Debian FTP archive. A summary of the changes between this version and the previous one is attached. Thank you for reporting the bug, which will now be closed. If you have further comments please address them to [email protected], and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Jörg Frings-Fürst <[email protected]> (supplier of updated sane-frontends package) (This message was generated automatically at their request; if you believe that there is a problem with it please contact the archive administrators by mailing [email protected]) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Format: 1.8 Date: Wed, 11 Feb 2015 08:00:08 +0100 Source: sane-frontends Binary: sane sane-dbg Architecture: source amd64 Version: 1.0.14-10 Distribution: unstable Urgency: medium Maintainer: Jörg Frings-Fürst <[email protected]> Changed-By: Jörg Frings-Fürst <[email protected]> Description: sane - scanner graphical frontends sane-dbg - scanner graphical frontends (debug symbols) Closes: 596232 612686 670380 Changes: sane-frontends (1.0.14-10) unstable; urgency=medium . * New maintainer (Close: #688556). * debian/control: - Add myself as maintainer. - Bump Standards-Version to 3.9.6. - Package sane: - Add ${misc:Depends} to Depends. - Remove useless "Section: graphics". - Add homepage. - Add Vcs-* to new git repository. * debian/compat: - Change from 5 to 9. * New debian/source/format - Set to "3.0 (quilt)". * Convert patches from dpatch to quilt. * Rewrite debian/copyright. * Rewrite builtsystem to dh and DebSrc3.0 (Closes: #670380): - Rewrite debian/rules. - New sane.links - New sane.install * Add debian/watch. * debian/patches: - New 20_scanadf-SIGCHLD.patch (Closes: #596232): - Sets SIGCHLD to SIG_DFL before execle(). - New 25_manpages-typo.patch (Closes: #612686): - Correct some typos. * New package sane-dbg. Checksums-Sha1: 53b7d3605896731e323b6d3c5dbb35b3bb97e70c 2022 sane-frontends_1.0.14-10.dsc 063e11df3e32d7a43161fd37026a4dc601d5482d 231892 sane-frontends_1.0.14.orig.tar.gz 4429a02807ecf7a4e4d6841f4bfb3cae6dfa8dcb 14212 sane-frontends_1.0.14-10.debian.tar.xz 9c3734063d6811e501c5fb429a8574485771c4da 94482 sane_1.0.14-10_amd64.deb 99773993dc94c40495620dbffcf3492845b53fb0 234852 sane-dbg_1.0.14-10_amd64.deb Checksums-Sha256: 670bf66f972568d09a209c0abea5b026ed8369115d5b174b86f277bf67ec3da7 2022 sane-frontends_1.0.14-10.dsc e7839dac1b70b5bb39124615aba8a136f5275d0e78bafd3d52ed76964ffea4a9 231892 sane-frontends_1.0.14.orig.tar.gz 82a7cea41142dc8f9ffa51b84e6a74b4f364da01917ce7085bfc259dcee59e66 14212 sane-frontends_1.0.14-10.debian.tar.xz 9ae2ca333a2ad716bff543c6e2e3840a886cad4e302161fba4278efa4bbec916 94482 sane_1.0.14-10_amd64.deb f808c23b153c40f115045d1b0250e864716a4d5b131ae36af0733c0311577bf0 234852 sane-dbg_1.0.14-10_amd64.deb Files: 61b1bd5e87ca2d6bb8bcb342b01fb6b8 2022 graphics optional sane-frontends_1.0.14-10.dsc c63bf7b0bb5f530cf3c08715db721cd3 231892 graphics optional sane-frontends_1.0.14.orig.tar.gz 8cdaaaf8efbe40cf42b9df5d0f354656 14212 graphics optional sane-frontends_1.0.14-10.debian.tar.xz 0d2d4aa3448309b6323901a5ef835be2 94482 graphics optional sane_1.0.14-10_amd64.deb a3908615aefca14d857f7417b71b791d 234852 debug extra sane-dbg_1.0.14-10_amd64.deb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBCgAGBQJU3ErWAAoJEIDTAvWIbYOc2FkP/3RLP0UJf8tvx+P/8S7TWmoF bbRrCyjoF3iFfw4caMZM+1qVhiNRzwbdvcIhuJe8jO0voSCz0A09bOPWEL645u7O trJEbHAwJrUuso0nWoz0dbC3U+DbT87EDULcMZbYUeY6SLt3bEPou5BkHj4RT118 AUS4ky3hSsbyi+Ht8v/xpjllUz5af/FfxxGdjgpijSnsZHqSmN4EoTRBVjQdoXke M3FUmscSXmdIRNVZJA+VxuQ8BbVYJKzdrGRbVjIi4nBEIHpY910k8Ti9uJojXfzO O4DP/DVNV1/ke61Io7Bo/iWZWXMZC+btKxGPIIP/GoFGUcdQE3hz8OFRO3MxvUpU l6MCLzVXmRzTswfUuhc2LigrnoyS05/supipGKJ/p4QeqoX3MlM5n28yd+VwYuEU hir2tncl7qZEaTHoG0zcqBWxw6zjpdTPezh/j3ssr0B1TQP1e2OpZziJfhBoAI/V atwUDxA/OHPODGXnTruoziUh3y7YxvLLK3n9ZHY6+5+B642RJzlAq8StnbgnDcqY Ki8op2gvMYpC2euF2nh90uu4E89K6AocY/FuVt1lmID0ts7vdLUs06j+m5sS7Cik A9XOveWN3TDGMfmKiMGRsbwRi33PkmZQAhRJfG7EbGn0OeBwBCfkgMwDtRYZeWGQ mB2L3ygJlJU9BkSlF51V =liyy -----END PGP SIGNATURE-----
--- End Message ---
