[pkg-java] r17324 - in trunk/batik/debian: . patches
Markus Koschany
apo-guest at alioth.debian.org
Mon Oct 14 13:14:42 UTC 2013
Author: apo-guest
Date: 2013-10-14 13:14:42 +0000 (Mon, 14 Oct 2013)
New Revision: 17324
Modified:
trunk/batik/debian/changelog
trunk/batik/debian/compat
trunk/batik/debian/control
trunk/batik/debian/patches/06_fix_paths_in_policy_files.patch
trunk/batik/debian/patches/remove-js.patch
trunk/batik/debian/patches/source-1.5.patch
trunk/batik/debian/rules
Log:
Fix FTBFS with pbuilder-satisfydepends-classic
Remove Michael Koch from Uploaders
Bump compat level to 9 and require debhelper >= 9
Set JAVA_HOME_DIRS to /usr/lib/jvm/default-java
Build-depend on default-jdk
Drop all jre/jdk dependencies
Suggest default-jre-headless and recommend default-jre instead
Modified: trunk/batik/debian/changelog
===================================================================
--- trunk/batik/debian/changelog 2013-10-14 07:36:59 UTC (rev 17323)
+++ trunk/batik/debian/changelog 2013-10-14 13:14:42 UTC (rev 17324)
@@ -1,10 +1,26 @@
batik (1.7+dfsg-4) unstable; urgency=low
+ * Team upload.
+ [ Jakub Adam ]
* Add OSGi metadata to JAR manifests.
* Add Jakub Adam to Uploaders.
- -- Jakub Adam <jakub.adam at ktknet.cz> Sun, 01 Jan 2012 20:12:43 +0100
+ [ Markus Koschany ]
+ * debian/rules: Set JAVA_HOME_DIRS to /usr/lib/jvm/default-java,
+ build-depend on default-jdk and not on openjdk6-jdk |
+ openjdk-7-jdk anymore. Fixes FTBFS with pbuilder-satisfydepends-classic.
+ (Closes: #725461)
+ * Bump Standards-Version to 3.9.4, no changes.
+ * Bump compat level to 9 and require debhelper >= 9.
+ * Use canonical VCS-URI.
+ * Remove Michael Koch from Uploaders. (Closes: #653996)
+ * libatik-java: Drop all jre/jdk dependencies. Suggest
+ default-jre-headless and recommend default-jre instead.
+ * Run wrap-and-sort -sa
+ * Add DEP-3 header to all patches.
+ -- Markus Koschany <apo at gambaru.de> Mon, 14 Oct 2013 12:49:09 +0200
+
batik (1.7+dfsg-3) unstable; urgency=low
* Team upload.
Modified: trunk/batik/debian/compat
===================================================================
--- trunk/batik/debian/compat 2013-10-14 07:36:59 UTC (rev 17323)
+++ trunk/batik/debian/compat 2013-10-14 13:14:42 UTC (rev 17324)
@@ -1 +1 @@
-5
+9
Modified: trunk/batik/debian/control
===================================================================
--- trunk/batik/debian/control 2013-10-14 07:36:59 UTC (rev 17323)
+++ trunk/batik/debian/control 2013-10-14 13:14:42 UTC (rev 17324)
@@ -2,29 +2,48 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Wolfgang Baer <WBaer at gmx.de>, Michael Koch <konqueror at gmx.de>,
- Vincent Fourmond <fourmond at debian.org>, Onkar Shinde <onkarshinde at ubuntu.com>,
+Uploaders:
+ Wolfgang Baer <WBaer at gmx.de>,
+ Vincent Fourmond <fourmond at debian.org>,
+ Onkar Shinde <onkarshinde at ubuntu.com>,
Jakub Adam <jakub.adam at ktknet.cz>
-Standards-Version: 3.9.3
-Build-Depends: debhelper (>= 5.0), cdbs
-Build-Depends-Indep: openjdk-6-jdk | openjdk-7-jdk, ant,
- libbsf-java, libxalan2-java, rhino, libavalon-framework-java (>= 4.2.0),
- libcommons-io-java, libcommons-logging-java, libxml-commons-external-java,
- maven-repo-helper, javahelper
+Standards-Version: 3.9.4
+Build-Depends:
+ cdbs,
+ debhelper (>= 9)
+Build-Depends-Indep:
+ ant,
+ default-jdk,
+ javahelper,
+ libavalon-framework-java (>= 4.2.0),
+ libbsf-java,
+ libcommons-io-java,
+ libcommons-logging-java,
+ libxalan2-java,
+ libxml-commons-external-java,
+ maven-repo-helper,
+ rhino
Homepage: http://xml.apache.org/batik/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/batik
-Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/batik
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/batik
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/batik
Package: libbatik-java
Architecture: all
-Depends: default-jre-headless | java5-runtime-headless
- | java6-runtime-headless | java7-runtime-headless,
- libxalan2-java, libbsf-java,
- libavalon-framework-java (>= 4.2.0), libcommons-io-java,
- libcommons-logging-java, java-wrappers (>= 0.1.12),
+Depends:
+ java-wrappers (>= 0.1.12),
+ libavalon-framework-java (>= 4.2.0),
+ libbsf-java,
+ libcommons-io-java,
+ libcommons-logging-java,
+ libxalan2-java,
libxml-commons-external-java,
${misc:Depends}
-Recommends: fop (>= 1:0.94), rhino, openjdk-6-jre | openjdk-7-jre-headless
+Recommends:
+ fop (>= 1:0.94),
+ rhino,
+ default-jre
+Suggests:
+ default-jre-headless
Description: xml.apache.org SVG Library
Batik is a toolkit for applications or applets that want to use images
in the Scalable Vector Graphics (SVG) format for various purposes, such
@@ -33,7 +52,7 @@
Batik provides several modules to be used in applications:
* A SVG generator module, usable to export graphics into the SVG format.
* A SVG processor and SVG Viewing component for integrating SVG viewing.
- * A module to convert SVG to various formats, such as raster images
+ * A module to convert SVG to various formats, such as raster images
(JPEG, PNG or Tiff) and PS, PDF.
.
fop is necessary for PDF output of rasterizer.
Modified: trunk/batik/debian/patches/06_fix_paths_in_policy_files.patch
===================================================================
--- trunk/batik/debian/patches/06_fix_paths_in_policy_files.patch 2013-10-14 07:36:59 UTC (rev 17323)
+++ trunk/batik/debian/patches/06_fix_paths_in_policy_files.patch 2013-10-14 13:14:42 UTC (rev 17324)
@@ -1,6 +1,16 @@
-diff -Nur -x '*.orig' -x '*~' batik-1.7.dfsg/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy batik-1.7.dfsg.new/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy
---- batik-1.7.dfsg/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy 2006-11-22 09:22:10.000000000 +0530
-+++ batik-1.7.dfsg.new/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy 2009-04-19 03:32:06.000000000 +0530
+From: Vincent Fourmond <fourmond at debian.org
+Date: Mon, 14 Oct 2013 14:59:02 +0200
+Subject: 06_fix_paths_in_policy_files
+
+---
+ .../apache/batik/apps/rasterizer/resources/rasterizer.policy | 8 ++++----
+ .../apache/batik/apps/svgbrowser/resources/svgbrowser.policy | 10 +++++-----
+ 2 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy b/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy
+index 9652745..a66f39d 100644
+--- a/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy
++++ b/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy
@@ -18,7 +18,7 @@
// $Id: rasterizer.policy 476799 2006-11-19 11:33:41Z cam $
// -----------------------------------------------------------------------------
@@ -10,7 +20,7 @@
permission java.security.AllPermission;
};
-@@ -26,16 +26,16 @@
+@@ -26,16 +26,16 @@ grant codeBase "${app.dev.base}/lib/xml-apis-dom3.jar" {
permission java.security.AllPermission;
};
@@ -30,9 +40,10 @@
permission java.lang.RuntimePermission "createClassLoader";
permission java.net.SocketPermission "*", "listen, connect, resolve, accept";
permission java.lang.RuntimePermission "accessDeclaredMembers";
-diff -Nur -x '*.orig' -x '*~' batik-1.7.dfsg/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy batik-1.7.dfsg.new/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy
---- batik-1.7.dfsg/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy 2007-11-14 12:43:56.000000000 +0530
-+++ batik-1.7.dfsg.new/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy 2009-04-19 03:30:52.000000000 +0530
+diff --git a/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy b/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy
+index 6f58c0d..7760b08 100644
+--- a/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy
++++ b/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy
@@ -18,23 +18,23 @@
// $Id: svgbrowser.policy 499629 2007-01-25 00:32:16Z cam $
// -----------------------------------------------------------------------------
Modified: trunk/batik/debian/patches/remove-js.patch
===================================================================
--- trunk/batik/debian/patches/remove-js.patch 2013-10-14 07:36:59 UTC (rev 17323)
+++ trunk/batik/debian/patches/remove-js.patch 2013-10-14 13:14:42 UTC (rev 17324)
@@ -1,8 +1,17 @@
-Index: batik-1.7+dfsg/build.xml
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Mon, 14 Oct 2013 14:59:02 +0200
+Subject: remove-js
+
===================================================================
---- batik-1.7+dfsg.orig/build.xml 2012-03-12 20:23:44.334097595 +0100
-+++ batik-1.7+dfsg/build.xml 2012-03-12 20:24:06.986097050 +0100
-@@ -808,9 +808,9 @@
+---
+ build.xml | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index f274e64..96e7bde 100644
+--- a/build.xml
++++ b/build.xml
+@@ -808,9 +808,9 @@ JAVA=/usr/bin/java
<copy file="${src}/batik-xml.pom.template" tofile="${maven}/batik-xml/${completeVersion}/batik-xml-${completeVersion}.pom" filtering="true"/>
<copy file="${build}/lib/batik-xml.jar" tofile="${maven}/batik-xml/${completeVersion}/batik-xml-${completeVersion}.jar"/>
Modified: trunk/batik/debian/patches/source-1.5.patch
===================================================================
--- trunk/batik/debian/patches/source-1.5.patch 2013-10-14 07:36:59 UTC (rev 17323)
+++ trunk/batik/debian/patches/source-1.5.patch 2013-10-14 13:14:42 UTC (rev 17324)
@@ -1,6 +1,16 @@
---- batik-1.7.orig/build.xml 2008-11-06 18:42:11.000000000 +0100
-+++ batik-1.7/build.xml 2008-11-06 18:41:24.000000000 +0100
-@@ -835,7 +835,7 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Mon, 14 Oct 2013 14:59:02 +0200
+Subject: source-1.5
+
+---
+ build.xml | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index c26e1ee..f274e64 100644
+--- a/build.xml
++++ b/build.xml
+@@ -835,7 +835,7 @@ JAVA=/usr/bin/java
<echo message="debug ${debug}, optimize ${optimize}, deprecation ${deprecation}"/>
<javac srcdir="${testsrc}" destdir="${dest}" deprecation="${deprecation}"
@@ -9,7 +19,7 @@
<classpath>
<pathelement location="${dest}"/>
<path refid="libs-classpath"/>
-@@ -858,7 +858,7 @@
+@@ -858,7 +858,7 @@ JAVA=/usr/bin/java
<echo message="debug ${debug}, optimize ${optimize}, deprecation ${deprecation}"/>
@@ -18,7 +28,7 @@
debug="${debug}" optimize="${optimize}" encoding="UTF-8">
<classpath>
<pathelement location="${dest}"/>
-@@ -868,7 +868,7 @@
+@@ -868,7 +868,7 @@ JAVA=/usr/bin/java
</classpath>
</javac>
@@ -27,7 +37,7 @@
debug="${debug}" optimize="${optimize}" encoding="UTF-8">
<classpath>
<pathelement location="${dest}"/>
-@@ -1004,7 +1004,7 @@
+@@ -1004,7 +1004,7 @@ JAVA=/usr/bin/java
</target>
<target name="compile" depends="init, compile-prepare" unless="compile.done">
Modified: trunk/batik/debian/rules
===================================================================
--- trunk/batik/debian/rules 2013-10-14 07:36:59 UTC (rev 17323)
+++ trunk/batik/debian/rules 2013-10-14 13:14:42 UTC (rev 17324)
@@ -12,8 +12,7 @@
arch = $(shell dpkg-architecture -qDEB_HOST_ARCH)
-JAVA_HOME_DIRS := /usr/lib/jvm/java-7-openjdk-$(arch) \
- /usr/lib/jvm/java-6-openjdk-$(arch) /usr/lib/jvm/java-6-openjdk
+JAVA_HOME_DIRS := /usr/lib/jvm/default-java
ANT_HOME := /usr/share/ant
DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar bfs \
gnujaxp js xalan2 xml-apis-ext
More information about the pkg-java-commits
mailing list