[Pkg-php-commits] r1080 - php5/trunk/debian

[Raphael Geissert]

tags 482517 pending
thanks

Author: atomo64-guest
Date: 2008-05-25 17:22:00 +0000 (Sun, 25 May 2008)
New Revision: 1080

Modified:
   php5/trunk/debian/changelog
   php5/trunk/debian/control
   php5/trunk/debian/rules
Log:
Lintian-based changes:
 - also install a lintian override for libapache2-mod-php5filter
 - fixed the generic lintian overrides so they are meaningful
 - dropping linda overrides, linda is gone now
 - s/meta-package/metapackage
debian/control: updated php5's description so it mentions three instead of
 only two server-side SAPIs
debian/control: Depend on php5-cli in php-pear (Closes: #482517)
 + Previous change reverted because of lots of FTBFS from the PEAR packages


Modified: php5/trunk/debian/changelog
===================================================================
--- php5/trunk/debian/changelog	2008-05-18 19:55:59 UTC (rev 1079)
+++ php5/trunk/debian/changelog	2008-05-25 17:22:00 UTC (rev 1080)
@@ -3,10 +3,17 @@
   * NOT RELEASED YET
 
   [ Raphael Geissert ]
-  * debian/rules: also add a lintian override for libapache2-mod-php5filter
-  * debian/rules: fixed the generic lintian overrides so they are meaningful
+  * Lintian-based changes:
+    - also install a lintian override for libapache2-mod-php5filter
+    - fixed the generic lintian overrides so they are meaningful
+    - dropping linda overrides, linda is gone now
+    - s/meta-package/metapackage
+  * debian/control: updated php5's description so it mentions three instead of
+    only two server-side SAPIs
+  * debian/control: Depend on php5-cli in php-pear (Closes: #482517)
+    + Previous change reverted because of lots of FTBFS from the PEAR packages
 
- -- Raphael Geissert <atomo64 at gmail.com>  Sun, 18 May 2008 10:06:23 -0500
+ -- Raphael Geissert <atomo64 at gmail.com>  Sun, 25 May 2008 12:21:11 -0500
 
 php5 (5.2.6-1) unstable; urgency=medium
 

Modified: php5/trunk/debian/control
===================================================================
--- php5/trunk/debian/control	2008-05-18 19:55:59 UTC (rev 1079)
+++ php5/trunk/debian/control	2008-05-25 17:22:00 UTC (rev 1080)
@@ -13,10 +13,10 @@
 Package: php5
 Architecture: all
 Depends: libapache2-mod-php5 (>= ${source:Version}) | libapache2-mod-php5filter (>= ${source:Version}) | php5-cgi (>= ${source:Version}), php5-common (>= ${source:Version})
-Description: server-side, HTML-embedded scripting language (meta-package)
- This package is a meta-package that, when installed, guarantees that you
- have at least one of the two server-side versions of the PHP5 interpreter
- installed.  Removing this package won't remove PHP5 from your system, however
+Description: server-side, HTML-embedded scripting language (metapackage)
+ This package is a metapackage that, when installed, guarantees that you
+ have at least one of the three server-side versions of the PHP5 interpreter
+ installed. Removing this package won't remove PHP5 from your system, however
  it may remove other packages that depend on this one.
  .
  PHP5 is an HTML-embedded scripting language. Much of its syntax is borrowed
@@ -144,8 +144,8 @@
 
 Package: php-pear
 Architecture: all
-Depends: php5-common (>= ${source:Version})
-Recommends: php5-cli | php4-cli, gnupg
+Depends: php5-common (>= ${source:Version}), php5-cli | php4-cli
+Recommends: gnupg
 Suggests: php5-dev | php4-dev
 Replaces: php4-pear (<< 4:4.4.0-0)
 Description: PEAR - PHP Extension and Application Repository

Modified: php5/trunk/debian/rules
===================================================================
--- php5/trunk/debian/rules	2008-05-18 19:55:59 UTC (rev 1079)
+++ php5/trunk/debian/rules	2008-05-25 17:22:00 UTC (rev 1080)
@@ -468,6 +468,9 @@
 			> $(CURDIR)/debian/"$$sapi"/usr/share/lintian/overrides/"$$sapi"; \
 	done
 
+	# directories cleanup:
+	-rmdir -p debian/libapache2-mod-php5/usr/share/man/man1
+
 	touch install-stamp
 
 # Build architecture-independent files here.
@@ -551,9 +554,6 @@
 	dh_link -s
 	dh_compress -s -Xphp.ini
 	dh_fixperms -s -X /var/lib/php5
-	mkdir -p debian/php5-common/usr/share/linda/overrides
-	echo "Tag: non-standard-dir-perm" >> debian/php5-common/usr/share/linda/overrides/php5-common
-	echo "Data: /var/lib/php5.*" >> debian/php5-common/usr/share/linda/overrides/php5-common
 	dh_installdeb -s
 	dh_shlibdeps -s