Update to 1.3.11

4 files changed, 32 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a7f70940e201..78cbfe74b221 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = freeplane
 	pkgdesc = A Java mindmapping tool
-	pkgver = 1.2.23_01
+	pkgver = 1.3.11
 	pkgrel = 1
 	url = http://freeplane.sourceforge.net
 	arch = i686
@@ -8,14 +8,14 @@ pkgbase = freeplane
 	license = GPL
 	makedepends = unzip
 	depends = java-runtime
-	source = http://downloads.sourceforge.net/sourceforge/freeplane/freeplane_bin-1.2.23_01.zip
+	source = http://downloads.sourceforge.net/sourceforge/freeplane/freeplane_bin-1.3.11.zip
 	source = freeplane.png
 	source = freeplane.desktop
 	source = freeplane.run
-	md5sums = 513a63eeabfa211eb2e69d4151832373
-	md5sums = 98cda5bde55691556b744c2787e7ac72
+	md5sums = 3bf5512c3865ac0a9c649ccfa5b21b75
+	md5sums = ca1ce05e60924f08a6b1dcefddcf43c1
 	md5sums = 85d40893aef0b71f9ffdf2dec4fbb0f0
-	md5sums = d72e3d0471338520f75a2fcf3ce536a7
+	md5sums = f1505d5b6872e2dffe8ef2e82d065551
 
 pkgname = freeplane
 
diff --git a/PKGBUILD b/PKGBUILD
index 5db6a17d154d..584a48ae0b63 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: scrawler@gmail.com
 
 pkgname=freeplane
-pkgver=1.2.23_01
+pkgver=1.3.11
 _WHATDIR=${srcdir}/${pkgname}-${pkgver}
 pkgrel=1
 pkgdesc="A Java mindmapping tool"
@@ -13,12 +13,25 @@ makedepends=('unzip')
 depends=('java-runtime')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}_bin-${pkgver}.zip
         freeplane.png freeplane.desktop freeplane.run)
-md5sums=('513a63eeabfa211eb2e69d4151832373'
-         '98cda5bde55691556b744c2787e7ac72'
+md5sums=('3bf5512c3865ac0a9c649ccfa5b21b75'
+         'ca1ce05e60924f08a6b1dcefddcf43c1'
          '85d40893aef0b71f9ffdf2dec4fbb0f0'
-         'd72e3d0471338520f75a2fcf3ce536a7')
+         'f1505d5b6872e2dffe8ef2e82d065551')
 
 package() {
+  # Create required directories
+  mkdir -p ${pkgdir}/usr/share/freeplane/core
+  mkdir -p ${pkgdir}/usr/share/freeplane/core/org.freeplane.core
+  mkdir -p ${pkgdir}/usr/share/freeplane/core/org.freeplane.core/META-INF
+  mkdir -p ${pkgdir}/usr/share/freeplane/core/org.freeplane.core/lib
+ 
+  mkdir -p ${pkgdir}/usr/share/freeplane/resources
+  mkdir -p ${pkgdir}/usr/share/freeplane/resources/ortho
+  mkdir -p ${pkgdir}/usr/share/freeplane/resources/templates
+  mkdir -p ${pkgdir}/usr/share/freeplane/resources/xslt
+  
+  mkdir -p ${pkgdir}/usr/share/freeplane/scripts
+
   cd ${srcdir}/${pkgname}-${pkgver}
   for file in $( find plugins -type f ) ; do
     install -Dm644 ${file} ${pkgdir}/usr/share/freeplane/${file}
@@ -29,40 +42,27 @@ package() {
   install -Dm644 ${srcdir}/${pkgname}-${pkgver}/init.xargs ${pkgdir}/usr/share/freeplane/init.xargs
   install -Dm644 ${srcdir}/${pkgname}-${pkgver}/props.xargs ${pkgdir}/usr/share/freeplane/props.xargs
   install -Dm644 ${srcdir}/${pkgname}-${pkgver}/license.txt ${pkgdir}/usr/share/freeplane/licence.txt
-
-  mkdir -p ${pkgdir}/usr/share/freeplane/resources
-  #mkdir -p ${pkgdir}/usr/share/freeplane/resources/accelerators
-  mkdir -p ${pkgdir}/usr/share/freeplane/resources/ortho
-  mkdir -p ${pkgdir}/usr/share/freeplane/resources/templates
-  mkdir -p ${pkgdir}/usr/share/freeplane/resources/xslt
-  
-  mkdir -p ${pkgdir}/usr/share/freeplane/core
-  mkdir -p ${pkgdir}/usr/share/freeplane/core/org.freeplane.core
-  mkdir -p ${pkgdir}/usr/share/freeplane/core/org.freeplane.core/META-INF
-  mkdir -p ${pkgdir}/usr/share/freeplane/core/org.freeplane.core/lib
-  
-  mkdir -p ${pkgdir}/usr/share/freeplane/scripts
+  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/freeplane.l4j.ini ${pkgdir}/usr/share/freeplane/freeplane.l4j.ini
+  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/freeplaneConsole.l4j.ini ${pkgdir}/usr/share/freeplane/freeplaneConsole.l4j.ini
+  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/freeplaneIcons.dll ${pkgdir}/usr/share/freeplane/freeplaneIcons.dll
+  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/gitinfo.txt ${pkgdir}/usr/share/freeplane/gitinfo.txt
+  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/freeplanelauncher.jar ${pkgdir}/usr/share/freeplane/freeplanelauncher.jar
+  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/framework.jar ${pkgdir}/usr/share/freeplane/framework.jar
 
   install -Dm644 ${srcdir}/${pkgname}-${pkgver}/core/org.freeplane.core/META-INF/* ${pkgdir}/usr/share/freeplane/core/org.freeplane.core/META-INF/
   install -Dm644 ${srcdir}/${pkgname}-${pkgver}/core/org.freeplane.core/lib/* ${pkgdir}/usr/share/freeplane/core/org.freeplane.core/lib
 
-#  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/resources/accelerators/* ${pkgdir}/usr/share/freeplane/resources/accelerators/
   install -Dm644 ${srcdir}/${pkgname}-${pkgver}/resources/ortho/* ${pkgdir}/usr/share/freeplane/resources/ortho/
   install -Dm644 ${srcdir}/${pkgname}-${pkgver}/resources/templates/* ${pkgdir}/usr/share/freeplane/resources/templates/
   install -Dm644 ${srcdir}/${pkgname}-${pkgver}/resources/xslt/* ${pkgdir}/usr/share/freeplane/resources/xslt/
   install -Dm644 ${srcdir}/${pkgname}-${pkgver}/resources/gitinfo.properties ${pkgdir}/usr/share/freeplane/resources/gitinfo.properties
-
+ 
   install -Dm644 ${srcdir}/${pkgname}-${pkgver}/scripts/* ${pkgdir}/usr/share/freeplane/scripts/
   
+  # Install the documentation 
   install -Dm644 ${srcdir}/${pkgname}-${pkgver}/doc/freeplane.mm ${pkgdir}/usr/share/freeplane/doc/freeplane.mm
-
+  # Install the desktop entry
   install -Dm644 ${srcdir}/freeplane.desktop ${pkgdir}/usr/share/applications/freeplane.desktop
   install -Dm644 ${srcdir}/freeplane.png ${pkgdir}/usr/share/pixmaps/freeplane.png
-  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/freeplane.l4j.ini ${pkgdir}/usr/share/freeplane/freeplane.l4j.ini
-  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/freeplaneConsole.l4j.ini ${pkgdir}/usr/share/freeplane/freeplaneConsole.l4j.ini
-  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/freeplaneIcons.dll ${pkgdir}/usr/share/freeplane/freeplaneIcons.dll
-  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/gitinfo.txt ${pkgdir}/usr/share/freeplane/gitinfo.txt
-  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/freeplanelauncher.jar ${pkgdir}/usr/share/freeplane/freeplanelauncher.jar
-  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/framework.jar ${pkgdir}/usr/share/freeplane/framework.jar
 }
 
diff --git a/freeplane.png b/freeplane.png
index 20f79396e2e8..454ce0b0b420 100644
--- a/freeplane.png
+++ b/freeplane.png
diff --git a/freeplane.run b/freeplane.run
index 002088957615..48e9cb7a18a7 100644
--- a/freeplane.run
+++ b/freeplane.run
@@ -1,4 +1,3 @@
 #!/bin/sh
 
-cd /usr/share/freeplane
-exec ./freeplane.sh
+exec /usr/share/freeplane/freeplane.sh "$@"