Package: mmm-mode
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 3378e99f081301bb036611aa84f93abc7b23132d Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Sat, 5 May 2012 19:50:04 +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 | 13 +++++++++++++
debian/compat | 2 +-
debian/control | 9 ++++-----
debian/copyright | 2 +-
debian/patches/00list | 1 -
debian/patches/{01compat.dpatch => 01-compat.patch} | 8 ++------
debian/patches/series | 1 +
debian/rules | 12 +++++++-----
debian/source/format | 1 +
9 files changed, 30 insertions(+), 19 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01compat.dpatch => 01-compat.patch} (87%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 2c9aaeb..19665e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+mmm-mode (0.4.8-6.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 priority section (Lintian).
+ * Fix no-homepage-field (Lintian).
+ * Fix depends-on-old-emacs (Lintian).
+
+ -- Jari Aalto <[email protected]> Sat, 05 May 2012 19:48:49 +0300
+
mmm-mode (0.4.8-6) unstable; urgency=low
* updated watch file, lifted standards version, added dpatch to build depends
diff --git a/debian/compat b/debian/compat
index b8626c4..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+9
diff --git a/debian/control b/debian/control
index 9cfd04d..6d413d8 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,13 @@ Source: mmm-mode
Maintainer: Alexander Zangerl <[email protected]>
Section: editors
Priority: optional
-Build-Depends: debhelper (>= 4), dpatch
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
+Homepage: http://www.emacswiki.org/emacs/MmmMode
Package: mmm-mode
-Section: editors
-Priority: optional
Architecture: all
-Depends: emacs22 | emacsen | emacs-snapshot | xemacs21-basesupport (>= 2003.11.13-1)
+Depends: ${misc:Depends}, emacs23 | emacsen | emacs-snapshot | xemacs21-basesupport (>= 2003.11.13-1)
Description: Multiple Major Mode for Emacs
MMM Mode is a minor mode for Emacs that allows Multiple Major Modes
(hence the name) to coexist in one buffer. It is particularly
diff --git a/debian/copyright b/debian/copyright
index fb31d68..39e430a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -43,4 +43,4 @@ The mmm-mode copyright is:
;;}}}
-On Debian systems, the full text of the GPL can be found in /usr/share/common-licenses/GPL
+On Debian systems, the full text of the GPL can be found in /usr/share/common-licenses/GPL-2
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 0966f5e..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01compat
diff --git a/debian/patches/01compat.dpatch b/debian/patches/01-compat.patch
similarity index 87%
rename from debian/patches/01compat.dpatch
rename to debian/patches/01-compat.patch
index d9bbac2..554b118 100644
--- a/debian/patches/01compat.dpatch
+++ b/debian/patches/01-compat.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01compat.dpatch by <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: removal of pre-19.28 backquote syntax, collection of other qa-fixes
+From: <[email protected]>
+Subject: removal of pre-19.28 backquote syntax, collection of other qa-fixes
-@DPATCH@
diff -urNad mmm-mode-0.4.8~/mmm-compat.el mmm-mode-0.4.8/mmm-compat.el
--- mmm-mode-0.4.8~/mmm-compat.el 2008-11-23 12:23:58.000000000 +1000
+++ mmm-mode-0.4.8/mmm-compat.el 2008-11-23 12:31:46.574432043 +1000
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1059f26
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-compat.patch
diff --git a/debian/rules b/debian/rules
index 581b444..4e946f5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,13 @@
#!/usr/bin/make -f
-# to get the patch application targets
-include /usr/share/dpatch/dpatch.make
+# to get the application targets
-build: patch
+build-arch: build
+build-indep: build
-clean: unpatch
+build:
+
+clean:
dh_testdir
dh_testroot
dh_clean
@@ -13,7 +15,7 @@ clean: unpatch
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
dh_install *.el usr/share/emacs/site-lisp/mmm-mode
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
