This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository freeplane.
commit 37ad5b13cef29745ca1ddc2b859ac4db4b72cb29 Author: Emmanuel Bourg <[email protected]> Date: Fri May 13 16:39:29 2016 +0200 Depend on groovy instead of groovy2 --- debian/changelog | 7 +++++++ debian/control | 4 ++-- debian/patches/10_libraries_properties.patch | 3 +-- debian/patches/15_libraries_manifest.patch | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 48e2da7..dfb5b6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +freeplane (1.3.15-4) UNRELEASED; urgency=medium + + * Team upload. + * Depend on groovy instead of groovy2 + + -- Emmanuel Bourg <[email protected]> Fri, 13 May 2016 16:38:43 +0200 + freeplane (1.3.15-3) unstable; urgency=medium * Upgrade JMapViewer to 1.11 (Closes: #801475) diff --git a/debian/control b/debian/control index 3faaa12..4f830fc 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: cdbs, quilt, jflex Build-Depends-Indep: javahelp2, - groovy2, + groovy, libcommons-lang-java (>= 2.6), libcommons-io-java, libjgoodies-forms-java (>= 1.6.0), @@ -42,7 +42,7 @@ Architecture: all Depends: ${misc:Depends}, default-jre | java7-runtime, javahelp2, - groovy2, + groovy, libcommons-lang-java (>= 2.6), libcommons-io-java, libjgoodies-forms-java (>= 1.6.0), diff --git a/debian/patches/10_libraries_properties.patch b/debian/patches/10_libraries_properties.patch index d31fcb8..a801cab 100644 --- a/debian/patches/10_libraries_properties.patch +++ b/debian/patches/10_libraries_properties.patch @@ -55,9 +55,8 @@ 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-2.x.jar + groovy.jar = ${plugin.ext.lib}/groovy-all.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 a4d765a..dea9f7f 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-2.x.jar ++ ../../../java/groovy-all.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 _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
