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

mparent-guest at alioth.debian.org mparent-guest at alioth.debian.org
Sun Dec 21 16:14:42 UTC 2008


Author: mparent-guest
Date: 2008-12-21 16:14:42 +0000 (Sun, 21 Dec 2008)
New Revision: 1093

Added:
   php-kolab-freebusy/trunk/debian/patches/
   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/patches/series
Modified:
   php-kolab-freebusy/trunk/debian/changelog
   php-kolab-freebusy/trunk/debian/rules
Log:
  * 10-remove-md5.diff: Remove md5sums to allow patching
  * 20-config-path.diff: Specify config path
  * 30-horde-path.diff: Avoid Horde include errors



Modified: php-kolab-freebusy/trunk/debian/changelog
===================================================================
--- php-kolab-freebusy/trunk/debian/changelog	2008-12-21 15:29:46 UTC (rev 1092)
+++ php-kolab-freebusy/trunk/debian/changelog	2008-12-21 16:14:42 UTC (rev 1093)
@@ -3,5 +3,8 @@
   * Initial Release (Closes: #508958)
   * remove the upstream COPYING
   * conflicts/replaces php-kolab and kolab-freebusy
+  * 10-remove-md5.diff: Remove md5sums to allow patching
+  * 20-config-path.diff: Specify config path
+  * 30-horde-path.diff: Avoid Horde include errors
 
- -- Mathieu Parent <math.parent at gmail.com>  Wed, 17 Dec 2008 17:03:52 +0100
+ -- Mathieu Parent <math.parent at gmail.com>  Sun, 21 Dec 2008 17:10:04 +0100

Added: php-kolab-freebusy/trunk/debian/patches/10-remove-md5.diff
===================================================================
--- php-kolab-freebusy/trunk/debian/patches/10-remove-md5.diff	                        (rev 0)
+++ php-kolab-freebusy/trunk/debian/patches/10-remove-md5.diff	2008-12-21 16:14:42 UTC (rev 1093)
@@ -0,0 +1,43 @@
+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
+@@ -48,18 +48,18 @@
+  <notes>* Fixed copyright information.</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 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/FreeBusy.php" role="php" />
++   <file name="test/Horde/Kolab/FreeBusy/AllTests.php" role="test" />
++   <file name="test/Horde/Kolab/FreeBusy/FreeBusyTest.php" role="test" />
++   <file name="www/Horde/Kolab/FreeBusy/config.php" role="www" />
++   <file name="www/Horde/Kolab/FreeBusy/freebusy.php" role="www" />
++   <file name="www/Horde/Kolab/FreeBusy/pfb.php" role="www" />
++   <file name="www/Horde/Kolab/FreeBusy/regenerate.php" role="www" />
++   <file name="COPYING" role="doc" />
+   </dir>
+  </contents>
+  <dependencies>

Added: php-kolab-freebusy/trunk/debian/patches/20-config-path.diff
===================================================================
--- php-kolab-freebusy/trunk/debian/patches/20-config-path.diff	                        (rev 0)
+++ php-kolab-freebusy/trunk/debian/patches/20-config-path.diff	2008-12-21 16:14:42 UTC (rev 1093)
@@ -0,0 +1,32 @@
+Goal: Specify config path
+
+Author: Mathieu Parent <math.parent at gmail.com>
+
+Upstream status: Specific to Debian
+
+Index: b/Kolab_FreeBusy-0.1.2/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
+@@ -19,7 +19,7 @@
+ require_once 'Horde/Kolab/FreeBusy.php';
+ 
+ /** Load the configuration */ 
+-require_once 'config.php';
++require_once '/etc/kolab/freebusy/config.php';
+ 
+ $fb = &new Horde_Kolab_FreeBusy();
+ $view = $fb->fetch();
+Index: b/Kolab_FreeBusy-0.1.2/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
+@@ -24,7 +24,7 @@
+ require_once 'Horde/Kolab/FreeBusy.php';
+ 
+ /** Load the configuration */ 
+-require_once 'config.php';
++require_once '/etc/kolab/freebusy/config.php';
+ 
+ $fb = &new Horde_Kolab_FreeBusy();
+ $view = $fb->trigger();


Property changes on: php-kolab-freebusy/trunk/debian/patches/20-config-path.diff
___________________________________________________________________
Name: svn:mergeinfo
   + 

Added: php-kolab-freebusy/trunk/debian/patches/30-horde-path.diff
===================================================================
--- php-kolab-freebusy/trunk/debian/patches/30-horde-path.diff	                        (rev 0)
+++ php-kolab-freebusy/trunk/debian/patches/30-horde-path.diff	2008-12-21 16:14:42 UTC (rev 1093)
@@ -0,0 +1,46 @@
+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_FreeBusy-0.1.2/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
+@@ -7,6 +7,8 @@
+  * @package Kolab_FreeBusy
+  */
+ 
++require_once '/usr/share/horde3/lib/core.php';
++
+ /** Load the required Horde libraries */ 
+ require_once 'Horde.php';
+ 
+Index: b/Kolab_FreeBusy-0.1.2/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
+@@ -6,6 +6,8 @@
+  *
+  * @package Kolab_FreeBusy
+  */
++ 
++require_once '/usr/share/horde3/lib/core.php';
+ 
+ /** 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
+===================================================================
+--- a/Kolab_FreeBusy-0.1.2/lib/Horde/Kolab/FreeBusy/Imap.php
++++ b/Kolab_FreeBusy-0.1.2/lib/Horde/Kolab/FreeBusy/Imap.php
+@@ -7,6 +7,8 @@
+  * @package Kolab_FreeBusy
+  */
+ 
++require_once '/usr/share/horde3/lib/core.php';
++
+ /** We need the Kolab Stores library for connecting to the IMAP storage. */
+ require_once 'Horde/Kolab/Storage/List.php';
+ 


Property changes on: php-kolab-freebusy/trunk/debian/patches/30-horde-path.diff
___________________________________________________________________
Name: svn:mergeinfo
   + 

Added: php-kolab-freebusy/trunk/debian/patches/series
===================================================================
--- php-kolab-freebusy/trunk/debian/patches/series	                        (rev 0)
+++ php-kolab-freebusy/trunk/debian/patches/series	2008-12-21 16:14:42 UTC (rev 1093)
@@ -0,0 +1,3 @@
+10-remove-md5.diff
+20-config-path.diff
+30-horde-path.diff

Modified: php-kolab-freebusy/trunk/debian/rules
===================================================================
--- php-kolab-freebusy/trunk/debian/rules	2008-12-21 15:29:46 UTC (rev 1092)
+++ php-kolab-freebusy/trunk/debian/rules	2008-12-21 16:14:42 UTC (rev 1093)
@@ -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::
 	rm $(DEB_DESTDIR)usr/share/doc/php-kolab-freebusy/COPYING




More information about the pkg-kolab-devel mailing list