[pkg-kolab] r437 - in kolab-webadmin: trunk/debian trunk/debian/patches upstream

[Peter Eisentraut]

Author: petere
Date: 2006-08-21 17:56:28 +0000 (Mon, 21 Aug 2006)
New Revision: 437

Added:
   kolab-webadmin/trunk/debian/watch
   kolab-webadmin/upstream/kolab-webadmin_0.4.0-20060810.orig.tar.gz
Modified:
   kolab-webadmin/trunk/debian/changelog
   kolab-webadmin/trunk/debian/patches/40-kolab_prefix.dpatch
Log:
* New upstream release
* Added watch file


Modified: kolab-webadmin/trunk/debian/changelog
===================================================================
--- kolab-webadmin/trunk/debian/changelog	2006-08-21 17:45:28 UTC (rev 436)
+++ kolab-webadmin/trunk/debian/changelog	2006-08-21 17:56:28 UTC (rev 437)
@@ -1,11 +1,13 @@
-kolab-webadmin (0.4.0-6) UNRELEASED; urgency=low
+kolab-webadmin (0.4.0-20060810-1) UNRELEASED; urgency=low
 
+  * New upstream release
   * Improved package description
   * Updated standards version
   * Fixed Build-Depends vs. Build-Depends-Indep
   * Removed unused autotools-dev dealings
+  * Added watch file
 
- -- Peter Eisentraut <petere at debian.org>  Mon, 21 Aug 2006 16:41:41 +0200
+ -- Peter Eisentraut <petere at debian.org>  Mon, 21 Aug 2006 19:11:40 +0200
 
 kolab-webadmin (0.4.0-5) unstable; urgency=low
 

Modified: kolab-webadmin/trunk/debian/patches/40-kolab_prefix.dpatch
===================================================================
--- kolab-webadmin/trunk/debian/patches/40-kolab_prefix.dpatch	2006-08-21 17:45:28 UTC (rev 436)
+++ kolab-webadmin/trunk/debian/patches/40-kolab_prefix.dpatch	2006-08-21 17:56:28 UTC (rev 437)
@@ -4,19 +4,15 @@
 ## DP: correct path of res_pub.pem (bug #361000)
 
 @DPATCH@
-diff -urNad kolab-webadmin-0.4.0~/www/admin/user/user.php kolab-webadmin-0.4.0/www/admin/user/user.php
---- kolab-webadmin-0.4.0~/www/admin/user/user.php	2006-04-07 18:39:49.000000000 +0200
-+++ kolab-webadmin-0.4.0/www/admin/user/user.php	2006-04-07 18:41:08.000000000 +0200
-@@ -463,10 +463,10 @@
- 		 }
- 		 if( isset( $_POST['accttype'] ) && $_POST['accttype'] > 1 ) {
- 		   // We have a group or resource, create encrypted pw
--		   $pubkeydata=file_get_contents("$kolab_prefix/etc/kolab/res_pub.pem" );		   
-+		   $pubkeydata=file_get_contents("/etc/kolab/res_pub.pem" );		   
- 		   $pkey = openssl_pkey_get_public( $pubkeydata );
- 		   if( $pkey === false ) {
--			 $sslerr = _("Could not read resource encryption public key file://$kolab_prefix/etc/kolab/res_pub.pem: ");
-+			 $sslerr = _("Could not read resource encryption public key file:///etc/kolab/res_pub.pem: ");
- 			 while( $msg = openssl_error_string() )
- 			   $sslerr .= $msg.' ';
- 			 $errors[] = $sslerr;
+diff -urNad kolab-webadmin-0.4.0-20060810~/php/admin/include/config.php kolab-webadmin-0.4.0-20060810/php/admin/include/config.php
+--- kolab-webadmin-0.4.0-20060810~/php/admin/include/config.php	2006-08-10 20:18:30.000000000 +0200
++++ kolab-webadmin-0.4.0-20060810/php/admin/include/config.php	2006-08-21 19:24:36.000000000 +0200
+@@ -19,7 +19,7 @@
+  */
+ 
+ $topdir = '/admin';
+-$kolab_prefix = '/kolab';
++$kolab_prefix = '';
+ $php_dir      = '/kolab/var/kolab/php';
+ $locale_dir   = "$php_dir/admin/locale/";
+ 

Added: kolab-webadmin/trunk/debian/watch
===================================================================
--- kolab-webadmin/trunk/debian/watch	2006-08-21 17:45:28 UTC (rev 436)
+++ kolab-webadmin/trunk/debian/watch	2006-08-21 17:56:28 UTC (rev 437)
@@ -0,0 +1,2 @@
+version=3
+ftp://ftp.belnet.be/packages/kolab/server/release/kolab-server-(?:[\d.]+)/sources/kolab-webadmin-([\d.-]+).src.rpm

Added: kolab-webadmin/upstream/kolab-webadmin_0.4.0-20060810.orig.tar.gz
===================================================================
(Binary files differ)


Property changes on: kolab-webadmin/upstream/kolab-webadmin_0.4.0-20060810.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream