Package: ircd-ircu
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.
Thanks,
Jari
>From 53e3f3dd1ce5682defff717d19a2647dc777c2b1 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sat, 21 Apr 2012 23:00:22 +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 | 14 ++++++++++++++
debian/compat | 2 +-
debian/control | 6 +++---
debian/copyright | 2 +-
debian/init | 4 ++--
debian/patches/00list | 1 -
debian/patches/01-ircd-features.patch | 18 ++++++++++++++++++
debian/patches/01_ircd_features.dpatch | 32 --------------------------------
debian/patches/series | 1 +
debian/postrm | 4 +++-
debian/rules | 22 +++++++++-------------
debian/source/format | 1 +
12 files changed, 53 insertions(+), 54 deletions(-)
mode change 100644 => 100755 debian/init
delete mode 100644 debian/patches/00list
create mode 100644 debian/patches/01-ircd-features.patch
delete mode 100644 debian/patches/01_ircd_features.dpatch
create mode 100644 debian/patches/series
mode change 100644 => 100755 debian/postrm
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index d74a7d2..b09d60a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+ircd-ircu (2.10.12.10.dfsg1-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, use dh_prep, fix config.*
+ file treatment in rules file.
+ * Patch 01: update with "quilt refresh" to make it apply cleanly.
+ * Fix init.d-script-missing-dependency-on-remote_fs (Lintian).
+ * Fix copyright-refers-to-symlink-license (Lintian).
+ * Fix maintainer-script-without-set-e (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Sat, 21 Apr 2012 22:51:03 +0300
+
ircd-ircu (2.10.12.10.dfsg1-1) unstable; urgency=low
* The "Omertà " release
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 fe9caa5..e3dff62 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: ircd-ircu
Section: net
Priority: optional
Maintainer: Martin Loschwitz <madk...@debian.org>
-Build-Depends: debhelper (>= 5), dpatch (>= 1.11), flex, byacc
-Standards-Version: 3.7.2.2
+Build-Depends: debhelper (>= 9), flex, byacc
+Standards-Version: 3.9.3
Package: ircd-ircu
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Replaces: ircd-dalnet, ircd (>= 2.10.10.pl18-4)
Conflicts: ircd-irc2
Provides: ircd
diff --git a/debian/copyright b/debian/copyright
index 11f4b5b..3d525e6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -86,5 +86,5 @@ From 2002 on, all modifications for the debian package are (C) Martin
Loschwitz.
On Debian 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/init b/debian/init
old mode 100644
new mode 100755
index 380c974..728eee3
--- a/debian/init
+++ b/debian/init
@@ -6,8 +6,8 @@
### BEGIN INIT INFO
# Provides: ircd-ircu
-# Required-Start: $local_fs
-# Required-Stop: $local_fs
+# Required-Start: $local_fs $remote_fs
+# Required-Stop: $local_fs $remote_fs
# Should-Start: $local_fs
# Should-Stop: $local_fs
# Default-Start: 2 3 4 5
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 7f2c525..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01_ircd_features
diff --git a/debian/patches/01-ircd-features.patch b/debian/patches/01-ircd-features.patch
new file mode 100644
index 0000000..edf001d
--- /dev/null
+++ b/debian/patches/01-ircd-features.patch
@@ -0,0 +1,18 @@
+From: Martin Loschwitz <madk...@madkiss.org>
+Subject: hard-code path to ircd.pid
+
+---
+ ircd/ircd_features.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/ircd/ircd_features.c
++++ b/ircd/ircd_features.c
+@@ -338,7 +338,7 @@
+ /* Some misc. default paths */
+ F_S(MPATH, FEAT_CASE | FEAT_MYOPER, "ircd.motd", motd_init),
+ F_S(RPATH, FEAT_CASE | FEAT_MYOPER, "remote.motd", motd_init),
+- F_S(PPATH, FEAT_CASE | FEAT_MYOPER | FEAT_READ, "ircd.pid", 0),
++ F_S(PPATH, FEAT_CASE | FEAT_MYOPER | FEAT_READ, "/var/run/ircd/ircd.pid", 0),
+
+ /* Networking features */
+ F_I(TOS_SERVER, 0, 0x08, 0),
diff --git a/debian/patches/01_ircd_features.dpatch b/debian/patches/01_ircd_features.dpatch
deleted file mode 100644
index 697ace7..0000000
--- a/debian/patches/01_ircd_features.dpatch
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh -e
-## 01_ircd_features.dpatch by Martin Loschwitz <madk...@madkiss.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: hard-code path to ircd.pid
-
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
- -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
-diff -ruN ircd-ircu-2.10.11.02-old/ircd/ircd_features.c ircd-ircu-2.10.11.02/ircd/ircd_features.c
---- ircd-ircu-2.10.11.02-old/ircd/ircd_features.c 2002-10-10 11:13:24.000000000 +0200
-+++ ircd-ircu-2.10.11.02/ircd/ircd_features.c 2002-10-13 18:54:40.000000000 +0200
-@@ -275,7 +275,7 @@
- /* Some misc. default paths */
- F_S(MPATH, FEAT_CASE | FEAT_MYOPER, "ircd.motd", motd_init),
- F_S(RPATH, FEAT_CASE | FEAT_MYOPER, "remote.motd", motd_init),
-- F_S(PPATH, FEAT_CASE | FEAT_MYOPER | FEAT_READ, "ircd.pid", 0),
-+ F_S(PPATH, FEAT_CASE | FEAT_MYOPER | FEAT_READ, "/var/run/ircd/ircd.pid", 0),
-
- /* Networking features */
- F_B(VIRTUAL_HOST, 0, 0, 0),
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1dbac5c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-ircd-features.patch
diff --git a/debian/postrm b/debian/postrm
old mode 100644
new mode 100755
index e0cfe8d..0934942
--- a/debian/postrm
+++ b/debian/postrm
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
if [ "$1" = "purge" ]; then
if [ -d "/etc/ircd" ]; then
diff --git a/debian/rules b/debian/rules
index f7e13cf..02364af 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,9 +3,6 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-# dpatch stuff
-include /usr/share/dpatch/dpatch.make
-
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
endif
@@ -18,14 +15,19 @@ CONFIGURE_OPTIONS = --prefix=/usr --bindir=\$${prefix}/bin --sbindir=\$${prefix}
--infodir=\$${prefix}/share/info --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --with-dpath=/etc/ircd --with-cpath=/etc/ircd/ircd.conf \
--with-lpath=/var/log/ircd/ircd.log --with-domain=localhost
-configure: patch configure-stamp
+configure: configure-stamp
configure-stamp:
dh_testdir
+ cp -vf /usr/share/misc/config.sub /usr/share/misc/config.guess .
./configure $(CONFIGURE_OPTIONS)
cat config.h | sed 's/\/bin\/ircd/\/sbin\/ircd-ircu/g' > config.h.deb && mv config.h.deb config.h
touch configure-stamp
+
+build-arch: build
+build-indep: build
+
build: configure build-stamp
build-stamp:
@@ -33,7 +35,7 @@ build-stamp:
$(MAKE)
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
@@ -42,20 +44,14 @@ clean: unpatch
[ ! -f Makefile ] || $(MAKE) distclean
- rm -rf config/config.h config/.config
-
- -test -r /usr/share/misc/config.sub && \
- cp -f /usr/share/misc/config.sub config.sub
- -test -r /usr/share/misc/config.guess && \
- cp -f /usr/share/misc/config.guess config.guess
-
+ rm -rf config/config.h config/.config config.guess config.sub
dh_clean
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
binary-indep: build install
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.9.5
