rev 14316 - kde-extras/kdesudo/trunk/debian

[Didier Raboud]

Author: odyx-guest
Date: 2009-04-08 12:27:16 +0000 (Wed, 08 Apr 2009)
New Revision: 14316

Added:
   kde-extras/kdesudo/trunk/debian/preinst
Modified:
   kde-extras/kdesudo/trunk/debian/changelog
   kde-extras/kdesudo/trunk/debian/postinst
   kde-extras/kdesudo/trunk/debian/postrm
Log:
kdesudo - Update maintainer scripts to handle the new location of kdesu in KDE4.



Modified: kde-extras/kdesudo/trunk/debian/changelog
===================================================================
--- kde-extras/kdesudo/trunk/debian/changelog	2009-04-08 12:23:27 UTC (rev 14315)
+++ kde-extras/kdesudo/trunk/debian/changelog	2009-04-08 12:27:16 UTC (rev 14316)
@@ -16,6 +16,10 @@
       automake, autoconf and libtool, but gain cmake).
     - Fix "[INTL:ja] please add Japanese po-debconf template translation
       (ja.po)", thanks to Hideki Yamane (Closes: #510713)
+  * debian/{postrm,postinst}
+    - Update to new location of kdesu in KDE 4.
+  * debian/preinst
+    - Add to manage update from KDE 3.
   * Manpage and translations are now in the tarball (from Rosetta).
 
   * Bump Standards to 3.8.1. No other changes needed.

Modified: kde-extras/kdesudo/trunk/debian/postinst
===================================================================
--- kde-extras/kdesudo/trunk/debian/postinst	2009-04-08 12:23:27 UTC (rev 14315)
+++ kde-extras/kdesudo/trunk/debian/postinst	2009-04-08 12:27:16 UTC (rev 14316)
@@ -1,6 +1,12 @@
 #!/bin/sh
 set -e 
 
+KDESU_ORIG=/usr/lib/kde4/libexec/kdesu
+KDESU_DEST=/usr/lib/kde4/libexec/kdesu.kde
+
+KDESU_MAN_ORIG=/usr/share/man/man1/kdesu.1.gz
+KDESU_MAN_DEST=/usr/share/man/man1/kdesu.kde.1.gz
+
 case "$1" in
 	configure)
 
@@ -14,29 +20,29 @@
 		db_get kdesudo/kdesu
 		case "$RET" in
 		true)
-			if ! dpkg-divert --list /usr/bin/kdesu | grep -q /usr/bin/kdesu
+			if ! dpkg-divert --list ${KDESU_ORIG} | grep -q ${KDESU_ORIG}
 			then
-				dpkg-divert --package kdesudo --divert /usr/bin/kdesu.kde --rename /usr/bin/kdesu
-				dpkg-divert --package kdesudo --divert /usr/share/man/man1/kdesu.1.gz.kde --rename /usr/share/man/man1/kdesu.1.gz
-				ln -s kdesudo /usr/bin/kdesu
-				ln -s kdesudo.1.gz /usr/share/man/man1/kdesu.1.gz
+				dpkg-divert --package kdesudo --divert ${KDESU_DEST} --rename ${KDESU_ORIG}
+				dpkg-divert --package kdesudo --divert ${KDESU_MAN_DEST} --rename ${KDESU_MAN_ORIG}
+				ln -s kdesudo ${KDESU_ORIG}
+				ln -s kdesudo.1.gz ${KDESU_MAN_ORIG}
 			fi
 		;;
 		false)
-			if dpkg-divert --list /usr/bin/kdesu | grep -q "by kdesu"
+			if dpkg-divert --list ${KDESU_ORIG} | grep -q "by kdesu"
 			then
-				if [ -L /usr/bin/kdesu ]
+				if [ -L ${KDESU_ORIG} ]
 				then
-					if [ "$(readlink -f /usr/bin/kdesu)" = "/usr/bin/kdesudo" ]
+					if [ "$(readlink -f ${KDESU_ORIG})" = "/usr/bin/kdesudo" ]
 					then
-						rm /usr/bin/kdesu
-						rm /usr/share/man/man1/kdesu.1.gz
+						rm ${KDESU_ORIG}
+						rm ${KDESU_MAN_ORIG}
 					fi
 				fi
-				if [ ! -e /usr/bin/kdesu ]
+				if [ ! -e ${KDESU_ORIG} ]
 				then
-					dpkg-divert --package kdesudo --rename --remove /usr/bin/kdesu
-					dpkg-divert --package kdesudo --rename --remove /usr/share/man/man1/kdesu.1.gz
+					dpkg-divert --package kdesudo --rename --remove ${KDESU_ORIG}
+					dpkg-divert --package kdesudo --rename --remove ${KDESU_MAN_ORIG}
 				fi
 			fi
 

Modified: kde-extras/kdesudo/trunk/debian/postrm
===================================================================
--- kde-extras/kdesudo/trunk/debian/postrm	2009-04-08 12:23:27 UTC (rev 14315)
+++ kde-extras/kdesudo/trunk/debian/postrm	2009-04-08 12:27:16 UTC (rev 14316)
@@ -2,23 +2,29 @@
 
 set -e
 
+KDESU_ORIG=/usr/lib/kde4/libexec/kdesu
+KDESU_DEST=/usr/lib/kde4/libexec/kdesu.kde
+
+KDESU_MAN_ORIG=/usr/share/man/man1/kdesu.1.gz
+KDESU_MAN_DEST=/usr/share/man/man1/kdesu.kde.1.gz
+
 case "$1" in
   remove)
         div=$(dpkg-divert --list $1)
-        if dpkg-divert --list /usr/bin/kdesu | grep -q "by kdesudo" 
+        if dpkg-divert --list ${KDESU_ORIG} | grep -q "by kdesudo" 
 	then
-		if [ -L /usr/bin/kdesu ]
+		if [ -L ${KDESU_ORIG} ]
 		then
-			if [ "$(readlink -f /usr/bin/kdesu)" = "/usr/bin/kdesudo" ]
+			if [ "$(readlink -f ${KDESU_ORIG})" = "/usr/bin/kdesudo" ]
 			then
-				rm /usr/bin/kdesu
-				rm /usr/share/man/man1/kdesu.1.gz
+				rm ${KDESU_ORIG}
+				rm ${KDESU_MAN_ORIG}
 			fi
 		fi
-		if [ ! -e /usr/bin/kdesu ]
+		if [ ! -e ${KDESU_ORIG} ]
 		then
-                	dpkg-divert --package kdesudo --rename --remove /usr/bin/kdesu
-			dpkg-divert --package kdesudo --rename --remove /usr/share/man/man1/kdesu.1.gz
+                	dpkg-divert --package kdesudo --rename --remove ${KDESU_ORIG}
+			dpkg-divert --package kdesudo --rename --remove ${KDESU_MAN_ORIG}
 		fi
 		
         fi

Added: kde-extras/kdesudo/trunk/debian/preinst
===================================================================
--- kde-extras/kdesudo/trunk/debian/preinst	                        (rev 0)
+++ kde-extras/kdesudo/trunk/debian/preinst	2009-04-08 12:27:16 UTC (rev 14316)
@@ -0,0 +1,36 @@
+#! /bin/sh
+
+set -e
+
+case "$1" in
+  upgrade)
+	oldVersion=$2
+	if dpkg --compare-versions $2 lt 3.4-1
+	then # We are updating from before KDE4 was here
+		if dpkg-divert --list /usr/bin/kdesu | grep -q "by kdesudo" 
+		then
+			if [ -L /usr/bin/kdesu ]
+			then
+				if [ "$(readlink -f /usr/bin/kdesu)" = "/usr/bin/kdesudo" ]
+				then
+					rm /usr/bin/kdesu
+					rm /usr/share/man/man1/kdesu.1.gz
+				fi
+			fi
+			if [ ! -e /usr/bin/kdesu ]
+			then
+	                	dpkg-divert --package kdesudo --rename --remove /usr/bin/kdesu
+				dpkg-divert --package kdesudo --rename --remove /usr/share/man/man1/kdesu.1.gz
+			fi
+			
+	        fi
+	fi
+    ;;
+  *) 
+     exit 0
+  ;;
+esac
+
+#DEBHELPER#
+
+exit 0