[pkg-kolab] r1373 - php-kolab-filter/trunk/debian php-kolab-freebusy/trunk/debian

[Mathieu Parent]

Author: sathieu
Date: 2009-10-17 17:38:11 +0000 (Sat, 17 Oct 2009)
New Revision: 1373

Modified:
   php-kolab-filter/trunk/debian/changelog
   php-kolab-filter/trunk/debian/rules
   php-kolab-freebusy/trunk/debian/changelog
   php-kolab-freebusy/trunk/debian/rules
Log:
debian/rules: remove usr/share/php/.registry/.channel.doc.php.net only if
empty (fix FTBFS)


Modified: php-kolab-filter/trunk/debian/changelog
===================================================================
--- php-kolab-filter/trunk/debian/changelog	2009-10-17 15:02:34 UTC (rev 1372)
+++ php-kolab-filter/trunk/debian/changelog	2009-10-17 17:38:11 UTC (rev 1373)
@@ -1,9 +1,9 @@
-php-kolab-filter (0.1.5-3~pre5) kolab-snapshots; urgency=low
+php-kolab-filter (0.1.5-3~pre6) kolab-snapshots; urgency=low
 
   * NOT RELEASED YET
   * Bump Standards-Version to 3.8.3: no changes
-  * debian/rules: don't remove usr/share/php/.registry/.channel.doc.php.net
-    anymore (fix FTBFS) 
+  * debian/rules: remove usr/share/php/.registry/.channel.doc.php.net only if
+    empty (fix FTBFS) 
   * Add README.source as required by policy 4.14
   * Change my email address, as I am now Debian developer
   * Depends on php5-imap due to the use of imap_rfc822_parse_adrlist
@@ -11,7 +11,7 @@
     test/Horde/Kolab/Filter/*.php
   * New 40-phpunit.diff: Avoid include errors when running testsuite
 
- -- Mathieu Parent <sathieu at debian.org>  Sat, 17 Oct 2009 16:30:27 +0200
+ -- Mathieu Parent <sathieu at debian.org>  Sat, 17 Oct 2009 19:31:45 +0200
 
 php-kolab-filter (0.1.5-2) unstable; urgency=low
 

Modified: php-kolab-filter/trunk/debian/rules
===================================================================
--- php-kolab-filter/trunk/debian/rules	2009-10-17 15:02:34 UTC (rev 1372)
+++ php-kolab-filter/trunk/debian/rules	2009-10-17 17:38:11 UTC (rev 1373)
@@ -12,3 +12,5 @@
 	rm $(DEB_DESTDIR)usr/share/doc/php-kolab-filter/COPYING
 	# move man pages to correct location
 	mv $(DEB_DESTDIR)usr/share/doc/php-kolab-filter/man $(DEB_DESTDIR)usr/share/
+	# remove empty directory
+	rmdir $(DEB_DESTDIR)usr/share/php/.registry/.channel.doc.php.net ||:

Modified: php-kolab-freebusy/trunk/debian/changelog
===================================================================
--- php-kolab-freebusy/trunk/debian/changelog	2009-10-17 15:02:34 UTC (rev 1372)
+++ php-kolab-freebusy/trunk/debian/changelog	2009-10-17 17:38:11 UTC (rev 1373)
@@ -1,9 +1,9 @@
-php-kolab-freebusy (0.1.5-3~pre5) kolab-snapshots; urgency=low
+php-kolab-freebusy (0.1.5-3~pre6) kolab-snapshots; urgency=low
 
   * NOT RELEASED YET
   * Bump Standards-Version to 3.8.3: no changes
-  * Don't remove usr/share/php/.registry/.channel.doc.php.net
-    anymore (fix FTBFS)
+  * debian/rules: remove usr/share/php/.registry/.channel.doc.php.net only if
+    empty (fix FTBFS)
   * Add README.source as required by policy 4.14
   * Change my email address, as I am now Debian developer
   * links: config.php is now in /usr/share/php/htdocs
@@ -12,7 +12,7 @@
     test/Horde/Kolab/Filter/*.php
   * New 40-phpunit.diff: Avoid include errors when running testsuite
 
- -- Mathieu Parent <sathieu at debian.org>  Sat, 17 Oct 2009 16:45:09 +0200
+ -- Mathieu Parent <sathieu at debian.org>  Sat, 17 Oct 2009 19:32:43 +0200
 
 php-kolab-freebusy (0.1.5-2) unstable; urgency=low
 

Modified: php-kolab-freebusy/trunk/debian/rules
===================================================================
--- php-kolab-freebusy/trunk/debian/rules	2009-10-17 15:02:34 UTC (rev 1372)
+++ php-kolab-freebusy/trunk/debian/rules	2009-10-17 17:38:11 UTC (rev 1373)
@@ -10,3 +10,5 @@
 common-install-indep::
 	# remove license file
 	rm $(DEB_DESTDIR)usr/share/doc/php-kolab-freebusy/COPYING
+	# remove empty directory
+	rmdir $(DEB_DESTDIR)usr/share/php/.registry/.channel.doc.php.net ||: