[pkg-kolab] r1289 - in kolab-webadmin/trunk/debian: . patches

[Mathieu Parent]

Author: mparent-guest
Date: 2009-05-11 16:45:34 +0000 (Mon, 11 May 2009)
New Revision: 1289

Added:
   kolab-webadmin/trunk/debian/preinst
Removed:
   kolab-webadmin/trunk/debian/patches/20-fix-require.diff
Modified:
   kolab-webadmin/trunk/debian/changelog
   kolab-webadmin/trunk/debian/patches/series
   kolab-webadmin/trunk/debian/postinst
   kolab-webadmin/trunk/debian/rules
Log:
  * install session_vars.php in /etc/kolab to follow upstream:
    - debian/rules: change installation path
    - preserve user changes (preinst/postinst)
    - 20-fix-require.diff: remove



Modified: kolab-webadmin/trunk/debian/changelog
===================================================================
--- kolab-webadmin/trunk/debian/changelog	2009-05-11 16:12:17 UTC (rev 1288)
+++ kolab-webadmin/trunk/debian/changelog	2009-05-11 16:45:34 UTC (rev 1289)
@@ -6,8 +6,12 @@
     - Use main download server files.kolab.org
     - No more mangle
   * debian/uupdate-wrapper: Updated
+  * install session_vars.php in /etc/kolab to follow upstream:
+    - debian/rules: change installation path
+    - preserve user changes (preinst/postinst)
+    - 20-fix-require.diff: remove
 
- -- Mathieu Parent <math.parent at gmail.com>  Sat, 09 May 2009 23:57:05 +0200
+ -- Mathieu Parent <math.parent at gmail.com>  Mon, 11 May 2009 18:44:34 +0200
 
 kolab-webadmin (2.2.1-20090304-1) experimental; urgency=low
 

Deleted: kolab-webadmin/trunk/debian/patches/20-fix-require.diff
===================================================================
--- kolab-webadmin/trunk/debian/patches/20-fix-require.diff	2009-05-11 16:12:17 UTC (rev 1288)
+++ kolab-webadmin/trunk/debian/patches/20-fix-require.diff	2009-05-11 16:45:34 UTC (rev 1289)
@@ -1,19 +0,0 @@
-Goal: Correction of the require paths
-
-Author: Steffen Joeris <steffen.joeris at skolelinux.de>
-
-Upstream status: Specific to Debian
-
-Index: b/php/admin/include/ldap.class.php.in
-===================================================================
---- a/php/admin/include/ldap.class.php.in
-+++ b/php/admin/include/ldap.class.php.in
-@@ -19,7 +19,7 @@
-  */
- 
- require_once('mysmarty.php');
--require_once('@sysconfdir@/kolab/session_vars.php');
-+require_once('/etc/kolab-webadmin/session_vars.php');
- require_once('debug.php');
- 
- /* We dont have any better place to put this right now... */

Modified: kolab-webadmin/trunk/debian/patches/series
===================================================================
--- kolab-webadmin/trunk/debian/patches/series	2009-05-11 16:12:17 UTC (rev 1288)
+++ kolab-webadmin/trunk/debian/patches/series	2009-05-11 16:45:34 UTC (rev 1289)
@@ -1,3 +1,2 @@
 10-dist_conf.diff
-20-fix-require.diff
 60-no_extra_doc.diff

Modified: kolab-webadmin/trunk/debian/postinst
===================================================================
--- kolab-webadmin/trunk/debian/postinst	2009-05-11 16:12:17 UTC (rev 1288)
+++ kolab-webadmin/trunk/debian/postinst	2009-05-11 16:45:34 UTC (rev 1289)
@@ -9,8 +9,24 @@
 	chown www-data:www-data /var/cache/kolab-webadmin/templates
 }
 
-if [ "$1" = configure ]; then
+# Move a conffile without triggering a dpkg question
+# (http://wiki.debian.org/DpkgConffileHandling&rev=11)
+mv_conffile() {
+    OLDCONFFILE="$1"
+    NEWCONFFILE="$2"
+    if [ -e "$OLDCONFFILE" ]; then
+        echo "Preserving user changes to $NEWCONFFILE ..."
+        mv -f "$NEWCONFFILE" "$NEWCONFFILE".dpkg-new
+        mv -f "$OLDCONFFILE" "$NEWCONFFILE"
+    fi
+}
+
+case "$1" in
+configure)
 	fixperms
-fi
+    if dpkg --compare-versions "$2" le "2.2.1-20090331-1"; then
+        mv_conffile "/etc/kolab-webadmin/session_vars.php" "/etc/kolab/session_vars.php"
+    fi
+esac
 
 #DEBHELPER#

Added: kolab-webadmin/trunk/debian/preinst
===================================================================
--- kolab-webadmin/trunk/debian/preinst	                        (rev 0)
+++ kolab-webadmin/trunk/debian/preinst	2009-05-11 16:45:34 UTC (rev 1289)
@@ -0,0 +1,24 @@
+#! /bin/sh
+
+set -e
+
+# Prepare to move a conffile without triggering a dpkg question
+# (http://wiki.debian.org/DpkgConffileHandling&rev=11)
+prep_mv_conffile() {
+    PKGNAME="$1"
+    CONFFILE="$2"
+    if [ -e "$CONFFILE" ]; then
+        md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
+        old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE '{s/ obsolete$//;s/.* //p}\"`"
+        if [ "$md5sum" = "$old_md5sum" ]; then
+            rm -f "$CONFFILE"
+        fi
+    fi
+}
+
+case "$1" in
+install|upgrade)
+    if dpkg --compare-versions "$2" le "2.2.1-20090331-1"; then
+        prep_mv_conffile kolab-webadmin "/etc/kolab-webadmin/session_vars.php"
+    fi
+esac

Modified: kolab-webadmin/trunk/debian/rules
===================================================================
--- kolab-webadmin/trunk/debian/rules	2009-05-11 16:12:17 UTC (rev 1288)
+++ kolab-webadmin/trunk/debian/rules	2009-05-11 16:45:34 UTC (rev 1289)
@@ -27,7 +27,7 @@
 	dh_installdirs
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/kolab-webadmin
 	install -D -m 644 debian/apache.conf $(CURDIR)/debian/kolab-webadmin/etc/kolab/kolab-webadmin-apache.conf
-	install -D -m 644 debian/session_vars.php $(CURDIR)/debian/kolab-webadmin/etc/kolab-webadmin/session_vars.php
+	install -D -m 644 debian/session_vars.php $(CURDIR)/debian/kolab-webadmin/etc/kolab/session_vars.php
 
 binary-indep: build install
 	dh_testdir