[pkg-kolab] r1280 - in kolab-webclient/trunk: . debian debian/patches

[Mathieu Parent]

Author: mparent-guest
Date: 2009-05-09 14:24:32 +0000 (Sat, 09 May 2009)
New Revision: 1280

Added:
   kolab-webclient/trunk/debian/apache.conf
   kolab-webclient/trunk/debian/svn-deblayout
Removed:
   kolab-webclient/trunk/horde-config/
   kolab-webclient/trunk/kolab-templates/
   kolab-webclient/trunk/scripts/
Modified:
   kolab-webclient/trunk/debian/
   kolab-webclient/trunk/debian/changelog
   kolab-webclient/trunk/debian/kolab-webclient.install
   kolab-webclient/trunk/debian/patches/20-data-directories.diff
Log:
use of upstream files:
 - removing horde-config, kolab-templates, scripts
 - 20-data-directories.diff updated
 - debian/kolab-webclient.install updated
 - use orig with svn-buildpackage
 




Property changes on: kolab-webclient/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Copied: kolab-webclient/trunk/debian/apache.conf (from rev 1278, kolab-webclient/trunk/horde-config/apache.conf)
===================================================================
--- kolab-webclient/trunk/debian/apache.conf	                        (rev 0)
+++ kolab-webclient/trunk/debian/apache.conf	2009-05-09 14:24:32 UTC (rev 1280)
@@ -0,0 +1,14 @@
+Alias /horde3 "/usr/share/horde3/"
+<Directory "/usr/share/horde3">
+  SSLRequireSSL
+  Options FollowSymLinks
+  AllowOverride Limit
+  Order allow,deny
+  Allow From all
+  php_flag session.auto_start Off
+  php_value error_reporting 'E_ALL & ~E_NOTICE'
+  php_value register_long_arrays Off
+  AddType application/x-httpd-php .php
+  DirectoryIndex index.php
+</Directory>
+

Modified: kolab-webclient/trunk/debian/changelog
===================================================================
--- kolab-webclient/trunk/debian/changelog	2009-05-09 14:12:51 UTC (rev 1279)
+++ kolab-webclient/trunk/debian/changelog	2009-05-09 14:24:32 UTC (rev 1280)
@@ -4,8 +4,11 @@
   * Conversion to non-native package:
     - debian/watch
     - debian/uupdate-wrapper: repack with config only 
+    - removing horde-config, kolab-templates, scripts
+    - 20-data-directories.diff updated
+    - debian/kolab-webclient.install updated
 
- -- Mathieu Parent <math.parent at gmail.com>  Sat, 09 May 2009 13:58:52 +0200
+ -- Mathieu Parent <math.parent at gmail.com>  Sat, 09 May 2009 16:19:50 +0200
 
 kolab-webclient (1.2.0~20090226) experimental; urgency=low
 

Modified: kolab-webclient/trunk/debian/kolab-webclient.install
===================================================================
--- kolab-webclient/trunk/debian/kolab-webclient.install	2009-05-09 14:12:51 UTC (rev 1279)
+++ kolab-webclient/trunk/debian/kolab-webclient.install	2009-05-09 14:24:32 UTC (rev 1280)
@@ -1,6 +1,16 @@
-kolab-templates/* etc/kolab/templates
-horde-config/* etc/kolab-webclient
-scripts/* usr/share/kolab-webclient/scripts
+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/scripts/* usr/share/kolab-webclient/scripts
+debian/apache.conf etc/kolab-webclient
 debian/registry.php etc/kolab-webclient/horde3
 debian/servers.php etc/kolab-webclient/imp4
 debian/backends.php etc/kolab-webclient/ingo1

Modified: kolab-webclient/trunk/debian/patches/20-data-directories.diff
===================================================================
--- kolab-webclient/trunk/debian/patches/20-data-directories.diff	2009-05-09 14:12:51 UTC (rev 1279)
+++ kolab-webclient/trunk/debian/patches/20-data-directories.diff	2009-05-09 14:24:32 UTC (rev 1280)
@@ -4,10 +4,10 @@
 
 Upstream status: Should be reported (parts can be integrated)
 
-Index: b/horde-config/horde3/conf.php
+Index: b/var/kolab/www/client/config/conf.php
 ===================================================================
---- a/horde-config/horde3/conf.php
-+++ b/horde-config/horde3/conf.php
+--- a/var/kolab/www/client/config/conf.php
++++ b/var/kolab/www/client/config/conf.php
 @@ -7,7 +7,7 @@
  $conf['compress_pages'] = true;
  $conf['secret_key'] = 'abcdefghijklmnopqrstuvwxzy1234567890ABCD';

Added: kolab-webclient/trunk/debian/svn-deblayout
===================================================================
--- kolab-webclient/trunk/debian/svn-deblayout	                        (rev 0)
+++ kolab-webclient/trunk/debian/svn-deblayout	2009-05-09 14:24:32 UTC (rev 1280)
@@ -0,0 +1,2 @@
+origDir=../upstream
+buildArea=../build-area