[pkg-kolab] r1209 - in php-kolab-filter/trunk/debian: . patches
mparent-guest at alioth.debian.org
mparent-guest at alioth.debian.org
Fri Mar 6 22:26:02 UTC 2009
Author: mparent-guest
Date: 2009-03-06 22:26:02 +0000 (Fri, 06 Mar 2009)
New Revision: 1209
Added:
php-kolab-filter/trunk/debian/php-kolab-filter.dirs
php-kolab-filter/trunk/debian/php-kolab-filter.links
Removed:
php-kolab-filter/trunk/debian/dirs
php-kolab-filter/trunk/debian/patches/20-install-path-correction.diff
php-kolab-filter/trunk/debian/patches/70-manpages.diff
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/series
php-kolab-filter/trunk/debian/rules
Log:
- New release 0.1.5
- updated 10-remove-md5.diff
- 20-install-path-correction.diff integrated: Correct LoadTest.php
installation path
- 70-manpages.diff integrated: manpages for kolabfilter and
kolabmailboxfilter (kolab/issue3364)
- pod2man non longer necessary
- remove license file
- move man pages to correct location
- debian/links: create symlink for kolabmailboxfilter manpage
Modified: php-kolab-filter/trunk/debian/changelog
===================================================================
--- php-kolab-filter/trunk/debian/changelog 2009-03-06 22:05:34 UTC (rev 1208)
+++ php-kolab-filter/trunk/debian/changelog 2009-03-06 22:26:02 UTC (rev 1209)
@@ -1,18 +1,23 @@
-php-kolab-filter (0.1.3-1) unstable; urgency=low
+php-kolab-filter (0.1.5-1~pre1) UNRELEASED; urgency=low
- * Initial Release (Closes: #508955)
+ * Initial Release 0.1.3 (Closes: #508955)
+ * New upstream version 0.1.5
+ - 20-install-path-correction.diff integrated: Correct LoadTest.php
+ installation path
+ - 70-manpages.diff integrated: manpages for kolabfilter and
+ kolabmailboxfilter (kolab/issue3364)
* depends on php5-cli for kolabfilter and kolabmailboxfilter
* depends on php-net-lmtp
* conflicts/replaces php-kolab and kolab-filter
- * corrected package-contains-empty-directory
- usr/share/php/.registry/.channel.pear.horde.org
+ * suggets phpunit (>=3.3) for unit tests
* 10-remove-md5.diff: Remove md5sums to allow patching
- * 20-install-path-correction.diff: Correct LoadTest.php installation path
* 30-horde-path.diff: Avoid Horde include errors
- * 70-manpages.diff: manpages for kolabfilter and kolabmailboxfilter
- * debian/rules: install manpages using pod2man
+ * debian/rules:
+ - remove license file
+ - remove pear registry cache (corrected package-contains-empty-directory)
+ - move man pages to correct location
* 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
+ * debian/links: create symlink for kolabmailboxfilter manpage
- -- Mathieu Parent <math.parent at gmail.com> Sun, 15 Feb 2009 21:34:42 +0100
+ -- Mathieu Parent <math.parent at gmail.com> Fri, 06 Mar 2009 23:13:03 +0100
Deleted: php-kolab-filter/trunk/debian/dirs
===================================================================
--- php-kolab-filter/trunk/debian/dirs 2009-03-06 22:05:34 UTC (rev 1208)
+++ php-kolab-filter/trunk/debian/dirs 2009-03-06 22:26:02 UTC (rev 1209)
@@ -1,2 +0,0 @@
-usr/share/php
-usr/share/man/man1
Modified: php-kolab-filter/trunk/debian/patches/10-remove-md5.diff
===================================================================
--- php-kolab-filter/trunk/debian/patches/10-remove-md5.diff 2009-03-06 22:05:34 UTC (rev 1208)
+++ php-kolab-filter/trunk/debian/patches/10-remove-md5.diff 2009-03-06 22:26:02 UTC (rev 1209)
@@ -10,80 +10,114 @@
===================================================================
--- a/package.xml
+++ b/package.xml
-@@ -39,43 +39,43 @@
- * Fixed copyright information.</notes>
+@@ -50,60 +50,60 @@
+ (kolab/issue3192, https://www.intevation.de/roundup/kolab/issue3192)</notes>
<contents>
<dir name="/">
-- <file md5sum="374ec7acae9a6ed0af2a8f16d87d1851" name="lib/Horde/Kolab/Filter/Transport/drop.php" role="php" />
-- <file md5sum="11798d6258707542f113da309109ef6f" name="lib/Horde/Kolab/Filter/Transport/DovecotLDA.php" role="php" />
-- <file md5sum="9c8bb1a48a0c8fdf5b11a71bbd900417" name="lib/Horde/Kolab/Filter/Transport/echo.php" role="php" />
-- <file md5sum="a063c84b1b3b64415c001e2f5111ff1d" name="lib/Horde/Kolab/Filter/Transport/lda.php" role="php" />
-- <file md5sum="7709fe045df8cbbb055296ac65f0b411" name="lib/Horde/Kolab/Filter/Transport/lmtp.php" role="php" />
-- <file md5sum="c8aa6c9a9ec9c1ce2525437fc5483aa2" name="lib/Horde/Kolab/Filter/Transport/LMTPTLS.php" role="php" />
-- <file md5sum="5dfb9b89a0ae913c2c4518dad0058c3b" name="lib/Horde/Kolab/Filter/Transport/smtp.php" role="php" />
-- <file md5sum="547a831c0d94e624c8e7f780561fbb94" name="lib/Horde/Kolab/Filter/Transport/stdout.php" role="php" />
-- <file md5sum="b097f06c77b87ef050c4093f414c4ce0" name="lib/Horde/Kolab/Filter/Content.php" role="php" />
-- <file md5sum="f2d4f9b07ec5c4302f1d39be2bdc18bb" name="lib/Horde/Kolab/Filter/Base.php" role="php" />
-- <file md5sum="93e92595f6f5d21752abc4be89c825c1" name="lib/Horde/Kolab/Filter/Incoming.php" role="php" />
-- <file md5sum="568ddea27b4efa4ac47fd7a47e0a37a0" name="lib/Horde/Kolab/Filter/Outlook.php" role="php" />
-- <file md5sum="fc76e79f6ddeaaec36c782003038b7cf" name="lib/Horde/Kolab/Filter/Response.php" role="php" />
-- <file md5sum="00e146d4672b74733355cd7f23843b2b" name="lib/Horde/Kolab/Filter/Transport.php" role="php" />
-- <file md5sum="2cd7fb4d32dfb3304e789b93528b9fc4" name="lib/Horde/Kolab/Resource.php" role="php" />
-- <file baseinstalldir="/" md5sum="3340778005deb997ecfb369e61fb7fac" name="script/Horde/Kolab/Filter/kolabfilter.php" role="script">
-+ <file name="lib/Horde/Kolab/Filter/Transport/drop.php" role="php" />
-+ <file name="lib/Horde/Kolab/Filter/Transport/DovecotLDA.php" role="php" />
-+ <file name="lib/Horde/Kolab/Filter/Transport/echo.php" role="php" />
-+ <file name="lib/Horde/Kolab/Filter/Transport/lda.php" role="php" />
-+ <file name="lib/Horde/Kolab/Filter/Transport/lmtp.php" role="php" />
-+ <file name="lib/Horde/Kolab/Filter/Transport/LMTPTLS.php" role="php" />
-+ <file name="lib/Horde/Kolab/Filter/Transport/smtp.php" role="php" />
-+ <file name="lib/Horde/Kolab/Filter/Transport/stdout.php" role="php" />
-+ <file name="lib/Horde/Kolab/Filter/Content.php" role="php" />
-+ <file name="lib/Horde/Kolab/Filter/Base.php" role="php" />
-+ <file name="lib/Horde/Kolab/Filter/Incoming.php" role="php" />
-+ <file name="lib/Horde/Kolab/Filter/Outlook.php" role="php" />
-+ <file name="lib/Horde/Kolab/Filter/Response.php" role="php" />
-+ <file name="lib/Horde/Kolab/Filter/Transport.php" role="php" />
-+ <file name="lib/Horde/Kolab/Resource.php" role="php" />
-+ <file baseinstalldir="/" name="script/Horde/Kolab/Filter/kolabfilter.php" role="script">
+- <file md5sum="cc30187fe2abc2860ba69f5fa11c7e59" name="doc/Horde/Kolab/Filter/kolabfilter.1" role="doc" />
+- <file md5sum="ce04167f9b461b04264e4922f6218fae" name="lib/Horde/Kolab/Test/Filter.php" role="php" />
+- <file md5sum="f58645b33bc001e962df0b28b30329bd" name="lib/Horde/Kolab/Filter/Transport/drop.php" role="php" />
+- <file md5sum="3389d5e44b4e5e284ff9cea2f3f5e6da" name="lib/Horde/Kolab/Filter/Transport/DovecotLDA.php" role="php" />
+- <file md5sum="12f67f3b4a3d12c83a9a8109c591236c" name="lib/Horde/Kolab/Filter/Transport/echo.php" role="php" />
+- <file md5sum="add4027acc1170e641fb306ac8a3d8f6" name="lib/Horde/Kolab/Filter/Transport/lda.php" role="php" />
+- <file md5sum="6a20c01ed862d8f05b1ad300cb46a5de" name="lib/Horde/Kolab/Filter/Transport/lmtp.php" role="php" />
+- <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="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 baseinstalldir="/" md5sum="a04649dc07394bf7e36de8e66e39e0bc" name="locale/de_DE/LC_MESSAGES/Kolab_Filter.mo" 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" />
++ <file name="lib/Horde/Kolab/Filter/Transport/drop.php" role="php" />
++ <file name="lib/Horde/Kolab/Filter/Transport/DovecotLDA.php" role="php" />
++ <file name="lib/Horde/Kolab/Filter/Transport/echo.php" role="php" />
++ <file name="lib/Horde/Kolab/Filter/Transport/lda.php" role="php" />
++ <file name="lib/Horde/Kolab/Filter/Transport/lmtp.php" role="php" />
++ <file name="lib/Horde/Kolab/Filter/Transport/LMTPTLS.php" role="php" />
++ <file name="lib/Horde/Kolab/Filter/Transport/smtp.php" role="php" />
++ <file name="lib/Horde/Kolab/Filter/Transport/stdout.php" role="php" />
++ <file name="lib/Horde/Kolab/Filter/Content.php" role="php" />
++ <file name="lib/Horde/Kolab/Filter/Base.php" role="php" />
++ <file name="lib/Horde/Kolab/Filter/Incoming.php" role="php" />
++ <file name="lib/Horde/Kolab/Filter/Outlook.php" role="php" />
++ <file name="lib/Horde/Kolab/Filter/Response.php" role="php" />
++ <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="script/Horde/Kolab/Filter/kolabfilter.php" role="script">
<replace from="@php_bin@" to="php_bin" type="pear-config" />
</file>
-- <file baseinstalldir="/" md5sum="02728c0fcd56fd36580876ade0070f4e" name="script/Horde/Kolab/Filter/kolabmailboxfilter.php" role="script">
-+ <file baseinstalldir="/" name="script/Horde/Kolab/Filter/kolabmailboxfilter.php" role="script">
+- <file baseinstalldir="/" md5sum="5612ff8f00eb51b7498a1d6b818be870" name="script/Horde/Kolab/Filter/kolabmailboxfilter.php" role="script">
++ <file baseinstalldir="/" name="script/Horde/Kolab/Filter/kolabmailboxfilter.php" role="script">
<replace from="@php_bin@" to="php_bin" type="pear-config" />
</file>
-- <file md5sum="7b4a59f5af7fd081c6dcb34e0e2d7d64" name="test/Horde/Kolab/Filter/fixtures/big.eml" role="test" />
- <file md5sum="ac0bba09a50305b9300bdbb5bafdfe1a" name="test/Horde/Kolab/Filter/fixtures/empty.eml" role="test" />
-- <file md5sum="37b8eb78c7262eca91f7e9ec116afe51" name="test/Horde/Kolab/Filter/fixtures/forged.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="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="aab3b6f62040abdcae54fbeb0f55e0ab" name="test/Horde/Kolab/Filter/fixtures/simple.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" />
+- <file md5sum="a3224ffae8b641169973acffc9108b48" name="test/Horde/Kolab/Filter/fixtures/simple2.ret" role="test" />
+- <file md5sum="ec7e32766682d5e9abe4b32c26970352" name="test/Horde/Kolab/Filter/fixtures/simple_out.ret" role="test" />
- <file md5sum="b0ea249ca264345ff104cc9c03505489" name="test/Horde/Kolab/Filter/fixtures/test.eml" role="test" />
-- <file md5sum="e37839af32d47b1fe5cea64d849b1380" name="test/Horde/Kolab/Filter/fixtures/tiny.eml" role="test" />
-- <file md5sum="cdc4efacb1380a45119399ac417f48f2" name="test/Horde/Kolab/Filter/fixtures/vacation.eml" role="test" />
-- <file md5sum="8e55238d08aac9b6e01ff90e45fb4a65" name="test/Horde/Kolab/Filter/AllTests.php" role="test" />
-- <file md5sum="12d19e92b5fbb7ede6280a24333cf458" name="test/Horde/Kolab/Filter/FilterTest.php" role="test" />
-- <file md5sum="c4840ac3d74694c8675e9d71caeeb0b7" name="test/Horde/Kolab/Filter/ContentTest.php" role="test" />
-- <file md5sum="dd85ed08a04f1025ae5711209234785d" name="test/Horde/Kolab/Filter/IncomingTest.php" role="test" />
-- <file md5sum="8182223c201033f15530304cf1524c48" name="test/Horde/Kolab/Filter/LoadTest.php" role="test" />
-- <file md5sum="3691ab2d3d6c51d7bc03995d16960967" name="test/Horde/Kolab/Filter/ResourceTest.php" role="test" />
-- <file md5sum="fbc093901857fcd118f065f900982c24" name="COPYING" role="doc" />
-+ <file name="test/Horde/Kolab/Filter/fixtures/big.eml" role="test" />
-+ <file name="test/Horde/Kolab/Filter/fixtures/empty.eml" role="test" />
-+ <file name="test/Horde/Kolab/Filter/fixtures/forged.eml" role="test" />
-+ <file name="test/Horde/Kolab/Filter/fixtures/recur_invitation.eml" role="test" />
-+ <file name="test/Horde/Kolab/Filter/fixtures/simple.eml" role="test" />
-+ <file name="test/Horde/Kolab/Filter/fixtures/simple.ret" role="test" />
-+ <file name="test/Horde/Kolab/Filter/fixtures/test.eml" role="test" />
-+ <file name="test/Horde/Kolab/Filter/fixtures/tiny.eml" role="test" />
-+ <file name="test/Horde/Kolab/Filter/fixtures/vacation.eml" role="test" />
-+ <file name="test/Horde/Kolab/Filter/AllTests.php" role="test" />
-+ <file name="test/Horde/Kolab/Filter/FilterTest.php" role="test" />
-+ <file name="test/Horde/Kolab/Filter/ContentTest.php" role="test" />
-+ <file name="test/Horde/Kolab/Filter/IncomingTest.php" role="test" />
-+ <file name="test/Horde/Kolab/Filter/LoadTest.php" role="test" />
-+ <file name="test/Horde/Kolab/Filter/ResourceTest.php" role="test" />
-+ <file name="COPYING" role="doc" />
+- <file md5sum="31b3b765510ac228006ac6c4aa61096f" name="test/Horde/Kolab/Filter/fixtures/tiny.eml" role="test" />
+- <file md5sum="51c659ed0b4fca39c582083c54a33f8d" name="test/Horde/Kolab/Filter/fixtures/tiny.ret" role="test" />
+- <file md5sum="31ebf918e881817516acf28d147e6899" name="test/Horde/Kolab/Filter/fixtures/vacation.eml" role="test" />
+- <file md5sum="34f97d1bedc888143175fbbcacbd5a3d" name="test/Horde/Kolab/Filter/fixtures/vacation.ret" role="test" />
+- <file md5sum="a645d758ee073d6fa3493ce31802d50f" name="test/Horde/Kolab/Filter/fixtures/validation.eml" role="test" />
+- <file md5sum="bf3397e22f1e04c9ecd110371e0f4dd9" name="test/Horde/Kolab/Filter/fixtures/validation.ret" role="test" />
+- <file md5sum="54eabf6b3031ee0055e2f243b23cc587" name="test/Horde/Kolab/Filter/AllTests.php" role="test" />
+- <file md5sum="401a754649c24d2a1bd6dc1ebac31819" name="test/Horde/Kolab/Filter/FilterTest.php" role="test" />
+- <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="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" />
++ <file name="test/Horde/Kolab/Filter/fixtures/forged.eml" role="test" />
++ <file name="test/Horde/Kolab/Filter/fixtures/forged.ret" role="test" />
++ <file name="test/Horde/Kolab/Filter/fixtures/forged_trans.ret" role="test" />
++ <file name="test/Horde/Kolab/Filter/fixtures/invitation_forward.eml" role="test" />
++ <file name="test/Horde/Kolab/Filter/fixtures/invitation_forward.ret" role="test" />
++ <file name="test/Horde/Kolab/Filter/fixtures/longstring_invitation.eml" role="test" />
++ <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_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" />
++ <file name="test/Horde/Kolab/Filter/fixtures/simple2.ret" role="test" />
++ <file name="test/Horde/Kolab/Filter/fixtures/simple_out.ret" role="test" />
++ <file name="test/Horde/Kolab/Filter/fixtures/test.eml" role="test" />
++ <file name="test/Horde/Kolab/Filter/fixtures/tiny.eml" role="test" />
++ <file name="test/Horde/Kolab/Filter/fixtures/tiny.ret" role="test" />
++ <file name="test/Horde/Kolab/Filter/fixtures/vacation.eml" role="test" />
++ <file name="test/Horde/Kolab/Filter/fixtures/vacation.ret" role="test" />
++ <file name="test/Horde/Kolab/Filter/fixtures/validation.eml" role="test" />
++ <file name="test/Horde/Kolab/Filter/fixtures/validation.ret" role="test" />
++ <file name="test/Horde/Kolab/Filter/AllTests.php" role="test" />
++ <file name="test/Horde/Kolab/Filter/FilterTest.php" role="test" />
++ <file name="test/Horde/Kolab/Filter/ContentTest.php" role="test" />
++ <file name="test/Horde/Kolab/Filter/IncomingTest.php" role="test" />
++ <file name="test/Horde/Kolab/Filter/LoadTest.php" role="test" />
++ <file name="test/Horde/Kolab/Filter/ResourceTest.php" role="test" />
++ <file name="COPYING" role="doc" />
</dir>
</contents>
<dependencies>
Deleted: php-kolab-filter/trunk/debian/patches/20-install-path-correction.diff
===================================================================
--- php-kolab-filter/trunk/debian/patches/20-install-path-correction.diff 2009-03-06 22:05:34 UTC (rev 1208)
+++ php-kolab-filter/trunk/debian/patches/20-install-path-correction.diff 2009-03-06 22:26:02 UTC (rev 1209)
@@ -1,19 +0,0 @@
-Goal: Correct LoadTest.php installation path
-
-Author: Mathieu Parent <math.parent at gmail.com>
-
-Upstream status: Talk on IRC
-
-Index: b/package.xml
-===================================================================
---- a/package.xml
-+++ b/package.xml
-@@ -140,7 +140,7 @@
- <install as="Horde/Kolab/Filter/ContentTest.php" name="test/Horde/Kolab/Filter/ContentTest.php" />
- <install as="Horde/Kolab/Filter/FilterTest.php" name="test/Horde/Kolab/Filter/FilterTest.php" />
- <install as="Horde/Kolab/Filter/IncomingTest.php" name="test/Horde/Kolab/Filter/IncomingTest.php" />
-- <install as="Horde/Kolab/Filter/IncomingTest.php" name="test/Horde/Kolab/Filter/LoadTest.php" />
-+ <install as="Horde/Kolab/Filter/LoadTest.php" name="test/Horde/Kolab/Filter/LoadTest.php" />
- <install as="Horde/Kolab/Filter/ResourceTest.php" name="test/Horde/Kolab/Filter/ResourceTest.php" />
- <install as="Horde/Kolab/Filter/fixtures/big.eml" name="test/Horde/Kolab/Filter/fixtures/big.eml" />
- <install as="Horde/Kolab/Filter/fixtures/empty.eml" name="test/Horde/Kolab/Filter/fixtures/empty.eml" />
Modified: php-kolab-filter/trunk/debian/patches/30-horde-path.diff
===================================================================
--- php-kolab-filter/trunk/debian/patches/30-horde-path.diff 2009-03-06 22:05:34 UTC (rev 1208)
+++ php-kolab-filter/trunk/debian/patches/30-horde-path.diff 2009-03-06 22:26:02 UTC (rev 1209)
@@ -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.3/lib/Horde/Kolab/Filter/Base.php
+Index: b/Kolab_Filter-0.1.5/lib/Horde/Kolab/Filter/Base.php
===================================================================
---- a/Kolab_Filter-0.1.3/lib/Horde/Kolab/Filter/Base.php
-+++ b/Kolab_Filter-0.1.3/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
@@ -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.3/lib/Horde/Kolab/Filter/Outlook.php
+Index: b/Kolab_Filter-0.1.5/lib/Horde/Kolab/Filter/Outlook.php
===================================================================
---- a/Kolab_Filter-0.1.3/lib/Horde/Kolab/Filter/Outlook.php
-+++ b/Kolab_Filter-0.1.3/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
@@ -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.3/lib/Horde/Kolab/Resource.php
+Index: b/Kolab_Filter-0.1.5/lib/Horde/Kolab/Resource.php
===================================================================
---- a/Kolab_Filter-0.1.3/lib/Horde/Kolab/Resource.php
-+++ b/Kolab_Filter-0.1.3/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
@@ -5,6 +5,11 @@
* @package Kolab_Filter
*/
@@ -53,10 +53,10 @@
/** Load the iCal handling */
require_once 'Horde/iCalendar.php';
-Index: b/Kolab_Filter-0.1.3/test/Horde/Kolab/Filter/ContentTest.php
+Index: b/Kolab_Filter-0.1.5/test/Horde/Kolab/Filter/ContentTest.php
===================================================================
---- a/Kolab_Filter-0.1.3/test/Horde/Kolab/Filter/ContentTest.php
-+++ b/Kolab_Filter-0.1.3/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
@@ -13,6 +13,11 @@
require_once 'PHPUnit/Framework.php';
require_once 'PHPUnit/Extensions/OutputTestCase.php';
@@ -69,10 +69,10 @@
require_once 'Horde.php';
require_once 'Horde/Kolab/Filter/Content.php';
-Index: b/Kolab_Filter-0.1.3/test/Horde/Kolab/Filter/FilterTest.php
+Index: b/Kolab_Filter-0.1.5/test/Horde/Kolab/Filter/FilterTest.php
===================================================================
---- a/Kolab_Filter-0.1.3/test/Horde/Kolab/Filter/FilterTest.php
-+++ b/Kolab_Filter-0.1.3/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
@@ -13,6 +13,11 @@
require_once 'PHPUnit/Framework.php';
require_once 'PHPUnit/Extensions/OutputTestCase.php';
@@ -85,10 +85,10 @@
require_once 'Horde.php';
require_once 'Horde/Kolab/Filter/Incoming.php';
-Index: b/Kolab_Filter-0.1.3/test/Horde/Kolab/Filter/IncomingTest.php
+Index: b/Kolab_Filter-0.1.5/test/Horde/Kolab/Filter/IncomingTest.php
===================================================================
---- a/Kolab_Filter-0.1.3/test/Horde/Kolab/Filter/IncomingTest.php
-+++ b/Kolab_Filter-0.1.3/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
@@ -17,6 +17,11 @@
*/
require_once 'PHPUnit/Extensions/OutputTestCase.php';
@@ -101,10 +101,10 @@
require_once 'Horde.php';
require_once 'Horde/Kolab/Filter/Incoming.php';
-Index: b/Kolab_Filter-0.1.3/test/Horde/Kolab/Filter/LoadTest.php
+Index: b/Kolab_Filter-0.1.5/test/Horde/Kolab/Filter/LoadTest.php
===================================================================
---- a/Kolab_Filter-0.1.3/test/Horde/Kolab/Filter/LoadTest.php
-+++ b/Kolab_Filter-0.1.3/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
@@ -13,6 +13,11 @@
require_once 'PHPUnit/Framework.php';
require_once 'PHPUnit/Extensions/PerformanceTestCase.php';
@@ -117,10 +117,10 @@
require_once 'Horde.php';
require_once 'Horde/Kolab/Filter/Incoming.php';
-Index: b/Kolab_Filter-0.1.3/test/Horde/Kolab/Filter/ResourceTest.php
+Index: b/Kolab_Filter-0.1.5/test/Horde/Kolab/Filter/ResourceTest.php
===================================================================
---- a/Kolab_Filter-0.1.3/test/Horde/Kolab/Filter/ResourceTest.php
-+++ b/Kolab_Filter-0.1.3/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
@@ -12,6 +12,11 @@
*/
require_once 'Horde/Kolab/Test.php';
Deleted: php-kolab-filter/trunk/debian/patches/70-manpages.diff
===================================================================
--- php-kolab-filter/trunk/debian/patches/70-manpages.diff 2009-03-06 22:05:34 UTC (rev 1208)
+++ php-kolab-filter/trunk/debian/patches/70-manpages.diff 2009-03-06 22:26:02 UTC (rev 1209)
@@ -1,63 +0,0 @@
-Goal: Add manpages for kolabfilter and kolabmailboxfilter
-
-Author: Mathieu Parent <math.parent at gmail.com>
-
-Upstream status: https://www.intevation.de/roundup/kolab/issue3364
-
-Index: b/Kolab_Filter-0.1.3/man1/kolabfilter.pod
-===================================================================
---- /dev/null
-+++ b/Kolab_Filter-0.1.3/man1/kolabfilter.pod
-@@ -0,0 +1,52 @@
-+=head1 NAME
-+
-+kolabfilter, kolabmailboxfilter - Kolab filters
-+
-+=head1 SYNOPSIS
-+
-+B<kolabfilter> B<--sender>=I<sender> B<--recipient>=I<recipient> B<--host>=I<host> B<--client>=I<client> B<--user>=I<user> B<--config>=I<config>
-+
-+B<kolabmailboxfilter> B<--sender>=I<sender> B<--recipient>=I<recipient> B<--host>=I<host> B<--client>=I<client> B<--user>=I<user> B<--config>=I<config>
-+
-+=head1 DESCRIPTION
-+
-+B<kolabfilter> is a filter for outgoing mail on a Kolab Server. It rewrites headers and handles
-+Outlook issues.
-+
-+B<kolabmailboxfilter> is a filter for incoming mail on a Kolab Server. It checks the messages for iCal
-+data and handles automatic invitations.
-+
-+=head1 OPTIONS
-+
-+=over 8
-+
-+=item B<-s> I<sender>|B<--sender>=I<sender>
-+
-+The message sender.
-+
-+=item B<-r> I<recipient>|B<--recipient>=I<recipient>
-+
-+A message recipient (can be repeated).
-+
-+=item B<-H> I<host>|B<--host>=I<host>
-+
-+The host running this script.
-+
-+=item B<-c> I<client>|B<--client>=I<client>
-+
-+The client sending the message.
-+
-+=item B<-u> I<user>|B<--user>=I<user>
-+
-+ID of the currently authenticated user.
-+
-+=item B<-C> I<config>|B<--config>=I<config>
-+
-+Path to the configuration file for this filter.
-+
-+=back
-+
-+=head1 COPYRIGHT AND AUTHORS
-+
-+Copyright 2004-2008 Klarälvdalens Datakonsult AB
-+
Modified: php-kolab-filter/trunk/debian/patches/series
===================================================================
--- php-kolab-filter/trunk/debian/patches/series 2009-03-06 22:05:34 UTC (rev 1208)
+++ php-kolab-filter/trunk/debian/patches/series 2009-03-06 22:26:02 UTC (rev 1209)
@@ -1,4 +1,2 @@
10-remove-md5.diff
-20-install-path-correction.diff
30-horde-path.diff
-70-manpages.diff
Copied: php-kolab-filter/trunk/debian/php-kolab-filter.dirs (from rev 1207, php-kolab-filter/trunk/debian/dirs)
===================================================================
--- php-kolab-filter/trunk/debian/php-kolab-filter.dirs (rev 0)
+++ php-kolab-filter/trunk/debian/php-kolab-filter.dirs 2009-03-06 22:26:02 UTC (rev 1209)
@@ -0,0 +1 @@
+usr/share/php
Property changes on: php-kolab-filter/trunk/debian/php-kolab-filter.dirs
___________________________________________________________________
Name: svn:mergeinfo
+
Added: php-kolab-filter/trunk/debian/php-kolab-filter.links
===================================================================
--- php-kolab-filter/trunk/debian/php-kolab-filter.links (rev 0)
+++ php-kolab-filter/trunk/debian/php-kolab-filter.links 2009-03-06 22:26:02 UTC (rev 1209)
@@ -0,0 +1 @@
+usr/share/man/man1/kolabfilter.1 usr/share/man/man1/kolabmailboxfilter.1
Modified: php-kolab-filter/trunk/debian/rules
===================================================================
--- php-kolab-filter/trunk/debian/rules 2009-03-06 22:05:34 UTC (rev 1208)
+++ php-kolab-filter/trunk/debian/rules 2009-03-06 22:26:02 UTC (rev 1209)
@@ -8,8 +8,10 @@
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
common-install-indep::
+ # remove license file
+ rm $(DEB_DESTDIR)usr/share/doc/php-kolab-filter/COPYING
+ # remove pear registry cache
rm -r $(DEB_DESTDIR)usr/share/php/.registry/.channel.pear.horde.org
rmdir $(DEB_DESTDIR)usr/share/php/.registry
- pod2man $(PEAR_SOURCE_DIR)/man1/kolabfilter.pod > $(DEB_DESTDIR)usr/share/man/man1/kolabfilter.1
- ln -s kolabfilter.1 $(DEB_DESTDIR)usr/share/man/man1/kolabmailboxfilter.1
-
+ # move man pages to correct location
+ mv $(DEB_DESTDIR)usr/share/doc/php-kolab-filter/man $(DEB_DESTDIR)usr/share/
More information about the pkg-kolab-devel
mailing list