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

[Raphael Geissert]

tags 331034 pending
thanks

Author: atomo64-guest
Date: 2008-05-02 04:29:51 +0000 (Fri, 02 May 2008)
New Revision: 1033

Added:
   php5/trunk/debian/php-pear.dirs
Modified:
   php5/trunk/debian/changelog
   php5/trunk/debian/php5-common.dirs
   php5/trunk/debian/rules
Log:
Lintian-based changes:
 - debian/php5-common.dirs: do NOT create usr/share/doc/php5-common/PEAR/
 - fixed a hyphen-used-as-minus-sign in php5(1):319
 - get rid of usr/share/php/data/Structures_Graph/LICENSE in php-pear
Move /usr/share/php/docs to /usr/share/doc/pear-php/PEAR (Closes: #331034)


Modified: php5/trunk/debian/changelog
===================================================================
--- php5/trunk/debian/changelog	2008-05-01 21:07:35 UTC (rev 1032)
+++ php5/trunk/debian/changelog	2008-05-02 04:29:51 UTC (rev 1033)
@@ -25,7 +25,6 @@
   * 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/
@@ -62,12 +61,17 @@
       (session.referer_check, session.entropy_file, session.entropy_length)
     - added more information to session configuration (not available in php.ini)
       based on the information at php.net
+  * Lintian-based changes:
+    - debian/php5-common.dirs: do NOT create usr/share/doc/php5-common/PEAR/
+    - fixed a hyphen-used-as-minus-sign in php5(1):319
+    - get rid of usr/share/php/data/Structures_Graph/LICENSE in php-pear
+  * Move /usr/share/php/docs to /usr/share/doc/pear-php/PEAR (Closes: #331034)
 
   [ 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>  Thu, 01 May 2008 16:04:03 -0500
+ -- Raphael Geissert <atomo64 at gmail.com>  Thu, 01 May 2008 23:27:52 -0500
 
 php5 (5.2.5-3) unstable; urgency=high
 

Added: php5/trunk/debian/php-pear.dirs
===================================================================
--- php5/trunk/debian/php-pear.dirs	                        (rev 0)
+++ php5/trunk/debian/php-pear.dirs	2008-05-02 04:29:51 UTC (rev 1033)
@@ -0,0 +1 @@
+/usr/share/doc/php-pear/PEAR

Modified: php5/trunk/debian/php5-common.dirs
===================================================================
--- php5/trunk/debian/php5-common.dirs	2008-05-01 21:07:35 UTC (rev 1032)
+++ php5/trunk/debian/php5-common.dirs	2008-05-02 04:29:51 UTC (rev 1033)
@@ -1,7 +1,6 @@
 /usr/lib/php5/libexec
 /usr/share/lintian/overrides
 /usr/share/doc/php5-common/examples
-/usr/share/doc/php5-common/PEAR
 /usr/share/php5
 /var/lib/php5
 /usr/lib/php5

Modified: php5/trunk/debian/rules
===================================================================
--- php5/trunk/debian/rules	2008-05-01 21:07:35 UTC (rev 1032)
+++ php5/trunk/debian/rules	2008-05-02 04:29:51 UTC (rev 1033)
@@ -335,7 +335,7 @@
 	cd apache2-build && $(MAKE) install-headers install-build install-modules install-programs INSTALL_ROOT=$(CURDIR)/debian/libapache2-mod-php5
 	# remove netware and win32 headers that we don't want
 	cd debian/libapache2-mod-php5/usr/include/php5/ && \
-		  rm -f TSRM/readdir.h \
+		  $(RM) TSRM/readdir.h \
 			TSRM/tsrm_config.nw.h TSRM/tsrm_config.w32.h\
 			TSRM/tsrm_nw.h TSRM/tsrm_win32.h\
 			Zend/zend_config.nw.h Zend/zend_config.w32.h\
@@ -345,6 +345,19 @@
 	# install PEAR
 	cp -r pear-build/* debian/php-pear/
 
+	# everything under usr/share/php/data except 'PEAR' is b0rken
+	# and actually needs to be fixed
+	[ ! -f debian/php-pear/usr/share/php/data/Structures_Graph/LICENSE ] || \
+		$(RM) debian/php-pear/usr/share/php/data/Structures_Graph/LICENSE
+	[ ! -f debian/php-pear/usr/share/php/doc/PEAR/INSTALL ] || \
+		$(RM) debian/php-pear/usr/share/php/doc/PEAR/INSTALL
+	[ -d debian/php-pear/usr/share/php/doc ] && { \
+		mv debian/php-pear/usr/share/php/doc/* debian/php-pear/usr/share/doc/php-pear/PEAR/; \
+		$(RM) -r debian/php-pear/usr/share/php/doc; \
+		ln -s ../doc/php-pear/PEAR debian/php-pear/usr/share/php/doc; \
+	}
+		
+
 	# install extensions
 	ext=`./debian/libapache2-mod-php5/usr/bin/php-config --extension-dir`;\
 	for i in libapache2-mod-php5 php5-cgi php5-cli; do \