[freeplane] 04/06: require libknopflerfish-osgi-framework-java 5.1.0, use groovy2

[Felix Natter]

This is an automated email from the git hooks/post-receive script.

fnatter-guest pushed a commit to branch master
in repository freeplane.

commit 0eabcc1cd6f697397f1823e40b643937a91c8878
Author: Felix Natter <fnatter at gmx.net>
Date:   Sat Mar 28 15:06:51 2015 +0100

    require libknopflerfish-osgi-framework-java 5.1.0, use groovy2
---
 debian/control                               | 8 ++++----
 debian/patches/10_libraries_properties.patch | 3 ++-
 debian/patches/15_libraries_manifest.patch   | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index 6f0979e..058598b 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends: cdbs,
                quilt,
                jflex
 Build-Depends-Indep: javahelp2,
-                     groovy,
+                     groovy2,
                      libcommons-lang-java (>= 2.6),
                      libcommons-io-java,
                      libjgoodies-forms-java (>= 1.6.0),
@@ -27,7 +27,7 @@ Build-Depends-Indep: javahelp2,
                      libxml-commons-external-java,
                      libjaxp1.3-java,
                      libjlatexmath-java (>= 1.0.2),
-                     libknopflerfish-osgi-framework-java,
+                     libknopflerfish-osgi-framework-java (>= 5.1.0),
                      libjsyntaxpane-java (>= 0.9.6~r156),
                      libcommons-codec-java (>= 1.7),
                      libidw-java,
@@ -42,7 +42,7 @@ Architecture: all
 Depends: ${misc:Depends},
          default-jre | java7-runtime,
          javahelp2,
-         groovy,
+         groovy2,
          libcommons-lang-java (>= 2.6),
          libcommons-io-java,
          libjgoodies-forms-java (>= 1.6.0),
@@ -54,7 +54,7 @@ Depends: ${misc:Depends},
          libxml-commons-external-java,
          libjaxp1.3-java,
          libjlatexmath-java (>= 1.0.2),
-         libknopflerfish-osgi-framework-java,
+         libknopflerfish-osgi-framework-java (>= 5.1.0),
          libjsyntaxpane-java (>= 0.9.6~r156),
          libcommons-codec-java (>= 1.7),
          libidw-java,
diff --git a/debian/patches/10_libraries_properties.patch b/debian/patches/10_libraries_properties.patch
index a801cab..d31fcb8 100644
--- a/debian/patches/10_libraries_properties.patch
+++ b/debian/patches/10_libraries_properties.patch
@@ -55,8 +55,9 @@ changes paths to dependency jars to /usr/share/java/...
 +++ b/freeplane_plugin_script/ant/ant.properties
 @@ -1,3 +1,3 @@
 -plugin.ext.lib = lib
+-groovy.jar = ${plugin.ext.lib}/groovy-all.jar
 +plugin.ext.lib = /usr/share/java
- groovy.jar = ${plugin.ext.lib}/groovy-all.jar
++groovy.jar = ${plugin.ext.lib}/groovy-all-2.x.jar
  jsyntaxpane.jar = ${plugin.ext.lib}/jsyntaxpane.jar
 --- a/freeplane_plugin_svg/ant/ant.properties
 +++ b/freeplane_plugin_svg/ant/ant.properties
diff --git a/debian/patches/15_libraries_manifest.patch b/debian/patches/15_libraries_manifest.patch
index dea9f7f..a4d765a 100644
--- a/debian/patches/15_libraries_manifest.patch
+++ b/debian/patches/15_libraries_manifest.patch
@@ -51,7 +51,7 @@ adapts jar paths in core MANIFEST as well as plugin MANIFESTs
 - lib/jsyntaxpane.jar,
 - lib/groovy-all.jar
 + ../../../java/jsyntaxpane.jar,
-+ ../../../java/groovy-all.jar
++ ../../../java/groovy-all-2.x.jar
  Export-Package: jsyntaxpane,
   jsyntaxpane.actions,
   jsyntaxpane.actions.gui,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/freeplane.git