Bug#664308: [PATCH] libhiglayout-java: Helping to update to packaging format 3.0
Package: libhiglayout-java
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 03ba55f4364314366b34ff2d8842aeb470ee929e Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aalto@cante.net>
Date: Sun, 26 Feb 2012 09:19:34 -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.aalto@cante.net>
---
debian/changelog | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 1 -
.../{10-makefile.dpatch => 10-makefile.patch} | 9 ++-------
debian/patches/series | 1 +
debian/rules | 1 -
debian/source/format | 1 +
8 files changed, 15 insertions(+), 12 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{10-makefile.dpatch => 10-makefile.patch} (69%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index eeffafd..abe05aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libhiglayout-java (1.0-6) unstable; urgency=low
+
+ * QA 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.aalto@cante.net> Sun, 26 Feb 2012 09:19:06 -0500
+
libhiglayout-java (1.0-5) unstable; urgency=low
* QA upload.
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 20b4443..0734900 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: libs
Priority: optional
Maintainer: Debian QA Group <packages@qa.debian.org>
Build-Depends-Indep: java-gcj-compat-dev
-Build-Depends: cdbs, debhelper (>= 5), dpatch
-Standards-Version: 3.7.3
+Build-Depends: cdbs, debhelper (>= 9)
+Standards-Version: 3.9.3
Homepage: http://www.autel.cz/dmi/tutorial.html
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/packages/trunk/libhiglayout-java/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/packages/trunk/libhiglayout-java/
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index a8138aa..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-10-makefile
\ No newline at end of file
diff --git a/debian/patches/10-makefile.dpatch b/debian/patches/10-makefile.patch
similarity index 69%
rename from debian/patches/10-makefile.dpatch
rename to debian/patches/10-makefile.patch
index 872f6b8..e38f234 100644
--- a/debian/patches/10-makefile.dpatch
+++ b/debian/patches/10-makefile.patch
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10-makefile.dpatch by <fourmond@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: A simple makefile, as it turns out to be simpler than
-## DP: tweaking debian/rules
+From: Vincent Fourmond <fourmond@debian.org>
+Subject: Add makefile. Simpler than tweaking debian/rules
-@DPATCH@
diff -urNad libhiglayout-java-1.0~/Makefile libhiglayout-java-1.0/Makefile
--- libhiglayout-java-1.0~/Makefile 1970-01-01 01:00:00.000000000 +0100
+++ libhiglayout-java-1.0/Makefile 2007-09-30 11:29:17.000000000 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..099ae2f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+10-makefile.patch
diff --git a/debian/rules b/debian/rules
index 6c7cedb..945d3bc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
DEB_TARBALL=
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
include /usr/share/cdbs/1/class/makefile.mk
DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/tmp/
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
Reply to: