Package: filepp
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 24d8ae3599bb468cb6eeb2e6b1f52e39c75a0b7d Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sat, 28 Apr 2012 09:04:24 +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 | 14 ++++++++++++++
debian/compat | 2 +-
debian/control | 12 ++++++++----
debian/copyright | 2 +-
debian/patches/00list | 1 -
.../{01manpage-fixup.dpatch => 01-manpage-fixup.patch} | 8 ++------
debian/patches/series | 1 +
debian/rules | 14 +++++---------
debian/source/format | 1 +
debian/watch | 6 +-----
10 files changed, 34 insertions(+), 27 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01manpage-fixup.dpatch => 01-manpage-fixup.patch} (75%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 23363e1..8848d76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+filepp (1.8.0-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.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+ * Fix description-synopsis-starts-with-article (Lintian).
+ * Fix debian-watch-contains-dh_make-template (Lintian).
+ * Fix no-homepage-field (Lintian).
+ * Fx extended-description-is-probably-too-short (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Sat, 28 Apr 2012 09:04:03 +0300
+
filepp (1.8.0-3) unstable; urgency=low
* Fixing minor lintian warnings.
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 9e3e82a..1eb12f8 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,16 @@ Source: filepp
Section: text
Priority: optional
Maintainer: Christoph Haas <h...@debian.org>
-Build-Depends: debhelper (>= 4.0.0), dpatch (>= 2)
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
+Homepage: http://freecode.com/projects/filepp
Package: filepp
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: A generic perl-based file pre-processor
- filepp is a pre-processor similar to cpp just that it can
- process any kind of text file.
+ A generic pre-preprocessor for any kind of text file. It is designed
+ to allow the functionality provided by the C preprocessor to be used
+ with any file type. filepp supports the following keywords, all of
+ which have their usual C preprocessor meanings and usage: define,
+ if, elif, ifdef, ifndef etc.
\ No newline at end of file
diff --git a/debian/copyright b/debian/copyright
index 5bf79d2..846ca7c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -17,7 +17,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License with
-your Debian GNU system, in /usr/share/common-licenses/GPL, or with the
+your Debian GNU system, in /usr/share/common-licenses/GPL-2, or with the
Debian GNU source package as the file COPYING. If not, write to the
Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
MA 02110-1301, USA.
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 6e7a143..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01manpage-fixup.dpatch
diff --git a/debian/patches/01manpage-fixup.dpatch b/debian/patches/01-manpage-fixup.patch
similarity index 75%
rename from debian/patches/01manpage-fixup.dpatch
rename to debian/patches/01-manpage-fixup.patch
index 0a015e0..9edf3e1 100644
--- a/debian/patches/01manpage-fixup.dpatch
+++ b/debian/patches/01-manpage-fixup.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## manpage-fixup.dpatch by <h...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Simple fix in the man page.
+From: <h...@debian.org>
+Subject: Simple fix in the man page.
-@DPATCH@
diff -urNad trunk~/modules/blc/blc.1.in trunk/modules/blc/blc.1.in
--- trunk~/modules/blc/blc.1.in 2005-04-25 21:55:55.000000000 +0200
+++ trunk/modules/blc/blc.1.in 2006-01-26 00:01:32.000000000 +0100
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ee45233
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-manpage-fixup.patch
diff --git a/debian/rules b/debian/rules
index d7e6221..efd7fb0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,16 +8,12 @@
PACKAGE = filepp
TMP = ${CURDIR}/debian/$(PACKAGE)
-patch: patch-stamp
-patch-stamp:
- dpatch apply-all
-
-unpatch:
- dpatch deapply-all
+build-arch: build
+build-indep: build
build: build-stamp
-build-stamp: patch
+build-stamp:
dh_testdir
# Substitute variables in the filepp.in file.
@@ -35,7 +31,7 @@ build-stamp: patch
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
@@ -51,7 +47,7 @@ clean: unpatch
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
# Add here commands to install the package into debian/filepp.
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 81c8bb3..4d34fd7 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,6 +1,2 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# Site Directory Pattern Version Script
version=3
-http://www.cabaret.demon.co.uk/filepp/ filepp-([\d\.]+)\.tar\.gz debian uupdate
+http://www.cabaret.demon.co.uk/filepp/ filepp-([\d\.]+)\.tar\.gz
--
1.7.10
