On 2012-06-24 18:55, Niels Thykier wrote:
> Package: libpixels-java
> Tags: patch
> Followup-For: Bug #678776
>
> Hi,
>
> I have attached an example patch to work around the issue. It will
> make use of default-jdk and newer javahelper features instead of
> gcj-jdk and dh_javadoc.
>
> Please note this patch will also correct the clean rule (which fails
> to clean the pixels.jar).
>
> ~Niels
Sorry, I attached a bad version of the patch. Here is the corrected one.
~Niels
diff -u libpixels-java-2.1.3+svn.42/debian/rules
libpixels-java-2.1.3+svn.42/debian/rules
--- libpixels-java-2.1.3+svn.42/debian/rules
+++ libpixels-java-2.1.3+svn.42/debian/rules
@@ -3,7 +3,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-export JAVA_HOME=/usr/lib/jvm/java-gcj
+export JAVA_HOME=/usr/lib/jvm/default-java
# Put depended upon jars in here
# export CLASSPATH=
@@ -17,13 +17,13 @@
build-indep: build-indep-stamp
build-indep-stamp:
dh_testdir
- jh_build pixels.jar src/main/java
+ jh_build
touch $@
clean:
dh_testdir
dh_testroot
- jh_build --clean pixels.jar src/main/java
+ jh_clean
dh_clean build-stamp build-indep-stamp build-arch-stamp
install-indep: build-indep
@@ -42,8 +42,7 @@
dh_install -i
dh_installdocs -i
dh_installchangelogs -i
- dh_javadoc -i --sourcedir=src/main/java com.jhlabs.composite \
- com.jhlabs.image com.jhlabs.math com.jhlabs.vecmath
+ jh_installjavadoc -i
jh_installlibs -i pixels.jar
jh_depends -i
dh_compress -i
diff -u libpixels-java-2.1.3+svn.42/debian/control
libpixels-java-2.1.3+svn.42/debian/control
--- libpixels-java-2.1.3+svn.42/debian/control
+++ libpixels-java-2.1.3+svn.42/debian/control
@@ -2,8 +2,8 @@
Section: java
Priority: optional
Maintainer: MartÃn Ferrari <tin...@debian.org>
-Build-Depends: debhelper (>> 5), javahelper
-Build-Depends-Indep: gcj-jdk, ant
+Build-Depends: debhelper (>> 5), javahelper (>= 0.40~)
+Build-Depends-Indep: default-jdk, ant
Standards-Version: 3.9.0.0
Homepage: https://pixels.dev.java.net/
Vcs-Browser: http://canterville.mine.nu/wsvn/debian/trunk/libpixels-java
diff -u libpixels-java-2.1.3+svn.42/debian/changelog
libpixels-java-2.1.3+svn.42/debian/changelog
--- libpixels-java-2.1.3+svn.42/debian/changelog
+++ libpixels-java-2.1.3+svn.42/debian/changelog
@@ -1,3 +1,15 @@
+libpixels-java (2.1.3+svn.42-1.1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * Use default-jdk instead gcj-jdk. (Closes: #678776)
+ * Replace dh_javadoc with jh_installjavadoc.
+ * Use debian/javabuild instead of calling jh_build with
+ arguments. This makes jh_build clean up the jar it
+ builds automatically.
+ * Replace jh_build --clean with jh_clean.
+
+ -- Niels Thykier <ni...@thykier.net> Sun, 24 Jun 2012 18:41:34 +0200
+
libpixels-java (2.1.3+svn.42-1) unstable; urgency=low
* New upstream release
only in patch2:
unchanged:
--- libpixels-java-2.1.3+svn.42.orig/debian/javabuild
+++ libpixels-java-2.1.3+svn.42/debian/javabuild
@@ -0,0 +1 @@
+pixels.jar src/main/java
only in patch2:
unchanged:
--- libpixels-java-2.1.3+svn.42.orig/debian/libpixels-java.javadoc
+++ libpixels-java-2.1.3+svn.42/debian/libpixels-java.javadoc
@@ -0,0 +1 @@
+internal
