Package: jp2a
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
As we spoke before, here is the proposed NMU patch.
Please let me know if there is anything that needs adjusting or if it
is ok to upload with these changes.
Thanks,
Jari
>From cce630a57ea2047df53fe72436a13a835cdf2d3a Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Tue, 28 Feb 2012 13:35:27 -0500
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <[email protected]>
---
debian/README.source | 2 --
debian/changelog | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 1 -
...1-fix_man_page.dpatch => 01-fix_man_page.patch} | 8 ++------
debian/patches/series | 1 +
debian/rules | 7 +++----
debian/source/format | 1 +
9 files changed, 18 insertions(+), 16 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{01-fix_man_page.dpatch => 01-fix_man_page.patch} (90%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 9a1a2c9..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,2 +0,0 @@
-This package uses dpatch to fix some errors.
-To know more about dpatch see /usr/share/doc/dpatch/README.source.gz file.
diff --git a/debian/changelog b/debian/changelog
index 1dd4423..3986309 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+jp2a (1.0.6-3.3) 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 <[email protected]> Tue, 28 Feb 2012 13:26:34 -0500
+
jp2a (1.0.6-3.2) unstable; urgency=low
* Non-maintainer upload.
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 822c8a0..de472bc 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: jp2a
Section: graphics
Priority: optional
Maintainer: Joao Eriberto Mota Filho <[email protected]>
-Build-Depends: debhelper (>= 7), autotools-dev, libjpeg-dev, libcurl4-gnutls-dev, libncurses5-dev, dpatch
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 9), autotools-dev, libjpeg-dev, libcurl4-gnutls-dev, libncurses5-dev
+Standards-Version: 3.9.3
Vcs-Svn: svn://svn.debian.org/svn/debian-br-team/packages/jp2a
Vcs-Browser: http://svn.debian.org/wsvn/debian-br-team/packages/jp2a
Homepage: http://csl.sublevel3.org/jp2a
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 6d3f2aa..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01-fix_man_page.dpatch
diff --git a/debian/patches/01-fix_man_page.dpatch b/debian/patches/01-fix_man_page.patch
similarity index 90%
rename from debian/patches/01-fix_man_page.dpatch
rename to debian/patches/01-fix_man_page.patch
index 6ff1319..9db351b 100644
--- a/debian/patches/01-fix_man_page.dpatch
+++ b/debian/patches/01-fix_man_page.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01-fix_man_page.dpatch by Joao Eriberto Mota Filho (eriberto) <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix mistakes in upstream man page.
+From: Joao Eriberto Mota Filho (eriberto) <[email protected]>
+Subject: Fix mistakes in upstream man page.
-@DPATCH@
diff -urNad jp2a-1.0.6~/man/jp2a.1 jp2a-1.0.6/man/jp2a.1
--- jp2a-1.0.6~/man/jp2a.1 2006-09-04 08:49:46.000000000 -0300
+++ jp2a-1.0.6/man/jp2a.1 2009-08-25 21:00:55.000000000 -0300
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..94d2a25
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-fix_man_page.patch
diff --git a/debian/rules b/debian/rules
index af980a9..e6398ff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,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)
@@ -35,14 +34,14 @@ build-stamp: config.status
$(MAKE)
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp config.guess config.sub
if [ -e Makefile ]; then $(MAKE) distclean; fi
dh_clean
-install: build patch-stamp
+install: build
dh_testdir
dh_testroot
dh_prep
@@ -55,7 +54,7 @@ binary-arch: install
dh_testdir
dh_testroot
dh_installchangelogs ChangeLog
- dh_installdocs debian/README.source
+ dh_installdocs
dh_strip
dh_compress
dh_fixperms
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
