Bug#669144: [PATCH] libgui-commands-java: packaging 3.0 and fix build-depends-on-obsolete-package default-jdk-builddep
Package: libgui-commands-java
Severity: normal
Tags: patch
Hi,
The build depends list package that has been obsoleted.
See attached patch to help to fix this and other things related
to new features and items reported by Lintian etc.
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 f84e70bf1d2b96b43adc43cc8451b67747e92602 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aalto@cante.net>
Date: Tue, 17 Apr 2012 21:14:05 +0300
Subject: [PATCH] obsolete-default-jdk
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <jari.aalto@cante.net>
---
debian/changelog | 11 +++++++++++
debian/compat | 2 +-
debian/control | 6 +++---
debian/rules | 10 +++++++++-
debian/source/format | 1 +
5 files changed, 25 insertions(+), 5 deletions(-)
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index f6bf128..6b53f18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+libgui-commands-java (1.1.43-6) unstable; urgency=low
+
+ * QA upload.
+ * Remove simple-patchsys.mk and upgrade to packaging format "3.0 quilt".
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+ * Update obsolete default-jdk-builddep to default-jdk (E: Lintian).
+ * Fix needless-dependency-on-jre (Lintian).
+ * Fix missing-classpath (Lintian).
+
+ -- Jari Aalto <jari.aalto@cante.net> Tue, 17 Apr 2012 21:05:12 +0300
+
libgui-commands-java (1.1.43-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 b46e38b..7d884b9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,14 +3,14 @@ Section: java
Priority: optional
Maintainer: Debian QA Group <packages@qa.debian.org>
Homepage: https://gui-commands.dev.java.net/
-Build-Depends: debhelper (>> 5.0.0), cdbs, patchutils, ant, default-jdk-builddep, libjaxen-java
+Build-Depends: debhelper (>= 9), cdbs, patchutils, ant, default-jdk, libjaxen-java
Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/libgui-commands-java/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libgui-commands-java/
-Standards-Version: 3.8.2
+Standards-Version: 3.9.3
Package: libgui-commands-java
Architecture: all
-Depends: gij | java-gcj-compat | java1-runtime | java2-runtime, libjaxen-java, ${misc:Depends}
+Depends: libjaxen-java, ${misc:Depends}
Description: command framework for Java Swing GUIs
GUI Commands is a comprehensive command framework for Java Swing user
interface applications. Conceptually it is similar to Swings Actions, but
diff --git a/debian/rules b/debian/rules
index 77ae5f9..254e9a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,11 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/ant.mk
JAVA_HOME := /usr/lib/jvm/default-java
ANT_HOME := /usr/share/ant
+LIB := /usr/share/java/jaxen.jar
DEB_JARS := jaxen
@@ -20,6 +20,14 @@ ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
endif
install/libgui-commands-java::
+ # repack with Class-Path in manifest file.
+ cd build && \
+ file=META-INF/MANIFEST.MF ; \
+ jar -xf gui-commands.jar && \
+ sed -i '/^[ \r\t]*$$/d' $$file && \
+ /bin/echo -e "Class-Path: $(LIB)\r" >> $$file && \
+ jar -cfm gui-commands.jar $$file .
+
mv build/gui-commands.jar build/gui-commands-$(DEB_UPSTREAM_VERSION).jar
dh_install -plibgui-commands-java build/gui-commands-$(DEB_UPSTREAM_VERSION).jar usr/share/java/
dh_link -plibgui-commands-java usr/share/java/gui-commands-$(DEB_UPSTREAM_VERSION).jar usr/share/java/gui-commands.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.5
Reply to: