Bug#668489: [PATCH] docbookwiki: Helping to update to packaging format 3.0

Package: docbookwiki
Severity: wishlist
Tags: patch

Hi,

The package's debian/rules file had targets that refered to old dpatch[*].

I had some free time; see attached patch to migrate to new package
format. I also included few Lintian fixes along the way.

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

[*]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>.



From 519f73dbc02e6239d0d840c8f6f6a7cbc41d0b34 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aalto@cante.net>
Date: Thu, 12 Apr 2012 11:12:37 +0300
Subject: [PATCH] format-3.0
Organization: Private

Signed-off-by: Jari Aalto <jari.aalto@cante.net>

debian/changelog | 14 ++++++++++++++
debian/compat | 2 +-
debian/config | 6 ++++--
debian/control | 7 ++++
debian/copyright | 6 +++
debian/prerm | 1 +
debian/rules | 22 +++++++
debian/source/format | 1 +
8 files changed, 35 insertions(+), 24 deletions(-)
mode change 100644 => 100755 debian/config
mode change 100644 => 100755 debian/prerm
create mode 100644 debian/source/format

diff --git a/debian/changelog b/debian/changelog
index dc3089e..e28a1c3 100644
a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+docbookwiki (0.9.2-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch references from rules file.
+ * Upgrade to packaging format "3.0 quilt".
+ * Update to Standards-Version to 3.9.3, debhelper to 9, add ${misc:Depends}.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+ * Fix maintainer-script-lacks-debhelper-token prerm (Lintian).
+ * Fix maintainer-script-without-set-e config (Lintian).
+ * Fix no-homepage-field (Lintian).
+
+ -- Jari Aalto <jari.aalto@cante.net> Thu, 12 Apr 2012 11:10:45 +0300
+
docbookwiki (0.9.2-2) unstable; urgency=low

* Debconf templates and debian/control reviewed by the debian-l10n-
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/config b/debian/config
old mode 100644
new mode 100755
index 26aefad..968b739
a/debian/config
+++ b/debian/config
@@ -1,6 +1,8 @@
-#!/bin/sh -e
+#!/bin/sh
# config script for docbookwiki
-#
+
+set -e
+
. /usr/share/debconf/confmodule
db_input high docbookwiki/purge_books || true ;
db_input medium docbookwiki/generate_downloads || true ;
diff --git a/debian/control b/debian/control
index 138e048..98e48cb 100644
a/debian/control
+++ b/debian/control
@@ -2,12 +2,13 @@ Source: docbookwiki
Section: web
Priority: extra
Maintainer: Jeremy Malcolm <terminus@debian.org>
-Build-Depends: debhelper (>= 5), gettext, dpatch, po-debconf
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 9), gettext, po-debconf
+Standards-Version: 3.9.3
+Homepage: http://freecode.com/projects/docbookwiki

Package: docbookwiki
Architecture: all
-Depends: apache2, php5-cli, libapache-mod-php5 | libapache2-mod-php5, debconf | debconf-2.0, xsltproc (>=1.1.18), libxml2-utils, openssl, sudo (>=1.7.2p1-1), swish-e, docbook-xml, docbook-xsl, xmlto, docbook-utils, dblatex, xmltex, docbook-dsssl, jadetex, subversion, adduser, gawk, svn-load, php-gettext
+Depends: ${misc:Depends}, apache2, php5-cli, libapache-mod-php5 | libapache2-mod-php5, debconf | debconf-2.0, xsltproc (>=1.1.18), libxml2-utils, openssl, sudo (>=1.7.2p1-1), swish-e, docbook-xml, docbook-xsl, xmlto, docbook-utils, dblatex, xmltex, docbook-dsssl, jadetex, subversion, adduser, gawk, svn-load, php-gettext
Description: web application to display and edit DocBook documents online
DocBookWiki is a wiki-like application that allows editing documents
in XML (DocBook) format. It has the following features:
diff --git a/debian/copyright b/debian/copyright
index 6623186..2ca4a80 100644
a/debian/copyright
+++ b/debian/copyright
@@ -46,7 +46,7 @@ Its licence is also the GNU General Public License:
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.

Several sample documents are bundled with the software in XML format:

@@ -88,7 +88,7 @@ These documents are all licensed under the GNU Free Documentation License:
of the document entitled "GNU Free Documentation License".

On Debian systems, the complete text of the GNU Free Documentation
-License can be found in `/usr/share/common-licenses/GFDL'.
+License can be found in `/usr/share/common-licenses/GFDL-1.2'.

Example scripts to make documentation for DocBookWiki are included in
/usr/share/doc/docbookwiki/codedoc. These scripts are for use with
@@ -114,7 +114,7 @@ license which is the GNU Lesser General Public License:
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

On Debian systems, the complete text of the GNU Lesser General Public
-License can be found in `/usr/share/common-licenses/LGPL'.
+License can be found in `/usr/share/common-licenses/LGPL-2'.

The Debian packaging is copyright 2007, Jeremy Malcolm
<terminus@debian.org> and is licensed under the GPL, see above.
diff --git a/debian/prerm b/debian/prerm
old mode 100644
new mode 100755
index 643036b..4fd64a2
a/debian/prerm
+++ b/debian/prerm
@@ -32,3 +32,4 @@ if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
done
fi

+#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index c6e3d14..ef961d3 100755
a/debian/rules
+++ b/debian/rules
@@ -14,40 +14,32 @@ endif

configure: configure-stamp

-patchsource: patch-stamp
-
-patch-stamp:
- dpatch apply-all
- dpatch cat-all >patch-stamp
-
configure-stamp:
dh_testdir
touch configure-stamp

-build: patchsource build-stamp
+
+build-arch: build
+build-indep: build
+
+build: build-stamp

build-stamp: configure-stamp
dh_testdir
l10n/msgfmt-all.sh
touch $@

-clean: clean-patched unpatch
-
-clean-patched:
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
rm -rf `find l10n -name *.mo`
dh_clean

-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
-
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs

# Build architecture-independent files here.
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.5





To UNSUBSCRIBE, email to debian-bugs-dist-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org