[batik] 05/08: Made the rhino and jython dependencies optional (Closes: #875322)
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon Oct 2 14:55:35 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository batik.
commit 379aa3ef3096ac69c33bb55e6d0c9220c1bedbbb
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon Oct 2 16:07:30 2017 +0200
Made the rhino and jython dependencies optional (Closes: #875322)
---
debian/changelog | 1 +
...07_optional_rhino_and_jython_dependencies.patch | 33 ++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 35 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 1ab2ebe..59eede2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
batik (1.9-3) UNRELEASED; urgency=medium
* Team upload.
+ * Made the rhino and jython dependencies optional (Closes: #875322)
* Build with Maven instead of Ant
* Build with the DH sequencer instead of CDBS
* Standards-Version updated to 4.1.1
diff --git a/debian/patches/07_optional_rhino_and_jython_dependencies.patch b/debian/patches/07_optional_rhino_and_jython_dependencies.patch
new file mode 100644
index 0000000..ac16da2
--- /dev/null
+++ b/debian/patches/07_optional_rhino_and_jython_dependencies.patch
@@ -0,0 +1,33 @@
+Description: Makes the rhino and jython dependencies optional
+Origin: backport, https://svn.apache.org/r1805148
+--- a/batik-bridge/pom.xml
++++ b/batik-bridge/pom.xml
+@@ -95,6 +95,12 @@
+ <artifactId>xml-apis-ext</artifactId>
+ <version>${xmlapis.version}</version>
+ </dependency>
++ <dependency>
++ <groupId>org.mozilla</groupId>
++ <artifactId>rhino</artifactId>
++ <version>${rhino.version}</version>
++ <optional>true</optional>
++ </dependency>
+ </dependencies>
+
+ <build>
+--- a/batik-script/pom.xml
++++ b/batik-script/pom.xml
+@@ -49,11 +49,13 @@
+ <groupId>org.mozilla</groupId>
+ <artifactId>rhino</artifactId>
+ <version>${rhino.version}</version>
++ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.python</groupId>
+ <artifactId>jython</artifactId>
+ <version>${jython.version}</version>
++ <optional>true</optional>
+ </dependency>
+ </dependencies>
+
diff --git a/debian/patches/series b/debian/patches/series
index f7a33cd..1270360 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
06_fix_paths_in_policy_files.patch
+07_optional_rhino_and_jython_dependencies.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/batik.git
More information about the pkg-java-commits
mailing list