[pgv-svn] r36 - phpgedview/trunk/debian

[Thijs Kinkhorst]

Author: kink-guest
Date: 2006-07-03 10:44:20 +0000 (Mon, 03 Jul 2006)
New Revision: 36

Modified:
   phpgedview/trunk/debian/control
   phpgedview/trunk/debian/rules
Log:
do not use packaged PEAR DB, SOAP but depend on Debian's and
remove the from the package


Modified: phpgedview/trunk/debian/control
===================================================================
--- phpgedview/trunk/debian/control	2006-07-03 10:28:27 UTC (rev 35)
+++ phpgedview/trunk/debian/control	2006-07-03 10:44:20 UTC (rev 36)
@@ -8,7 +8,7 @@
 
 Package: phpgedview
 Architecture: all
-Depends: libapache2-mod-php4 (>= 4:4.3) | libapache-mod-php4 | php4 (>= 4:4.3) | php4-cgi (>= 4:4.3) | libapache2-mod-php5 | libapache-mod-php5 | php5 | php5-cgi , apache2 | httpd
+Depends: libapache2-mod-php4 (>= 4:4.3) | libapache-mod-php4 | php4 (>= 4:4.3) | php4-cgi (>= 4:4.3) | libapache2-mod-php5 | libapache-mod-php5 | php5 | php5-cgi , apache2 | httpd, php4-pear | php-pear, php-db, php-soap
 Suggests: php4-gd
 Description: Web-based genealogy viewer and editor
  PhpGedView is a web-based genealogy program which allows you to view and edit

Modified: phpgedview/trunk/debian/rules
===================================================================
--- phpgedview/trunk/debian/rules	2006-07-03 10:28:27 UTC (rev 35)
+++ phpgedview/trunk/debian/rules	2006-07-03 10:44:20 UTC (rev 36)
@@ -7,7 +7,14 @@
 
 binary-fixup/phpgedview::
 	find debian/phpgedview/ -type f -print0 | xargs -0r chmod a-x
+	# spurious licence
 	rm -f debian/phpgedview/usr/share/phpgedview/www/ufpdf/LICENSE.txt
+	# drop PEAR stuff since we use the Debian package
+	rm -rf debian/phpgedview/usr/share/phpgedview/www/DB/ \
+		debian/phpgedview/usr/share/phpgedview/www/SOAP/ \
+		debian/phpgedview/usr/share/phpgedview/www/DB.php \
+		debian/phpgedview/usr/share/phpgedview/www/PEAR.php
+	# prepare writable dir
 	chgrp www-data debian/phpgedview/var/lib/phpgedview
 	chmod 0770 debian/phpgedview/var/lib/phpgedview
 	mv debian/phpgedview/usr/share/lintian/overrides/phpgedview.lintian \