Package: icicles
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 868b11aded8c6550bf8328f885443cab8745d00b Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Thu, 12 Apr 2012 12:50:50 +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/README.source | 4 ----
debian/changelog | 10 ++++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/copyright | 2 +-
debian/patches/00list | 3 ---
...> 10-old-shell-dynamic-complete-filename.patch} | 0
...tch => 20-less-intrusive-startup-warning.patch} | 0
...dpatch => 30-old-mouse-choose-completion.patch} | 0
debian/patches/series | 3 +++
debian/rules | 11 +++++------
debian/source/format | 2 +-
12 files changed, 23 insertions(+), 18 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{10-old-shell-dynamic-complete-filename.dpatch => 10-old-shell-dynamic-complete-filename.patch} (100%)
rename debian/patches/{20-less-intrusive-startup-warning.dpatch => 20-less-intrusive-startup-warning.patch} (100%)
rename debian/patches/{30-old-mouse-choose-completion.dpatch => 30-old-mouse-choose-completion.patch} (100%)
create mode 100644 debian/patches/series
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 096d38b..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,4 +0,0 @@
-Please refer to /usr/share/doc/dpatch/README.source.gz for more
-information about dpatch.
-
- -- Sebastien Delafond <s...@debian.org> Mon, 28 Sep 2009 18:12:26 +0200
diff --git a/debian/changelog b/debian/changelog
index e3f4b3a..d672be0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+icicles (23.0+20110910-1.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).
+
+ -- Jari Aalto <jari.aa...@cante.net> Thu, 12 Apr 2012 12:50:08 +0300
+
icicles (23.0+20110910-1) unstable; urgency=low
* New upstream release
diff --git a/debian/compat b/debian/compat
index 1e8b314..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-6
+9
diff --git a/debian/control b/debian/control
index 2395e39..f4a9836 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: icicles
Section: misc
Priority: optional
Maintainer: Sebastien Delafond <s...@debian.org>
-Build-Depends: debhelper (>= 6.0.0), dpatch
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
Homepage: http://www.emacswiki.org/emacs/Icicles
Package: icicles
diff --git a/debian/copyright b/debian/copyright
index ca62815..06630f2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -24,4 +24,4 @@ Copyright:
On Debian systems, the complete text of the GNU General Public License
can be found in:
- /usr/share/common-licenses/GPL
+ /usr/share/common-licenses/GPL-2
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 722b878..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-#10-old-shell-dynamic-complete-filename
-#20-less-intrusive-startup-warning
-#30-old-mouse-choose-completion
diff --git a/debian/patches/10-old-shell-dynamic-complete-filename.dpatch b/debian/patches/10-old-shell-dynamic-complete-filename.patch
similarity index 100%
rename from debian/patches/10-old-shell-dynamic-complete-filename.dpatch
rename to debian/patches/10-old-shell-dynamic-complete-filename.patch
diff --git a/debian/patches/20-less-intrusive-startup-warning.dpatch b/debian/patches/20-less-intrusive-startup-warning.patch
similarity index 100%
rename from debian/patches/20-less-intrusive-startup-warning.dpatch
rename to debian/patches/20-less-intrusive-startup-warning.patch
diff --git a/debian/patches/30-old-mouse-choose-completion.dpatch b/debian/patches/30-old-mouse-choose-completion.patch
similarity index 100%
rename from debian/patches/30-old-mouse-choose-completion.dpatch
rename to debian/patches/30-old-mouse-choose-completion.patch
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..59acfe4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+#10-old-shell-dynamic-complete-filename.patch
+#20-less-intrusive-startup-warning.patch
+#30-old-mouse-choose-completion.patch
diff --git a/debian/rules b/debian/rules
index 8688be6..529f621 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,18 @@
#! /usr/bin/make -f
-include /usr/share/dpatch/dpatch.make
-clean: unpatch
+clean:
dh_testdir
dh_testroot
dh_clean
build: build-arch build-indep
-build-arch: patch
-build-indep: patch
+build-arch:
+build-indep:
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
cp lisp/* doc/*el $(CURDIR)/debian/icicles/usr/share/emacs/site-lisp/icicles
@@ -36,4 +35,4 @@ binary-arch: build install
# We have nothing to do by default.
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch
+.PHONY: build clean binary-indep binary-arch binary install
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
--
1.7.9.5
