[pkg-kolab] r1462 - kolab-webclient/trunk/debian
Mathieu Parent
sathieu at alioth.debian.org
Tue Dec 1 21:23:22 UTC 2009
Author: sathieu
Date: 2009-12-01 21:23:22 +0000 (Tue, 01 Dec 2009)
New Revision: 1462
Removed:
kolab-webclient/trunk/debian/horde-config/
Modified:
kolab-webclient/trunk/debian/changelog
kolab-webclient/trunk/debian/control
kolab-webclient/trunk/debian/kolab-webclient.install
kolab-webclient/trunk/debian/kolab-webclient.postinst
kolab-webclient/trunk/debian/kolab-webclient.prerm
kolab-webclient/trunk/debian/rules
Log:
New way to handle configuration files:
- Install all ustream's configuration files (*.php, conf.xml)
- Don't divert horde's conffiles by default
- Don't use registry.d as all apps are enabled by default'
Modified: kolab-webclient/trunk/debian/changelog
===================================================================
--- kolab-webclient/trunk/debian/changelog 2009-11-30 22:43:44 UTC (rev 1461)
+++ kolab-webclient/trunk/debian/changelog 2009-12-01 21:23:22 UTC (rev 1462)
@@ -1,17 +1,23 @@
-kolab-webclient (1.2.0-20090514+debian0-2~pre4) UNRELEASED; urgency=low
+kolab-webclient (1.2.0-20090514+debian0-2~pre9) UNRELEASED; urgency=low
* NOT RELEASED YET
- * Add Vcs-{Browser,Svn}
- * updated Standards-Version to 3.8.3: no changes
+ * Fix "Permissions wrong on /var/log/kolab-webclient/horde.log"
+ by depending on kronolith2 >= 2.3.1-1 (Closes: #542188)
* Fix of kolab/issue3758 in ingo1, turba2, imp4:
- Bump depends to imp4 (>= 4.3.4+debian0-2~), ingo1 (>= 1.2.1-2~) and
turba2 (>= 2.3.1-2~)
- Removed sources.php, backends.php and servers.php and stop diverting
- * Depends on dimp1 (instead of Recommends) to match upstream
- * Add README.source as required by policy 4.14
- * Fix "Permissions wrong on /var/log/kolab-webclient/horde.log"
- by depending on kronolith2 >= 2.3.1-1 (Closes: #542188)
- * Change my email address, as I am now Debian developer
+ * 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)
+ - Don't divert horde's conffiles by default
+ - Don't use registry.d as all apps are enabled by default
+ * Cosmetic:
+ - Add Vcs-{Browser,Svn}
+ - Updated Standards-Version to 3.8.3: no changes
+ - Add README.source as required by policy 4.14
+ - Change my email address, as I am now Debian developer
-- Mathieu Parent <sathieu at debian.org> Wed, 23 Sep 2009 21:35:30 +0200
Modified: kolab-webclient/trunk/debian/control
===================================================================
--- kolab-webclient/trunk/debian/control 2009-11-30 22:43:44 UTC (rev 1461)
+++ kolab-webclient/trunk/debian/control 2009-12-01 21:23:22 UTC (rev 1462)
@@ -11,9 +11,9 @@
Package: kolab-webclient
Architecture: all
-Depends: ${misc:Depends}, horde3, imp4 (>= 4.3.4+debian0-2~), dimp1, ingo1 (>= 1.2.1-2~), kronolith2 (>= 2.3.1-1~), turba2 (>= 2.3.1-2~), nag2, mnemo2,
+Depends: ${misc:Depends}, horde3, dimp1, imp4 (>= 4.3.4+debian0-2~), ingo1 (>= 1.2.1-2~), kronolith2 (>= 2.3.1-1~), mnemo2, nag2, sork-passwd-h3, turba2 (>= 2.3.1-2~),
php-db, php5-sqlite, sqlite, php-net-sieve, php-net-smtp
-Recommends: mimp1, sork-passwd-h3, aspell
+Recommends: aspell, mimp1
Suggests: kolabd,
imagemagick | graphicsmagick-imagemagick-compat,
php5-tidy
Modified: kolab-webclient/trunk/debian/kolab-webclient.install
===================================================================
--- kolab-webclient/trunk/debian/kolab-webclient.install 2009-11-30 22:43:44 UTC (rev 1461)
+++ kolab-webclient/trunk/debian/kolab-webclient.install 2009-12-01 21:23:22 UTC (rev 1462)
@@ -1,14 +1,13 @@
etc/kolab/templates/*-kolab-conf.template etc/kolab/templates
-var/kolab/www/client/config/conf.php etc/kolab-webclient/horde3
-var/kolab/www/client/dimp/config/conf.php etc/kolab-webclient/dimp1
-var/kolab/www/client/imp/config/conf.php etc/kolab-webclient/imp4
-var/kolab/www/client/ingo/config/conf.php etc/kolab-webclient/ingo1
-var/kolab/www/client/kronolith/config/conf.php etc/kolab-webclient/kronolith2
-var/kolab/www/client/mimp/config/conf.php etc/kolab-webclient/mimp1
-var/kolab/www/client/mnemo/config/conf.php etc/kolab-webclient/mnemo2
-var/kolab/www/client/nag/config/conf.php etc/kolab-webclient/nag2
-var/kolab/www/client/passwd/config/conf.php etc/kolab-webclient/passwd3
-var/kolab/www/client/turba/config/conf.php etc/kolab-webclient/turba2
+var/kolab/www/client/config/{*.php,conf.xml} etc/kolab-webclient/horde3
+var/kolab/www/client/dimp/config/{*.php,conf.xml} etc/kolab-webclient/dimp1
+var/kolab/www/client/imp/config/{*.php,conf.xml} etc/kolab-webclient/imp4
+var/kolab/www/client/ingo/config/{*.php,conf.xml} etc/kolab-webclient/ingo1
+var/kolab/www/client/kronolith/config/{*.php,conf.xml} etc/kolab-webclient/kronolith2
+var/kolab/www/client/mimp/config/{*.php,conf.xml} etc/kolab-webclient/mimp1
+var/kolab/www/client/mnemo/config/{*.php,conf.xml} etc/kolab-webclient/mnemo2
+var/kolab/www/client/nag/config/{*.php,conf.xml} etc/kolab-webclient/nag2
+var/kolab/www/client/passwd/config/{*.php,conf.xml} etc/kolab-webclient/passwd3
+var/kolab/www/client/turba/config/{*.php,conf.xml} etc/kolab-webclient/turba2
var/kolab/www/client/scripts/* usr/share/kolab-webclient/scripts
debian/apache.conf etc/kolab-webclient
-debian/horde-config/* etc/horde
Modified: kolab-webclient/trunk/debian/kolab-webclient.postinst
===================================================================
--- kolab-webclient/trunk/debian/kolab-webclient.postinst 2009-11-30 22:43:44 UTC (rev 1461)
+++ kolab-webclient/trunk/debian/kolab-webclient.postinst 2009-12-01 21:23:22 UTC (rev 1462)
@@ -57,14 +57,15 @@
initialize_horde_db
configure_apache
configure_kolab
+ #add_horde_diversion horde3/conf.php
#add_horde_diversion dimp1/conf.php
- add_horde_diversion horde3/conf.php
- add_horde_diversion imp4/conf.php
- add_horde_diversion ingo1/conf.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 imp4/conf.php
+ #add_horde_diversion ingo1/conf.php
+ #add_horde_diversion kronolith2/conf.php
+ #add_horde_diversion mnemo2/conf.php
+ #add_horde_diversion nag2/conf.php
+ #add_horde_diversion passwd3/conf.php
+ #add_horde_diversion turba2/conf.php
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: kolab-webclient/trunk/debian/kolab-webclient.prerm
===================================================================
--- kolab-webclient/trunk/debian/kolab-webclient.prerm 2009-11-30 22:43:44 UTC (rev 1461)
+++ kolab-webclient/trunk/debian/kolab-webclient.prerm 2009-12-01 21:23:22 UTC (rev 1462)
@@ -28,13 +28,24 @@
case "$1" in
remove)
#rm_horde_diversion dimp1/conf.php
- rm_horde_diversion horde3/conf.php
- rm_horde_diversion imp4/conf.php
- rm_horde_diversion ingo1/conf.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 horde3/conf.php
+ #rm_horde_diversion imp4/conf.php
+ #rm_horde_diversion ingo1/conf.php
+ #rm_horde_diversion kronolith2/conf.php
+ #rm_horde_diversion mnemo2/conf.php
+ #rm_horde_diversion nag2/conf.php
+ #em_horde_diversion passwd3/conf.php
+ #rm_horde_diversion turba2/conf.php
+ 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
;;
upgrade|deconfigure)
Modified: kolab-webclient/trunk/debian/rules
===================================================================
--- kolab-webclient/trunk/debian/rules 2009-11-30 22:43:44 UTC (rev 1461)
+++ kolab-webclient/trunk/debian/rules 2009-12-01 21:23:22 UTC (rev 1462)
@@ -26,6 +26,21 @@
dh_installdocs
dh_installexamples
dh_install
+ cat var/kolab/www/client/config/registry.php | \
+ sed -e "s/'fileroot' *=> *dirname(__FILE__)/'fileroot' => '\/usr\/share\/horde3\/lib'/"| \
+ sed -e "s/'templates' *=> *dirname(__FILE__)/'templates' => '\/usr\/share\/horde3\/lib'/"| \
+ sed -e "s/'webroot' *=> *_detect_webroot()/'webroot' => '\/horde3'/" > \
+ debian/kolab-webclient/etc/kolab-webclient/horde3/registry.php
+ 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/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
dh_compress
More information about the pkg-kolab-devel
mailing list