Package: makeself
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 c42311335c820abb315ad8f70f371d3c0948debd Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sat, 28 Apr 2012 18:48:54 +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 | 11 +++++++++++
debian/compat | 2 +-
debian/control | 7 ++++---
debian/copyright | 2 +-
debian/patches/00list | 2 --
debian/patches/01-makeself.patch | 15 +++++++++++++++
debian/patches/01_makeself.dpatch | 33 ---------------------------------
debian/patches/series | 2 ++
debian/rules | 15 ++++++++-------
debian/source/format | 1 +
10 files changed, 43 insertions(+), 47 deletions(-)
delete mode 100644 debian/patches/00list
create mode 100644 debian/patches/01-makeself.patch
delete mode 100644 debian/patches/01_makeself.dpatch
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index bc4aeb6..c43ddb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+makeself (2.1.5-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 binary-arch, build-arch and build-indep targets; use dh_prep in rules.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+ * Fix using-first-person-in-description (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Sat, 28 Apr 2012 18:48:42 +0300
+
makeself (2.1.5-1) unstable; urgency=low
* New upstream release.
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 428da3e..51dacfb 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,14 @@ Source: makeself
Section: utils
Priority: optional
Maintainer: Bartosz Fenski <fe...@debian.org>
-Build-Depends: debhelper (>= 4.0.0), dpatch
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
Homepage: http://www.megastep.org/makeself/
Package: makeself
Architecture: all
Suggests: bzip2
+Depends: ${misc:Depends}
Description: utility to generate self-extractable archives
makeself is a small shell script that generates a self-extractable
archive from a directory. The resulting file appears as a shell script
@@ -26,7 +27,7 @@ Description: utility to generate self-extractable archives
extracting the files, running the embedded command, and removing the
temporary files when it's all over. All what the user has to do to
install the software contained in such an archive is to "run" the
- archive, i.e. sh nice-software.run. I recommend using the "run" (which
+ archive, i.e. sh nice-software.run. It is recommended to use the "run" (which
was introduced by some Makeself archives released by Loki Software) or
"sh" suffix for such archives not to confuse the users, since they
actually are shell scripts (with quite a lot of binary data attached
diff --git a/debian/copyright b/debian/copyright
index 72794ef..822311d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -17,4 +17,4 @@ Free Software Foundation; either version 2, or (at your option) any
later version.
On Debian systems, the complete text of the GNU General Public License
-can be found in the file `/usr/share/common-licenses/GPL'.
+can be found in the file `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index c6da41d..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-01_makeself
-
diff --git a/debian/patches/01-makeself.patch b/debian/patches/01-makeself.patch
new file mode 100644
index 0000000..b3ceb47
--- /dev/null
+++ b/debian/patches/01-makeself.patch
@@ -0,0 +1,15 @@
+From: Bartosz Fenski <fe...@debian.org>
+Subject: Use absolute path for HEADER in Makefile
+
+--- makeself-2.1.2.orig/makeself.sh 2003-07-05 03:38:05.000000000 +0200
++++ makeself-2.1.2/makeself.sh 2004-03-24 23:50:04.000000000 +0100
+@@ -98,7 +98,7 @@
+ APPEND=n
+ COPY=none
+ TAR_ARGS=cvf
+-HEADER=`dirname $0`/makeself-header.sh
++HEADER=/usr/share/makeself/makeself-header
+
+ # LSM file stuff
+ LSM_CMD="echo No LSM. >> \"\$archname\""
+
diff --git a/debian/patches/01_makeself.dpatch b/debian/patches/01_makeself.dpatch
deleted file mode 100644
index 32a32d7..0000000
--- a/debian/patches/01_makeself.dpatch
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh -e
-## makeself.dpatch
-## Bartosz Fenski <fe...@debian.org>
-
-patch_opts="${patch_opts:--f --no-backup-if-mismatch ${2:+-d $2}}"
-
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -R -p1 < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
---- makeself-2.1.2.orig/makeself.sh 2003-07-05 03:38:05.000000000 +0200
-+++ makeself-2.1.2/makeself.sh 2004-03-24 23:50:04.000000000 +0100
-@@ -98,7 +98,7 @@
- APPEND=n
- COPY=none
- TAR_ARGS=cvf
--HEADER=`dirname $0`/makeself-header.sh
-+HEADER=/usr/share/makeself/makeself-header
-
- # LSM file stuff
- LSM_CMD="echo No LSM. >> \"\$archname\""
-
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0327674
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01-makeself.patch
+
diff --git a/debian/rules b/debian/rules
index 8bb0bc0..bb39ca0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
-
CFLAGS = -Wall -g
configure: configure-stamp
@@ -13,14 +11,16 @@ configure-stamp:
dh_testdir
touch configure-stamp
+build-arch: build
+build-indep: build
build: build-stamp
-build-stamp: configure-stamp patch-stamp
+build-stamp: configure-stamp
dh_testdir
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
@@ -29,12 +29,14 @@ clean: unpatch
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
install makeself.sh debian/makeself/usr/bin/makeself
install -m 644 makeself-header.sh debian/makeself/usr/share/makeself/makeself-header
+binary-arch:
+
binary-indep: build install
dh_testdir
dh_testroot
@@ -49,6 +51,5 @@ binary-indep: build install
dh_builddeb
binary: binary-indep
-.PHONY: build clean binary-indep binary install configure \
-patch unpatch
+.PHONY: build clean binary-indep binary install configure
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
