[pkg-kolab] r1169 - kolab-webclient/trunk/debian

mparent-guest at alioth.debian.org mparent-guest at alioth.debian.org
Mon Jan 26 19:21:29 UTC 2009


Author: mparent-guest
Date: 2009-01-26 19:21:29 +0000 (Mon, 26 Jan 2009)
New Revision: 1169

Added:
   kolab-webclient/trunk/debian/kolab-webclient.prerm
Removed:
   kolab-webclient/trunk/debian/kolab-webclient.postrm
   kolab-webclient/trunk/debian/kolab-webclient.preinst
Modified:
   kolab-webclient/trunk/debian/changelog
   kolab-webclient/trunk/debian/kolab-webclient.install
   kolab-webclient/trunk/debian/kolab-webclient.postinst
Log:
Another try


Modified: kolab-webclient/trunk/debian/changelog
===================================================================
--- kolab-webclient/trunk/debian/changelog	2009-01-25 21:36:24 UTC (rev 1168)
+++ kolab-webclient/trunk/debian/changelog	2009-01-26 19:21:29 UTC (rev 1169)
@@ -1,5 +1,5 @@
-kolab-webclient (1.2.0~beta1~pre1) unstable; urgency=low
+kolab-webclient (1.2.0~beta1~pre2) unstable; urgency=low
 
   * Initial Release.
 
- -- Mathieu Parent <math.parent at gmail.com>  Sun, 25 Jan 2009 21:33:44 +0100
+ -- Mathieu Parent <math.parent at gmail.com>  Mon, 26 Jan 2009 20:18:08 +0100

Modified: kolab-webclient/trunk/debian/kolab-webclient.install
===================================================================
--- kolab-webclient/trunk/debian/kolab-webclient.install	2009-01-25 21:36:24 UTC (rev 1168)
+++ kolab-webclient/trunk/debian/kolab-webclient.install	2009-01-26 19:21:29 UTC (rev 1169)
@@ -1,5 +1,5 @@
 kolab-templates/* etc/kolab/templates
-horde-config/* etc/horde
+horde-config/* etc/kolab-webclient
 scripts/* usr/share/kolab-webclient/scripts
 debian/registry.php etc/horde/horde3
 debian/servers.php etc/horde/imp4

Modified: kolab-webclient/trunk/debian/kolab-webclient.postinst
===================================================================
--- kolab-webclient/trunk/debian/kolab-webclient.postinst	2009-01-25 21:36:24 UTC (rev 1168)
+++ kolab-webclient/trunk/debian/kolab-webclient.postinst	2009-01-26 19:21:29 UTC (rev 1169)
@@ -7,6 +7,16 @@
 
 sqlite_db_path=/var/lib/kolab-webclient/storage/horde.db
 
+horde_config=/etc/horde
+kolab_webclient_config=/etc/kolab-webclient
+
+add_horde_diversion() {
+    dpkg-divert --add --package kolab-webclient --rename \
+        --divert "$horde_config/$1.pre-kolab-webclient" "$horde_config/$1"
+    [ \! -e "$horde_config/$1" -o -L "$horde_config/$1" ] && ln -sf "$kolab_webclient_config/$1" "$horde_config/$1"
+
+}
+
 initialize_horde_db() {
     if [ -e "$sqlite_db_path" ]; then
         echo "SQLite database $sqlite_db_path already exists."
@@ -47,6 +57,18 @@
         initialize_horde_db
         configure_apache
         configure_kolab
+        add_horde_diversion dimp1/conf.php
+        add_horde_diversion horde3/conf.php
+        add_horde_diversion horde3/registry.php
+        add_horde_diversion imp4/conf.php
+        add_horde_diversion imp4/servers.php
+        add_horde_diversion ingo1/conf.php
+        add_horde_diversion ingo1/backends.php
+        add_horde_diversion kronolith2/conf.php
+        add_horde_diversion mnemo2/conf.php
+        add_horde_diversion nag2/conf.php
+        add_horde_diversion turba2/conf.php
+        add_horde_diversion turba2/sources.php
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Deleted: kolab-webclient/trunk/debian/kolab-webclient.postrm
===================================================================
--- kolab-webclient/trunk/debian/kolab-webclient.postrm	2009-01-25 21:36:24 UTC (rev 1168)
+++ kolab-webclient/trunk/debian/kolab-webclient.postrm	2009-01-26 19:21:29 UTC (rev 1169)
@@ -1,58 +0,0 @@
-#!/bin/sh
-# postrm script for #PACKAGE#
-#
-# see: dh_installdeb(1)
-
-set -e
-
-horde_config=/etc/horde
-
-rm_diversion() {
-  dpkg-divert --package kolab-webclient --rename --remove "$1"
-}
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <overwriter>
-#          <overwriter-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    remove)
-        rm_diversion $horde_config/dimp1/conf.php
-        rm_diversion $horde_config/horde3/conf.php
-        rm_diversion $horde_config/horde3/registry.php
-        rm_diversion $horde_config/imp4/conf.php
-        rm_diversion $horde_config/imp4/servers.php
-        rm_diversion $horde_config/ingo1/conf.php
-        rm_diversion $horde_config/ingo1/backends.php
-        rm_diversion $horde_config/kronolith2/conf.php
-        rm_diversion $horde_config/mnemo2/conf.php
-        rm_diversion $horde_config/nag2/conf.php
-        rm_diversion $horde_config/turba2/conf.php
-        rm_diversion $horde_config/turba2/sources.php
-    ;;
-
-    purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-    ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0

Deleted: kolab-webclient/trunk/debian/kolab-webclient.preinst
===================================================================
--- kolab-webclient/trunk/debian/kolab-webclient.preinst	2009-01-25 21:36:24 UTC (rev 1168)
+++ kolab-webclient/trunk/debian/kolab-webclient.preinst	2009-01-26 19:21:29 UTC (rev 1169)
@@ -1,57 +0,0 @@
-#!/bin/sh
-# preinst script for #PACKAGE#
-#
-# see: dh_installdeb(1)
-
-set -e
-
-horde_config=/etc/horde
-
-add_diversion() {
-    dpkg-divert --package kolab-webclient --add --rename \
-        --divert "$1.pre-kolab-webclient" "$1"
-}
-
-# summary of how this script can be called:
-#        * <new-preinst> `install'
-#        * <new-preinst> `install' <old-version>
-#        * <new-preinst> `upgrade' <old-version>
-#        * <old-preinst> `abort-upgrade' <new-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    install)
-        add_diversion $horde_config/dimp1/conf.php
-        add_diversion $horde_config/horde3/conf.php
-        add_diversion $horde_config/horde3/registry.php
-        add_diversion $horde_config/imp4/conf.php
-        add_diversion $horde_config/imp4/servers.php
-        add_diversion $horde_config/ingo1/conf.php
-        add_diversion $horde_config/ingo1/backends.php
-        add_diversion $horde_config/kronolith2/conf.php
-        add_diversion $horde_config/mnemo2/conf.php
-        add_diversion $horde_config/nag2/conf.php
-        add_diversion $horde_config/turba2/conf.php
-        add_diversion $horde_config/turba2/sources.php
-    ;;
-
-    upgrade)
-    ;;
-
-    abort-upgrade)
-    ;;
-
-    *)
-        echo "preinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0

Added: kolab-webclient/trunk/debian/kolab-webclient.prerm
===================================================================
--- kolab-webclient/trunk/debian/kolab-webclient.prerm	                        (rev 0)
+++ kolab-webclient/trunk/debian/kolab-webclient.prerm	2009-01-26 19:21:29 UTC (rev 1169)
@@ -0,0 +1,61 @@
+#!/bin/sh
+# prerm script for #PACKAGE#
+#
+# see: dh_installdeb(1)
+
+set -e
+
+horde_config=/etc/horde
+
+rm_horde_diversion() {
+    [ -L "$horde_config/$1" ] && rm "$horde_config/$1"
+    dpkg-divert --remove --package kolab-webclient --rename \
+        --divert "$horde_config/$1.pre-kolab-webclient" "$horde_config/$1"
+}
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove)
+        rm_horde_diversion dimp1/conf.php
+        rm_horde_diversion horde3/conf.php
+        rm_horde_diversion horde3/registry.php
+        rm_horde_diversion imp4/conf.php
+        rm_horde_diversion imp4/servers.php
+        rm_horde_diversion ingo1/conf.php
+        rm_horde_diversion ingo1/backends.php
+        rm_horde_diversion kronolith2/conf.php
+        rm_horde_diversion mnemo2/conf.php
+        rm_horde_diversion nag2/conf.php
+        rm_horde_diversion turba2/conf.php
+        rm_horde_diversion turba2/sources.php
+    ;;
+
+    upgrade|deconfigure)
+    ;;
+
+    failed-upgrade)
+    ;;
+
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0




More information about the pkg-kolab-devel mailing list