Your message dated Tue, 20 Dec 2022 22:21:13 +0000
with message-id <e1p7kz3-005omw...@fasolo.debian.org>
and subject line Bug#670739: fixed in lifelines 3.0.61-2.2
has caused the Debian Bug report #670739,
regarding [PATCH] lifelines: Helping to update to packaging format 3.0
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
670739: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=670739
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
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
--- End Message ---
--- Begin Message ---
Source: lifelines
Source-Version: 3.0.61-2.2
Done: Bastian Germann <b...@debian.org>
We believe that the bug you reported is fixed in the latest version of
lifelines, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 670...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Bastian Germann <b...@debian.org> (supplier of updated lifelines package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Tue, 20 Dec 2022 22:46:33 +0100
Source: lifelines
Architecture: source
Version: 3.0.61-2.2
Distribution: unstable
Urgency: medium
Maintainer: Felipe Augusto van de Wiel (faw) <f...@debian.org>
Changed-By: Bastian Germann <b...@debian.org>
Closes: 670739 805867 927664
Changes:
lifelines (3.0.61-2.2) unstable; urgency=medium
.
* Non-maintainer upload.
* Remove Christian Perrier from Uploaders. (Closes: #927664)
* Set Homepage and d/watch to the new GitHub location. (Closes: #805867)
.
[ Jari Aalto ]
* Remove deprecated dpatch and upgrade to packaging format "3.0 (quilt)".
(Closes: #670739)
* 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.
Checksums-Sha1:
259e154c59d682437d1f39b384482b78949705c0 1909 lifelines_3.0.61-2.2.dsc
b335f33dfdac65a5bd2a807468aacc30b5097f57 12152
lifelines_3.0.61-2.2.debian.tar.xz
f6e4ea88c3f9808f2e22657ddbb7ceb69688440d 14084
lifelines_3.0.61-2.2_source.buildinfo
Checksums-Sha256:
dfdd997b7fa6ebb90f749db7a1c991108921b28c34858fa638c570f748db923e 1909
lifelines_3.0.61-2.2.dsc
f94c12ec802047a456985080ef1fe87abf8d7e86fc94abecb2d4263c030af978 12152
lifelines_3.0.61-2.2.debian.tar.xz
93fd83108269b06e52b740beb92002d3fa8beaf939d32438116b53268573bd01 14084
lifelines_3.0.61-2.2_source.buildinfo
Files:
7bf38049ccec02a4ade050f80bdfd0e4 1909 misc optional lifelines_3.0.61-2.2.dsc
00ccb63d5572e559dd30c56fc5fc00da 12152 misc optional
lifelines_3.0.61-2.2.debian.tar.xz
1e9f9bf31d378f73eae41e596a0108b9 14084 misc optional
lifelines_3.0.61-2.2_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQHEBAEBCgAuFiEEQGIgyLhVKAI3jM5BH1x6i0VWQxQFAmOiM0EQHGJhZ2VAZGVi
aWFuLm9yZwAKCRAfXHqLRVZDFGqMDAC19++PMISeEkQa9I6SKHHj5W3bf1H4xNQX
+jjuBC5ugOtqMgCTHjF5oK6bj/IDQJZXuMTk4evZC9/JmwU5q0d5GXuFvaZwO4yL
zLDO4wd5yC4jtfsN04oiJZMLxkn98Y8GbBO2eEIwRiiq/2iFwE1uzppgDq/gs3aI
vb7JoDzyMFPy3SycuP1oBiZkPuNy4aE6kxzV58lubCi5TGNCVu2HK6bN61/2Yn+E
7Hc2dlTiaIpNsHSnj5WT6/cx/6X6JdbnOVFz4VgRRisQKi2qrUZa1LV6dwfDYewv
kC7aJwg4n0XKppHiq/1lRt+vm01HrYHGpu9minhQI7m2BSUjF/efi4Ugv2NaTZC7
n6rRLGkL5KMUr3iZNEnqm3VAKx6tXogbvyD+m8TJzns/HEZk4qF209kDpRlbl9JI
XoszoHW20stekFkmf/xkv47+L02glzGjBTZaoUh/26daFq29iapAutlp/ZL/sp6R
ZXK5gRjbDjAZhiPkTgtrGWkDd7vQDfc=
=47ds
-----END PGP SIGNATURE-----
--- End Message ---
