Package: libunwind
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 71a07528df583015918726449f297f863a7b56ba Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sat, 21 Apr 2012 13:29:51 +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 | 16 +++++++++
debian/compat | 2 +-
debian/control | 23 ++++++-------
debian/copyright | 2 +-
debian/patches/00list | 1 -
.../{090828-rpath.dpatch => 01-rpath.patch} | 9 ++---
debian/patches/series | 1 +
debian/rules | 35 ++++++--------------
debian/source.lintian-overrides | 4 ---
debian/source/format | 1 +
debian/watch | 2 +-
11 files changed, 44 insertions(+), 52 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{090828-rpath.dpatch => 01-rpath.patch} (73%)
create mode 100644 debian/patches/series
delete mode 100644 debian/source.lintian-overrides
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 352b7d4..ba4324a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+libunwind (0.99-0.4) 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, debhelper to 9, add autotools-dev.
+ * Add build-arch and build-indep targets, use dh_prep and
+ correct config.* file treatment in rules file.
+ * Update URL in watch and copyright file.
+ * Delete source.lintian-overrides; no longer needed.
+ * Fix binary-control-field-duplicates-source (Lintian).
+ * Fix diff-contains-substvars (Lintian)
+ * Fix no-homepage-field (Lintian).
+ * Fix description-synopsis-starts-with-article (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Sat, 21 Apr 2012 13:29:37 +0300
+
libunwind (0.99-0.3) unstable; urgency=low
* Non-maintainer upload.
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 9021e0a..b842e06 100644
--- a/debian/control
+++ b/debian/control
@@ -3,15 +3,16 @@ Priority: optional
Section: libs
Maintainer: Matthieu Delahaye <matth...@debian.org>
Uploaders: Al Stone <a...@debian.org>
-Build-Depends: debhelper (>> 4.0.0), libatomic-ops-dev (>> 0.5.1), dpatch, autoconf, automake, libtool
-Standards-Version: 3.6.1
+Build-Depends: debhelper (>= 9), libatomic-ops-dev (>> 0.5.1), autoconf, automake, libtool, autotools-dev
+Standards-Version: 3.9.3
+Homepage: http://www.nongnu.org/libunwind
Package: libunwind7-dev
Section: libdevel
Architecture: ia64 i386 amd64 ppc64 powerpc
-Depends: libunwind7 (= ${binary:Version})
+Depends: ${misc:Depends}, libunwind7 (= ${binary:Version})
Conflicts: libunwind1-dev
-Description: A library to determine the call-chain of a program - development
+Description: library to determine the call-chain of a program - development
The primary goal of this project is to define a portable and efficient C
programming interface (API) to determine the call-chain of a program.
The API additionally provides the means to manipulate the preserved
@@ -23,11 +24,10 @@ Description: A library to determine the call-chain of a program - development
This package includes the development support files.
Package: libunwind7
-Section: libs
Architecture: ia64 i386 amd64 ppc64 powerpc
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Replaces: libgcc1 (<< 1:4.0.0-2)
-Description: A library to determine the call-chain of a program - runtime
+Description: library to determine the call-chain of a program - runtime
The primary goal of this project is to define a portable and efficient C
programming interface (API) to determine the call-chain of a program.
The API additionally provides the means to manipulate the preserved
@@ -41,8 +41,8 @@ Description: A library to determine the call-chain of a program - runtime
Package: libunwind-setjmp0-dev
Section: libdevel
Architecture: ia64 i386 amd64 ppc64 powerpc
-Depends: libunwind7-dev (= ${binary:Version}), libunwind-setjmp0 (= ${binary:Version})
-Description: A libunwind-based non local goto - development
+Depends: ${misc:Depends}, libunwind7-dev (= ${binary:Version}), libunwind-setjmp0 (= ${binary:Version})
+Description: libunwind-based non local goto - development
The unwind-setjmp library offers a libunwind-based implementation of
non-local gotos. This implementation is intended to be a drop-in
replacement for the normal, system-provided routines of the same name.
@@ -52,10 +52,9 @@ Description: A libunwind-based non local goto - development
This package includes the development support files
Package: libunwind-setjmp0
-Section: libs
Architecture: ia64 i386 amd64 ppc64 powerpc
-Depends: ${shlibs:Depends}
-Description: A libunwind-based non local goto - runtime
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: libunwind-based non local goto - runtime
The unwind-setjmp library offers a libunwind-based implementation of
non-local gotos. This implementation is intended to be a drop-in
replacement for the normal, system-provided routines of the same name.
diff --git a/debian/copyright b/debian/copyright
index f97ca7d..ddde7e8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
This package was debianized by Matthieu Delahaye <matth...@debian.org> on
Tue, 01 Apr 2003 17:37:16 +0200.
-It was downloaded from http://www.hpl.hp.com/research/linux/libunwind/
+It was downloaded from http://www.nongnu.org/libunwind
Upstream Author: David Mosberger <dav...@hpl.hp.com>
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 7a378be..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-090828-rpath
diff --git a/debian/patches/090828-rpath.dpatch b/debian/patches/01-rpath.patch
similarity index 73%
rename from debian/patches/090828-rpath.dpatch
rename to debian/patches/01-rpath.patch
index 4363120..d7d4b44 100644
--- a/debian/patches/090828-rpath.dpatch
+++ b/debian/patches/01-rpath.patch
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 090828-rpath.dpatch by Daigo Moriwaki <da...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: rpath should not be used
-## DP: http://wiki.debian.org/RpathIssue
+From: Daigo Moriwaki <da...@debian.org>
+Subject: rpath should not be used. See http://wiki.debian.org/RpathIssue
-@DPATCH@
diff -urNad libunwind-0.99~/configure.in libunwind-0.99/configure.in
--- libunwind-0.99~/configure.in 2009-05-09 01:34:10.000000000 +0900
+++ libunwind-0.99/configure.in 2009-08-29 10:41:18.000000000 +0900
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..53eec08
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-rpath.patch
diff --git a/debian/rules b/debian/rules
index 905300a..98fca9e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -35,12 +34,17 @@ major=2
config.status: configure
dh_testdir
# Add here commands to configure the package.
+ cp -vf /usr/share/misc/config.sub /usr/share/misc/config.guess .
autoreconf --force --install --include=config
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+
+build-arch: build
+build-indep: build
+
build: build-stamp
-build-stamp: patch config.status
+build-stamp: config.status
dh_testdir
# Add here commands to compile the package.
@@ -48,28 +52,20 @@ build-stamp: patch config.status
touch build-stamp
-clean: clean1 unpatch
-clean1:
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(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
-
-
+ rm -f config.sub config.guess debian/substvars
dh_clean
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
# Add here commands to install the package into debian/tmp
@@ -118,16 +114,5 @@ binary-arch: build install
get-orig-source:
uscan --verbose --force-download --rename --repack --destdir=..
-patch: patch-stamp
-patch-stamp:
- dpatch apply-all
- dpatch cat-all >patch-stamp
- touch patch-stamp
-
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
-
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install get-orig-source \
- patch unpatch clean1
+.PHONY: build clean binary-indep binary-arch binary install get-orig-source
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
deleted file mode 100644
index 7013130..0000000
--- a/debian/source.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-libunwind source: ancient-autotools-helper-file aux/config.sub 2002-03-07
-libunwind source: ancient-libtool aux/ltmain.sh 1.4.3
-libunwind source: ancient-autotools-helper-file aux/config.guess 2002-03-20
-
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)
diff --git a/debian/watch b/debian/watch
index 35dae4a..8f95dc2 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-http://nongnu.askapache.com/libunwind/libunwind-([0-9].[0-9]+\.?[0-9]*)\.tar\.gz
+http://download.savannah.nongnu.org/releases/libunwind/libunwind-([0-9].[0-9]+\.?[0-9]*)\.tar\.gz
--
1.7.9.5
