[pkg-kolab] r686 - in kolab-resource-handlers/trunk/debian: . patches

[petere at alioth.debian.org]

Author: petere
Date: 2007-09-07 09:54:55 +0000 (Fri, 07 Sep 2007)
New Revision: 686

Removed:
   kolab-resource-handlers/trunk/debian/patches/20-kolabmailtransport.php.dpatch
Modified:
   kolab-resource-handlers/trunk/debian/changelog
   kolab-resource-handlers/trunk/debian/control
   kolab-resource-handlers/trunk/debian/patches/00list
Log:
* Now using new external package php-net-lmtp; obsoletes patch
  20-kolabmailtransport.php.dpatch

Modified: kolab-resource-handlers/trunk/debian/changelog
===================================================================
--- kolab-resource-handlers/trunk/debian/changelog	2007-08-10 12:47:58 UTC (rev 685)
+++ kolab-resource-handlers/trunk/debian/changelog	2007-09-07 09:54:55 UTC (rev 686)
@@ -11,6 +11,8 @@
   * Dropped obsolete php4-domxml dependency
   * Dropped SSL certificate setup, now done by kolab_bootstrap
   * Updated apache.conf relative to upstream and Debian
+  * Now using new external package php-net-lmtp; obsoletes patch
+    20-kolabmailtransport.php.dpatch
 
  -- Peter Eisentraut <petere at debian.org>  Wed, 01 Aug 2007 13:38:31 +0200
 

Modified: kolab-resource-handlers/trunk/debian/control
===================================================================
--- kolab-resource-handlers/trunk/debian/control	2007-08-10 12:47:58 UTC (rev 685)
+++ kolab-resource-handlers/trunk/debian/control	2007-09-07 09:54:55 UTC (rev 686)
@@ -10,7 +10,7 @@
 
 Package: kolab-resource-handlers
 Architecture: all
-Depends: php-pear, php-net-smtp, php-net-socket, horde3, php-mail-mime, php-net-imap, libapache2-mod-php5 | libapache2-mod-php4, php5-ldap | php4-ldap, php5-cli | php4-cli
+Depends: php-pear, php-net-lmtp, php-net-smtp, php-net-socket, horde3, php-mail-mime, php-net-imap, libapache2-mod-php5 | libapache2-mod-php4, php5-ldap | php4-ldap, php5-cli | php4-cli
 Description: Kolab free/busy scripts
  This package contains scripts for the free/busy feature of the Kolab
  groupware server.

Modified: kolab-resource-handlers/trunk/debian/patches/00list
===================================================================
--- kolab-resource-handlers/trunk/debian/patches/00list	2007-08-10 12:47:58 UTC (rev 685)
+++ kolab-resource-handlers/trunk/debian/patches/00list	2007-09-07 09:54:55 UTC (rev 686)
@@ -1,3 +1,2 @@
 01-dist_conf
 10-resmgr.conf
-#20-kolabmailtransport.php.dpatch

Deleted: kolab-resource-handlers/trunk/debian/patches/20-kolabmailtransport.php.dpatch
===================================================================
--- kolab-resource-handlers/trunk/debian/patches/20-kolabmailtransport.php.dpatch	2007-08-10 12:47:58 UTC (rev 685)
+++ kolab-resource-handlers/trunk/debian/patches/20-kolabmailtransport.php.dpatch	2007-09-07 09:54:55 UTC (rev 686)
@@ -1,17 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 20-kolabmailtransport.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
-##
-## DP: Correct path
-
- at DPATCH@
---- kolab-resource-handlers-0.3.9/kolab-resource-handlers/resmgr/kolabmailtransport.php.orig	2006-01-04 15:08:14.000000000 +0100
-+++ kolab-resource-handlers-0.3.9/kolab-resource-handlers/resmgr/kolabmailtransport.php	2006-01-04 15:09:21.000000000 +0100
-@@ -134,7 +134,7 @@
-   }
- 
-   function createTransport() {
--    require_once 'Net/LMTP.php';
-+    require_once '/usr/share/kolab-resource-handlers/php/LMTP.php';
-     $this->transport = &new Net_LMTP($this->host, $this->port);    
-   }
- };