Package: nwall
Version: 1.32+debian-4.1
Severity: wishlist
Tags: patch
Hi Luis,
As with your other package nwrite
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=664385, here is patch to
migrate to new package format.
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 9e278de6146adcc66dac7346097b5a667faffa0b Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Thu, 5 Apr 2012 15:53:08 +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 | 12 ++++++++
debian/compat | 2 +-
debian/control | 5 ++-
debian/copyright | 4 +-
debian/patches/00list | 1 -
.../{01-segfault.dpatch => 01-segfault.patch} | 8 +----
debian/patches/series | 1 +
debian/rules | 29 +++++++++----------
debian/source/format | 1 +
9 files changed, 36 insertions(+), 27 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01-segfault.dpatch => 01-segfault.patch} (68%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index a866fcd..355cb9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+nwall (1.32+debian-4.2) unstable; urgency=low
+
+ * Non-maintainer upload; ACKed by the maintainer, see #.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt"
+ (Closes: #).
+ * Update to Standards-Version to 3.9.3.1 and debhelper to 9.
+ * Add homepage field to control file.
+ * 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, 05 Apr 2012 15:50:23 +0300
+
nwall (1.32+debian-4.1) unstable; urgency=low
* Non maintainer upload.
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 353a9c3..3630736 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,9 @@ Source: nwall
Section: misc
Priority: optional
Maintainer: Luis Uribe <a...@eviled.org>
-Build-Depends: debhelper (>= 5), dpatch, autotools-dev, libncurses5-dev, libreadline-dev | libreadline5-dev
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 9), autotools-dev, libncurses5-dev, libreadline-dev | libreadline5-dev
+Standards-Version: 3.9.3.1
+Homepage: http://freecode.com/projects/nwall
Package: nwall
Architecture: any
diff --git a/debian/copyright b/debian/copyright
index da7991a..ca5dadb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -24,7 +24,7 @@ License:
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
On Debian systems, the complete text of the GNU General Public License
-can be found in /usr/share/common-licenses/GPL file.
+can be found in /usr/share/common-licenses/GPL-2.
The Debian packaging is (C) 2004-2007, Daniel Baumann <dan...@debian.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 89b04a6..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01-segfault
diff --git a/debian/patches/01-segfault.dpatch b/debian/patches/01-segfault.patch
similarity index 68%
rename from debian/patches/01-segfault.dpatch
rename to debian/patches/01-segfault.patch
index c42480d..807a98b 100644
--- a/debian/patches/01-segfault.dpatch
+++ b/debian/patches/01-segfault.patch
@@ -1,10 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 01-segfault.dpatch by Christoph Berg <m...@debian.org>
-##
-## DP: Fix segfault when encountering lockfiles from users without passwd entry
-## DP: (Closes: #150669)
+From: Christoph Berg <m...@debian.org>
+Subject: Fix segfault when encountering lockfiles from users without passwd entry (Closes: #150669)
-@DPATCH@
diff -Naur nwall-1.32.orig/src/nwall.c nwall-1.32/src/nwall.c
--- nwall-1.32.orig/src/nwall.c 2001-04-08 20:31:35.000000000 +0000
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..fd9de77
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-segfault.patch
diff --git a/debian/rules b/debian/rules
index 41a2f37..1725ac4 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)
@@ -17,11 +16,18 @@ else
CFLAGS += -O2
endif
-config.status: patch-stamp configure
+config.status: configure
dh_testdir
-
+ cp -f /usr/share/misc/config.sub config.sub
+ cp -f /usr/share/misc/config.guess config.guess
# Configuring package
- CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) ./configure --prefix=/usr --localstatedir=/var
+ CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --localstatedir=/var
+ # For some reason @top_builddir@ is not set
+ sed -i 's,@top_builddir@,$$(pwd),' Makefile
+
+
+build-arch: build
+build-indep: build
build: build-stamp
build-stamp: config.status
@@ -32,26 +38,19 @@ build-stamp: config.status
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
-
# 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
-
+ [ ! -f Makefile ] || $(MAKE) distclean
+ rm -f config.sub config.guess config.h.in
dh_clean
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
# Installing package
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.1
