This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a commit to branch master in repository freeplane.
commit 65e896c516803806ca6f9874a88b8e12e0dba55c Author: Felix Natter <[email protected]> Date: Sun Aug 14 14:11:21 2016 +0200 mergedViewerDependencies->compile --- debian/patches/10_build_usr_share_java.patch | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/debian/patches/10_build_usr_share_java.patch b/debian/patches/10_build_usr_share_java.patch index 993d5fb..03adeaf 100644 --- a/debian/patches/10_build_usr_share_java.patch +++ b/debian/patches/10_build_usr_share_java.patch @@ -143,7 +143,19 @@ Last-Update: 2016-02-04 --- a/freeplane/build.gradle +++ b/freeplane/build.gradle -@@ -13,19 +13,17 @@ +@@ -4,8 +4,9 @@ + } + + dependencies { +- +- mergedViewerDependencies 'org.dpolivaev.mnemonicsetter:mnemonicsetter:0.5' ++ ++ // no not use mergedViewerDependencies to avoid Debian upgrade problems ++ compile 'org.dpolivaev.mnemonicsetter:mnemonicsetter:0.5' + + compile project(':JOrtho_0.4_freeplane') + +@@ -13,19 +14,17 @@ 'commons-io:commons-io:2.4', 'commons-codec:commons-codec:1.7', 'com.jgoodies:jgoodies-forms:1.6.0', @@ -168,7 +180,7 @@ Last-Update: 2016-02-04 } sourceSets { -@@ -179,16 +177,17 @@ +@@ -179,16 +178,17 @@ } task copyOSGiJars(type: Copy) { @@ -195,7 +207,7 @@ Last-Update: 2016-02-04 } into(globalBuild + '/core/' + pluginid + '/lib/') } -@@ -311,7 +310,7 @@ +@@ -311,7 +311,7 @@ jar.dependsOn viewerJar jar.dependsOn editorJar jar.dependsOn osgiJar -- 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
