This is an automated email from the git hooks/post-receive script.
fnatter-guest pushed a commit to branch master
in repository freeplane.
commit e1c477a6783338efb527ff4bbe604a48c83f24eb
Author: Felix Natter <fnat...@gmx.net>
Date: Sat Feb 10 13:21:40 2018 +0100
update patches for 1.6.13
---
debian/patches/10_build_usr_share_java.patch | 26 +++++++++++++-------------
debian/patches/20_freeplane_sh.patch | 24 +++++++++---------------
debian/patches/30_disable_update_check.patch | 4 ++--
3 files changed, 24 insertions(+), 30 deletions(-)
diff --git a/debian/patches/10_build_usr_share_java.patch
b/debian/patches/10_build_usr_share_java.patch
index 7a635fa..84295b9 100644
--- a/debian/patches/10_build_usr_share_java.patch
+++ b/debian/patches/10_build_usr_share_java.patch
@@ -86,7 +86,7 @@ Last-Update: 2016-02-04
dependencies {
testCompile 'junit:junit:4.11'
testCompile 'org.assertj:assertj-core:2.6.0'
-@@ -108,14 +121,9 @@
+@@ -117,14 +130,9 @@
// OSGi projects (/plugin/, freeplane) need this for compilation (e.g.
resolve Bundle),
// and freeplane_framework needs to copy it to BUILD/framework.jar
configure(subprojects.findAll {it.name =~ /plugin/ || it.name =~
/^freeplane$/ || it.name =~ /^freeplane_framework$/}){
@@ -103,7 +103,7 @@ Last-Update: 2016-02-04
}
}
-@@ -128,11 +136,13 @@
+@@ -137,11 +145,13 @@
else
ext.pluginid = project.name.replace("freeplane_plugin_",
"org.freeplane.plugin.")
@@ -122,7 +122,7 @@ Last-Update: 2016-02-04
task filterOSGiManifestForEclipse(type: Copy) {
from('build/tmp/jar/MANIFEST.MF') {
-@@ -184,18 +194,9 @@
+@@ -193,18 +203,9 @@
configure(subprojects.findAll {it.name =~ /plugin/ }) {
task copyOSGiJars(type: Copy) {
@@ -184,7 +184,7 @@ Last-Update: 2016-02-04
}
sourceSets {
-@@ -181,16 +181,17 @@
+@@ -187,16 +187,17 @@
}
task copyOSGiJars(type: Copy) {
@@ -211,7 +211,7 @@ Last-Update: 2016-02-04
}
into(globalBin + '/core/' + pluginid + '/lib/')
}
-@@ -315,7 +316,7 @@
+@@ -321,7 +322,7 @@
jar.dependsOn viewerJar
jar.dependsOn editorJar
jar.dependsOn osgiJar
@@ -222,8 +222,8 @@ Last-Update: 2016-02-04
build.dependsOn copyExternalResources
--- a/freeplane_plugin_jsyntaxpane/build.gradle
+++ b/freeplane_plugin_jsyntaxpane/build.gradle
-@@ -2,7 +2,8 @@
- compile project(':freeplane')
+@@ -3,7 +3,8 @@
+ testCompile project(':freeplane')
// from flatDir "localGitDepsRepository":
- compile ':jsyntaxpane-0.9.6~r156-5' // from the Debian
"libjsyntaxpane-java" package
@@ -236,7 +236,7 @@ Last-Update: 2016-02-04
+++ b/freeplane_plugin_openmaps/build.gradle
@@ -8,7 +8,8 @@
dependencies {
- compile project(':freeplane')
+ compileOnly project(':freeplane')
- compile 'org.openstreetmap.jmapviewer:jmapviewer:1.14'
+ //compile 'org.openstreetmap.jmapviewer:jmapviewer:1.14'
@@ -246,18 +246,18 @@ Last-Update: 2016-02-04
jar {
--- a/freeplane_plugin_script/build.gradle
+++ b/freeplane_plugin_script/build.gradle
-@@ -2,10 +2,10 @@
- compile project(':freeplane')
- compile project(':freeplane_plugin_jsyntaxpane')
+@@ -4,10 +4,10 @@
+ compileOnly project(':freeplane_plugin_jsyntaxpane')
+ testCompile project(':freeplane_plugin_jsyntaxpane')
compile 'org.codehaus.groovy:groovy-all:2.3.1'
- compile ('org.freeplane.securegroovy:groovy-patcher:0.0.2') {
- transitive = false
- }
-- compile 'net.bytebuddy:byte-buddy:1.6.9'
+- compile 'net.bytebuddy:byte-buddy:1.7.9'
+ //compile ('org.freeplane.securegroovy:groovy-patcher:0.0.2') {
+ // transitive = false
+ //}
-+ //compile 'net.bytebuddy:byte-buddy:1.6.9'
++ //compile 'net.bytebuddy:byte-buddy:1.7.9'
}
tasks.withType(JavaCompile) {
diff --git a/debian/patches/20_freeplane_sh.patch
b/debian/patches/20_freeplane_sh.patch
index 0770596..2b64358 100644
--- a/debian/patches/20_freeplane_sh.patch
+++ b/debian/patches/20_freeplane_sh.patch
@@ -20,7 +20,7 @@ Last-Update: 2016-05-05
########## FUNCTIONS DEFINITIONS #######################################
_debug() {
-@@ -29,36 +36,36 @@
+@@ -29,31 +36,31 @@
findjava() {
# We try hard to find the proper 'java' command
@@ -58,18 +58,12 @@ Last-Update: 2016-05-05
- "$JAVACMD" -version >&2
+ "$JAVA_CMD" -version >&2
fi
-- if (! "${JAVACMD}" -version 2>&1 | grep -qe 'Java(TM)' -e
OpenJDK); then
-+ if (! "${JAVA_CMD}" -version 2>&1 | grep -qe 'Java(TM)' -e
OpenJDK); then
- _error "Your Java is not a derivative from Sun's code,"
\
- "========================================" \
- "FREEPLANE WILL MOST PROBABLY *NOT* WORK," \
- "========================================" \
-- "define JAVACMD, JAVA_BINDIR, JAVA_HOME or PATH"
\
-+ "define JAVA_CMD, JAVA_BINDIR, JAVA_HOME or
PATH" \
- "in order to point to such a VM." \
- "See the manpage of freeplane(1) for details."
+- if "${JAVACMD}" -version 2>&1 | grep -qe OpenJDK; then
++ if "${JAVA_CMD}" -version 2>&1 | grep -qe OpenJDK; then
JAVA_TYPE=other
-@@ -68,7 +75,7 @@
+ else
+ JAVA_TYPE=sun
+@@ -61,7 +68,7 @@
return 0
else
_error "Couldn't find a java virtual machine," \
@@ -78,7 +72,7 @@ Last-Update: 2016-05-05
return 1
fi
}
-@@ -119,9 +126,16 @@
+@@ -112,9 +119,16 @@
_source /etc/freeplane/freeplanerc
_source "${userfpdir}/freeplanerc"
@@ -98,7 +92,7 @@ Last-Update: 2016-05-05
fi
output_debug_info
-@@ -179,7 +193,8 @@
+@@ -176,7 +190,8 @@
fi
_debug "Calling: "\
@@ -108,7 +102,7 @@ Last-Update: 2016-05-05
"-Dorg.freeplane.userfpdir=$userfpdir"\
"-Dorg.freeplane.old_userfpdir=$old_userfpdir"\
"-Dorg.freeplane.globalresourcedir=${freedir}/resources"\
-@@ -191,7 +206,8 @@
+@@ -188,7 +203,8 @@
( echo "${DEBUG}" | grep -qe "exit" ) && exit 0 # do not start Freeplane
# now actually launch Freeplane
diff --git a/debian/patches/30_disable_update_check.patch
b/debian/patches/30_disable_update_check.patch
index 781d36b..44b2ed4 100644
--- a/debian/patches/30_disable_update_check.patch
+++ b/debian/patches/30_disable_update_check.patch
@@ -4,7 +4,7 @@ Forwarded: not-needed
Last-Update: 2016-02-04
--- a/freeplane/viewer-resources/freeplane.properties
+++ b/freeplane/viewer-resources/freeplane.properties
-@@ -176,7 +176,7 @@
+@@ -177,7 +177,7 @@
browsemode_initial_map=map.mm
bugTrackerLocation=http\://www.freeplane.org/bugs
center_selected_node=false
@@ -15,7 +15,7 @@ Last-Update: 2016-02-04
connector_shape=CUBIC_CURVE
--- a/freeplane/external-resources/xml/mindmapmodemenu.xml
+++ b/freeplane/external-resources/xml/mindmapmodemenu.xml
-@@ -488,7 +488,7 @@
+@@ -492,7 +492,7 @@
<Entry builder="separator" />
</Entry>
<Entry name="help">
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/freeplane.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
