[pkg-kolab] r1464 - kolab-webclient/trunk/debian
Mathieu Parent
sathieu at alioth.debian.org
Wed Dec 2 18:00:46 UTC 2009
Author: sathieu
Date: 2009-12-02 18:00:28 +0000 (Wed, 02 Dec 2009)
New Revision: 1464
Modified:
kolab-webclient/trunk/debian/changelog
kolab-webclient/trunk/debian/kolab-webclient.postinst
kolab-webclient/trunk/debian/kolab-webclient.prerm
kolab-webclient/trunk/debian/rules
Log:
- Make necessary change to include path
Modified: kolab-webclient/trunk/debian/changelog
===================================================================
--- kolab-webclient/trunk/debian/changelog 2009-12-01 21:36:44 UTC (rev 1463)
+++ kolab-webclient/trunk/debian/changelog 2009-12-02 18:00:28 UTC (rev 1464)
@@ -1,4 +1,4 @@
-kolab-webclient (1.2.0-20090514+debian0-2~pre10) UNRELEASED; urgency=low
+kolab-webclient (1.2.0-20090514+debian0-2~pre11) UNRELEASED; urgency=low
* NOT RELEASED YET
* Fix "Permissions wrong on /var/log/kolab-webclient/horde.log"
@@ -10,7 +10,8 @@
* Depends on dimp1 and sork-passwd-h3 (instead of Recommends) to match
upstream
* New way to handle configuration files:
- - Install all ustream's configuration files (*.php, conf.xml)
+ - Install all upstream's configuration files (*.php, conf.xml)
+ - Make necessary change to include path
- Don't divert horde's conffiles by default
- Don't use registry.d as all apps are enabled by default
- Very hackish way of handling horde's config in maintainers scripts
Modified: kolab-webclient/trunk/debian/kolab-webclient.postinst
===================================================================
--- kolab-webclient/trunk/debian/kolab-webclient.postinst 2009-12-01 21:36:44 UTC (rev 1463)
+++ kolab-webclient/trunk/debian/kolab-webclient.postinst 2009-12-02 18:00:28 UTC (rev 1464)
@@ -68,16 +68,16 @@
#add_horde_diversion turba2/conf.php
#overriding horde's symlinks
- ln -sTf /etc/kolab-webclient/horde3 /usr/share/horde3/config
- ln -sTf /etc/kolab-webclient/dimp1 /usr/share/horde3/dimp/config
- ln -sTf /etc/kolab-webclient/imp4 /usr/share/horde3/imp/config
- ln -sTf /etc/kolab-webclient/ingo1 /usr/share/horde3/ingo/config
- ln -sTf /etc/kolab-webclient/kronolith2 /usr/share/horde3/kronolith/config
- #ln -sTf /etc/kolab-webclient/mimp1 /usr/share/horde3/mimp/config
- ln -sTf /etc/kolab-webclient/mnemo2 /usr/share/horde3/mnemo/config
- ln -sTf /etc/kolab-webclient/nag2 /usr/share/horde3/nag/config
- ln -sTf /etc/kolab-webclient/passwd3 /usr/share/horde3/passwd/config
- ln -sTf /etc/kolab-webclient/turba2 /usr/share/horde3/turba/config
+ ln -sTfv /etc/kolab-webclient/horde3 /usr/share/horde3/config
+ ln -sTfv /etc/kolab-webclient/dimp1 /usr/share/horde3/dimp/config
+ ln -sTfv /etc/kolab-webclient/imp4 /usr/share/horde3/imp/config
+ ln -sTfv /etc/kolab-webclient/ingo1 /usr/share/horde3/ingo/config
+ ln -sTfv /etc/kolab-webclient/kronolith2 /usr/share/horde3/kronolith/config
+ #ln -sTfv /etc/kolab-webclient/mimp1 /usr/share/horde3/mimp/config
+ ln -sTfv /etc/kolab-webclient/mnemo2 /usr/share/horde3/mnemo/config
+ ln -sTfv /etc/kolab-webclient/nag2 /usr/share/horde3/nag/config
+ ln -sTfv /etc/kolab-webclient/passwd3 /usr/share/horde3/passwd/config
+ ln -sTfv /etc/kolab-webclient/turba2 /usr/share/horde3/turba/config
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: kolab-webclient/trunk/debian/kolab-webclient.prerm
===================================================================
--- kolab-webclient/trunk/debian/kolab-webclient.prerm 2009-12-01 21:36:44 UTC (rev 1463)
+++ kolab-webclient/trunk/debian/kolab-webclient.prerm 2009-12-02 18:00:28 UTC (rev 1464)
@@ -38,16 +38,16 @@
#rm_horde_diversion turba2/conf.php
#reverting back to horde's symlinks
- ln -sTf /etc/horde/horde3 /usr/share/horde3/config
- ln -sTf /etc/horde/dimp1 /usr/share/horde3/dimp/config
- ln -sTf /etc/horde/imp4 /usr/share/horde3/imp/config
- ln -sTf /etc/horde/ingo1 /usr/share/horde3/ingo/config
- ln -sTf /etc/horde/kronolith2 /usr/share/horde3/kronolith/config
- #ln -sTf /etc/horde/mimp1 /usr/share/horde3/mimp/config
- ln -sTf /etc/horde/mnemo2 /usr/share/horde3/mnemo/config
- ln -sTf /etc/horde/nag2 /usr/share/horde3/nag/config
- ln -sTf /etc/horde/passwd3 /usr/share/horde3/passwd/config
- ln -sTf /etc/horde/turba2 /usr/share/horde3/turba/config
+ ln -sTfv /etc/horde/horde3 /usr/share/horde3/config
+ ln -sTfv /etc/horde/dimp1 /usr/share/horde3/dimp/config
+ ln -sTfv /etc/horde/imp4 /usr/share/horde3/imp/config
+ ln -sTfv /etc/horde/ingo1 /usr/share/horde3/ingo/config
+ ln -sTfv /etc/horde/kronolith2 /usr/share/horde3/kronolith/config
+ #ln -sTfv /etc/horde/mimp1 /usr/share/horde3/mimp/config
+ ln -sTfv /etc/horde/mnemo2 /usr/share/horde3/mnemo/config
+ ln -sTfv /etc/horde/nag2 /usr/share/horde3/nag/config
+ ln -sTfv /etc/horde/passwd3 /usr/share/horde3/passwd/config
+ ln -sTfv /etc/horde/turba2 /usr/share/horde3/turba/config
;;
upgrade|deconfigure)
Modified: kolab-webclient/trunk/debian/rules
===================================================================
--- kolab-webclient/trunk/debian/rules 2009-12-01 21:36:44 UTC (rev 1463)
+++ kolab-webclient/trunk/debian/rules 2009-12-02 18:00:28 UTC (rev 1464)
@@ -34,12 +34,15 @@
cat var/kolab/www/client/imp/config/prefs.php | \
sed -e "5,10s at require_once dirname(__FILE__) . '/../lib/IMP.php';@require_once '/usr/share/horde3/imp/lib/IMP.php';@" > \
debian/kolab-webclient/etc/kolab-webclient/imp4/prefs.php
+ cat var/kolab/www/client/ingo/config/prefs.php | \
+ sed -e "7,10s at require_once dirname(__FILE__) . '/../lib/Storage.php';@require_once '/usr/share/horde3/ingo/lib/Storage.php';@" > \
+ debian/kolab-webclient/etc/kolab-webclient/ingo1/prefs.php
+ cat var/kolab/www/client/mnemo/config/prefs.php | \
+ sed -e "s at dirname(__FILE__) . '/../@'/usr/share/horde3/mnemo/@" > \
+ debian/kolab-webclient/etc/kolab-webclient/mnemo2/prefs.php
cat var/kolab/www/client/nag/config/prefs.php | \
sed -e "s at dirname(__FILE__) . '/../@'/usr/share/horde3/nag/@" > \
debian/kolab-webclient/etc/kolab-webclient/nag2/prefs.php
- cat var/kolab/www/client/ingo/config/prefs.php | \
- sed -e "7,10s at require_once dirname(__FILE__) . '/../lib/Storage.php';@require_once '/usr/share/horde3/ingo/lib/Storage.php';@" > \
- debian/kolab-webclient/etc/kolab-webclient/ingo1/prefs.php
#
dh_link
dh_strip
More information about the pkg-kolab-devel
mailing list