Package: lifelines
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 e73c9230e3f193c51bb8c1de0c2ab4b081cabe12 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sat, 28 Apr 2012 18:45:46 +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 | 10 ++++
debian/compat | 2 +-
debian/control | 4 +-
debian/copyright | 2 +-
debian/patches/00list | 4 --
...akefile.in.dpatch => 01-docs-Makefile.in.patch} | 26 +----------
debian/patches/02-Makefile.am.patch | 15 ++++++
debian/patches/02_Makefile.am.dpatch | 37 ---------------
...{03_Makefile.in.dpatch => 03-Makefile.in.patch} | 26 +----------
debian/patches/04-docs-ll-userguide.xml.patch | 15 ++++++
debian/patches/04_docs-ll-userguide.xml.dpatch | 37 ---------------
debian/patches/series | 4 ++
debian/rules | 48 ++++++--------------
debian/source/format | 1 +
14 files changed, 68 insertions(+), 163 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01_docs-Makefile.in.dpatch => 01-docs-Makefile.in.patch} (57%)
create mode 100644 debian/patches/02-Makefile.am.patch
delete mode 100644 debian/patches/02_Makefile.am.dpatch
rename debian/patches/{03_Makefile.in.dpatch => 03-Makefile.in.patch} (60%)
create mode 100644 debian/patches/04-docs-ll-userguide.xml.patch
delete mode 100644 debian/patches/04_docs-ll-userguide.xml.dpatch
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index e74f469..fbd0c85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+lifelines (3.0.61-2.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 required build-arch and build-indep targets to rules file.
+ * Add note to copyright file about unreachable upstream URL.
+
+ -- Jari Aalto <jari.aa...@cante.net> Sat, 28 Apr 2012 18:45:23 +0300
+
lifelines (3.0.61-2) unstable; urgency=low
* The "let's modernize this package a bit" release
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 7311b52..117a41d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: misc
Priority: optional
Maintainer: Felipe Augusto van de Wiel (faw) <f...@debian.org>
Uploaders: Christian Perrier <bubu...@debian.org>
-Build-Depends: libncursesw5-dev, bison, debhelper (>= 8), sgmltools-lite, docbook-utils, ghostscript, autoconf (>= 2.5), autotools-dev, devscripts, dh-buildinfo, dpatch, lynx
-Standards-Version: 3.9.2
+Build-Depends: libncursesw5-dev, bison, debhelper (>= 9), sgmltools-lite, docbook-utils, ghostscript, autoconf (>= 2.5), autotools-dev, devscripts, dh-buildinfo, lynx
+Standards-Version: 3.9.3
Package: lifelines
Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 93b1e4a..b70d0a2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,7 +2,7 @@ This is Debian GNU/Linux's prepackaged version of the Lifelines Program.
This package was first put together by Javier Fernandez-Sanguino Peña
<j...@computer.org>, from the lines sources, which he obtained from
-http://bartonstreet.com/webdev
+http://bartonstreet.com/webdev which as of 2012-04-28 no longer exists.
Version 3.0.6 of the package was debianized by Christian Perrier
<bubu...@kheops.frmug.org> on Sat, 13 Jan 2001 16:09:23 +0100.
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 9d286b0..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-01_docs-Makefile.in.dpatch
-02_Makefile.am.dpatch
-03_Makefile.in.dpatch
-04_docs-ll-userguide.xml.dpatch
diff --git a/debian/patches/01_docs-Makefile.in.dpatch b/debian/patches/01-docs-Makefile.in.patch
similarity index 57%
rename from debian/patches/01_docs-Makefile.in.dpatch
rename to debian/patches/01-docs-Makefile.in.patch
index 7da1fb4..3a9ae01 100644
--- a/debian/patches/01_docs-Makefile.in.dpatch
+++ b/debian/patches/01-docs-Makefile.in.patch
@@ -1,28 +1,6 @@
-#! /bin/sh -e
-## 002_docs-Makefile.dpatch by <bubu...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Tim Dijkstra patch for proper handling of autocomments
+From: Christian Perrier <bubu...@debian.org>
+Subject: Tim Dijkstra patch for proper handling of autocomments
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
--- lifelines-3.0.61.orig/docs/Makefile.in
+++ lifelines-3.0.61/docs/Makefile.in
diff --git a/debian/patches/02-Makefile.am.patch b/debian/patches/02-Makefile.am.patch
new file mode 100644
index 0000000..42ad750
--- /dev/null
+++ b/debian/patches/02-Makefile.am.patch
@@ -0,0 +1,15 @@
+From: Felipe Augusto van de Wiel <f...@debian.org>
+Subject: Removing INSTALL COPYING LICENSE
+
+
+--- lifelines-3.0.50.orig/Makefile.am
++++ lifelines-3.0.50/Makefile.am
+@@ -6,7 +6,7 @@
+ SUBDIRS = build intl po win32 src docs reports tt
+
+ EXTRA_DIST = .linesrc lines.cfg lines.cfg.input \
+- COPYING LICENSE INSTALL NEWS README AUTHORS ABOUT-NLS \
++ NEWS README AUTHORS ABOUT-NLS \
+ README.AUTOCONF README.DEVELOPERS README.INTERNATIONAL \
+ README.LAYOUT \
+ README.MAINTAINERS README.MAINTAINERS.rpm \
diff --git a/debian/patches/02_Makefile.am.dpatch b/debian/patches/02_Makefile.am.dpatch
deleted file mode 100644
index 8afcb42..0000000
--- a/debian/patches/02_Makefile.am.dpatch
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh -e
-## 01_Makefile.am.dpatch by <f...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Removing INSTALL COPYING LICENSE
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-
---- lifelines-3.0.50.orig/Makefile.am
-+++ lifelines-3.0.50/Makefile.am
-@@ -6,7 +6,7 @@
- SUBDIRS = build intl po win32 src docs reports tt
-
- EXTRA_DIST = .linesrc lines.cfg lines.cfg.input \
-- COPYING LICENSE INSTALL NEWS README AUTHORS ABOUT-NLS \
-+ NEWS README AUTHORS ABOUT-NLS \
- README.AUTOCONF README.DEVELOPERS README.INTERNATIONAL \
- README.LAYOUT \
- README.MAINTAINERS README.MAINTAINERS.rpm \
diff --git a/debian/patches/03_Makefile.in.dpatch b/debian/patches/03-Makefile.in.patch
similarity index 60%
rename from debian/patches/03_Makefile.in.dpatch
rename to debian/patches/03-Makefile.in.patch
index 6848697..cb572cc 100644
--- a/debian/patches/03_Makefile.in.dpatch
+++ b/debian/patches/03-Makefile.in.patch
@@ -1,28 +1,6 @@
-#! /bin/sh -e
-## 02_Makefile.in.dpatch by <f...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Removing INSTALL COPYING LICENSE
+From: Felipe Augusto van de Wiel <f...@debian.org>
+Subject: Removing INSTALL COPYING LICENSE
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
--- lifelines-3.0.50.orig/Makefile.in
+++ lifelines-3.0.50/Makefile.in
diff --git a/debian/patches/04-docs-ll-userguide.xml.patch b/debian/patches/04-docs-ll-userguide.xml.patch
new file mode 100644
index 0000000..78ffa63
--- /dev/null
+++ b/debian/patches/04-docs-ll-userguide.xml.patch
@@ -0,0 +1,15 @@
+From: Felipe Augusto van de Wiel <f...@debian.org>
+Subject: fix XML to allow documentation build
+
+
+--- lifelines-3.0.50.orig/docs/ll-userguide.xml
++++ lifelines-3.0.50/docs/ll-userguide.xml
+@@ -3678,7 +3678,7 @@
+ </para>
+ </glossdef></glossentry>
+
+-<glossentry><glossterm>\ #</glossterm><glossdef>
++<glossentry><glossterm>\#</glossterm><glossdef>
+ <!-- note above has extra space between \ and # - without this
+ conversion to pdf gets confused openjade does some tex processing...
+ -->
diff --git a/debian/patches/04_docs-ll-userguide.xml.dpatch b/debian/patches/04_docs-ll-userguide.xml.dpatch
deleted file mode 100644
index 64b2eff..0000000
--- a/debian/patches/04_docs-ll-userguide.xml.dpatch
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh -e
-## 04_docs-ll-userguide.xml.dpatch by <f...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix XML to allow documentation build
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-
---- lifelines-3.0.50.orig/docs/ll-userguide.xml
-+++ lifelines-3.0.50/docs/ll-userguide.xml
-@@ -3678,7 +3678,7 @@
- </para>
- </glossdef></glossentry>
-
--<glossentry><glossterm>\ #</glossterm><glossdef>
-+<glossentry><glossterm>\#</glossterm><glossdef>
- <!-- note above has extra space between \ and # - without this
- conversion to pdf gets confused openjade does some tex processing...
- -->
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..53e9ae8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+01-docs-Makefile.in.patch
+02-Makefile.am.patch
+03-Makefile.in.patch
+04-docs-ll-userguide.xml.patch
diff --git a/debian/rules b/debian/rules
index d74d4ef..d777b49 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,35 +27,17 @@ package = lifelines
docdir = $(tmp)/usr/share/doc/$(package)
export DESTDIR = $(shell pwd)/debian/$(package)
-# PATCHLIST = $(notdir $(basename $(wildcard debian/patches/*.dpatch)))
-
-include /usr/share/dpatch/dpatch.make
-
-
-
-# The autotools target adds forced build-time dependencies on
-# autotools-dev (for /usr/share/misc/config.*) and devscripts (for dch)
-# It's also a .PHONY make target.
-autotools:
- chmod u+x build/autotools/config.sub
- chmod u+x build/autotools/config.guess
- OLDDATESUB=`build/autotools/config.sub -t | tr -d -` ;\
- OLDDATEGUESS=`build/autotools/config.guess -t | tr -d -` ;\
- NEWDATESUB=`/usr/share/misc/config.sub -t | tr -d -` ;\
- NEWDATEGUESS=`/usr/share/misc/config.guess -t | tr -d -` ;\
- if [ $$OLDDATESUB -lt $$NEWDATESUB -o \
- $$OLDDATEGUESS -lt $$NEWDATEGUESS ]; then \
- cp -f /usr/share/misc/config.sub build/autotools/config.sub ;\
- cp -f /usr/share/misc/config.guess build/autotools/config.guess ;\
- echo WARNING: GNU config scripts updated from master copies 1>&2 ;\
- fi
-
-configure:
- # Commented out as this made 3.0.28-1 impossible to build from sources.
+configure: configure-stamp
+
+configure-stamp:
+ # The 3.0.28-1 impossible to build from sources.
# This autogen.sh script is probably wrong.
# debian/autogen.sh
-configure-stamp: patch
+ cd build/autotools && \
+ cp -vf /usr/share/misc/config.sub /usr/share/misc/config.guess . && \
+ chmod u+x config.sub config.guess
+
dh_testdir
./configure $(confflags) \
--prefix=/usr \
@@ -63,17 +45,17 @@ configure-stamp: patch
--infodir=\$${prefix}/share/info
touch configure-stamp
-clean: clean-patched unpatch
-
-clean-patched: configure autotools
+clean:
dh_testdir
dh_testroot
-rm -f build-stamp configure-stamp
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) distclean
- -rm -f po/*.gmo
- -rm -f config.h config.cache config.status config.log stamp-config
- -rm -f $(CURDIR)/linesrc
+ rm -f po/*.gmo
+ rm -f config.h config.cache config.status config.log stamp-config \
+ build/autotools/config.sub \
+ build/autotools/config.guess
+ rm -f $(CURDIR)/linesrc
dh_clean
build: build-arch build-indep
@@ -175,6 +157,6 @@ binary-arch:: build install
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: autotools build clean binary-indep binary-arch binary install patch unpatch
+.PHONY: autotools build clean binary-indep binary-arch binary install
export DH_OPTIONS
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
