Major cleaning

- Cleaned PKGBUILD file.
- Removed sumo.sh and generate it inside the PKGBUILD.
- Removed sumo.desktop version so that it can be added automatically
  from PKGBUILD.

4 files changed, 29 insertions, 95 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 27d7b3cdb9bf..c924d48b8f0c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -12,18 +12,14 @@ pkgbase = sumo
 	depends = fox
 	depends = xerces-c
 	depends = gdal
-	source = sumo-src-1.0.1.tar.gz::http://prdownloads.sourceforge.net/sumo/sumo-src-1.0.1.tar.gz?download
+	source = http://prdownloads.sourceforge.net/sumo/sumo-src-1.0.1.tar.gz?download
 	source = sumo.desktop
-	source = sumo.sh
 	sha256sums = 6e46a1568b1b3627f06c999c798feceb37f17e92aadb4d517825b01c797ec531
-	sha256sums = 0500ba9cdf827cceae9a9bce66094bdb077300c94b0040bdd710afb92d0d4849
-	sha256sums = 16db32dbba617f8a38f5d103ce3af7cc70ab4cbf5b50e30be5d7f13ee6ea2f4f
+	sha256sums = d9ec82a1b56ebeaf31c6382f6d903baf0767e440b640a713e587d7e09f72d213
 
 pkgname = sumo
 	optdepends = java-runtime-common: for executing Jar files like TraCI4J
-	optdepends = python2: for executing various python scripts in $SUMO_HOME/tools
-	optdepends = perl: for executing various perl scripts in $SUMO_HOME/tools
-	backup = etc/profile.d/sumo.sh
+	optdepends = python2: for executing various python scripts in /usr/lib/sumo/tools
 
 pkgname = sumo-doc
 
diff --git a/PKGBUILD b/PKGBUILD
index e39a9ebc17f2..2aa6eebd1860 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,17 +13,16 @@ url="http://sumo.dlr.de"
 license=('GPL')
 depends=('python' 'proj' 'fox' 'xerces-c' 'gdal')
 makedepends=('help2man')
-source=("${pkgbase}-src-${pkgver}.tar.gz::http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-src-${pkgver}.tar.gz?download"
-        "${pkgbase}.desktop"
-        "${pkgbase}.sh")
+source=("http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-src-${pkgver}.tar.gz?download"
+        "${pkgbase}.desktop")
 
 sha256sums=('6e46a1568b1b3627f06c999c798feceb37f17e92aadb4d517825b01c797ec531'
-            '0500ba9cdf827cceae9a9bce66094bdb077300c94b0040bdd710afb92d0d4849'
-            '16db32dbba617f8a38f5d103ce3af7cc70ab4cbf5b50e30be5d7f13ee6ea2f4f')
+            'd9ec82a1b56ebeaf31c6382f6d903baf0767e440b640a713e587d7e09f72d213')
 
 prepare() {
     cd ${pkgbase}-${pkgver}
     ./configure --prefix=/usr
+    sed -i "/^Version=/ s/$/${pkgver}/" "${srcdir}/${pkgbase}.desktop"
 }
 
 build() {
@@ -33,92 +32,34 @@ build() {
 }
 
 package_sumo() {
-    backup=("etc/profile.d/sumo.sh")
+    # I can't see how is backup useful?
+    # backup=("etc/profile.d/sumo.sh")
     optdepends=('java-runtime-common: for executing Jar files like TraCI4J'
-                'python2: for executing various python scripts in $SUMO_HOME/tools'
-                'perl: for executing various perl scripts in $SUMO_HOME/tools')
+                "python2: for executing various python scripts in $SUMO_HOME/tools")
 
-    mkdir -p ${pkgdir}/etc/profile.d/
-    mkdir -p ${pkgdir}/usr/bin
-    mkdir -p ${pkgdir}/usr/lib/${pkgbase}/data
-    mkdir -p ${pkgdir}/usr/lib/${pkgbase}/tools
-    mkdir -p ${pkgdir}/usr/share/applications
-    mkdir -p ${pkgdir}/usr/share/doc/${pkgbase}
-    mkdir -p ${pkgdir}/usr/share/man/man1
-    mkdir -p ${pkgdir}/usr/share/pixmaps
+    cd ${pkgbase}-${pkgver}
+
+    # Installs just the bin files
+    make DESTDIR="${pkgdir}/" install
 
-    install -m0755 ${srcdir}/${pkgbase}.sh ${pkgdir}/etc/profile.d/
+    install -d "${pkgdir}/etc/profile.d"
+cat <<EOF > "${pkgdir}/etc/profile.d/sumo.sh"
+#!/bin/sh
 
-    install -m0755 ${srcdir}/${pkgbase}-${pkgver}/bin/activitygen ${pkgdir}/usr/bin/
-    install -m0755 ${srcdir}/${pkgbase}-${pkgver}/bin/dfrouter ${pkgdir}/usr/bin/
-    install -m0755 ${srcdir}/${pkgbase}-${pkgver}/bin/duarouter ${pkgdir}/usr/bin/
-    install -m0755 ${srcdir}/${pkgbase}-${pkgver}/bin/emissionsDrivingCycle ${pkgdir}/usr/bin/
-    install -m0755 ${srcdir}/${pkgbase}-${pkgver}/bin/emissionsMap ${pkgdir}/usr/bin/
-    install -m0755 ${srcdir}/${pkgbase}-${pkgver}/bin/jtrrouter ${pkgdir}/usr/bin/
-    install -m0755 ${srcdir}/${pkgbase}-${pkgver}/bin/marouter ${pkgdir}/usr/bin/
-    install -m0755 ${srcdir}/${pkgbase}-${pkgver}/bin/netconvert ${pkgdir}/usr/bin/
-    install -m0755 ${srcdir}/${pkgbase}-${pkgver}/bin/netedit ${pkgdir}/usr/bin/
-    install -m0755 ${srcdir}/${pkgbase}-${pkgver}/bin/netgenerate ${pkgdir}/usr/bin/
-    install -m0755 ${srcdir}/${pkgbase}-${pkgver}/bin/od2trips ${pkgdir}/usr/bin/
-    install -m0755 ${srcdir}/${pkgbase}-${pkgver}/bin/polyconvert ${pkgdir}/usr/bin/
-    install -m0755 ${srcdir}/${pkgbase}-${pkgver}/bin/${pkgbase} ${pkgdir}/usr/bin/
-    install -m0755 ${srcdir}/${pkgbase}-${pkgver}/bin/${pkgbase}-gui ${pkgdir}/usr/bin/
-    install -m0755 ${srcdir}/${pkgbase}-${pkgver}/bin/TraCITestClient ${pkgdir}/usr/bin/
+export SUMO_HOME="/usr/lib/sumo"
+EOF
 
-    SAVEIFS=$IFS
-    IFS=$(echo -en "\n\b")
+    install -d ${pkgdir}/usr/lib/${pkgbase}
+    cp -a data ${pkgdir}/usr/lib/${pkgbase}/
+    cp -a tools ${pkgdir}/usr/lib/${pkgbase}/
 
-########### DATA
-    cd ${srcdir}/${pkgbase}-${pkgver}/data
-    for d in $(find . -type d)
-    do
-        mkdir -p ${pkgdir}/usr/lib/${pkgbase}/data/$d
-    done
-    for f in $(find . -type f)
-    do
-        install -m0644 $f ${pkgdir}/usr/lib/${pkgbase}/data/$f
-    done
-    for l in $(find . -type l)
-    do
-        ln -s $(readlink $l) ${pkgdir}/usr/lib/${pkgbase}/data/$l
-    done
-########### TOOLS
-    cd ${srcdir}/${pkgbase}-${pkgver}/tools
-    for d in $(find . -type d)
-    do
-        mkdir -p ${pkgdir}/usr/lib/${pkgbase}/tools/$d
-    done
-    for f in $(find . -type f)
-    do
-        install -m0644 $f ${pkgdir}/usr/lib/${pkgbase}/tools/$f
-    done
-    for l in $(find . -type l)
-    do
-        ln -s $(readlink $l) ${pkgdir}/usr/lib/${pkgbase}/tools/$l
-    done
+    # Make all scripts executable (not sure if this is necessary)
+    find ${pkgdir}/usr/lib/${pkgbase}/tools/ -iname "*.py" -exec chmod +x {} \;
 
-    # make all scripts executable
-    find ${pkgdir}/usr/lib/${pkgbase}/tools/ -iname \*.sh -exec chmod +x {} \;
-    find ${pkgdir}/usr/lib/${pkgbase}/tools/ -iname \*.py -exec chmod +x {} \;
-    find ${pkgdir}/usr/lib/${pkgbase}/tools/ -iname \*.pl -exec chmod +x {} \;
-########### PIXMAP
-    install -m0644 ${srcdir}/${pkgbase}-${pkgver}/docs/userdoc/logo.png ${pkgdir}/usr/share/pixmaps/${pkgbase}.png
-########### .DESKTOP FILE
-    install -m0644 ${srcdir}/${pkgbase}.desktop ${pkgdir}/usr/share/applications
-########### MAN
-    cd ${srcdir}/${pkgbase}-${pkgver}/docs/man
-    for d in $(find . -type d)
-    do
-        mkdir -p ${pkgdir}/usr/share/man/man1/$d
-    done
-    for f in $(find . -type f)
-    do
-        install -m0644 $f ${pkgdir}/usr/share/man/man1/$f
-    done
-    for l in $(find . -type l)
-    do
-        ln -s $(readlink $l) ${pkgdir}/usr/share/man/man1/$l
-    done
+    # logo is missing in current source?
+    # install -m0644 docs/userdoc/logo.png ${pkgdir}/usr/share/pixmaps/${pkgbase}.png
+    install -Dm644 ${srcdir}/${pkgbase}.desktop -t ${pkgdir}/usr/share/applications/
+    install -Dm644 docs/man/* -t ${pkgdir}/usr/share/man/man1/
 }
 
 package_sumo-doc() {
diff --git a/sumo.desktop b/sumo.desktop
index cb1bb5f4fcf6..f3b7dda8a867 100644
--- a/sumo.desktop
+++ b/sumo.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Version=1.0
+Version=
 Type=Application
 Exec=sumo-gui %U
 Icon=sumo
diff --git a/sumo.sh b/sumo.sh
deleted file mode 100644
index d4000331aeaa..000000000000
--- a/sumo.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-export SUMO_HOME="/usr/lib/sumo"