1 files changed, 12 insertions, 8 deletions
diff --git a/academic/qgis/qgis.SlackBuild b/academic/qgis/qgis.SlackBuild
index 28b9de69ad..e76f4fac09 100644
--- a/academic/qgis/qgis.SlackBuild
+++ b/academic/qgis/qgis.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for Quantum GIS
 
 # Copyright 2011 David Spencer, Baildon, West Yorkshire, U.K.
+# Copyright 2013 Benjamin Trigona-Harany
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=qgis
-VERSION=${VERSION:-1.7.4}
+VERSION=${VERSION:-1.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -80,8 +81,6 @@ if [ "${SERVER:-no}" = "yes" ]; then
   WITHSERVER="-DWITH_MAPSERVER=TRUE -DQGIS_CGIBIN_SUBDIR=$CGIBINDIR"
 fi
 
-patch -p1 < $CWD/qgis-1.7.4-headers.patch
-
 cmake . \
   -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
   -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
@@ -101,18 +100,23 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
-install -D -m 0644 $CWD/$PRGNAM.desktop \
-  $PKG/usr/share/applications/$PRGNAM.desktop
-install -D -m 0644 $CWD/$PRGNAM.png \
-  $PKG/usr/share/pixmaps/$PRGNAM.png
+install -D -m 0644 debian/qgis.desktop \
+  $PKG/usr/share/applications/qgis.desktop
+install -D -m 0644 debian/qgis.xml \
+  $PKG/usr/share/mime/packages/qgis.xml
+
+mkdir -p $PKG/usr/share/pixmaps
+ln -s /usr/share/qgis/images/icons/qgis-icon.png $PKG/usr/share/pixmaps
+ln -s /usr/share/qgis/images/icons/qgis-mime-icon.png $PKG/usr/share/pixmaps
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  doc/AUTHORS BUGS CODING doc/CONTRIBUTORS COPYING CHANGELOG \
+  doc/AUTHORS BUGS CODING doc/CONTRIBUTORS COPYING ChangeLog \
   doc/DONORS Exception_to_GPL_for_Qt.txt INSTALL \
   PROVENANCE README doc/SPONSORS TODO doc/TRANSLATORS \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/README.server > $PKG/usr/doc/$PRGNAM-$VERSION/README.server
 
 # Move a couple of optional server files to a more appropriate place -- they
 # need to be properly customised (and the server works without them).