[pkg-kolab] r1493 - in php-kolab-freebusy/trunk/debian: . patches source
Mathieu Parent
sathieu at alioth.debian.org
Tue May 18 11:13:11 UTC 2010
Author: sathieu
Date: 2010-05-18 11:13:03 +0000 (Tue, 18 May 2010)
New Revision: 1493
Added:
php-kolab-freebusy/trunk/debian/source/
php-kolab-freebusy/trunk/debian/source/format
Removed:
php-kolab-freebusy/trunk/debian/patches/60-testsuite-include.diff
Modified:
php-kolab-freebusy/trunk/debian/changelog
php-kolab-freebusy/trunk/debian/patches/10-remove-md5.diff
php-kolab-freebusy/trunk/debian/patches/30-horde-path.diff
php-kolab-freebusy/trunk/debian/patches/40-phpunit.diff
php-kolab-freebusy/trunk/debian/patches/series
php-kolab-freebusy/trunk/debian/rules
Log:
New upstream release
- updated patches
- removed 60-testsuite-include.diff (doesn't apply anymore)
- Switch to dpkg-source 3.0 (quilt) format
Modified: php-kolab-freebusy/trunk/debian/changelog
===================================================================
--- php-kolab-freebusy/trunk/debian/changelog 2010-03-10 08:40:54 UTC (rev 1492)
+++ php-kolab-freebusy/trunk/debian/changelog 2010-05-18 11:13:03 UTC (rev 1493)
@@ -1,10 +1,12 @@
-php-kolab-freebusy (0.1.5-4~pre1) UNRELEASED; urgency=low
+php-kolab-freebusy (0.1.6-1) UNRELEASED; urgency=low
- * Package snapshot
- * New 60-testsuite-include.diff: Avoid include errors when running testsuite
+ * New upstream release
+ - updated patches
+ * Switch to dpkg-source 3.0 (quilt) format
* Updated Standards-Version to 3.8.4: no changes
+ * TODO: fix testsuite (See kolab/issue3983)
- -- Mathieu Parent <sathieu at debian.org> Tue, 17 Nov 2009 21:50:37 +0100
+ -- Mathieu Parent <sathieu at debian.org> Tue, 18 May 2010 10:30:34 +0200
php-kolab-freebusy (0.1.5-3) unstable; urgency=low
Modified: php-kolab-freebusy/trunk/debian/patches/10-remove-md5.diff
===================================================================
--- php-kolab-freebusy/trunk/debian/patches/10-remove-md5.diff 2010-03-10 08:40:54 UTC (rev 1492)
+++ php-kolab-freebusy/trunk/debian/patches/10-remove-md5.diff 2010-05-18 11:13:03 UTC (rev 1493)
@@ -13,25 +13,65 @@
===================================================================
--- a/package.xml
+++ b/package.xml
-@@ -50,21 +50,21 @@
- * Extended support for more complex scenario testing.</notes>
+@@ -52,41 +52,41 @@
+ </notes>
<contents>
<dir name="/">
-- <file md5sum="513fa32cd48338e55ae69fdbf54dcc5e" name="lib/Horde/Kolab/FreeBusy/Access.php" role="php" />
-- <file md5sum="b14fbc2e2893402b9bbd1dc98ab1dad7" name="lib/Horde/Kolab/FreeBusy/Cache.php" role="php" />
-- <file md5sum="fd1b85ef7651de489e57631aa28b07f8" name="lib/Horde/Kolab/FreeBusy/Imap.php" role="php" />
+- <file md5sum="52bb30e517eb6c292eca3e40df1aa77b" name="lib/Horde/Kolab/FreeBusy/Cache/DB/acl.php" role="php" />
+- <file md5sum="97c944aae057d1a0a4ac6e4e5232c214" name="lib/Horde/Kolab/FreeBusy/Cache/DB/xacl.php" role="php" />
+- <file md5sum="8f436a91dc99e4aad3fe374e649c1e64" name="lib/Horde/Kolab/FreeBusy/Cache/File/acl.php" role="php" />
+- <file md5sum="1f9401251dab31d667686f6adbba43ae" name="lib/Horde/Kolab/FreeBusy/Cache/File/pvcal.php" role="php" />
+- <file md5sum="59cee89da309596234fd87ff49fc052a" name="lib/Horde/Kolab/FreeBusy/Cache/File/vcal.php" role="php" />
+- <file md5sum="892624cce063cde5e28a928da9b4d9fe" name="lib/Horde/Kolab/FreeBusy/Cache/File/xacl.php" role="php" />
+- <file md5sum="6ee2256b77b5b99ba2eb548fce993f34" name="lib/Horde/Kolab/FreeBusy/Cache/Freebusy/Partial/Decorator/Log.php" role="php" />
+- <file md5sum="0fc1679212cf40d75555c50064784892" name="lib/Horde/Kolab/FreeBusy/Cache/Freebusy/Partial.php" role="php" />
+- <file md5sum="5f91c423f26639286d7ba60596064394" name="lib/Horde/Kolab/FreeBusy/Cache/Freebusy/Partials.php" role="php" />
+- <file md5sum="105c6571bfe81b92abeb44baa6b6adcf" name="lib/Horde/Kolab/FreeBusy/Cache/DB.php" role="php" />
+- <file md5sum="ad3d639460933a4ab288278e73af4acb" name="lib/Horde/Kolab/FreeBusy/Cache/File.php" role="php" />
+- <file md5sum="118f3f80b7ccc9eaaf3c783ce814e353" name="lib/Horde/Kolab/FreeBusy/Export/Freebusy/Acl/Cache.php" role="php" />
+- <file md5sum="c8e17864536ab7a79ef757c9a6ac70d3" name="lib/Horde/Kolab/FreeBusy/Export/Freebusy/Acl/Null.php" role="php" />
+- <file md5sum="93a6b6759558c067136a922ebe7c6fdc" name="lib/Horde/Kolab/FreeBusy/Export/Freebusy/Combined/Decorator/Cache.php" role="php" />
+- <file md5sum="da128b0911fe5592c5991c60c886846b" name="lib/Horde/Kolab/FreeBusy/Export/Freebusy/Xacl/Decorator/Log.php" role="php" />
+- <file md5sum="2d2d9af19c4bad5cfd36bec457c65aca" name="lib/Horde/Kolab/FreeBusy/Export/Freebusy/Xacl/Cache.php" role="php" />
+- <file md5sum="3c27585022b585463358fec196673b86" name="lib/Horde/Kolab/FreeBusy/Export/Freebusy/Xacl/Configuration.php" role="php" />
+- <file md5sum="9ef30fb9c29e84a5fcdd89858a0c6b82" name="lib/Horde/Kolab/FreeBusy/Export/Freebusy/Acl.php" role="php" />
+- <file md5sum="f686e5782386e54eadb9decbb79614c0" name="lib/Horde/Kolab/FreeBusy/Export/Freebusy/Combined.php" role="php" />
+- <file md5sum="1e46344044d3a34e21a746be31d3761d" name="lib/Horde/Kolab/FreeBusy/Export/Freebusy/Xacl.php" role="php" />
+- <file md5sum="1014486a82cd0bb624f848a0e71f888e" name="lib/Horde/Kolab/FreeBusy/Access.php" role="php" />
+- <file md5sum="f96bf093b0e6cdfe8cc92ee2f3e98ce0" name="lib/Horde/Kolab/FreeBusy/Cache.php" role="php" />
+- <file md5sum="01f89cad1c4191765e2957e354d3dee1" name="lib/Horde/Kolab/FreeBusy/Imap.php" role="php" />
- <file md5sum="80da2c141eb036959206e7f06bbdec55" name="lib/Horde/Kolab/FreeBusy/Report.php" role="php" />
- <file md5sum="eb3fb721d32898be15e5f823b4ca6058" name="lib/Horde/Kolab/FreeBusy/View.php" role="php" />
-- <file md5sum="dba68c21e39621241fab5799730d9961" name="lib/Horde/Kolab/Test/FreeBusy.php" role="php" />
+- <file md5sum="41a5146351eff85f6655c8cc0f08982c" name="lib/Horde/Kolab/Test/FreeBusy.php" role="php" />
- <file md5sum="e75573e32de93ba5d947e2a7bdf7b636" name="lib/Horde/Kolab/FreeBusy.php" role="php" />
-- <file md5sum="53b79e83027c02bdbb7b6ff60a8cb7f7" name="test/Horde/Kolab/FreeBusy/AllTests.php" role="test" />
-- <file md5sum="8d4ebb055c17f0808906bf674231d45d" name="test/Horde/Kolab/FreeBusy/FreeBusyTest.php" role="test" />
-- <file md5sum="6a307421112672a673eae5af934b17d5" name="test/Horde/Kolab/FreeBusy/FreeBusyScenarioTest.php" role="test" />
+- <file md5sum="0b9d20846156d8df18bf4c34c77f7865" name="test/Horde/Kolab/FreeBusy/AllTests.php" role="test" />
+- <file md5sum="16bad0b91e0663be70318e17ef2f96da" name="test/Horde/Kolab/FreeBusy/FreeBusyTest.php" role="test" />
+- <file md5sum="5ac1af3dd90921a26ce4d79f4d882ed3" name="test/Horde/Kolab/FreeBusy/FreeBusyScenarioTest.php" role="test" />
- <file md5sum="45237350a8751e95eebfaad89191112e" name="www/Horde/Kolab/FreeBusy/config.php" role="www" />
- <file md5sum="517930c38ab99d7c57292b0b02a3872f" name="www/Horde/Kolab/FreeBusy/freebusy.php" role="www" />
- <file md5sum="b465debdcb4965e63d4df37d415cf41c" name="www/Horde/Kolab/FreeBusy/pfb.php" role="www" />
- <file md5sum="fc45e41a5f4ae9cbcfc010168ea3f4aa" name="www/Horde/Kolab/FreeBusy/regenerate.php" role="www" />
- <file md5sum="3f4ea54f3394faa88b3da3613a20a27f" name="COPYING" role="doc" />
++ <file name="lib/Horde/Kolab/FreeBusy/Cache/DB/acl.php" role="php" />
++ <file name="lib/Horde/Kolab/FreeBusy/Cache/DB/xacl.php" role="php" />
++ <file name="lib/Horde/Kolab/FreeBusy/Cache/File/acl.php" role="php" />
++ <file name="lib/Horde/Kolab/FreeBusy/Cache/File/pvcal.php" role="php" />
++ <file name="lib/Horde/Kolab/FreeBusy/Cache/File/vcal.php" role="php" />
++ <file name="lib/Horde/Kolab/FreeBusy/Cache/File/xacl.php" role="php" />
++ <file name="lib/Horde/Kolab/FreeBusy/Cache/Freebusy/Partial/Decorator/Log.php" role="php" />
++ <file name="lib/Horde/Kolab/FreeBusy/Cache/Freebusy/Partial.php" role="php" />
++ <file name="lib/Horde/Kolab/FreeBusy/Cache/Freebusy/Partials.php" role="php" />
++ <file name="lib/Horde/Kolab/FreeBusy/Cache/DB.php" role="php" />
++ <file name="lib/Horde/Kolab/FreeBusy/Cache/File.php" role="php" />
++ <file name="lib/Horde/Kolab/FreeBusy/Export/Freebusy/Acl/Cache.php" role="php" />
++ <file name="lib/Horde/Kolab/FreeBusy/Export/Freebusy/Acl/Null.php" role="php" />
++ <file name="lib/Horde/Kolab/FreeBusy/Export/Freebusy/Combined/Decorator/Cache.php" role="php" />
++ <file name="lib/Horde/Kolab/FreeBusy/Export/Freebusy/Xacl/Decorator/Log.php" role="php" />
++ <file name="lib/Horde/Kolab/FreeBusy/Export/Freebusy/Xacl/Cache.php" role="php" />
++ <file name="lib/Horde/Kolab/FreeBusy/Export/Freebusy/Xacl/Configuration.php" role="php" />
++ <file name="lib/Horde/Kolab/FreeBusy/Export/Freebusy/Acl.php" role="php" />
++ <file name="lib/Horde/Kolab/FreeBusy/Export/Freebusy/Combined.php" role="php" />
++ <file name="lib/Horde/Kolab/FreeBusy/Export/Freebusy/Xacl.php" role="php" />
+ <file name="lib/Horde/Kolab/FreeBusy/Access.php" role="php" />
+ <file name="lib/Horde/Kolab/FreeBusy/Cache.php" role="php" />
+ <file name="lib/Horde/Kolab/FreeBusy/Imap.php" role="php" />
Modified: php-kolab-freebusy/trunk/debian/patches/30-horde-path.diff
===================================================================
--- php-kolab-freebusy/trunk/debian/patches/30-horde-path.diff 2010-03-10 08:40:54 UTC (rev 1492)
+++ php-kolab-freebusy/trunk/debian/patches/30-horde-path.diff 2010-05-18 11:13:03 UTC (rev 1493)
@@ -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_FreeBusy-0.1.5/lib/Horde/Kolab/FreeBusy/Access.php
+Index: b/Kolab_FreeBusy-0.1.6/lib/Horde/Kolab/FreeBusy/Access.php
===================================================================
---- a/Kolab_FreeBusy-0.1.5/lib/Horde/Kolab/FreeBusy/Access.php
-+++ b/Kolab_FreeBusy-0.1.5/lib/Horde/Kolab/FreeBusy/Access.php
+--- a/Kolab_FreeBusy-0.1.6/lib/Horde/Kolab/FreeBusy/Access.php
++++ b/Kolab_FreeBusy-0.1.6/lib/Horde/Kolab/FreeBusy/Access.php
@@ -7,6 +7,11 @@
* @package Kolab_FreeBusy
*/
@@ -21,10 +21,10 @@
/** Load the required Horde libraries */
require_once 'Horde.php';
-Index: b/Kolab_FreeBusy-0.1.5/lib/Horde/Kolab/FreeBusy/Cache.php
+Index: b/Kolab_FreeBusy-0.1.6/lib/Horde/Kolab/FreeBusy/Cache.php
===================================================================
---- a/Kolab_FreeBusy-0.1.5/lib/Horde/Kolab/FreeBusy/Cache.php
-+++ b/Kolab_FreeBusy-0.1.5/lib/Horde/Kolab/FreeBusy/Cache.php
+--- a/Kolab_FreeBusy-0.1.6/lib/Horde/Kolab/FreeBusy/Cache.php
++++ b/Kolab_FreeBusy-0.1.6/lib/Horde/Kolab/FreeBusy/Cache.php
@@ -6,6 +6,11 @@
*
* @package Kolab_FreeBusy
@@ -35,12 +35,12 @@
+ ini_set('include_path', ini_get('include_path') . ':' . '/usr/share/horde3/lib');
+}
- /** We require the iCalendar library to build the free/busy list */
- require_once 'Horde/iCalendar.php';
-Index: b/Kolab_FreeBusy-0.1.5/lib/Horde/Kolab/FreeBusy/Imap.php
+ /** Load the cache components that we always need */
+ require_once 'Horde/Kolab/FreeBusy/Cache/File.php';
+Index: b/Kolab_FreeBusy-0.1.6/lib/Horde/Kolab/FreeBusy/Imap.php
===================================================================
---- a/Kolab_FreeBusy-0.1.5/lib/Horde/Kolab/FreeBusy/Imap.php
-+++ b/Kolab_FreeBusy-0.1.5/lib/Horde/Kolab/FreeBusy/Imap.php
+--- a/Kolab_FreeBusy-0.1.6/lib/Horde/Kolab/FreeBusy/Imap.php
++++ b/Kolab_FreeBusy-0.1.6/lib/Horde/Kolab/FreeBusy/Imap.php
@@ -10,6 +10,11 @@
/** We need the Kolab Stores library for connecting to the IMAP storage. */
require_once 'Horde/Kolab/Storage/List.php';
@@ -53,10 +53,10 @@
/** We need the Date library for event handling. */
require_once 'Horde/Date.php';
-Index: b/Kolab_FreeBusy-0.1.5/test/Horde/Kolab/FreeBusy/FreeBusyScenarioTest.php
+Index: b/Kolab_FreeBusy-0.1.6/test/Horde/Kolab/FreeBusy/FreeBusyScenarioTest.php
===================================================================
---- a/Kolab_FreeBusy-0.1.5/test/Horde/Kolab/FreeBusy/FreeBusyScenarioTest.php
-+++ b/Kolab_FreeBusy-0.1.5/test/Horde/Kolab/FreeBusy/FreeBusyScenarioTest.php
+--- a/Kolab_FreeBusy-0.1.6/test/Horde/Kolab/FreeBusy/FreeBusyScenarioTest.php
++++ b/Kolab_FreeBusy-0.1.6/test/Horde/Kolab/FreeBusy/FreeBusyScenarioTest.php
@@ -14,6 +14,11 @@
* @link http://pear.horde.org/index.php?package=Share
*/
@@ -67,12 +67,12 @@
+}
+
/**
- * We need the base class
+ * Prepare the test setup.
*/
-Index: b/Kolab_FreeBusy-0.1.5/test/Horde/Kolab/FreeBusy/FreeBusyTest.php
+Index: b/Kolab_FreeBusy-0.1.6/test/Horde/Kolab/FreeBusy/FreeBusyTest.php
===================================================================
---- a/Kolab_FreeBusy-0.1.5/test/Horde/Kolab/FreeBusy/FreeBusyTest.php
-+++ b/Kolab_FreeBusy-0.1.5/test/Horde/Kolab/FreeBusy/FreeBusyTest.php
+--- a/Kolab_FreeBusy-0.1.6/test/Horde/Kolab/FreeBusy/FreeBusyTest.php
++++ b/Kolab_FreeBusy-0.1.6/test/Horde/Kolab/FreeBusy/FreeBusyTest.php
@@ -11,6 +11,11 @@
* @link http://pear.horde.org/index.php?package=Kolab_FreeBusy
*/
@@ -83,5 +83,5 @@
+}
+
/**
- * We need the base class
+ * Prepare the test setup.
*/
Modified: php-kolab-freebusy/trunk/debian/patches/40-phpunit.diff
===================================================================
--- php-kolab-freebusy/trunk/debian/patches/40-phpunit.diff 2010-03-10 08:40:54 UTC (rev 1492)
+++ php-kolab-freebusy/trunk/debian/patches/40-phpunit.diff 2010-05-18 11:13:03 UTC (rev 1493)
@@ -5,10 +5,10 @@
Upstream status: Should be reported.
-Index: b/Kolab_FreeBusy-0.1.5/test/Horde/Kolab/FreeBusy/AllTests.php
+Index: b/Kolab_FreeBusy-0.1.6/test/Horde/Kolab/FreeBusy/AllTests.php
===================================================================
---- a/Kolab_FreeBusy-0.1.5/test/Horde/Kolab/FreeBusy/AllTests.php
-+++ b/Kolab_FreeBusy-0.1.5/test/Horde/Kolab/FreeBusy/AllTests.php
+--- a/Kolab_FreeBusy-0.1.6/test/Horde/Kolab/FreeBusy/AllTests.php
++++ b/Kolab_FreeBusy-0.1.6/test/Horde/Kolab/FreeBusy/AllTests.php
@@ -14,6 +14,7 @@
define('PHPUnit_MAIN_METHOD', 'Horde_Kolab_FreeBusy_AllTests::main');
}
Deleted: php-kolab-freebusy/trunk/debian/patches/60-testsuite-include.diff
===================================================================
--- php-kolab-freebusy/trunk/debian/patches/60-testsuite-include.diff 2010-03-10 08:40:54 UTC (rev 1492)
+++ php-kolab-freebusy/trunk/debian/patches/60-testsuite-include.diff 2010-05-18 11:13:03 UTC (rev 1493)
@@ -1,18 +0,0 @@
-Goal: Avoid include errors when running testsuite
-
-Author: Mathieu Parent <math.parent at gmail.com>
-
-Upstream status: Should be reported.
-
-Index: b/Kolab_FreeBusy-0.1.5/test/Horde/Kolab/FreeBusy/FreeBusyTest.php
-===================================================================
---- a/Kolab_FreeBusy-0.1.5/test/Horde/Kolab/FreeBusy/FreeBusyTest.php
-+++ b/Kolab_FreeBusy-0.1.5/test/Horde/Kolab/FreeBusy/FreeBusyTest.php
-@@ -20,6 +20,7 @@
- * We need the base class
- */
- require_once 'Horde/Kolab/Test/Storage.php';
-+require_once 'Horde/Kolab/Test/FreeBusy.php';
-
- require_once 'Horde/Kolab/FreeBusy.php';
-
Modified: php-kolab-freebusy/trunk/debian/patches/series
===================================================================
--- php-kolab-freebusy/trunk/debian/patches/series 2010-03-10 08:40:54 UTC (rev 1492)
+++ php-kolab-freebusy/trunk/debian/patches/series 2010-05-18 11:13:03 UTC (rev 1493)
@@ -1,4 +1,3 @@
10-remove-md5.diff
30-horde-path.diff
40-phpunit.diff
-60-testsuite-include.diff
Modified: php-kolab-freebusy/trunk/debian/rules
===================================================================
--- php-kolab-freebusy/trunk/debian/rules 2010-03-10 08:40:54 UTC (rev 1492)
+++ php-kolab-freebusy/trunk/debian/rules 2010-05-18 11:13:03 UTC (rev 1493)
@@ -5,7 +5,6 @@
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::
# remove license file
Added: php-kolab-freebusy/trunk/debian/source/format
===================================================================
--- php-kolab-freebusy/trunk/debian/source/format (rev 0)
+++ php-kolab-freebusy/trunk/debian/source/format 2010-05-18 11:13:03 UTC (rev 1493)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the pkg-kolab-devel
mailing list