Update freeplace to 1.5.10

Removed patch as it's not required, and the icon is now included on the
distribution. Install documentation. Upstream release 1.5.10

3 files changed, 23 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9fbdd323130e..d6518a8737c9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Thu Jul  7 19:28:25 UTC 2016
 pkgbase = freeplane
 	pkgdesc = A Java mindmapping tool
-	pkgver = 1.3.15
-	pkgrel = 2
+	pkgver = 1.5.10
+	pkgrel = 1
 	url = http://freeplane.sourceforge.net
 	install = freeplane.install
 	arch = any
@@ -9,16 +11,12 @@ pkgbase = freeplane
 	makedepends = unzip
 	depends = java-environment
 	depends = desktop-file-utils
-	source = http://downloads.sourceforge.net/sourceforge/freeplane/freeplane_bin-1.3.15.zip
+	source = http://downloads.sourceforge.net/sourceforge/freeplane/freeplane_bin-1.5.10.zip
 	source = freeplane.desktop
 	source = freeplane.run
-	source = freeplane.svg
-	source = freeplane_sh_fix_spaces.patch
-	md5sums = 5b53a13bb60a7f8bfbab7a178f9e47fa
+	md5sums = c7e39e1a72e8931643851f57a7e6971c
 	md5sums = 85d40893aef0b71f9ffdf2dec4fbb0f0
 	md5sums = f1505d5b6872e2dffe8ef2e82d065551
-	md5sums = 8b5495861133945b4c0e485260d1c536
-	md5sums = 4e16ea24ea49f71847eb5242674eab2b
 
 pkgname = freeplane
 
diff --git a/PKGBUILD b/PKGBUILD
index e9241869a5bb..27dacfa66bdc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: scrawler@gmail.com
 
 pkgname=freeplane
-pkgver=1.3.15
-pkgrel=2
+pkgver=1.5.10
+pkgrel=1
 pkgdesc="A Java mindmapping tool"
 arch=('any')
 url="http://freeplane.sourceforge.net"
@@ -11,41 +11,35 @@ license=('GPL')
 makedepends=('unzip')
 depends=('java-environment' 'desktop-file-utils')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}_bin-${pkgver}.zip
-        freeplane.desktop freeplane.run freeplane.svg freeplane_sh_fix_spaces.patch)
-md5sums=('5b53a13bb60a7f8bfbab7a178f9e47fa'
+        freeplane.desktop freeplane.run)
+md5sums=('c7e39e1a72e8931643851f57a7e6971c'
          '85d40893aef0b71f9ffdf2dec4fbb0f0'
-         'f1505d5b6872e2dffe8ef2e82d065551'
-         '8b5495861133945b4c0e485260d1c536'
-         '4e16ea24ea49f71847eb5242674eab2b')
+         'f1505d5b6872e2dffe8ef2e82d065551')
 install=freeplane.install
 
-prepare(){
-  cd "${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/freeplane_sh_fix_spaces.patch"
-}
-
-
 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/resources/xml
+  mkdir -p ${pkgdir}/usr/share/freeplane/fwdir/perms
+  mkdir -p ${pkgdir}/usr/share/freeplane/fwdir/condperm
   mkdir -p ${pkgdir}/usr/share/freeplane/scripts
+  mkdir -p ${pkgdir}/usr/share/freeplane/doc
 
   cd ${srcdir}/${pkgname}-${pkgver}
   for file in $( find plugins -type f ) ; do
     install -Dm644 ${file} ${pkgdir}/usr/share/freeplane/${file}
   done
+  for file in $( find doc -type f ) ; do
+    install -Dm644 ${file} ${pkgdir}/usr/share/freeplane/${file}
+  done
 
-  install -Dm755 ${srcdir}/freeplane.run ${pkgdir}/usr/bin/freeplane
   install -Dm755 ${srcdir}/${pkgname}-${pkgver}/freeplane.sh ${pkgdir}/usr/share/freeplane/freeplane.sh
+  install -Dm755 ${srcdir}/${pkgname}-${pkgver}/freeplane.policy ${pkgdir}/usr/share/freeplane/freeplane.policy
   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
@@ -58,18 +52,17 @@ package() {
 
   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/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/xml/* ${pkgdir}/usr/share/freeplane/resources/xml/
   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 icons
-  install -Dm644 ${srcdir}/freeplane.svg ${pkgdir}/usr/share/pixmaps/freeplane.svg
+  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/freeplane.svg ${pkgdir}/usr/share/pixmaps/freeplane.svg
+  # Install the executable script
+  install -Dm755 ${srcdir}/freeplane.run ${pkgdir}/usr/bin/freeplane
 }
diff --git a/freeplane_sh_fix_spaces.patch b/freeplane_sh_fix_spaces.patch
deleted file mode 100644
index 829d345f81e4..000000000000
--- a/freeplane_sh_fix_spaces.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- freeplane-1.3.15/freeplane.sh	2015-02-07 18:04:56.000000000 +0000
-+++ ./freeplane.sh	2015-05-05 20:36:04.737382474 +0100
-@@ -181,7 +181,7 @@
-  $JAVA_OPTS\
-  $xdockname\
-  -jar "${freedir}/freeplanelauncher.jar"\
-- $*
-+ "$*"
- ( echo "${DEBUG}" | grep -qe "exit" ) && exit 0 # do not start Freeplane
- 
- # now actually launch Freeplane
-@@ -192,4 +192,4 @@
-  $JAVA_OPTS\
-  $xdockname\
-  -jar "${freedir}/freeplanelauncher.jar"\
-- $*
-+ "$*"