[pkg-java] r15569 - trunk/libisrt-java/debian

[Miguel Landaeta]

Author: nomadium-guest
Date: 2011-12-21 04:50:02 +0000 (Wed, 21 Dec 2011)
New Revision: 15569

Modified:
   trunk/libisrt-java/debian/changelog
   trunk/libisrt-java/debian/control
   trunk/libisrt-java/debian/rules
Log:
Fix FTBFS with OpenJDK7

Modified: trunk/libisrt-java/debian/changelog
===================================================================
--- trunk/libisrt-java/debian/changelog	2011-12-21 04:45:26 UTC (rev 15568)
+++ trunk/libisrt-java/debian/changelog	2011-12-21 04:50:02 UTC (rev 15569)
@@ -1,3 +1,19 @@
+libisrt-java (4.8.20100629-2) UNRELEASED; urgency=low
+
+  [ Miguel Landaeta ]
+  * Team upload.
+  * Bump Standards-Version to 3.9.2. No changes were required.
+  * Remove unused B-D on cdbs.
+  * Improve description of -doc package.
+  * Add missing Vcs-* fields.
+
+  [ James Page ]
+  * Fix FTBFS with OpenJDK7 (LP: #888964) (Closes: #652045):
+    - d/rules: Overide jh_build and pass source/target as 1.5 to ensure
+      backwards compatibility and workaround Java 7 encoding errors.
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Tue, 20 Dec 2011 20:45:09 -0430
+
 libisrt-java (4.8.20100629-1) unstable; urgency=low
 
   * Team upload

Modified: trunk/libisrt-java/debian/control
===================================================================
--- trunk/libisrt-java/debian/control	2011-12-21 04:45:26 UTC (rev 15568)
+++ trunk/libisrt-java/debian/control	2011-12-21 04:50:02 UTC (rev 15569)
@@ -3,8 +3,10 @@
 Priority: extra
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Steffen Moeller <moeller at debian.org>
-Build-Depends: debhelper (>= 7), default-jdk, cdbs, libjna-java, javahelper (>= 0.37)
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 7), default-jdk, libjna-java, javahelper (>= 0.37)
+Standards-Version: 3.9.2
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libisrt-java
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libisrt-java/
 Homepage: http://opensource.intarsys.de/home/en/index.php?n=OpenSource.IsRuntime
 
 Package: libisrt-java
@@ -12,7 +14,7 @@
 Depends: ${java:Depends}, ${misc:Depends}
 Recommends: ${java:Recommends}
 Description: isRuntime library of intarsys
- Ths isRuntime library collects a series of routines common to the isCWT
+ The isRuntime library collects a series of routines common to the isCWT
  and the jPod Java libraries of the intarsys PDF management software.
  .
  This package always installs the latest version of the isCWT library.
@@ -24,6 +26,11 @@
 Depends: ${java:Depends}, ${misc:Depends}
 Recommends: ${java:Recommends}
 Description: Short Description - doc
- Long Description
+ Documentation for the isRuntime library that is Java library that collects
+ a series of routines common to the isCWT and the jPod Java libraries
+ of the intarsys PDF management software.
  .
- This package contains the Javadoc API
+ This package always installs the latest version of the isCWT library.
+ It only offers a symbolic link to the respective jar file.
+ .
+ This package contains the Javadoc API for the isRuntime library.

Modified: trunk/libisrt-java/debian/rules
===================================================================
--- trunk/libisrt-java/debian/rules	2011-12-21 04:45:26 UTC (rev 15568)
+++ trunk/libisrt-java/debian/rules	2011-12-21 04:50:02 UTC (rev 15569)
@@ -6,9 +6,12 @@
 # export CLASSPATH=
 
 %:
-	dh --with javahelper $@
+	dh $@ --with javahelper
 
 VERSION := $(shell dpkg-parsechangelog | awk -F'[ -]' '/^Version: /{print $$2}')
 
+override_jh_build:
+	jh_build --javacopts="-source 1.5 -target 1.5" --javadoc-opts="-source 1.5"
+	
 get-orig-source:
 	uscan --download-version $(VERSION) --force-download