Package: tdom
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 ce1725bd8c103d0ccca18c35c4108128bdf4bb3b Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Wed, 29 Feb 2012 07:03:03 -0500
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 | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 1 -
debian/patches/series | 1 +
.../{shared-expat.dpatch => shared-expat.patch} | 17 ++++++++++-------
debian/rules | 5 ++---
debian/source/format | 1 +
8 files changed, 25 insertions(+), 14 deletions(-)
delete mode 100644 debian/patches/00list
create mode 100644 debian/patches/series
rename debian/patches/{shared-expat.dpatch => shared-expat.patch} (99%)
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index b58c0c2..fd5fb24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tdom (0.8.3~20080525-3.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.
+
+ -- Jari Aalto <jari.aa...@cante.net> Wed, 29 Feb 2012 06:45:32 -0500
+
tdom (0.8.3~20080525-3) unstable; urgency=low
* Checked for lintian sanity (v2.2.12)
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 630e980..8cb06e1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: libs
Priority: optional
Maintainer: Tcl/Tk Debian Packagers <pkg-tcltk-de...@lists.alioth.debian.org>
Uploaders: Hector Romojaro <hromoj...@dia.uned.es>, Stefan Sobernig <stefan.sober...@wu-wien.ac.at>, Avni Khatri <avni...@gmail.com>, and Carl Blesius <c...@blesius.org>
-Build-Depends: debhelper (>= 5), autotools-dev, tcl-dev (>= 8.4), dpatch, libexpat1-dev
-Standards-Version: 3.8.2
+Build-Depends: debhelper (>= 9), autotools-dev, tcl-dev (>= 8.4), libexpat1-dev
+Standards-Version: 3.9.3
Homepage: http://www.tdom.org
Vcs-Svn: svn://svn.debian.org/viewsvn/pkg-tcltk/tdom/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-tcltk/tdom/
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 7ac47f8..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-shared-expat.dpatch
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3e2c997
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+shared-expat.patch
diff --git a/debian/patches/shared-expat.dpatch b/debian/patches/shared-expat.patch
similarity index 99%
rename from debian/patches/shared-expat.dpatch
rename to debian/patches/shared-expat.patch
index f584dcf..d8eba75 100644
--- a/debian/patches/shared-expat.dpatch
+++ b/debian/patches/shared-expat.patch
@@ -1,11 +1,14 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## shared-expat.dpatch by Stefan Sobernig <stefan.sober...@wu-wien.ac.at>,
-## based on prior work found at svn://bamboo.nes.ru/debian/tcl/tdom/trunk
-## and http://autoconf-archive.cryp.to/ax_lib_expat.m4
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: tDOM is distributed with a bundled version of expat (2.0.1). This is not acceptable in the realm of Debian packaging. Therefore, this patchs adds support for shared expat version (libexpat1) as provided by the Debian collection of packages. Once patched, one may use the "--with-expat" configure flag to point to a shared expat library. In addition, it renders tDOM indepedent from being either built against expat 1.95.* or expat 2.* as it offers appropriate preprocessor conditionals (this applies to both, the bundled and shared scenario).
+From: Stefan Sobernig <stefan.sober...@wu-wien.ac.at>,
+Subject: Ad support for shared expat version (libexpat1)
+ tDOM is distributed with a bundled version of expat (2.0.1). This is
+ not acceptable in the realm of Debian packaging. Therefore, this
+ patchs adds support for shared expat version (libexpat1) as provided
+ by the Debian collection of packages. Once patched, one may use the
+ "--with-expat" configure flag to point to a shared expat library. In
+ addition, it renders tDOM indepedent from being either built against
+ expat 1.95.* or expat 2.* as it offers appropriate preprocessor
+ conditionals (this applies to both, the bundled and shared scenario).
-@DPATCH@
diff -urNad trunk~/configure trunk/configure
--- trunk~/configure 2007-08-15 23:40:11.000000000 +0200
+++ trunk/configure 2008-05-20 04:45:04.000000000 +0200
diff --git a/debian/rules b/debian/rules
index 7e5dada..1b2d119 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,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)
@@ -33,7 +32,7 @@ VERSION=$(shell grep -m 1 AC_INIT configure.in | sed -e 's/AC_INIT(\[tdom\], \[/
DEV=$(CURDIR)/debian/tdom-dev
ARCH_DEPENDENT=$(CURDIR)/debian/tdom/usr/lib/tcltk
-config.status: patch configure
+config.status: configure
dh_testdir
# Add here commands to configure the package.
( cd unix ; ../configure --host=$(DEB_HOST_GNU_TYPE) \
@@ -83,7 +82,7 @@ build-stamp: config.status
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
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
