Merge branch 'develop' into 'master'

Fix an error with duplicate desktop entries for some apps.

See merge request !7

.gitignore

 package/debian/files
 package/debian/debhelper-build-stamp
-package/debian/le-all
+package/debian/le-user-apps
 le-*.tar.gz
+le-*.tar.xz
 le-*.build
 le-*.dsc
 le-*.changes

package/debian/changelog

+le-user-apps (0.0.5) testing; urgency=medium
+
+  * Update the divert location for .desktop files
+
+ -- Levi Gomes <lhgs15@inf.ufpr.br>  Tue, 17 Oct 2017 17:03:48 -0300
+
 le-user-apps (0.0.4) testing; urgency=medium
 
   * Change apps categories

package/debian/dirs

+usr/share/le-user-apps
+

package/debian/postrm

@@ -26,6 +26,8 @@ set -e
 # Icons paths
 icon="/usr/share/pixmaps/gconjugue.png"
 AppPath="/usr/share/applications"
+DivertPath="/usr/share/le-user-apps"
+
 if [ remove = "$1" -o abort-install = "$1" -o disappear = "$1" ]; then
     dpkg-divert --package le-user-apps --rename --remove $icon
     dpkg-divert --package le-user-apps --rename --remove $AppPath/gconjugue.desktop

package/debian/preinst

@@ -27,10 +27,30 @@ set -e
 icon="/usr/share/pixmaps/gconjugue.png"
 icondivert="/usr/share/pixmaps/.gconjugue.png"
 AppPath="/usr/share/applications"
+DivertPath="/usr/share/le-user-apps"
+
+if [ ! -d $DivertPath ]; then
+    mkdir $DivertPath 
+fi
+
+# Remove old diversions if upgrading from versions above 0.0.4
+if [ upgrade = "$1" ] && dpkg --compare-versions "$2" gt 0.0.3; then
+    rm $AppPath/gconjugue.desktop
+    rm $AppPath/tuxtype.desktop
+    dpkg-divert --package le-user-apps --rename --remove $AppPath/gconjugue.desktop
+    dpkg-divert --package le-user-apps --rename --remove $AppPath/tuxtype.desktop
+    
+    # Create new diversions
+    dpkg-divert --package le-user-apps --divert $DivertPath/gconjugue.desktop --rename --add $AppPath/gconjugue.desktop 
+    dpkg-divert --package le-user-apps --divert $DivertPath/tuxtype.desktop --rename --add $AppPath/tuxtype.desktop
+     
+fi
+
+# Add new diversions
 if [ upgrade != "$1" ] || dpkg --compare-versions "$2" lt 0.0.4; then
     dpkg-divert --package le-user-apps --divert $icondivert --rename --add $icon
-    dpkg-divert --package le-user-apps --divert $AppPath/.gconjugue.desktop --rename --add $AppPath/gconjugue.desktop 
-    dpkg-divert --package le-user-apps --divert $AppPath/.tuxtype.desktop --rename --add $AppPath/tuxtype.desktop
+    dpkg-divert --package le-user-apps --divert $DivertPath/gconjugue.desktop --rename --add $AppPath/gconjugue.desktop 
+    dpkg-divert --package le-user-apps --divert $DivertPath/tuxtype.desktop --rename --add $AppPath/tuxtype.desktop
      
 fi