[freeplane] 03/04: update patch for 1.5.13

Felix Natter fnatter-guest at moszumanska.debian.org
Sun Jul 31 17:06:07 UTC 2016


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

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

commit 210f68805666395d66e8b79f929f8f845bc02953
Author: Felix Natter <fnatter at gmx.net>
Date:   Sun Jul 31 18:56:59 2016 +0200

    update patch for 1.5.13
---
 debian/patches/10_build_usr_share_java.patch | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/patches/10_build_usr_share_java.patch b/debian/patches/10_build_usr_share_java.patch
index 2c54a95..993d5fb 100644
--- a/debian/patches/10_build_usr_share_java.patch
+++ b/debian/patches/10_build_usr_share_java.patch
@@ -143,15 +143,15 @@ Last-Update: 2016-02-04
  
 --- a/freeplane/build.gradle
 +++ b/freeplane/build.gradle
-@@ -13,19 +13,18 @@
+@@ -13,19 +13,17 @@
              'commons-io:commons-io:2.4',
              'commons-codec:commons-codec:1.7',
              'com.jgoodies:jgoodies-forms:1.6.0',
 -            'com.jgoodies:jgoodies-common:1.4.0'
-+            //'com.jgoodies:jgoodies-common:1.4.0',
++            //'com.jgoodies:jgoodies-common:1.4.0'
 +	    ':idw'
  
- 	compile  ('com.lightdev.app.shtm.simplyhtml:SimplyHTML:0.16.17') {
+ 	compile  ('com.lightdev.app.shtm.simplyhtml:SimplyHTML:0.16.18') {
  		exclude module: 'javahelp'
  		exclude module: 'mnemonicsetter'
  	}
@@ -159,16 +159,16 @@ Last-Update: 2016-02-04
 -    testCompile 'junit:junit:4.12',
 -                'org.hamcrest:hamcrest-all:1.3',
 -                'org.mockito:mockito-all:1.10.19'        
+-
+-    // from flatDir "localGitDepsRepository":
+-    compile ':idw-gpl-1.6.1'
 +    //testCompile 'junit:junit:4.12',
 +    //            'org.hamcrest:hamcrest-all:1.3',
 +    //            'org.mockito:mockito-all:1.10.19'
- 
--    // from flatDir "localGitDepsRepository":
--    compile ':idw-gpl-1.6.1'
  }
  
  sourceSets {
-@@ -179,16 +178,17 @@
+@@ -179,16 +177,17 @@
  }
  
  task copyOSGiJars(type: Copy) {
@@ -195,7 +195,7 @@ Last-Update: 2016-02-04
       }
       into(globalBuild + '/core/' + pluginid + '/lib/')
  }
-@@ -301,7 +301,7 @@
+@@ -311,7 +310,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



More information about the pkg-java-commits mailing list