[Pkg-php-commits] r1029 - in php5/trunk/debian: . patches

[Raphael Geissert]

Author: atomo64-guest
Date: 2008-05-01 06:10:21 +0000 (Thu, 01 May 2008)
New Revision: 1029

Modified:
   php5/trunk/debian/changelog
   php5/trunk/debian/patches/manpage_spelling.patch
   php5/trunk/debian/php5.lintian-overrides
   php5/trunk/debian/rules
Log:
Fixed a hyphen-used-as-minus-sign in php5(1):319 reported by lintian
Override the following lintian messages:
 + SAPI packages package-contains-empty-directory usr/lib/php5/20060613+lfs/
 + php5-common package-contains-empty-directory usr/lib/php5/libexec/


Modified: php5/trunk/debian/changelog
===================================================================
--- php5/trunk/debian/changelog	2008-05-01 05:14:18 UTC (rev 1028)
+++ php5/trunk/debian/changelog	2008-05-01 06:10:21 UTC (rev 1029)
@@ -25,12 +25,16 @@
   * debian/NEWS: s/suhosin/Suhosin (Closes: #434351)
   * debian/control: removed ORed postgresql-dev build-dep (Closes: #429981)
     + postgresql-dev is a transitional package since etch
+  * Fixed a hyphen-used-as-minus-sign in php5(1):319 reported by lintian
+  * Override the following lintian messages:
+    + SAPI packages package-contains-empty-directory usr/lib/php5/20060613+lfs/
+    + php5-common package-contains-empty-directory usr/lib/php5/libexec/
 
   [ Steve Langasek ]
   * Step down from the PHP maintenance team, removing myself from uploaders.
     So long, and thanks for all the fish!
 
- -- Raphael Geissert <atomo64 at gmail.com>  Wed, 30 Apr 2008 23:57:29 -0500
+ -- Raphael Geissert <atomo64 at gmail.com>  Thu, 01 May 2008 01:08:02 -0500
 
 php5 (5.2.5-3) unstable; urgency=high
 

Modified: php5/trunk/debian/patches/manpage_spelling.patch
===================================================================
--- php5/trunk/debian/patches/manpage_spelling.patch	2008-05-01 05:14:18 UTC (rev 1028)
+++ php5/trunk/debian/patches/manpage_spelling.patch	2008-05-01 06:10:21 UTC (rev 1029)
@@ -1,7 +1,7 @@
 Index: php5-5.2.5/sapi/cli/php.1.in
 ===================================================================
---- php5-5.2.5.orig/sapi/cli/php.1.in	2008-04-30 23:26:21.000000000 -0500
-+++ php5-5.2.5/sapi/cli/php.1.in	2008-04-30 23:26:58.000000000 -0500
+--- php5-5.2.5.orig/sapi/cli/php.1.in	2008-05-01 01:04:40.000000000 -0500
++++ php5-5.2.5/sapi/cli/php.1.in	2008-05-01 01:07:05.000000000 -0500
 @@ -69,7 +69,7 @@
  You can access the input line by \fB$argn\fP. While processing the input lines
  .B $argi 
@@ -11,7 +11,16 @@
  .IR code
  (see \-r) before and
  after all input lines have been processed respectively. Notice that the
-@@ -339,7 +339,7 @@
+@@ -316,7 +316,7 @@
+ The configuration file for the version of PHP that apache2 uses.
+ .SH EXAMPLES
+ .TP 5
+-\fIphp -r 'echo "Hello World\\n";'\fP
++\fIphp \-r 'echo "Hello World\\n";'\fP
+ This command simply writes the text "Hello World" to standard out.
+ .TP
+ \fIphp \-r 'print_r(gd_info());'\fP
+@@ -340,7 +340,7 @@
  Using this PHP command you can count the lines being input.
  .TP
  \fIphp \-R '@$l+=count(file($argn));' \-E 'echo "Lines:$l\\n";'\fP

Modified: php5/trunk/debian/php5.lintian-overrides
===================================================================
--- php5/trunk/debian/php5.lintian-overrides	2008-05-01 05:14:18 UTC (rev 1028)
+++ php5/trunk/debian/php5.lintian-overrides	2008-05-01 06:10:21 UTC (rev 1029)
@@ -1 +1,2 @@
 php5-common: non-standard-dir-perm var/lib/php5/ 1733 != 0755
+php5-common: package-contains-empty-directory usr/lib/php5/libexec/

Modified: php5/trunk/debian/rules
===================================================================
--- php5/trunk/debian/rules	2008-05-01 05:14:18 UTC (rev 1028)
+++ php5/trunk/debian/rules	2008-05-01 06:10:21 UTC (rev 1029)
@@ -400,6 +400,14 @@
 	# install lintian overrides
 	cp debian/php5.lintian-overrides $(CURDIR)/debian/php5-common/usr/share/lintian/overrides/php5-common
 
+	ext=$(shell $(CURDIR)/debian/php5-dev/usr/bin/php-config5 --extension-dir | cut -b2- ); \
+	for sapi in php5-cli php5-cgi libapache2-mod-php5; do \
+		mkdir -p $(CURDIR)/debian/"$$sapi"/usr/share/lintian/overrides/; \
+		printf "%s: package-contains-empty-directory %s/\n" \
+			"$$sapi" "$${ext}" \
+			> $(CURDIR)/debian/"$$sapi"/usr/share/lintian/overrides/"$$sapi"; \
+	done
+
 	touch install-stamp
 
 # Build architecture-independent files here.