This is an automated email from the git hooks/post-receive script. mans0954 pushed a commit to branch master in repository batik.
commit 9461dfd29b62d3d6f3c6020d9b51501827451d5e Author: Christopher Hoskin <[email protected]> Date: Mon Sep 4 05:36:57 2017 +0100 Update 06_fix_paths_in_policy_files.patch --- debian/changelog | 4 +- debian/patches/06_fix_paths_in_policy_files.patch | 66 +++++++++-------------- debian/patches/series | 1 + 3 files changed, 29 insertions(+), 42 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5c0674d..91ccf1b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,10 +14,12 @@ batik (1.9-1) UNRELEASED; urgency=medium DEB_ANT_BUILD_TARGET + Add debian/debian/libbatik-java.poms, call mh_install to install jars and poms, for closer alignment to other pkg-java packages - * Fix spellings in debian/manpages/rasterizer.1 + * Fix spellings in debian/manpages/rasterizer.1 + * Remove redundant remove-js.patch * Fix "batik is crashing (libbatik-java)" by patching build.xml to specify classpaths as appropriate for Debian (Closes: #605063) * Update Standards-Version from 3.9.8 to 4.0.0 (no change required) + * Update 06_fix_paths_in_policy_files.patch -- Christopher Hoskin <[email protected]> Sun, 03 Sep 2017 16:39:56 +0100 diff --git a/debian/patches/06_fix_paths_in_policy_files.patch b/debian/patches/06_fix_paths_in_policy_files.patch index a436a5b..e72a0c6 100644 --- a/debian/patches/06_fix_paths_in_policy_files.patch +++ b/debian/patches/06_fix_paths_in_policy_files.patch @@ -1,41 +1,27 @@ -From: Vincent Fourmond <[email protected] +From: Vincent Fourmond <[email protected]> Date: Mon, 14 Oct 2013 14:59:02 +0200 Subject: 06_fix_paths_in_policy_files +Forwarded: not-needed +Last-Update: 4-Sep-2017 ---- - .../apache/batik/apps/rasterizer/resources/rasterizer.policy | 8 ++++---- - .../apache/batik/apps/svgbrowser/resources/svgbrowser.policy | 10 +++++----- - 2 files changed, 9 insertions(+), 9 deletions(-) - -Index: batik-1.8/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy -=================================================================== ---- batik-1.8.orig/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy -+++ batik-1.8/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy -@@ -18,7 +18,7 @@ - // $Id: rasterizer.policy 1664314 2015-03-05 11:45:15Z lbernardo $ - // ----------------------------------------------------------------------------- - --grant codeBase "${app.dev.base}/classes/" { -+grant codeBase "file:/usr/share/java/batik-all.jar" { - permission java.security.AllPermission; - }; - -@@ -26,19 +26,19 @@ grant codeBase "${app.dev.base}/lib/xml- +--- a/batik-svgbrowser/src/main/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy ++++ b/batik-svgbrowser/src/main/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy +@@ -22,19 +22,19 @@ permission java.security.AllPermission; }; --grant codeBase "${app.dev.base}/lib/xerces_2_5_0.jar" { -+grant codeBase "file:/usr/share/java/xercesImpl.jar" { +-grant codeBase "${app.dev.base}/lib/xml-apis-1.3.04.jar" { ++grant codeBase "file:/usr/share/java/xml-apis.jar" { permission java.security.AllPermission; }; --grant codeBase "${app.dev.base}/lib/fop-transcoder-allinone-svn-trunk.jar" { -+grant codeBase "${app.dev.base}/lib/fop-transcoder.jar" { +-grant codeBase "${app.dev.base}/lib/xml-apis-ext-1.3.04.jar" { ++grant codeBase "file:/usr/share/java/xml-apis-ext.jar" { permission java.security.AllPermission; }; --grant codeBase "${app.dev.base}/lib/xmlgraphics-commons-svn-trunk.jar" { -+grant codeBase "file:/usr/share/java/xmlgraphics-commons.jar" { +-grant codeBase "${app.dev.base}/lib/xerces_2_5_0.jar" { ++grant codeBase "file:/usr/share/java/xercesImpl.jar" { permission java.security.AllPermission; }; @@ -44,31 +30,29 @@ Index: batik-1.8/resources/org/apache/batik/apps/rasterizer/resources/rasterizer permission java.lang.RuntimePermission "createClassLoader"; permission java.net.SocketPermission "*", "listen, connect, resolve, accept"; permission java.lang.RuntimePermission "accessDeclaredMembers"; -Index: batik-1.8/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy -=================================================================== ---- batik-1.8.orig/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy -+++ batik-1.8/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy -@@ -18,23 +18,23 @@ - // $Id: svgbrowser.policy 1664625 2015-03-06 14:07:41Z lbernardo $ - // ----------------------------------------------------------------------------- +--- a/batik-svgrasterizer/src/main/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy ++++ b/batik-svgrasterizer/src/main/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy +@@ -22,23 +22,23 @@ + permission java.security.AllPermission; + }; --grant codeBase "${app.dev.base}/classes/" { -+grant codeBase "file:/usr/share/java/batik-all.jar" { +-grant codeBase "${app.dev.base}/lib/xml-apis-dom3.jar" { ++grant codeBase "file:/usr/share/java/xml-apis-dom3.jar" { permission java.security.AllPermission; }; --grant codeBase "${app.dev.base}/lib/xml-apis-1.3.04.jar" { -+grant codeBase "file:/usr/share/java/xml-apis.jar" { +-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/xml-apis-ext-1.3.04.jar" { -+grant codeBase "file:/usr/share/java/xml-apis-ext.jar" { +-grant codeBase "${app.dev.base}/lib/fop-transcoder-allinone-svn-trunk.jar" { ++grant codeBase "file:/usr/share/java/fop-transcoder-allinone.jar" { permission java.security.AllPermission; }; --grant codeBase "${app.dev.base}/lib/xerces_2_5_0.jar" { -+grant codeBase "file:/usr/share/java/xercesImpl.jar" { +-grant codeBase "${app.dev.base}/lib/xmlgraphics-commons-svn-trunk.jar" { ++grant codeBase "file:/usr/share/java/xmlgraphics-commons.jar" { permission java.security.AllPermission; }; diff --git a/debian/patches/series b/debian/patches/series index 13c5c4e..593d361 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,5 @@ #06_fix_paths_in_policy_files.patch #source-1.5.patch #bug805469.patch +06_fix_paths_in_policy_files.patch classpath.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/batik.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
