[pkg-kolab] r1207 - in php-kolab-server/trunk/debian: . patches
mparent-guest at alioth.debian.org
mparent-guest at alioth.debian.org
Sun Feb 15 22:35:02 UTC 2009
Author: mparent-guest
Date: 2009-02-15 22:35:02 +0000 (Sun, 15 Feb 2009)
New Revision: 1207
Added:
php-kolab-server/trunk/debian/patches/
php-kolab-server/trunk/debian/patches/10-remove-md5.diff
php-kolab-server/trunk/debian/patches/30-horde-path.diff
php-kolab-server/trunk/debian/patches/series
Modified:
php-kolab-server/trunk/debian/changelog
php-kolab-server/trunk/debian/control
php-kolab-server/trunk/debian/rules
Log:
* 10-remove-md5.diff: Remove md5sums to allow patching
* 30-horde-path.diff: Avoid Horde include errors
Modified: php-kolab-server/trunk/debian/changelog
===================================================================
--- php-kolab-server/trunk/debian/changelog 2009-02-15 22:10:45 UTC (rev 1206)
+++ php-kolab-server/trunk/debian/changelog 2009-02-15 22:35:02 UTC (rev 1207)
@@ -4,5 +4,7 @@
* debian/copyright: refers to versionned license version
* debian/pearrc: avoid FTBS when /tmp/pear files are owned by root
* suggets phpunit (>=3.3) for unit tests
+ * 10-remove-md5.diff: Remove md5sums to allow patching
+ * 30-horde-path.diff: Avoid Horde include errors
- -- Mathieu Parent <math.parent at gmail.com> Sun, 15 Feb 2009 21:10:58 +0100
+ -- Mathieu Parent <math.parent at gmail.com> Sun, 15 Feb 2009 23:31:13 +0100
Modified: php-kolab-server/trunk/debian/control
===================================================================
--- php-kolab-server/trunk/debian/control 2009-02-15 22:10:45 UTC (rev 1206)
+++ php-kolab-server/trunk/debian/control 2009-02-15 22:35:02 UTC (rev 1207)
@@ -4,7 +4,7 @@
Maintainer: Debian Kolab Maintainers <pkg-kolab-devel at lists.alioth.debian.org>
Uploaders: Noèl Köthe <noel at debian.org>, Steffen Joeris <white at debian.org>, Mathieu Parent <math.parent at gmail.com>
Build-Depends-Indep: pear-horde-channel
-Build-Depends: debhelper (>= 5), dh-make-php (>= 0.2.3), cdbs
+Build-Depends: debhelper (>= 5), dh-make-php (>= 0.2.3), cdbs, quilt
Standards-Version: 3.8.0
Homepage: http://pear.horde.org/index.php?package=Kolab_Server
Vcs-Browser: http://svn.debian.org/wsvn/pkg-kolab/php-kolab-server/trunk/
Added: php-kolab-server/trunk/debian/patches/10-remove-md5.diff
===================================================================
--- php-kolab-server/trunk/debian/patches/10-remove-md5.diff (rev 0)
+++ php-kolab-server/trunk/debian/patches/10-remove-md5.diff 2009-02-15 22:35:02 UTC (rev 1207)
@@ -0,0 +1,85 @@
+Goal: Remove md5sums to allow patching
+
+Author: Mathieu Parent <math.parent at gmail.com>
+
+Upstream status: More information:
+ https://www.intevation.de/roundup/kolab/issue3294
+ http://pear.php.net/bugs/bug.php?id=15242
+
+Index: b/package.xml
+===================================================================
+--- a/package.xml
++++ b/package.xml
+@@ -44,39 +44,39 @@
+ * Fixed identification of external addresses.</notes>
+ <contents>
+ <dir name="/">
+- <file md5sum="6af186cdbcd95502c0ddc0eba219526c" name="lib/Horde/Kolab/IMAP/cclient.php" role="php" />
+- <file md5sum="355b99019879529fb64709c33dfa48d4" name="lib/Horde/Kolab/IMAP/pear.php" role="php" />
+- <file md5sum="840f2bf3a6ce28548b32c987edcaf1b8" name="lib/Horde/Kolab/IMAP/test.php" role="php" />
+- <file md5sum="ad41e5caf556da28904811cc8e0388ea" name="lib/Horde/Kolab/Server/Object/address.php" role="php" />
+- <file md5sum="99a697ab6b7e28b6a8083c478989782a" name="lib/Horde/Kolab/Server/Object/administrator.php" role="php" />
+- <file md5sum="d804a96076a990d2bc37e698c1a2f72a" name="lib/Horde/Kolab/Server/Object/adminrole.php" role="php" />
+- <file md5sum="97ba7c37505d0286296bb8c24e82a2b9" name="lib/Horde/Kolab/Server/Object/distlist.php" role="php" />
+- <file md5sum="94805d9ce302a6e85bfd9dd3b7671a55" name="lib/Horde/Kolab/Server/Object/domainmaintainer.php" role="php" />
+- <file md5sum="25c7943a634336da2a4f62331c889364" name="lib/Horde/Kolab/Server/Object/group.php" role="php" />
+- <file md5sum="8bb6d3d3c0565acd2d1521c93a413ad9" name="lib/Horde/Kolab/Server/Object/maintainer.php" role="php" />
+- <file md5sum="3d671526564f7404a2f1902ac4cb8903" name="lib/Horde/Kolab/Server/Object/server.php" role="php" />
+- <file md5sum="5a5ec2ee9d823f07ca89a194d45b7b9c" name="lib/Horde/Kolab/Server/Object/sharedfolder.php" role="php" />
+- <file md5sum="84875c4651e860c723c9976da19b7834" name="lib/Horde/Kolab/Server/Object/user.php" role="php" />
+- <file md5sum="3b55ef0d5e40cbe991f4071ab9c0a5f6" name="lib/Horde/Kolab/Server/ldap.php" role="php" />
+- <file md5sum="e5b784976fb651e0c4fc67b3ea3e748e" name="lib/Horde/Kolab/Server/Object.php" role="php" />
+- <file md5sum="7758ad725c8de5a29237d1c472014bae" name="lib/Horde/Kolab/Server/test.php" role="php" />
+- <file md5sum="2b81705fea2d75642538445a0b51da83" name="lib/Horde/Kolab/Test/Server.php" role="php" />
+- <file md5sum="82093abf8a62d61a212262f18a32cf02" name="lib/Horde/Kolab/IMAP.php" role="php" />
+- <file md5sum="e99f3eecbb972dbd2d4baa7a0a08ffe0" name="lib/Horde/Kolab/Server.php" role="php" />
+- <file md5sum="235e8a6a4b87bb780ac09be5260afde8" name="lib/Horde/Kolab/Session.php" role="php" />
+- <file md5sum="87e9c09cb05010aca9b7fe60d43e93b8" name="test/Horde/Kolab/Server/AddingObjectsTest.php" role="test" />
+- <file md5sum="6fc0cde9932b498c72debcd0e6b1221a" name="test/Horde/Kolab/Server/AdminTest.php" role="test" />
+- <file md5sum="e6cdfc36acdd5b01922c352989a0300b" name="test/Horde/Kolab/Server/AllTests.php" role="test" />
+- <file md5sum="d9c3c303ddac02e3ec85b28835baa4e9" name="test/Horde/Kolab/Server/DistListHandlingTest.php" role="test" />
+- <file md5sum="28a97d1c57cc7fd14a35b9904de2f33d" name="test/Horde/Kolab/Server/GroupHandlingTest.php" role="test" />
+- <file md5sum="fe49c654290d6417929a14c2bdd4662e" name="test/Horde/Kolab/Server/GroupTest.php" role="test" />
+- <file md5sum="0f4dba967728d93f453861ecbe52e8a6" name="test/Horde/Kolab/Server/ldapTest.php" role="test" />
+- <file md5sum="635f5a2d5538b57af6996c672b7d93e3" name="test/Horde/Kolab/Server/ObjectTest.php" role="test" />
+- <file md5sum="b566deb184105ff06002e220e2c00d22" name="test/Horde/Kolab/Server/ServerTest.php" role="test" />
+- <file md5sum="1d995e7a51f687e73328e450675a267b" name="test/Horde/Kolab/Server/SessionTest.php" role="test" />
+- <file md5sum="fedc57f2add0f177c5ac97d886f0a9f6" name="test/Horde/Kolab/Server/testTest.php" role="test" />
+- <file md5sum="8e303acd5b1f76bf1366ec6eeb5974dc" name="test/Horde/Kolab/Server/UserHandlingTest.php" role="test" />
+- <file md5sum="d67844489565a95af978a0b7c963d22c" name="test/Horde/Kolab/Server/UserTest.php" role="test" />
++ <file name="lib/Horde/Kolab/IMAP/cclient.php" role="php" />
++ <file name="lib/Horde/Kolab/IMAP/pear.php" role="php" />
++ <file name="lib/Horde/Kolab/IMAP/test.php" role="php" />
++ <file name="lib/Horde/Kolab/Server/Object/address.php" role="php" />
++ <file name="lib/Horde/Kolab/Server/Object/administrator.php" role="php" />
++ <file name="lib/Horde/Kolab/Server/Object/adminrole.php" role="php" />
++ <file name="lib/Horde/Kolab/Server/Object/distlist.php" role="php" />
++ <file name="lib/Horde/Kolab/Server/Object/domainmaintainer.php" role="php" />
++ <file name="lib/Horde/Kolab/Server/Object/group.php" role="php" />
++ <file name="lib/Horde/Kolab/Server/Object/maintainer.php" role="php" />
++ <file name="lib/Horde/Kolab/Server/Object/server.php" role="php" />
++ <file name="lib/Horde/Kolab/Server/Object/sharedfolder.php" role="php" />
++ <file name="lib/Horde/Kolab/Server/Object/user.php" role="php" />
++ <file name="lib/Horde/Kolab/Server/ldap.php" role="php" />
++ <file name="lib/Horde/Kolab/Server/Object.php" role="php" />
++ <file name="lib/Horde/Kolab/Server/test.php" role="php" />
++ <file name="lib/Horde/Kolab/Test/Server.php" role="php" />
++ <file name="lib/Horde/Kolab/IMAP.php" role="php" />
++ <file name="lib/Horde/Kolab/Server.php" role="php" />
++ <file name="lib/Horde/Kolab/Session.php" role="php" />
++ <file name="test/Horde/Kolab/Server/AddingObjectsTest.php" role="test" />
++ <file name="test/Horde/Kolab/Server/AdminTest.php" role="test" />
++ <file name="test/Horde/Kolab/Server/AllTests.php" role="test" />
++ <file name="test/Horde/Kolab/Server/DistListHandlingTest.php" role="test" />
++ <file name="test/Horde/Kolab/Server/GroupHandlingTest.php" role="test" />
++ <file name="test/Horde/Kolab/Server/GroupTest.php" role="test" />
++ <file name="test/Horde/Kolab/Server/ldapTest.php" role="test" />
++ <file name="test/Horde/Kolab/Server/ObjectTest.php" role="test" />
++ <file name="test/Horde/Kolab/Server/ServerTest.php" role="test" />
++ <file name="test/Horde/Kolab/Server/SessionTest.php" role="test" />
++ <file name="test/Horde/Kolab/Server/testTest.php" role="test" />
++ <file name="test/Horde/Kolab/Server/UserHandlingTest.php" role="test" />
++ <file name="test/Horde/Kolab/Server/UserTest.php" role="test" />
+ </dir>
+ </contents>
+ <dependencies>
Added: php-kolab-server/trunk/debian/patches/30-horde-path.diff
===================================================================
--- php-kolab-server/trunk/debian/patches/30-horde-path.diff (rev 0)
+++ php-kolab-server/trunk/debian/patches/30-horde-path.diff 2009-02-15 22:35:02 UTC (rev 1207)
@@ -0,0 +1,71 @@
+Goal: Avoid Horde include errors
+
+Author: Mathieu Parent <math.parent at gmail.com>
+
+Upstream status: Specific to Debian. Horde libs should probably
+go in default PEAR path (http://bugs.debian.org/510760).
+
+Index: b/Kolab_Server-0.3.0/lib/Horde/Kolab/IMAP.php
+===================================================================
+--- a/Kolab_Server-0.3.0/lib/Horde/Kolab/IMAP.php
++++ b/Kolab_Server-0.3.0/lib/Horde/Kolab/IMAP.php
+@@ -5,6 +5,11 @@
+ * $Horde: framework/Kolab_Server/lib/Horde/Kolab/IMAP.php,v 1.1.2.1 2008/10/27 09:17:58 wrobel Exp $
+ */
+
++/** Debian Hack: use old Horde path until #510760 is fixed */
++if(!preg_match('@:/usr/share/horde3/lib($|:)@', ini_get('include_path'))) {
++ ini_set('include_path', ini_get('include_path') . ':' . '/usr/share/horde3/lib');
++}
++
+ /**
+ * The Horde_Kolab_IMAP class provides a wrapper around two different Kolab IMAP
+ * connection types.
+Index: b/Kolab_Server-0.3.0/lib/Horde/Kolab/Server/ldap.php
+===================================================================
+--- a/Kolab_Server-0.3.0/lib/Horde/Kolab/Server/ldap.php
++++ b/Kolab_Server-0.3.0/lib/Horde/Kolab/Server/ldap.php
+@@ -13,6 +13,11 @@
+ * @link http://pear.horde.org/index.php?package=Kolab_Server
+ */
+
++/** Debian Hack: use old Horde path until #510760 is fixed */
++if(!preg_match('@:/usr/share/horde3/lib($|:)@', ini_get('include_path'))) {
++ ini_set('include_path', ini_get('include_path') . ':' . '/usr/share/horde3/lib');
++}
++
+ /** We need the Horde LDAP tools for this class **/
+ require_once 'Horde/LDAP.php';
+
+Index: b/Kolab_Server-0.3.0/lib/Horde/Kolab/Session.php
+===================================================================
+--- a/Kolab_Server-0.3.0/lib/Horde/Kolab/Session.php
++++ b/Kolab_Server-0.3.0/lib/Horde/Kolab/Session.php
+@@ -14,6 +14,11 @@
+ * @link http://pear.horde.org/index.php?package=Kolab_Server
+ */
+
++/** Debian Hack: use old Horde path until #510760 is fixed */
++if(!preg_match('@:/usr/share/horde3/lib($|:)@', ini_get('include_path'))) {
++ ini_set('include_path', ini_get('include_path') . ':' . '/usr/share/horde3/lib');
++}
++
+ /** We need the Auth library */
+ require_once 'Horde/Auth.php';
+
+Index: b/Kolab_Server-0.3.0/lib/Horde/Kolab/Test/Server.php
+===================================================================
+--- a/Kolab_Server-0.3.0/lib/Horde/Kolab/Test/Server.php
++++ b/Kolab_Server-0.3.0/lib/Horde/Kolab/Test/Server.php
+@@ -13,6 +13,11 @@
+ * @link http://pear.horde.org/index.php?package=Share
+ */
+
++/** Debian Hack: use old Horde path until #510760 is fixed */
++if(!preg_match('@:/usr/share/horde3/lib($|:)@', ini_get('include_path'))) {
++ ini_set('include_path', ini_get('include_path') . ':' . '/usr/share/horde3/lib');
++}
++
+ /**
+ * We need the unit test framework
+ */
Added: php-kolab-server/trunk/debian/patches/series
===================================================================
--- php-kolab-server/trunk/debian/patches/series (rev 0)
+++ php-kolab-server/trunk/debian/patches/series 2009-02-15 22:35:02 UTC (rev 1207)
@@ -0,0 +1,2 @@
+10-remove-md5.diff
+30-horde-path.diff
Modified: php-kolab-server/trunk/debian/rules
===================================================================
--- php-kolab-server/trunk/debian/rules 2009-02-15 22:10:45 UTC (rev 1206)
+++ php-kolab-server/trunk/debian/rules 2009-02-15 22:35:02 UTC (rev 1207)
@@ -5,3 +5,9 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/pear.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+common-install-indep::
+ rm -r $(DEB_DESTDIR)usr/share/php/.registry/.channel.pear.horde.org
+ rmdir $(DEB_DESTDIR)usr/share/php/.registry
+
More information about the pkg-kolab-devel
mailing list