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 <jari.aa...@cante.net>
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 <jari.aa...@cante.net>
---
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 <jari.aa...@cante.net> 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 <jbla...@debian.org>
-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 <jbla...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove dead code in src/xcam.c::load_defaults()
+From: <jbla...@debian.org>
+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 <jbla...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix various typos in xcam.man.
+From: <jbla...@debian.org>
+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 <jbla...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Get option descriptor 0 before getting the value for option 0.
+From: <jbla...@debian.org>
+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 <jbla...@debian.org>
-##
-## 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: <jbla...@debian.org>
+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 <jbla...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix an off-by-one.
+From: <jbla...@debian.org>
+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 <jbla...@debian.org>
-##
-## 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: <jbla...@debian.org>
+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
