[pkg-java] r8199 - in trunk/batik/debian: . patches wrappers

Vincent Fourmond fourmond at alioth.debian.org
Mon Apr 20 20:04:40 UTC 2009


Author: fourmond
Date: 2009-04-20 20:04:40 +0000 (Mon, 20 Apr 2009)
New Revision: 8199

Added:
   trunk/batik/debian/patches/06_fix_paths_in_policy_files.patch
Modified:
   trunk/batik/debian/changelog
   trunk/batik/debian/control
   trunk/batik/debian/wrappers/squiggle
Log:
[batik] Porting the work from Onkar to Debian. Great thanks !!

Modified: trunk/batik/debian/changelog
===================================================================
--- trunk/batik/debian/changelog	2009-04-19 20:09:17 UTC (rev 8198)
+++ trunk/batik/debian/changelog	2009-04-20 20:04:40 UTC (rev 8199)
@@ -1,3 +1,16 @@
+batik (1.7-4) unstable; urgency=low
+
+  * Porting fixes from Ubuntu (1.7.dfsg-0ubuntu3) by Onkar Shinde
+    <onkarshinde at ubuntu.com>:
+    - add xml-apis-ext and js to classpath for debian/wrappers/squiggle
+    - promote rhino to a Recommends, as squiggle depends on it
+    - debian/patches/06_fix_paths_in_policy_files.patch to fix the paths
+      of the security policy files
+  * This finally makes squiggle work for Debian ! (closes: #499852)
+    Many thanks again to Onkar...
+
+ -- Vincent Fourmond <fourmond at debian.org>  Mon, 20 Apr 2009 21:22:26 +0200
+
 batik (1.7-3) unstable; urgency=low
 
   [ Onkar Shinde ]

Modified: trunk/batik/debian/control
===================================================================
--- trunk/batik/debian/control	2009-04-19 20:09:17 UTC (rev 8198)
+++ trunk/batik/debian/control	2009-04-20 20:04:40 UTC (rev 8199)
@@ -19,11 +19,10 @@
 Depends: openjdk-6-jre | sun-java5-jre | sun-java6-jre | sun-j2re1.4 | java2-runtime,
  libxalan2-java, libbsf-java, 
  libavalon-framework-java (>= 4.2.0), libcommons-io-java, 
- libcommons-logging-java, java-wrappers (>= 0.1.7),
+ libcommons-logging-java, java-wrappers (>= 0.1.12),
  libxml-commons-external-java,
  ${misc:Depends}
-Recommends: fop (>= 1:0.94)
-Suggests: rhino
+Recommends: fop (>= 1:0.94), rhino
 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
@@ -37,4 +36,6 @@
  .
  fop is necessary for PDF output of rasterizer.
  .
+ rhino is necessary for using the SVG browser, squiggle.
+ .
  For detailed information, go to http://xml.apache.org/batik/

Added: trunk/batik/debian/patches/06_fix_paths_in_policy_files.patch
===================================================================
--- trunk/batik/debian/patches/06_fix_paths_in_policy_files.patch	                        (rev 0)
+++ trunk/batik/debian/patches/06_fix_paths_in_policy_files.patch	2009-04-20 20:04:40 UTC (rev 8199)
@@ -0,0 +1,64 @@
+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
+@@ -18,7 +18,7 @@
+ // $Id: rasterizer.policy 476799 2006-11-19 11:33:41Z cam $
+ // -----------------------------------------------------------------------------
+ 
+-grant codeBase "${app.dev.base}/classes/" {
++grant codeBase "file:/usr/share/java/batik-all.jar" {
+   permission java.security.AllPermission;
+ };
+ 
+@@ -26,16 +26,16 @@
+   permission java.security.AllPermission;
+ };
+ 
+-grant codeBase "${app.dev.base}/lib/xerces_2_5_0.jar" {
++grant codeBase "file:/usr/share/java/xercesImpl.jar" {
+   permission java.security.AllPermission;
+ };
+ 
+-grant codeBase "${app.dev.base}/lib/pdf-transcoder.jar" {
++grant codeBase "file:/usr/share/java/fop-transcoder.jar" {
+   permission java.security.AllPermission;
+ };
+ 
+ 
+-grant codeBase "${app.dev.base}/lib/js.jar" {
++grant codeBase "file:/usr/share/java/js.jar" {
+   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
+@@ -18,23 +18,23 @@
+ // $Id: svgbrowser.policy 499629 2007-01-25 00:32:16Z cam $
+ // -----------------------------------------------------------------------------
+ 
+-grant codeBase "${app.dev.base}/classes/" {
++grant codeBase "file:/usr/share/java/batik-all.jar" {
+   permission java.security.AllPermission;
+ };
+ 
+-grant codeBase "${app.dev.base}/lib/xml-apis.jar" {
++grant codeBase "file:/usr/share/java/xml-apis.jar" {
+   permission java.security.AllPermission;
+ };
+ 
+-grant codeBase "${app.dev.base}/lib/xml-apis-ext.jar" {
++grant codeBase "file:/usr/share/java/xml-apis-ext.jar" {
+   permission java.security.AllPermission;
+ };
+ 
+-grant codeBase "${app.dev.base}/lib/xerces_2_5_0.jar" {
++grant codeBase "file:/usr/share/java/xercesImpl.jar" {
+   permission java.security.AllPermission;
+ };
+ 
+-grant codeBase "${app.dev.base}/lib/js.jar" {
++grant codeBase "file:/usr/share/java/js.jar" {
+   permission java.lang.RuntimePermission "createClassLoader";
+   permission java.net.SocketPermission "*", "listen, connect, resolve, accept";
+   permission java.lang.RuntimePermission "accessDeclaredMembers";

Modified: trunk/batik/debian/wrappers/squiggle
===================================================================
--- trunk/batik/debian/wrappers/squiggle	2009-04-19 20:09:17 UTC (rev 8198)
+++ trunk/batik/debian/wrappers/squiggle	2009-04-20 20:04:40 UTC (rev 8199)
@@ -3,7 +3,7 @@
 # Include the wrappers utility script
 . /usr/lib/java-wrappers/java-wrappers.sh
 
-find_java_runtime
-find_jars xercesImpl batik-all
+find_java_runtime java6
+find_jars xercesImpl batik-all xml-apis-ext js
 
 run_java org.apache.batik.apps.svgbrowser.Main "$@"




More information about the pkg-java-commits mailing list