Package: janino
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 bfc2bb365b678de9c43ac5602a555ad5eeb64417 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Tue, 28 Feb 2012 13:58: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 <[email protected]>
---
debian/changelog | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/build-remove-hardcoded.patch | 25 ++++++++++++++-----------
debian/patches/{00list => series} | 0
debian/rules | 1 -
debian/source/format | 1 +
7 files changed, 26 insertions(+), 15 deletions(-)
rename debian/patches/{00list => series} (100%)
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 9dd5fb2..be95e21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+janino (2.5.15-1.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 <[email protected]> Tue, 28 Feb 2012 13:43:56 -0500
+
janino (2.5.15-1) unstable; urgency=low
* New upstream version
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 eb9b1aa..954905b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: janino
Section: libs
Priority: optional
Maintainer: Philipp Hagemeister <[email protected]>
-Standards-Version: 3.8.0
-Build-Depends: cdbs, debhelper (>= 5), dpatch
+Standards-Version: 3.9.3
+Build-Depends: cdbs, debhelper (>= 9)
Build-Depends-Indep: ant, java-gcj-compat-dev, unzip
Homepage: http://janino.net
diff --git a/debian/patches/build-remove-hardcoded.patch b/debian/patches/build-remove-hardcoded.patch
index 767be31..953a8a2 100644
--- a/debian/patches/build-remove-hardcoded.patch
+++ b/debian/patches/build-remove-hardcoded.patch
@@ -1,12 +1,14 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## build-remove-hardcoded.patch by <[email protected]>
-##
-## DP: Remove hardcoded paths from build.xml.
-## DP: Create a manifest in the resulting jar file to set the Compiler class as main class.
-## DP: Correct indenting
-@DPATCH@
---- /build.xml 2007-06-03 14:15:03.000000000 +0200
-+++ /build.xml 2007-05-18 23:14:10.000000000 +0200
+From: <[email protected]>
+Subject: Remove hardcoded paths from build.xml.
+ Create a manifest in the resulting jar file to set the Compiler class
+ as main class. Correct indenting
+
+---
+ build.xml | 32 +++++++++++++++++---------------
+ 1 file changed, 17 insertions(+), 15 deletions(-)
+
+--- a/build.xml
++++ b/build.xml
@@ -35,23 +35,23 @@
<project name="Janino" default="compile" basedir=".">
<description>
@@ -16,8 +18,8 @@
+ </description>
+
<property file="build.properties"/>
-+ <property name="janino.manifest" value="janino.manifest"/>
-
++ <property name="janino.manifest" value="janino.manifest"/>
+
<target name="compile" description="Compile the source">
<mkdir dir="build/classes"/>
@@ -70,7 +72,7 @@
<zip destfile="${janino_zip}">
<zipfileset file="build/lib/janino.jar" prefix="janino-${version}/lib"/>
<zipfileset dir="build/javadoc" prefix="janino-${version}/javadoc"/>
-@@ -92,7 +93,8 @@
+@@ -92,8 +93,9 @@
<zipfileset file="build.*" prefix="janino-${version}"/>
</zip>
</target>
@@ -80,3 +82,4 @@
<delete dir="build"/>
+ <delete file="${janino.manifest}"/>
</target>
+ </project>
diff --git a/debian/patches/00list b/debian/patches/series
similarity index 100%
rename from debian/patches/00list
rename to debian/patches/series
diff --git a/debian/rules b/debian/rules
index 87cc870..a62a201 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
DEB_ANT_BUILDFILE := build.xml
DEB_ANT_BUILD_TARGET := jar
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
