[pkg-kolab] r1390 - in php-kolab-filter/trunk/debian: . patches
Mathieu Parent
sathieu at alioth.debian.org
Thu Nov 12 17:36:12 UTC 2009
Author: sathieu
Date: 2009-11-12 17:36:12 +0000 (Thu, 12 Nov 2009)
New Revision: 1390
Modified:
php-kolab-filter/trunk/debian/changelog
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/40-phpunit.diff
Log:
Updating patches
Modified: php-kolab-filter/trunk/debian/changelog
===================================================================
--- php-kolab-filter/trunk/debian/changelog 2009-11-12 17:25:26 UTC (rev 1389)
+++ php-kolab-filter/trunk/debian/changelog 2009-11-12 17:36:12 UTC (rev 1390)
@@ -1,8 +1,9 @@
php-kolab-filter (0.1.6-1) unstable; urgency=low
* New upstream version 0.1.6
+ - updating patches
- -- Mathieu Parent <sathieu at debian.org> Thu, 12 Nov 2009 18:23:56 +0100
+ -- Mathieu Parent <sathieu at debian.org> Thu, 12 Nov 2009 18:35:44 +0100
php-kolab-filter (0.1.5-3) unstable; urgency=low
Modified: php-kolab-filter/trunk/debian/patches/10-remove-md5.diff
===================================================================
--- php-kolab-filter/trunk/debian/patches/10-remove-md5.diff 2009-11-12 17:25:26 UTC (rev 1389)
+++ php-kolab-filter/trunk/debian/patches/10-remove-md5.diff 2009-11-12 17:36:12 UTC (rev 1390)
@@ -1,5 +1,8 @@
Goal: Remove md5sums to allow patching
+It has been generated with:
+sed -i 's/ md5sum="[0-9a-z]*"//' package.xml
+
Author: Mathieu Parent <math.parent at gmail.com>
Upstream status: More information:
@@ -10,8 +13,8 @@
===================================================================
--- a/package.xml
+++ b/package.xml
-@@ -50,60 +50,60 @@
- (kolab/issue3192, https://www.intevation.de/roundup/kolab/issue3192)</notes>
+@@ -54,65 +54,65 @@
+ (https://issues.kolab.org/issue3868)</notes>
<contents>
<dir name="/">
- <file md5sum="cc30187fe2abc2860ba69f5fa11c7e59" name="doc/Horde/Kolab/Filter/kolabfilter.1" role="doc" />
@@ -24,14 +27,18 @@
- <file md5sum="26137eadce443da496095c3f41150fd5" name="lib/Horde/Kolab/Filter/Transport/LMTPTLS.php" role="php" />
- <file md5sum="733773bb13cd1a14aa7b5a0ee7e78a46" name="lib/Horde/Kolab/Filter/Transport/smtp.php" role="php" />
- <file md5sum="b22709a252503d254a42d054d7eb10a2" name="lib/Horde/Kolab/Filter/Transport/stdout.php" role="php" />
-- <file md5sum="7459e418363b92a6436334a7a209d593" name="lib/Horde/Kolab/Filter/Content.php" role="php" />
-- <file md5sum="6369d69036475cd68df14bb1687c599e" name="lib/Horde/Kolab/Filter/Base.php" role="php" />
-- <file md5sum="38e923df94737a4241fd6a0c12a5c703" name="lib/Horde/Kolab/Filter/Incoming.php" role="php" />
+- <file md5sum="48d198d768c9e0916352d2088b223081" name="lib/Horde/Kolab/Filter/Content.php" role="php" />
+- <file md5sum="7ac091bc6e93641b6aaf1178835a78c9" name="lib/Horde/Kolab/Filter/Base.php" role="php" />
+- <file md5sum="7a91fc1318f8fb1b505b9bc648b11c67" name="lib/Horde/Kolab/Filter/Incoming.php" role="php" />
- <file md5sum="759e56ec7c642212b601b1c1d9de42ad" name="lib/Horde/Kolab/Filter/Outlook.php" role="php" />
- <file md5sum="7af6b65b9b2ce0342e90b7fdf07a6c82" name="lib/Horde/Kolab/Filter/Response.php" role="php" />
- <file md5sum="e7603bb3fcab64ed965f8c56abaf95b9" name="lib/Horde/Kolab/Filter/Transport.php" role="php" />
-- <file md5sum="44c33a2039c580199bf51761a98ce48e" name="lib/Horde/Kolab/Resource.php" role="php" />
+- <file md5sum="4a8e702fbf3663282eee7ba5962bae4e" name="lib/Horde/Kolab/Resource.php" role="php" />
- <file baseinstalldir="/" md5sum="a04649dc07394bf7e36de8e66e39e0bc" name="locale/de_DE/LC_MESSAGES/Kolab_Filter.mo" role="data" />
+- <file baseinstalldir="/" md5sum="ed6978095b81aef6ce0537214828b383" name="locale/fr_FR/LC_MESSAGES/Kolab_Filter.mo" role="data" />
+- <file baseinstalldir="/" md5sum="48a6d6162bc03fc11cfc99eb02eaab55" name="po/Kolab_Filter.pot" role="data" />
+- <file baseinstalldir="/" md5sum="f29779c282042c38887a5c0c780cb999" name="po/de_DE.po" role="data" />
+- <file baseinstalldir="/" md5sum="5ae85773a11b30bfd987c5e7c63d0d4c" name="po/fr_FR.po" role="data" />
- <file baseinstalldir="/" md5sum="d5c12fda5a2d619bdbcbaa9b0374896d" name="script/Horde/Kolab/Filter/kolabfilter.php" role="script">
+ <file name="doc/Horde/Kolab/Filter/kolabfilter.1" role="doc" />
+ <file name="lib/Horde/Kolab/Test/Filter.php" role="php" />
@@ -51,6 +58,10 @@
+ <file name="lib/Horde/Kolab/Filter/Transport.php" role="php" />
+ <file name="lib/Horde/Kolab/Resource.php" role="php" />
+ <file baseinstalldir="/" name="locale/de_DE/LC_MESSAGES/Kolab_Filter.mo" role="data" />
++ <file baseinstalldir="/" name="locale/fr_FR/LC_MESSAGES/Kolab_Filter.mo" role="data" />
++ <file baseinstalldir="/" name="po/Kolab_Filter.pot" role="data" />
++ <file baseinstalldir="/" name="po/de_DE.po" role="data" />
++ <file baseinstalldir="/" name="po/fr_FR.po" role="data" />
+ <file baseinstalldir="/" name="script/Horde/Kolab/Filter/kolabfilter.php" role="script">
<replace from="@php_bin@" to="php_bin" type="pear-config" />
</file>
@@ -61,14 +72,15 @@
- <file md5sum="ac0bba09a50305b9300bdbb5bafdfe1a" name="test/Horde/Kolab/Filter/fixtures/empty.eml" role="test" />
- <file md5sum="f531fdf4473cccb721f5bc2604caf9ad" name="test/Horde/Kolab/Filter/fixtures/empty2.ret" role="test" />
- <file md5sum="e9893edaf7e6f8ba999ab87f04e30e08" name="test/Horde/Kolab/Filter/fixtures/forged.eml" role="test" />
-- <file md5sum="91b6527ff27560cc17cd38de30ecc2e6" name="test/Horde/Kolab/Filter/fixtures/forged.ret" role="test" />
-- <file md5sum="91b6527ff27560cc17cd38de30ecc2e6" name="test/Horde/Kolab/Filter/fixtures/forged_trans.ret" role="test" />
+- <file md5sum="e1a301fd6db9605771c5c6b978fef859" name="test/Horde/Kolab/Filter/fixtures/forged.ret" role="test" />
+- <file md5sum="e1a301fd6db9605771c5c6b978fef859" name="test/Horde/Kolab/Filter/fixtures/forged_trans.ret" role="test" />
- <file md5sum="a057ae00b3db85374175f6cc2ec91156" name="test/Horde/Kolab/Filter/fixtures/invitation_forward.eml" role="test" />
- <file md5sum="6355cc3f199b0ffc12e6db58abd7bfb9" name="test/Horde/Kolab/Filter/fixtures/invitation_forward.ret" role="test" />
- <file md5sum="9cd31394f99b2b08df9263b9588eeb23" name="test/Horde/Kolab/Filter/fixtures/longstring_invitation.eml" role="test" />
- <file md5sum="d41d8cd98f00b204e9800998ecf8427e" name="test/Horde/Kolab/Filter/fixtures/null.ret" role="test" />
- <file md5sum="6e6a6856355da4df732c604f4c40009c" name="test/Horde/Kolab/Filter/fixtures/privileged.ret" role="test" />
- <file md5sum="8b177e9f8d050fd41bb047636ac27859" name="test/Horde/Kolab/Filter/fixtures/recur_invitation.eml" role="test" />
+- <file md5sum="e237c05e0fc2797f457c8c4167e4b174" name="test/Horde/Kolab/Filter/fixtures/recur_invitation2.eml" role="test" />
- <file md5sum="1ce6cb772f4943caab5870e8455065a9" name="test/Horde/Kolab/Filter/fixtures/recur_invitation.ret" role="test" />
- <file md5sum="b9a57356f47551238e9d82cc1efc4b41" name="test/Horde/Kolab/Filter/fixtures/simple.eml" role="test" />
- <file md5sum="bdc99f67a23e958ec10c5b3c865029a9" name="test/Horde/Kolab/Filter/fixtures/simple.ret" role="test" />
@@ -86,7 +98,7 @@
- <file md5sum="1ca431b146f2b82d8d0645f63917d54b" name="test/Horde/Kolab/Filter/ContentTest.php" role="test" />
- <file md5sum="8ef5bf6da88310b74a0b088ff2852c59" name="test/Horde/Kolab/Filter/IncomingTest.php" role="test" />
- <file md5sum="098fdc5c479326d8d24efdf187a42023" name="test/Horde/Kolab/Filter/LoadTest.php" role="test" />
-- <file md5sum="4a0bc349b6915c5c77aa69c10706ec4c" name="test/Horde/Kolab/Filter/ResourceTest.php" role="test" />
+- <file md5sum="6d21fa50ff0c4c32094b490faf2819e6" name="test/Horde/Kolab/Filter/ResourceTest.php" role="test" />
- <file md5sum="3f4ea54f3394faa88b3da3613a20a27f" name="COPYING" role="doc" />
+ <file name="test/Horde/Kolab/Filter/fixtures/empty.eml" role="test" />
+ <file name="test/Horde/Kolab/Filter/fixtures/empty2.ret" role="test" />
@@ -99,6 +111,7 @@
+ <file name="test/Horde/Kolab/Filter/fixtures/null.ret" role="test" />
+ <file name="test/Horde/Kolab/Filter/fixtures/privileged.ret" role="test" />
+ <file name="test/Horde/Kolab/Filter/fixtures/recur_invitation.eml" role="test" />
++ <file name="test/Horde/Kolab/Filter/fixtures/recur_invitation2.eml" role="test" />
+ <file name="test/Horde/Kolab/Filter/fixtures/recur_invitation.ret" role="test" />
+ <file name="test/Horde/Kolab/Filter/fixtures/simple.eml" role="test" />
+ <file name="test/Horde/Kolab/Filter/fixtures/simple.ret" role="test" />
Modified: php-kolab-filter/trunk/debian/patches/30-horde-path.diff
===================================================================
--- php-kolab-filter/trunk/debian/patches/30-horde-path.diff 2009-11-12 17:25:26 UTC (rev 1389)
+++ php-kolab-filter/trunk/debian/patches/30-horde-path.diff 2009-11-12 17:36:12 UTC (rev 1390)
@@ -5,10 +5,10 @@
Upstream status: Specific to Debian. Horde libs should probably
go in default PEAR path (http://bugs.debian.org/510760).
-Index: b/Kolab_Filter-0.1.5/lib/Horde/Kolab/Filter/Base.php
+Index: b/Kolab_Filter-0.1.6/lib/Horde/Kolab/Filter/Base.php
===================================================================
---- a/Kolab_Filter-0.1.5/lib/Horde/Kolab/Filter/Base.php
-+++ b/Kolab_Filter-0.1.5/lib/Horde/Kolab/Filter/Base.php
+--- a/Kolab_Filter-0.1.6/lib/Horde/Kolab/Filter/Base.php
++++ b/Kolab_Filter-0.1.6/lib/Horde/Kolab/Filter/Base.php
@@ -11,6 +11,11 @@
/** Console_Getopt */
require_once 'Console/Getopt.php';
@@ -21,10 +21,10 @@
/** Load the required Horde libraries */
require_once 'Horde.php';
-Index: b/Kolab_Filter-0.1.5/lib/Horde/Kolab/Filter/Outlook.php
+Index: b/Kolab_Filter-0.1.6/lib/Horde/Kolab/Filter/Outlook.php
===================================================================
---- a/Kolab_Filter-0.1.5/lib/Horde/Kolab/Filter/Outlook.php
-+++ b/Kolab_Filter-0.1.5/lib/Horde/Kolab/Filter/Outlook.php
+--- a/Kolab_Filter-0.1.6/lib/Horde/Kolab/Filter/Outlook.php
++++ b/Kolab_Filter-0.1.6/lib/Horde/Kolab/Filter/Outlook.php
@@ -5,6 +5,11 @@
* @package Kolab_Filter
*/
@@ -37,10 +37,10 @@
/* Load the iCal handling */
require_once 'Horde/iCalendar.php';
-Index: b/Kolab_Filter-0.1.5/lib/Horde/Kolab/Resource.php
+Index: b/Kolab_Filter-0.1.6/lib/Horde/Kolab/Resource.php
===================================================================
---- a/Kolab_Filter-0.1.5/lib/Horde/Kolab/Resource.php
-+++ b/Kolab_Filter-0.1.5/lib/Horde/Kolab/Resource.php
+--- a/Kolab_Filter-0.1.6/lib/Horde/Kolab/Resource.php
++++ b/Kolab_Filter-0.1.6/lib/Horde/Kolab/Resource.php
@@ -14,6 +14,11 @@
* @link http://pear.horde.org/index.php?package=Kolab_Server
*/
@@ -53,10 +53,10 @@
/** Load the iCal handling */
require_once 'Horde/iCalendar.php';
-Index: b/Kolab_Filter-0.1.5/test/Horde/Kolab/Filter/ContentTest.php
+Index: b/Kolab_Filter-0.1.6/test/Horde/Kolab/Filter/ContentTest.php
===================================================================
---- a/Kolab_Filter-0.1.5/test/Horde/Kolab/Filter/ContentTest.php
-+++ b/Kolab_Filter-0.1.5/test/Horde/Kolab/Filter/ContentTest.php
+--- a/Kolab_Filter-0.1.6/test/Horde/Kolab/Filter/ContentTest.php
++++ b/Kolab_Filter-0.1.6/test/Horde/Kolab/Filter/ContentTest.php
@@ -7,6 +7,12 @@
* @package Horde_Kolab_Filter
*/
@@ -70,10 +70,10 @@
/**
* We need the unit test framework
*/
-Index: b/Kolab_Filter-0.1.5/test/Horde/Kolab/Filter/FilterTest.php
+Index: b/Kolab_Filter-0.1.6/test/Horde/Kolab/Filter/FilterTest.php
===================================================================
---- a/Kolab_Filter-0.1.5/test/Horde/Kolab/Filter/FilterTest.php
-+++ b/Kolab_Filter-0.1.5/test/Horde/Kolab/Filter/FilterTest.php
+--- a/Kolab_Filter-0.1.6/test/Horde/Kolab/Filter/FilterTest.php
++++ b/Kolab_Filter-0.1.6/test/Horde/Kolab/Filter/FilterTest.php
@@ -13,6 +13,11 @@
require_once 'PHPUnit/Framework.php';
require_once 'PHPUnit/Extensions/OutputTestCase.php';
@@ -86,10 +86,10 @@
require_once 'Horde.php';
require_once 'Horde/Kolab/Filter/Incoming.php';
-Index: b/Kolab_Filter-0.1.5/test/Horde/Kolab/Filter/IncomingTest.php
+Index: b/Kolab_Filter-0.1.6/test/Horde/Kolab/Filter/IncomingTest.php
===================================================================
---- a/Kolab_Filter-0.1.5/test/Horde/Kolab/Filter/IncomingTest.php
-+++ b/Kolab_Filter-0.1.5/test/Horde/Kolab/Filter/IncomingTest.php
+--- a/Kolab_Filter-0.1.6/test/Horde/Kolab/Filter/IncomingTest.php
++++ b/Kolab_Filter-0.1.6/test/Horde/Kolab/Filter/IncomingTest.php
@@ -7,6 +7,11 @@
* @package Horde_Kolab_Filter
*/
@@ -102,10 +102,10 @@
/**
* We need the base class
*/
-Index: b/Kolab_Filter-0.1.5/test/Horde/Kolab/Filter/LoadTest.php
+Index: b/Kolab_Filter-0.1.6/test/Horde/Kolab/Filter/LoadTest.php
===================================================================
---- a/Kolab_Filter-0.1.5/test/Horde/Kolab/Filter/LoadTest.php
-+++ b/Kolab_Filter-0.1.5/test/Horde/Kolab/Filter/LoadTest.php
+--- a/Kolab_Filter-0.1.6/test/Horde/Kolab/Filter/LoadTest.php
++++ b/Kolab_Filter-0.1.6/test/Horde/Kolab/Filter/LoadTest.php
@@ -13,6 +13,11 @@
require_once 'PHPUnit/Framework.php';
require_once 'PHPUnit/Extensions/PerformanceTestCase.php';
@@ -118,10 +118,10 @@
require_once 'Horde.php';
require_once 'Horde/Kolab/Filter/Incoming.php';
-Index: b/Kolab_Filter-0.1.5/test/Horde/Kolab/Filter/ResourceTest.php
+Index: b/Kolab_Filter-0.1.6/test/Horde/Kolab/Filter/ResourceTest.php
===================================================================
---- a/Kolab_Filter-0.1.5/test/Horde/Kolab/Filter/ResourceTest.php
-+++ b/Kolab_Filter-0.1.5/test/Horde/Kolab/Filter/ResourceTest.php
+--- a/Kolab_Filter-0.1.6/test/Horde/Kolab/Filter/ResourceTest.php
++++ b/Kolab_Filter-0.1.6/test/Horde/Kolab/Filter/ResourceTest.php
@@ -7,6 +7,11 @@
* @package Horde_Kolab_Filter
*/
Modified: php-kolab-filter/trunk/debian/patches/40-phpunit.diff
===================================================================
--- php-kolab-filter/trunk/debian/patches/40-phpunit.diff 2009-11-12 17:25:26 UTC (rev 1389)
+++ php-kolab-filter/trunk/debian/patches/40-phpunit.diff 2009-11-12 17:36:12 UTC (rev 1390)
@@ -5,10 +5,10 @@
Upstream status: Should be reported.
-Index: b/Kolab_Filter-0.1.5/test/Horde/Kolab/Filter/AllTests.php
+Index: b/Kolab_Filter-0.1.6/test/Horde/Kolab/Filter/AllTests.php
===================================================================
---- a/Kolab_Filter-0.1.5/test/Horde/Kolab/Filter/AllTests.php
-+++ b/Kolab_Filter-0.1.5/test/Horde/Kolab/Filter/AllTests.php
+--- a/Kolab_Filter-0.1.6/test/Horde/Kolab/Filter/AllTests.php
++++ b/Kolab_Filter-0.1.6/test/Horde/Kolab/Filter/AllTests.php
@@ -14,6 +14,7 @@
define('PHPUnit_MAIN_METHOD', 'Horde_Kolab_Filter_AllTests::main');
}
More information about the pkg-kolab-devel
mailing list