[pkg-kolab] r1213 - in php-kolab-freebusy/trunk/debian: . patches

mparent-guest at alioth.debian.org mparent-guest at alioth.debian.org
Fri Mar 6 22:46:19 UTC 2009 

Author: mparent-guest
Date: 2009-03-06 22:46:19 +0000 (Fri, 06 Mar 2009)
New Revision: 1213

Modified:
   php-kolab-freebusy/trunk/debian/changelog
   php-kolab-freebusy/trunk/debian/patches/10-remove-md5.diff
   php-kolab-freebusy/trunk/debian/patches/20-config-path.diff
   php-kolab-freebusy/trunk/debian/patches/30-horde-path.diff
   php-kolab-freebusy/trunk/debian/rules
Log:
New upstream version
updated patches


Modified: php-kolab-freebusy/trunk/debian/changelog
===================================================================
--- php-kolab-freebusy/trunk/debian/changelog	2009-03-06 22:40:58 UTC (rev 1212)
+++ php-kolab-freebusy/trunk/debian/changelog	2009-03-06 22:46:19 UTC (rev 1213)
@@ -1,13 +1,16 @@
-php-kolab-freebusy (0.1.2-1) unstable; urgency=low
+php-kolab-freebusy (0.1.3-1) unstable; urgency=low
 
-  * Initial Release (Closes: #508958)
+  * Initial Release 0.1.2 (Closes: #508958)
+  * New upstream version 0.1.3
   * remove the upstream COPYING
   * conflicts/replaces php-kolab, kolab-freebusy and kolab-resource-handlers
   * 10-remove-md5.diff: Remove md5sums to allow patching
   * 20-config-path.diff: Specify config path
   * 30-horde-path.diff: Avoid Horde include errors
+  * debian/rules:
+    - remove license file
   * 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
 
- -- Mathieu Parent <math.parent at gmail.com>  Sun, 15 Feb 2009 21:10:57 +0100
+ -- Mathieu Parent <math.parent at gmail.com>  Fri, 06 Mar 2009 23:41:40 +0100

Modified: php-kolab-freebusy/trunk/debian/patches/10-remove-md5.diff
===================================================================
--- php-kolab-freebusy/trunk/debian/patches/10-remove-md5.diff	2009-03-06 22:40:58 UTC (rev 1212)
+++ php-kolab-freebusy/trunk/debian/patches/10-remove-md5.diff	2009-03-06 22:46:19 UTC (rev 1213)
@@ -10,26 +10,28 @@
 ===================================================================
 --- a/package.xml
 +++ b/package.xml
-@@ -48,18 +48,18 @@
-  <notes>* Fixed copyright information.</notes>
+@@ -55,19 +55,19 @@
+   kolab/issue3313 (free/busy regeneration as manager broken in 2.2.1-beta1)</notes>
   <contents>
    <dir name="/">
--   <file md5sum="b7594e9b3088ce86fd4a908aeaaf5e45" name="lib/Horde/Kolab/FreeBusy/Access.php" role="php" />
--   <file md5sum="de61db8c17f0aad102e97637120fd23a" name="lib/Horde/Kolab/FreeBusy/Cache.php" role="php" />
--   <file md5sum="802b11772208551b4083a480076bd95e" name="lib/Horde/Kolab/FreeBusy/Imap.php" role="php" />
--   <file md5sum="2e921a15ebf054722af984c497f65873" name="lib/Horde/Kolab/FreeBusy/View.php" role="php" />
--   <file md5sum="7fb4c1ffd9037d78163e09868619e8ab" name="lib/Horde/Kolab/FreeBusy.php" role="php" />
--   <file md5sum="98644e422fb2b1df37a8c22700ed6b9e" name="test/Horde/Kolab/FreeBusy/AllTests.php" role="test" />
--   <file md5sum="149cac275aa58b7f8930265a81f0a7a5" name="test/Horde/Kolab/FreeBusy/FreeBusyTest.php" role="test" />
--   <file md5sum="6f13499d9a0154374d20d815b0a27d53" name="www/Horde/Kolab/FreeBusy/config.php" role="www" />
--   <file md5sum="f18f8a748cc0d6c89e4111c6fcc2a85a" name="www/Horde/Kolab/FreeBusy/freebusy.php" role="www" />
--   <file md5sum="77fd14ab949d838009345a32d1c88bfe" name="www/Horde/Kolab/FreeBusy/pfb.php" role="www" />
--   <file md5sum="7e971b993a3f77b8972bda59632c0874" name="www/Horde/Kolab/FreeBusy/regenerate.php" role="www" />
--   <file md5sum="fbc093901857fcd118f065f900982c24" name="COPYING" role="doc" />
+-   <file md5sum="513fa32cd48338e55ae69fdbf54dcc5e" name="lib/Horde/Kolab/FreeBusy/Access.php" role="php" />
+-   <file md5sum="b1224b3cf04852229e09337617d0da0d" name="lib/Horde/Kolab/FreeBusy/Cache.php" role="php" />
+-   <file md5sum="fd1b85ef7651de489e57631aa28b07f8" name="lib/Horde/Kolab/FreeBusy/Imap.php" role="php" />
+-   <file md5sum="eb3fb721d32898be15e5f823b4ca6058" name="lib/Horde/Kolab/FreeBusy/View.php" role="php" />
+-   <file md5sum="513f90ba4df30616c3580e481e70ff3d" name="lib/Horde/Kolab/Test/FreeBusy.php" role="php" />
+-   <file md5sum="ff4f3c467534d2c56a67ba49d67a63c5" name="lib/Horde/Kolab/FreeBusy.php" role="php" />
+-   <file md5sum="53b79e83027c02bdbb7b6ff60a8cb7f7" name="test/Horde/Kolab/FreeBusy/AllTests.php" role="test" />
+-   <file md5sum="7497f853610beb69e73cef3b8067bde3" name="test/Horde/Kolab/FreeBusy/FreeBusyTest.php" role="test" />
+-   <file md5sum="45237350a8751e95eebfaad89191112e" name="www/Horde/Kolab/FreeBusy/config.php" role="www" />
+-   <file md5sum="b71a3c2456cdcdbee7fa91e8a2df4853" name="www/Horde/Kolab/FreeBusy/freebusy.php" role="www" />
+-   <file md5sum="461a562c1f36625d4f84694467c109f9" name="www/Horde/Kolab/FreeBusy/pfb.php" role="www" />
+-   <file md5sum="ad0748782832596105ddc2e39607fd53" name="www/Horde/Kolab/FreeBusy/regenerate.php" role="www" />
+-   <file md5sum="3f4ea54f3394faa88b3da3613a20a27f" name="COPYING" role="doc" />
 +   <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" />
 +   <file name="lib/Horde/Kolab/FreeBusy/View.php" role="php" />
++   <file name="lib/Horde/Kolab/Test/FreeBusy.php" role="php" />
 +   <file name="lib/Horde/Kolab/FreeBusy.php" role="php" />
 +   <file name="test/Horde/Kolab/FreeBusy/AllTests.php" role="test" />
 +   <file name="test/Horde/Kolab/FreeBusy/FreeBusyTest.php" role="test" />

Modified: php-kolab-freebusy/trunk/debian/patches/20-config-path.diff
===================================================================
--- php-kolab-freebusy/trunk/debian/patches/20-config-path.diff	2009-03-06 22:40:58 UTC (rev 1212)
+++ php-kolab-freebusy/trunk/debian/patches/20-config-path.diff	2009-03-06 22:46:19 UTC (rev 1213)
@@ -4,10 +4,10 @@
 
 Upstream status: Specific to Debian
 
-Index: b/Kolab_FreeBusy-0.1.2/www/Horde/Kolab/FreeBusy/freebusy.php
+Index: b/Kolab_FreeBusy-0.1.3/www/Horde/Kolab/FreeBusy/freebusy.php
 ===================================================================
---- a/Kolab_FreeBusy-0.1.2/www/Horde/Kolab/FreeBusy/freebusy.php
-+++ b/Kolab_FreeBusy-0.1.2/www/Horde/Kolab/FreeBusy/freebusy.php
+--- a/Kolab_FreeBusy-0.1.3/www/Horde/Kolab/FreeBusy/freebusy.php
++++ b/Kolab_FreeBusy-0.1.3/www/Horde/Kolab/FreeBusy/freebusy.php
 @@ -19,7 +19,7 @@
  require_once 'Horde/Kolab/FreeBusy.php';
  
@@ -17,10 +17,10 @@
  
  $fb = &new Horde_Kolab_FreeBusy();
  $view = $fb->fetch();
-Index: b/Kolab_FreeBusy-0.1.2/www/Horde/Kolab/FreeBusy/pfb.php
+Index: b/Kolab_FreeBusy-0.1.3/www/Horde/Kolab/FreeBusy/pfb.php
 ===================================================================
---- a/Kolab_FreeBusy-0.1.2/www/Horde/Kolab/FreeBusy/pfb.php
-+++ b/Kolab_FreeBusy-0.1.2/www/Horde/Kolab/FreeBusy/pfb.php
+--- a/Kolab_FreeBusy-0.1.3/www/Horde/Kolab/FreeBusy/pfb.php
++++ b/Kolab_FreeBusy-0.1.3/www/Horde/Kolab/FreeBusy/pfb.php
 @@ -24,7 +24,7 @@
  require_once 'Horde/Kolab/FreeBusy.php';
  

Modified: php-kolab-freebusy/trunk/debian/patches/30-horde-path.diff
===================================================================
--- php-kolab-freebusy/trunk/debian/patches/30-horde-path.diff	2009-03-06 22:40:58 UTC (rev 1212)
+++ php-kolab-freebusy/trunk/debian/patches/30-horde-path.diff	2009-03-06 22:46:19 UTC (rev 1213)
@@ -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.2/lib/Horde/Kolab/FreeBusy/Access.php
+Index: b/Kolab_FreeBusy-0.1.3/lib/Horde/Kolab/FreeBusy/Access.php
 ===================================================================
---- a/Kolab_FreeBusy-0.1.2/lib/Horde/Kolab/FreeBusy/Access.php
-+++ b/Kolab_FreeBusy-0.1.2/lib/Horde/Kolab/FreeBusy/Access.php
+--- a/Kolab_FreeBusy-0.1.3/lib/Horde/Kolab/FreeBusy/Access.php
++++ b/Kolab_FreeBusy-0.1.3/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.2/lib/Horde/Kolab/FreeBusy/Cache.php
+Index: b/Kolab_FreeBusy-0.1.3/lib/Horde/Kolab/FreeBusy/Cache.php
 ===================================================================
---- a/Kolab_FreeBusy-0.1.2/lib/Horde/Kolab/FreeBusy/Cache.php
-+++ b/Kolab_FreeBusy-0.1.2/lib/Horde/Kolab/FreeBusy/Cache.php
+--- a/Kolab_FreeBusy-0.1.3/lib/Horde/Kolab/FreeBusy/Cache.php
++++ b/Kolab_FreeBusy-0.1.3/lib/Horde/Kolab/FreeBusy/Cache.php
 @@ -6,6 +6,11 @@
   *
   * @package Kolab_FreeBusy
@@ -37,10 +37,10 @@
  
  /** We require the iCalendar library to build the free/busy list */
  require_once 'Horde/iCalendar.php';
-Index: b/Kolab_FreeBusy-0.1.2/lib/Horde/Kolab/FreeBusy/Imap.php
+Index: b/Kolab_FreeBusy-0.1.3/lib/Horde/Kolab/FreeBusy/Imap.php
 ===================================================================
---- a/Kolab_FreeBusy-0.1.2/lib/Horde/Kolab/FreeBusy/Imap.php
-+++ b/Kolab_FreeBusy-0.1.2/lib/Horde/Kolab/FreeBusy/Imap.php
+--- a/Kolab_FreeBusy-0.1.3/lib/Horde/Kolab/FreeBusy/Imap.php
++++ b/Kolab_FreeBusy-0.1.3/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';

Modified: php-kolab-freebusy/trunk/debian/rules
===================================================================
--- php-kolab-freebusy/trunk/debian/rules	2009-03-06 22:40:58 UTC (rev 1212)
+++ php-kolab-freebusy/trunk/debian/rules	2009-03-06 22:46:19 UTC (rev 1213)
@@ -8,4 +8,5 @@
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 common-install-indep::
+	# remove license file
 	rm $(DEB_DESTDIR)usr/share/doc/php-kolab-freebusy/COPYING

More information about the pkg-kolab-devel mailing list