Package: bopm
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 23e2d48e39a85ae1531e2e55aa157696f6c60a02 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sat, 21 Apr 2012 15:22:48 +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 | 2 --
debian/bopm.postrm | 4 +++-
debian/changelog | 13 +++++++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/copyright | 2 +-
debian/docs | 2 +-
debian/patches/00list | 1 -
...-topic-check.diff => 03-bopm-topic-check.patch} | 7 ++-----
debian/patches/series | 1 +
debian/rules | 17 +++++++++--------
debian/source.lintian-overrides | 2 --
debian/source/format | 2 +-
13 files changed, 34 insertions(+), 25 deletions(-)
delete mode 100644 debian/README.source
mode change 100644 => 100755 debian/bopm.postrm
delete mode 100644 debian/patches/00list
rename debian/patches/{03_bopm-topic-check.diff => 03-bopm-topic-check.patch} (97%)
create mode 100644 debian/patches/series
delete mode 100644 debian/source.lintian-overrides
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 5e94a7b..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,2 +0,0 @@
-This packages uses dpatch to manage differences between the upsteram and the
-Debian version.
diff --git a/debian/bopm.postrm b/debian/bopm.postrm
old mode 100644
new mode 100755
index c34eee2..799eecb
--- a/debian/bopm.postrm
+++ b/debian/bopm.postrm
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
case "$1" in
remove)
diff --git a/debian/changelog b/debian/changelog
index ab2011c..9449f11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+bopm (3.1.3-3.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.
+ * Delete debian/source.lintian-overrides; no longer needed.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+ * Fix maintainer-script-without-set-e (Lintian)
+ * Fix duplicate-changelog-files (Lintian)
+
+ -- Jari Aalto <jari.aa...@cante.net> Sat, 21 Apr 2012 15:21:44 +0300
+
bopm (3.1.3-3) unstable; urgency=low
* added debian source format
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index db5d7ec..2e93e18 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: bopm
Section: net
Priority: optional
Maintainer: Martin Wuertele <m...@debian.org>
-Build-Depends: debhelper (>= 7.0.50), dpatch, autotools-dev
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 9), autotools-dev
+Standards-Version: 3.9.3
Homepage: http://wiki.blitzed.org/BOPM
Package: bopm
diff --git a/debian/copyright b/debian/copyright
index 1b56761..599c608 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -43,4 +43,4 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/docs b/debian/docs
index 78dbe26..cf4ddc8 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,3 +1,3 @@
README
TODO
-ChangeLog
+
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 19b6822..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-03_bopm-topic-check.diff
diff --git a/debian/patches/03_bopm-topic-check.diff b/debian/patches/03-bopm-topic-check.patch
similarity index 97%
rename from debian/patches/03_bopm-topic-check.diff
rename to debian/patches/03-bopm-topic-check.patch
index f14028e..ffeb118 100644
--- a/debian/patches/03_bopm-topic-check.diff
+++ b/debian/patches/03-bopm-topic-check.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## bopm-topic-check.diff.dpatch by Philipp Kern <pk...@debian.org>
-##
-## DP: Check the topic of BOPM's channel to retrieve new ports and protocols
+From: Philipp Kern <pk...@debian.org>
+Subject: Check the topic of BOPM's channel to retrieve new ports and protocols
-@DPATCH@
Index: src/irc.c
===================================================================
RCS file: /data/cvs/bopm/src/irc.c,v
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..616fd8c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+03-bopm-topic-check.patch
diff --git a/debian/rules b/debian/rules
index 2e9379f..5626c3b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,9 +3,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# we use dpatch
-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)
@@ -37,9 +34,13 @@ config.status: configure
+
+build-arch: build
+build-indep: build
+
build: build-stamp
-build-stamp: patch-stamp config.status
+build-stamp: config.status
@echo "--- Compiling"
dh_testdir
@@ -47,8 +48,7 @@ build-stamp: patch-stamp config.status
touch build-stamp
-clean: clean1 unpatch
-clean1:
+clean:
@echo "--- Cleaning"
dh_testdir
dh_testroot
@@ -56,7 +56,8 @@ clean1:
[ ! -f Makefile ] || $(MAKE) distclean
- rm -f config.guess config.sub
+ rm -f config.guess config.sub \
+ src/libopm/config.guess src/libopm/config.sub
install: build
dh_testdir
@@ -94,4 +95,4 @@ binary-arch: build install
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch build install patch unpatch clean1
+.PHONY: build clean binary-indep binary-arch build install
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
deleted file mode 100644
index 85de623..0000000
--- a/debian/source.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# we discard config.guess and regenerate it with autoconf
-bopm source: patch-system-but-direct-changes-in-diff src/libopm/config.guess and 1 more
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
