[pkg-kolab] r1206 - in php-kolab-format/trunk/debian: . patches
mparent-guest at alioth.debian.org
mparent-guest at alioth.debian.org
Sun Feb 15 22:10:45 UTC 2009
Author: mparent-guest
Date: 2009-02-15 22:10:45 +0000 (Sun, 15 Feb 2009)
New Revision: 1206
Added:
php-kolab-format/trunk/debian/patches/
php-kolab-format/trunk/debian/patches/10-remove-md5.diff
php-kolab-format/trunk/debian/patches/30-horde-path.diff
php-kolab-format/trunk/debian/patches/series
Modified:
php-kolab-format/trunk/debian/changelog
php-kolab-format/trunk/debian/control
php-kolab-format/trunk/debian/rules
Log:
* 10-remove-md5.diff: Remove md5sums to allow patching
* 30-horde-path.diff: Avoid Horde include errors
Modified: php-kolab-format/trunk/debian/changelog
===================================================================
--- php-kolab-format/trunk/debian/changelog 2009-02-15 21:25:13 UTC (rev 1205)
+++ php-kolab-format/trunk/debian/changelog 2009-02-15 22:10:45 UTC (rev 1206)
@@ -5,5 +5,7 @@
* 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
+ * 10-remove-md5.diff: Remove md5sums to allow patching
+ * 30-horde-path.diff: Avoid Horde include errors
- -- Mathieu Parent <math.parent at gmail.com> Sun, 15 Feb 2009 21:10:57 +0100
+ -- Mathieu Parent <math.parent at gmail.com> Sun, 15 Feb 2009 23:05:04 +0100
Modified: php-kolab-format/trunk/debian/control
===================================================================
--- php-kolab-format/trunk/debian/control 2009-02-15 21:25:13 UTC (rev 1205)
+++ php-kolab-format/trunk/debian/control 2009-02-15 22:10:45 UTC (rev 1206)
@@ -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://pear.horde.org/index.php?package=Kolab_Format
Vcs-Browser: http://svn.debian.org/wsvn/pkg-kolab/php-kolab-format/trunk/
Added: php-kolab-format/trunk/debian/patches/10-remove-md5.diff
===================================================================
--- php-kolab-format/trunk/debian/patches/10-remove-md5.diff (rev 0)
+++ php-kolab-format/trunk/debian/patches/10-remove-md5.diff 2009-02-15 22:10:45 UTC (rev 1206)
@@ -0,0 +1,71 @@
+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
+@@ -43,32 +43,32 @@
+ <notes>* Fixed copyright information.</notes>
+ <contents>
+ <dir name="/">
+- <file md5sum="bfc4b24367746130782b5aea0b5fec0d" name="doc/Horde/Kolab/Format/usage.txt" role="doc" />
+- <file md5sum="44c0c826213e311c4a38133102c673cf" name="examples/Horde/Kolab/Format/event.php" role="doc" />
+- <file md5sum="2ce517323e828b769cf04f9c481ab6a7" name="examples/Horde/Kolab/Format/new_type.php" role="doc" />
+- <file md5sum="09fb9faf9625089d11ffbe97f11babd8" name="lib/Horde/Kolab/Format/XML/annotation.php" role="php" />
+- <file md5sum="9451cd7410d9eee200d6f22760daf79d" name="lib/Horde/Kolab/Format/XML/contact.php" role="php" />
+- <file md5sum="20b9576237d018b66446bca328db70d7" name="lib/Horde/Kolab/Format/XML/distributionlist.php" role="php" />
+- <file md5sum="2832f56fc3ba3cb9a267e07af8ec2e09" name="lib/Horde/Kolab/Format/XML/event.php" role="php" />
+- <file md5sum="055aaf8fc8fb5279a218ba815bee1135" name="lib/Horde/Kolab/Format/XML/hprefs.php" role="php" />
+- <file md5sum="4c0e6350a6e45bdbbc5f09553ec388bb" name="lib/Horde/Kolab/Format/XML/note.php" role="php" />
+- <file md5sum="3066be9001094222120a8c3941f978ea" name="lib/Horde/Kolab/Format/XML/task.php" role="php" />
+- <file md5sum="9f4ce9d71f41f08b817c8f3cf385db67" name="lib/Horde/Kolab/Format/Date.php" role="php" />
+- <file md5sum="06f6c2b4c85b57581d77b779cd10da5d" name="lib/Horde/Kolab/Format/XML.php" role="php" />
+- <file md5sum="88d50eda2d946ce1e3fb5202922b2e26" name="lib/Horde/Kolab/Format.php" role="php" />
+- <file md5sum="7be2c4147e48752d12165cef3d518db7" name="test/Horde/Kolab/Format/fixtures/contact_category.xml" role="test" />
+- <file md5sum="f67bf428f4c53ac1740b47d74990cc87" name="test/Horde/Kolab/Format/fixtures/contact_mail.xml" role="test" />
+- <file md5sum="9bbfb06523de40df4172388fa54a4c5b" name="test/Horde/Kolab/Format/fixtures/contact_pgp.xml" role="test" />
+- <file md5sum="a8205dd4da86fe10d2b9a2eed8eef53c" name="test/Horde/Kolab/Format/fixtures/preferences_read_old.xml" role="test" />
+- <file md5sum="cd00599bf57479c306c4725efaaee3cb" name="test/Horde/Kolab/Format/fixtures/preferences_write_old.xml" role="test" />
+- <file md5sum="2f39cb0868d9b472587f136d617198b0" name="test/Horde/Kolab/Format/fixtures/recur_fail.xml" role="test" />
+- <file md5sum="dd69d0182d04111dc0abd8cd0c294131" name="test/Horde/Kolab/Format/fixtures/recur.xml" role="test" />
+- <file md5sum="39d9f0053798f3ea19110ec758951c0f" name="test/Horde/Kolab/Format/AllTests.php" role="test" />
+- <file md5sum="b8559fbb81694adf9b503478a10b5ede" name="test/Horde/Kolab/Format/ContactTest.php" role="test" />
+- <file md5sum="9ad8d6e7f6647c63e70a15ca49543d7c" name="test/Horde/Kolab/Format/PreferencesTest.php" role="test" />
+- <file md5sum="67d869f62c070e0ecd95daaf4103a955" name="test/Horde/Kolab/Format/RecurrenceTest.php" role="test" />
+- <file md5sum="995b5f604b154241fd90f928ad6e286d" name="test/Horde/Kolab/Format/XmlTest.php" role="test" />
+- <file md5sum="fbc093901857fcd118f065f900982c24" name="COPYING" role="doc" />
++ <file name="doc/Horde/Kolab/Format/usage.txt" role="doc" />
++ <file name="examples/Horde/Kolab/Format/event.php" role="doc" />
++ <file name="examples/Horde/Kolab/Format/new_type.php" role="doc" />
++ <file name="lib/Horde/Kolab/Format/XML/annotation.php" role="php" />
++ <file name="lib/Horde/Kolab/Format/XML/contact.php" role="php" />
++ <file name="lib/Horde/Kolab/Format/XML/distributionlist.php" role="php" />
++ <file name="lib/Horde/Kolab/Format/XML/event.php" role="php" />
++ <file name="lib/Horde/Kolab/Format/XML/hprefs.php" role="php" />
++ <file name="lib/Horde/Kolab/Format/XML/note.php" role="php" />
++ <file name="lib/Horde/Kolab/Format/XML/task.php" role="php" />
++ <file name="lib/Horde/Kolab/Format/Date.php" role="php" />
++ <file name="lib/Horde/Kolab/Format/XML.php" role="php" />
++ <file name="lib/Horde/Kolab/Format.php" role="php" />
++ <file name="test/Horde/Kolab/Format/fixtures/contact_category.xml" role="test" />
++ <file name="test/Horde/Kolab/Format/fixtures/contact_mail.xml" role="test" />
++ <file name="test/Horde/Kolab/Format/fixtures/contact_pgp.xml" role="test" />
++ <file name="test/Horde/Kolab/Format/fixtures/preferences_read_old.xml" role="test" />
++ <file name="test/Horde/Kolab/Format/fixtures/preferences_write_old.xml" role="test" />
++ <file name="test/Horde/Kolab/Format/fixtures/recur_fail.xml" role="test" />
++ <file name="test/Horde/Kolab/Format/fixtures/recur.xml" role="test" />
++ <file name="test/Horde/Kolab/Format/AllTests.php" role="test" />
++ <file name="test/Horde/Kolab/Format/ContactTest.php" role="test" />
++ <file name="test/Horde/Kolab/Format/PreferencesTest.php" role="test" />
++ <file name="test/Horde/Kolab/Format/RecurrenceTest.php" role="test" />
++ <file name="test/Horde/Kolab/Format/XmlTest.php" role="test" />
++ <file name="COPYING" role="doc" />
+ </dir>
+ </contents>
+ <dependencies>
Added: php-kolab-format/trunk/debian/patches/30-horde-path.diff
===================================================================
--- php-kolab-format/trunk/debian/patches/30-horde-path.diff (rev 0)
+++ php-kolab-format/trunk/debian/patches/30-horde-path.diff 2009-02-15 22:10:45 UTC (rev 1206)
@@ -0,0 +1,87 @@
+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 (http://bugs.debian.org/510760).
+
+Index: b/Kolab_Format-1.0.0/lib/Horde/Kolab/Format/XML.php
+===================================================================
+--- a/Kolab_Format-1.0.0/lib/Horde/Kolab/Format/XML.php
++++ b/Kolab_Format-1.0.0/lib/Horde/Kolab/Format/XML.php
+@@ -6,6 +6,11 @@
+ *
+ * @package Kolab_Format
+ */
++
++/** Debian Hack: use old Horde path until #510760 is fixed */
++if(!preg_match('@:/usr/share/horde3/lib($|:)@', ini_get('include_path'))) {
++ ini_set('include_path', ini_get('include_path') . ':' . '/usr/share/horde3/lib');
++}
+
+ /** We need the DOM library for XML access. */
+ require_once 'Horde/DOM.php';
+Index: b/Kolab_Format-1.0.0/test/Horde/Kolab/Format/ContactTest.php
+===================================================================
+--- a/Kolab_Format-1.0.0/test/Horde/Kolab/Format/ContactTest.php
++++ b/Kolab_Format-1.0.0/test/Horde/Kolab/Format/ContactTest.php
+@@ -7,6 +7,11 @@
+ * @package Kolab_Format
+ */
+
++/** Debian Hack: use old Horde path until #510760 is fixed */
++if(!preg_match('@:/usr/share/horde3/lib($|:)@', ini_get('include_path'))) {
++ ini_set('include_path', ini_get('include_path') . ':' . '/usr/share/horde3/lib');
++}
++
+ /**
+ * We need the unit test framework
+ */
+Index: b/Kolab_Format-1.0.0/test/Horde/Kolab/Format/PreferencesTest.php
+===================================================================
+--- a/Kolab_Format-1.0.0/test/Horde/Kolab/Format/PreferencesTest.php
++++ b/Kolab_Format-1.0.0/test/Horde/Kolab/Format/PreferencesTest.php
+@@ -7,6 +7,11 @@
+ * @package Kolab_Format
+ */
+
++/** Debian Hack: use old Horde path until #510760 is fixed */
++if(!preg_match('@:/usr/share/horde3/lib($|:)@', ini_get('include_path'))) {
++ ini_set('include_path', ini_get('include_path') . ':' . '/usr/share/horde3/lib');
++}
++
+ /**
+ * We need the unit test framework
+ */
+Index: b/Kolab_Format-1.0.0/test/Horde/Kolab/Format/RecurrenceTest.php
+===================================================================
+--- a/Kolab_Format-1.0.0/test/Horde/Kolab/Format/RecurrenceTest.php
++++ b/Kolab_Format-1.0.0/test/Horde/Kolab/Format/RecurrenceTest.php
+@@ -7,6 +7,11 @@
+ * @package Kolab_Format
+ */
+
++/** Debian Hack: use old Horde path until #510760 is fixed */
++if(!preg_match('@:/usr/share/horde3/lib($|:)@', ini_get('include_path'))) {
++ ini_set('include_path', ini_get('include_path') . ':' . '/usr/share/horde3/lib');
++}
++
+ /**
+ * We need the unit test framework
+ */
+Index: b/Kolab_Format-1.0.0/test/Horde/Kolab/Format/XmlTest.php
+===================================================================
+--- a/Kolab_Format-1.0.0/test/Horde/Kolab/Format/XmlTest.php
++++ b/Kolab_Format-1.0.0/test/Horde/Kolab/Format/XmlTest.php
+@@ -7,6 +7,11 @@
+ * @package Kolab_Format
+ */
+
++/** Debian Hack: use old Horde path until #510760 is fixed */
++if(!preg_match('@:/usr/share/horde3/lib($|:)@', ini_get('include_path'))) {
++ ini_set('include_path', ini_get('include_path') . ':' . '/usr/share/horde3/lib');
++}
++
+ /**
+ * We need the unit test framework
+ */
Added: php-kolab-format/trunk/debian/patches/series
===================================================================
--- php-kolab-format/trunk/debian/patches/series (rev 0)
+++ php-kolab-format/trunk/debian/patches/series 2009-02-15 22:10:45 UTC (rev 1206)
@@ -0,0 +1,2 @@
+10-remove-md5.diff
+30-horde-path.diff
Modified: php-kolab-format/trunk/debian/rules
===================================================================
--- php-kolab-format/trunk/debian/rules 2009-02-15 21:25:13 UTC (rev 1205)
+++ php-kolab-format/trunk/debian/rules 2009-02-15 22:10:45 UTC (rev 1206)
@@ -5,6 +5,10 @@
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 -r $(DEB_DESTDIR)usr/share/php/.registry/.channel.pear.horde.org
+ rmdir $(DEB_DESTDIR)usr/share/php/.registry
rm $(DEB_DESTDIR)usr/share/doc/php-kolab-format/COPYING
+
More information about the pkg-kolab-devel
mailing list