Package: pxe
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 f0ae90cb8d81a6c09f0401b22a6a197f59804130 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Mon, 27 Feb 2012 15:43:59 -0500
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 | 9 +++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/init.d | 4 ++--
debian/patches/00list | 4 ----
.../{01-logfile.dpatch => 01-logfile.patch} | 7 ++-----
.../{02-lockfile.dpatch => 02-lockfile.patch} | 7 ++-----
.../{03-pidfile.dpatch => 03-pidfile.patch} | 5 ++---
debian/patches/{04-gcc4.dpatch => 04-gcc4.patch} | 7 ++-----
debian/patches/series | 4 ++++
debian/rules | 16 ++++++----------
debian/source/format | 1 +
12 files changed, 33 insertions(+), 37 deletions(-)
mode change 100644 => 100755 debian/init.d
delete mode 100644 debian/patches/00list
rename debian/patches/{01-logfile.dpatch => 01-logfile.patch} (71%)
rename debian/patches/{02-lockfile.dpatch => 02-lockfile.patch} (84%)
rename debian/patches/{03-pidfile.dpatch => 03-pidfile.patch} (95%)
rename debian/patches/{04-gcc4.dpatch => 04-gcc4.patch} (70%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 68dd61f..d2d7d32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+pxe (1.4.2-7.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 $remote_fs to init.d script Required-{Start,Stop} headers.
+
+ -- Jari Aalto <[email protected]> Mon, 27 Feb 2012 15:42:25 -0500
+
pxe (1.4.2-7) unstable; urgency=low
* New maintainer (Closes: #407907)
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 255efab..bf50920 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: pxe
Section: net
Priority: optional
Maintainer: Herve Rousseau <[email protected]>
-Build-Depends: debhelper (>= 5), dpatch
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
Package: pxe
Architecture: any
diff --git a/debian/init.d b/debian/init.d
old mode 100644
new mode 100755
index cdf8e7b..621dc58
--- a/debian/init.d
+++ b/debian/init.d
@@ -2,8 +2,8 @@
### BEGIN INIT INFO
# Provides: pxe
-# Required-Start: $network
-# Required-Stop: $network
+# Required-Start: $network $remote_fs
+# Required-Stop: $network $remote_fs
# Should-Start:
# Should-Stop:
# Default-Start: 2 3 4 5
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 31040de..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-01-logfile
-02-lockfile
-03-pidfile
-04-gcc4
diff --git a/debian/patches/01-logfile.dpatch b/debian/patches/01-logfile.patch
similarity index 71%
rename from debian/patches/01-logfile.dpatch
rename to debian/patches/01-logfile.patch
index cae8666..c91dedc 100644
--- a/debian/patches/01-logfile.dpatch
+++ b/debian/patches/01-logfile.patch
@@ -1,9 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 01-logfile.dpatch by Jens Schmalzing <[email protected]>
-##
-## DP: Adjusts permission of the logfile.
+From: Jens Schmalzing <[email protected]>
+Subject: Adjusts permission of the logfile.
-@DPATCH@
diff -Naur pxe-1.4.2.orig/logfile.cc pxe-1.4.2/logfile.cc
--- pxe-1.4.2.orig/logfile.cc 2003-02-02 12:33:32.000000000 +0000
diff --git a/debian/patches/02-lockfile.dpatch b/debian/patches/02-lockfile.patch
similarity index 84%
rename from debian/patches/02-lockfile.dpatch
rename to debian/patches/02-lockfile.patch
index 8f15971..c79ab37 100644
--- a/debian/patches/02-lockfile.dpatch
+++ b/debian/patches/02-lockfile.patch
@@ -1,9 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 02-lockfile.dpatch by Jens Schmalzing <[email protected]>
-##
-## DP: Adjusts location and content of the lockfile.
+From: Jens Schmalzing <[email protected]>
+Subject: Adjusts location and content of the lockfile.
-@DPATCH@
diff -Naur pxe-1.4.2.orig/autoconf.h.in pxe-1.4.2/autoconf.h.in
--- pxe-1.4.2.orig/autoconf.h.in 2002-08-22 18:06:11.000000000 +0000
diff --git a/debian/patches/03-pidfile.dpatch b/debian/patches/03-pidfile.patch
similarity index 95%
rename from debian/patches/03-pidfile.dpatch
rename to debian/patches/03-pidfile.patch
index d6d2f15..2204538 100644
--- a/debian/patches/03-pidfile.dpatch
+++ b/debian/patches/03-pidfile.patch
@@ -1,7 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 03-pidfile.dpatch
+From: Jens Schmalzing <[email protected]>
+Subject: Pidfile modifications
-@DPATCH@
diff -Naur pxe-1.4.2.BAR/pxe.cc pxe-1.4.2.FOO/pxe.cc
--- pxe-1.4.2.BAR/pxe.cc 2006-08-15 10:12:25.000000000 +0000
diff --git a/debian/patches/04-gcc4.dpatch b/debian/patches/04-gcc4.patch
similarity index 70%
rename from debian/patches/04-gcc4.dpatch
rename to debian/patches/04-gcc4.patch
index d117e68..7103ebe 100644
--- a/debian/patches/04-gcc4.dpatch
+++ b/debian/patches/04-gcc4.patch
@@ -1,9 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 04-gcc4.dpatch by Alexandre Francois <[email protected]>.
-##
-## DP: Fixes segfault with GCC 4.x (Closes: #330851).
+From: Alexandre Francois <[email protected]>.
+Subject: Fixes segfault with GCC 4.x (Closes: #330851).
-@DPATCH@
diff -Naur pxe-1.4.2.orig/pxe.cc pxe-1.4.2/pxe.cc
--- pxe-1.4.2.orig/pxe.cc 2006-08-15 10:49:17.000000000 +0000
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..436a25e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+01-logfile.patch
+02-lockfile.patch
+03-pidfile.patch
+04-gcc4.patch
diff --git a/debian/rules b/debian/rules
index a941473..2266ba5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-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)
@@ -18,10 +17,12 @@ else
CFLAGS += -O2
endif
-config.status: patch-stamp configure
+config.status: configure
dh_testdir
# Configuring package
+ cp -f /usr/share/misc/config.sub config.sub
+ cp -f /usr/share/misc/config.guess config.guess
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --with-log=/var/log/pxe.log --with-setuid=Debian-pxe
build: build-stamp
@@ -33,19 +34,14 @@ build-stamp: config.status
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
-
+ rm -f config.sub config.guess
# Cleaning package
-$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
+
dh_clean
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
