[pkg-kolab] r1095 - in php-kolab-filter/trunk/debian: . patches
mparent-guest at alioth.debian.org
mparent-guest at alioth.debian.org
Sun Dec 21 16:38:23 UTC 2008
Author: mparent-guest
Date: 2008-12-21 16:38:23 +0000 (Sun, 21 Dec 2008)
New Revision: 1095
Added:
php-kolab-filter/trunk/debian/patches/
php-kolab-filter/trunk/debian/patches/10-remove-md5.diff
php-kolab-filter/trunk/debian/patches/30-horde-path.diff
php-kolab-filter/trunk/debian/patches/series
Modified:
php-kolab-filter/trunk/debian/changelog
php-kolab-filter/trunk/debian/control
php-kolab-filter/trunk/debian/rules
Log:
* 10-remove-md5.diff: Remove md5sums to allow patching
* 30-horde-path.diff: Avoid Horde include errors
Modified: php-kolab-filter/trunk/debian/changelog
===================================================================
--- php-kolab-filter/trunk/debian/changelog 2008-12-21 16:16:00 UTC (rev 1094)
+++ php-kolab-filter/trunk/debian/changelog 2008-12-21 16:38:23 UTC (rev 1095)
@@ -6,5 +6,7 @@
* corrected package-contains-empty-directory
usr/share/php/.registry/.channel.pear.horde.org
* create manpage for undocumented binaries
+ * 10-remove-md5.diff: Remove md5sums to allow patching
+ * 30-horde-path.diff: Avoid Horde include errors
- -- Mathieu Parent <math.parent at gmail.com> Sat, 20 Dec 2008 20:24:04 +0100
+ -- Mathieu Parent <math.parent at gmail.com> Sun, 21 Dec 2008 17:35:43 +0100
Modified: php-kolab-filter/trunk/debian/control
===================================================================
--- php-kolab-filter/trunk/debian/control 2008-12-21 16:16:00 UTC (rev 1094)
+++ php-kolab-filter/trunk/debian/control 2008-12-21 16:38:23 UTC (rev 1095)
@@ -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://www.kolab.org/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-kolab/php-kolab-filter/trunk/
Added: php-kolab-filter/trunk/debian/patches/10-remove-md5.diff
===================================================================
--- php-kolab-filter/trunk/debian/patches/10-remove-md5.diff (rev 0)
+++ php-kolab-filter/trunk/debian/patches/10-remove-md5.diff 2008-12-21 16:38:23 UTC (rev 1095)
@@ -0,0 +1,89 @@
+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
+@@ -39,43 +39,43 @@
+ * Fixed copyright information.</notes>
+ <contents>
+ <dir name="/">
+- <file md5sum="374ec7acae9a6ed0af2a8f16d87d1851" name="lib/Horde/Kolab/Filter/Transport/drop.php" role="php" />
+- <file md5sum="11798d6258707542f113da309109ef6f" name="lib/Horde/Kolab/Filter/Transport/DovecotLDA.php" role="php" />
+- <file md5sum="9c8bb1a48a0c8fdf5b11a71bbd900417" name="lib/Horde/Kolab/Filter/Transport/echo.php" role="php" />
+- <file md5sum="a063c84b1b3b64415c001e2f5111ff1d" name="lib/Horde/Kolab/Filter/Transport/lda.php" role="php" />
+- <file md5sum="7709fe045df8cbbb055296ac65f0b411" name="lib/Horde/Kolab/Filter/Transport/lmtp.php" role="php" />
+- <file md5sum="c8aa6c9a9ec9c1ce2525437fc5483aa2" name="lib/Horde/Kolab/Filter/Transport/LMTPTLS.php" role="php" />
+- <file md5sum="5dfb9b89a0ae913c2c4518dad0058c3b" name="lib/Horde/Kolab/Filter/Transport/smtp.php" role="php" />
+- <file md5sum="547a831c0d94e624c8e7f780561fbb94" name="lib/Horde/Kolab/Filter/Transport/stdout.php" role="php" />
+- <file md5sum="b097f06c77b87ef050c4093f414c4ce0" name="lib/Horde/Kolab/Filter/Content.php" role="php" />
+- <file md5sum="f2d4f9b07ec5c4302f1d39be2bdc18bb" name="lib/Horde/Kolab/Filter/Base.php" role="php" />
+- <file md5sum="93e92595f6f5d21752abc4be89c825c1" name="lib/Horde/Kolab/Filter/Incoming.php" role="php" />
+- <file md5sum="568ddea27b4efa4ac47fd7a47e0a37a0" name="lib/Horde/Kolab/Filter/Outlook.php" role="php" />
+- <file md5sum="fc76e79f6ddeaaec36c782003038b7cf" name="lib/Horde/Kolab/Filter/Response.php" role="php" />
+- <file md5sum="00e146d4672b74733355cd7f23843b2b" name="lib/Horde/Kolab/Filter/Transport.php" role="php" />
+- <file md5sum="2cd7fb4d32dfb3304e789b93528b9fc4" name="lib/Horde/Kolab/Resource.php" role="php" />
+- <file baseinstalldir="/" md5sum="3340778005deb997ecfb369e61fb7fac" name="script/Horde/Kolab/Filter/kolabfilter.php" role="script">
++ <file name="lib/Horde/Kolab/Filter/Transport/drop.php" role="php" />
++ <file name="lib/Horde/Kolab/Filter/Transport/DovecotLDA.php" role="php" />
++ <file name="lib/Horde/Kolab/Filter/Transport/echo.php" role="php" />
++ <file name="lib/Horde/Kolab/Filter/Transport/lda.php" role="php" />
++ <file name="lib/Horde/Kolab/Filter/Transport/lmtp.php" role="php" />
++ <file name="lib/Horde/Kolab/Filter/Transport/LMTPTLS.php" role="php" />
++ <file name="lib/Horde/Kolab/Filter/Transport/smtp.php" role="php" />
++ <file name="lib/Horde/Kolab/Filter/Transport/stdout.php" role="php" />
++ <file name="lib/Horde/Kolab/Filter/Content.php" role="php" />
++ <file name="lib/Horde/Kolab/Filter/Base.php" role="php" />
++ <file name="lib/Horde/Kolab/Filter/Incoming.php" role="php" />
++ <file name="lib/Horde/Kolab/Filter/Outlook.php" role="php" />
++ <file name="lib/Horde/Kolab/Filter/Response.php" role="php" />
++ <file name="lib/Horde/Kolab/Filter/Transport.php" role="php" />
++ <file name="lib/Horde/Kolab/Resource.php" role="php" />
++ <file baseinstalldir="/" name="script/Horde/Kolab/Filter/kolabfilter.php" role="script">
+ <replace from="@php_bin@" to="php_bin" type="pear-config" />
+ </file>
+- <file baseinstalldir="/" md5sum="02728c0fcd56fd36580876ade0070f4e" name="script/Horde/Kolab/Filter/kolabmailboxfilter.php" role="script">
++ <file baseinstalldir="/" name="script/Horde/Kolab/Filter/kolabmailboxfilter.php" role="script">
+ <replace from="@php_bin@" to="php_bin" type="pear-config" />
+ </file>
+- <file md5sum="7b4a59f5af7fd081c6dcb34e0e2d7d64" name="test/Horde/Kolab/Filter/fixtures/big.eml" role="test" />
+- <file md5sum="ac0bba09a50305b9300bdbb5bafdfe1a" name="test/Horde/Kolab/Filter/fixtures/empty.eml" role="test" />
+- <file md5sum="37b8eb78c7262eca91f7e9ec116afe51" name="test/Horde/Kolab/Filter/fixtures/forged.eml" role="test" />
+- <file md5sum="8b177e9f8d050fd41bb047636ac27859" name="test/Horde/Kolab/Filter/fixtures/recur_invitation.eml" role="test" />
+- <file md5sum="aab3b6f62040abdcae54fbeb0f55e0ab" name="test/Horde/Kolab/Filter/fixtures/simple.eml" role="test" />
+- <file md5sum="bdc99f67a23e958ec10c5b3c865029a9" name="test/Horde/Kolab/Filter/fixtures/simple.ret" role="test" />
+- <file md5sum="b0ea249ca264345ff104cc9c03505489" name="test/Horde/Kolab/Filter/fixtures/test.eml" role="test" />
+- <file md5sum="e37839af32d47b1fe5cea64d849b1380" name="test/Horde/Kolab/Filter/fixtures/tiny.eml" role="test" />
+- <file md5sum="cdc4efacb1380a45119399ac417f48f2" name="test/Horde/Kolab/Filter/fixtures/vacation.eml" role="test" />
+- <file md5sum="8e55238d08aac9b6e01ff90e45fb4a65" name="test/Horde/Kolab/Filter/AllTests.php" role="test" />
+- <file md5sum="12d19e92b5fbb7ede6280a24333cf458" name="test/Horde/Kolab/Filter/FilterTest.php" role="test" />
+- <file md5sum="c4840ac3d74694c8675e9d71caeeb0b7" name="test/Horde/Kolab/Filter/ContentTest.php" role="test" />
+- <file md5sum="dd85ed08a04f1025ae5711209234785d" name="test/Horde/Kolab/Filter/IncomingTest.php" role="test" />
+- <file md5sum="8182223c201033f15530304cf1524c48" name="test/Horde/Kolab/Filter/LoadTest.php" role="test" />
+- <file md5sum="3691ab2d3d6c51d7bc03995d16960967" name="test/Horde/Kolab/Filter/ResourceTest.php" role="test" />
+- <file md5sum="fbc093901857fcd118f065f900982c24" name="COPYING" role="doc" />
++ <file name="test/Horde/Kolab/Filter/fixtures/big.eml" role="test" />
++ <file name="test/Horde/Kolab/Filter/fixtures/empty.eml" role="test" />
++ <file name="test/Horde/Kolab/Filter/fixtures/forged.eml" role="test" />
++ <file name="test/Horde/Kolab/Filter/fixtures/recur_invitation.eml" role="test" />
++ <file name="test/Horde/Kolab/Filter/fixtures/simple.eml" role="test" />
++ <file name="test/Horde/Kolab/Filter/fixtures/simple.ret" role="test" />
++ <file name="test/Horde/Kolab/Filter/fixtures/test.eml" role="test" />
++ <file name="test/Horde/Kolab/Filter/fixtures/tiny.eml" role="test" />
++ <file name="test/Horde/Kolab/Filter/fixtures/vacation.eml" role="test" />
++ <file name="test/Horde/Kolab/Filter/AllTests.php" role="test" />
++ <file name="test/Horde/Kolab/Filter/FilterTest.php" role="test" />
++ <file name="test/Horde/Kolab/Filter/ContentTest.php" role="test" />
++ <file name="test/Horde/Kolab/Filter/IncomingTest.php" role="test" />
++ <file name="test/Horde/Kolab/Filter/LoadTest.php" role="test" />
++ <file name="test/Horde/Kolab/Filter/ResourceTest.php" role="test" />
++ <file name="COPYING" role="doc" />
+ </dir>
+ </contents>
+ <dependencies>
Added: php-kolab-filter/trunk/debian/patches/30-horde-path.diff
===================================================================
--- php-kolab-filter/trunk/debian/patches/30-horde-path.diff (rev 0)
+++ php-kolab-filter/trunk/debian/patches/30-horde-path.diff 2008-12-21 16:38:23 UTC (rev 1095)
@@ -0,0 +1,33 @@
+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.
+
+Index: b/Kolab_Filter-0.1.3/script/Horde/Kolab/Filter/kolabfilter.php
+===================================================================
+--- a/Kolab_Filter-0.1.3/script/Horde/Kolab/Filter/kolabfilter.php
++++ b/Kolab_Filter-0.1.3/script/Horde/Kolab/Filter/kolabfilter.php
+@@ -14,6 +14,8 @@
+ * @package Kolab
+ */
+
++require_once '/usr/share/horde3/lib/core.php';
++
+ /** Kolab filter library */
+ require_once 'Horde/Kolab/Filter/Content.php';
+ require_once 'Horde/Kolab/Filter/Response.php';
+Index: b/Kolab_Filter-0.1.3/script/Horde/Kolab/Filter/kolabmailboxfilter.php
+===================================================================
+--- a/Kolab_Filter-0.1.3/script/Horde/Kolab/Filter/kolabmailboxfilter.php
++++ b/Kolab_Filter-0.1.3/script/Horde/Kolab/Filter/kolabmailboxfilter.php
+@@ -14,6 +14,8 @@
+ * @package Kolab
+ */
+
++require_once '/usr/share/horde3/lib/core.php';
++
+ /** Kolab filter library */
+ require_once 'Horde/Kolab/Filter/Incoming.php';
+ require_once 'Horde/Kolab/Filter/Response.php';
Added: php-kolab-filter/trunk/debian/patches/series
===================================================================
--- php-kolab-filter/trunk/debian/patches/series (rev 0)
+++ php-kolab-filter/trunk/debian/patches/series 2008-12-21 16:38:23 UTC (rev 1095)
@@ -0,0 +1,2 @@
+10-remove-md5.diff
+30-horde-path.diff
Modified: php-kolab-filter/trunk/debian/rules
===================================================================
--- php-kolab-filter/trunk/debian/rules 2008-12-21 16:16:00 UTC (rev 1094)
+++ php-kolab-filter/trunk/debian/rules 2008-12-21 16:38:23 UTC (rev 1095)
@@ -5,6 +5,7 @@
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::
rmdir $(DEB_DESTDIR)usr/share/php/.registry/.channel.pear.horde.org
More information about the pkg-kolab-devel
mailing list