[Fusionforge-commits] r8388 - in branches/Branch_4_8/gforge/debian: . patches

Roland Mas lolando at libremir.placard.fr.eu.org
Wed Nov 18 18:11:24 CET 2009


Author: lolando
Date: 2009-11-18 18:11:24 +0100 (Wed, 18 Nov 2009)
New Revision: 8388

Added:
   branches/Branch_4_8/gforge/debian/patches/use-nusoap-from-distro.dpatch
Modified:
   branches/Branch_4_8/gforge/debian/changelog
   branches/Branch_4_8/gforge/debian/control
   branches/Branch_4_8/gforge/debian/patches/00list
   branches/Branch_4_8/gforge/debian/rules
Log:
No longer ship copy of nusoap, adding dependency on libnusoap-php instead (Closes: #529575)


Modified: branches/Branch_4_8/gforge/debian/changelog
===================================================================
--- branches/Branch_4_8/gforge/debian/changelog	2009-11-18 17:11:14 UTC (rev 8387)
+++ branches/Branch_4_8/gforge/debian/changelog	2009-11-18 17:11:24 UTC (rev 8388)
@@ -3,8 +3,10 @@
   * Fix copyright file to mention nusoap.
   * Fix location of Vcs-Bzr: sources repository.
   * Fix problem in use-snoopy-from-distro.dpatch containing .rej changes.
+  * No longer ship copy of nusoap, adding dependency on libnusoap-php
+    instead (Closes: #529575).
   
- -- Olivier Berger <olivier.berger at it-sudparis.eu>  Sat, 14 Nov 2009 11:14:39 +0100
+ -- Olivier Berger <olivier.berger at it-sudparis.eu>  Sat, 14 Nov 2009 11:16:10 +0100
 
 gforge (4.8.1-3) unstable; urgency=low
 

Modified: branches/Branch_4_8/gforge/debian/control
===================================================================
--- branches/Branch_4_8/gforge/debian/control	2009-11-18 17:11:14 UTC (rev 8387)
+++ branches/Branch_4_8/gforge/debian/control	2009-11-18 17:11:24 UTC (rev 8388)
@@ -39,7 +39,7 @@
 
 Package: gforge-web-apache2
 Architecture: all
-Depends: gforge-common, gforge-db-postgresql | gforge-db, libapache2-mod-php5, php5-cgi, php5-pgsql, php5-gd, perl, perl-suid, libdbi-perl, libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, cronolog, python, ssl-cert, ${misc:Depends}
+Depends: gforge-common, gforge-db-postgresql | gforge-db, libapache2-mod-php5, php5-cgi, php5-pgsql, php5-gd, perl, perl-suid, libdbi-perl, libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, cronolog, python, ssl-cert, libnusoap-php, ${misc:Depends}
 Recommends: libphp-jpgraph, locales | locales-all
 Provides: gforge-web
 Conflicts: gforge-web

Modified: branches/Branch_4_8/gforge/debian/patches/00list
===================================================================
--- branches/Branch_4_8/gforge/debian/patches/00list	2009-11-18 17:11:14 UTC (rev 8387)
+++ branches/Branch_4_8/gforge/debian/patches/00list	2009-11-18 17:11:24 UTC (rev 8388)
@@ -2,3 +2,5 @@
 disable-tracker-reply-by-email
 use-snoopy-from-distro
 disable-dav
+use-nusoap-from-distro
+

Added: branches/Branch_4_8/gforge/debian/patches/use-nusoap-from-distro.dpatch
===================================================================
--- branches/Branch_4_8/gforge/debian/patches/use-nusoap-from-distro.dpatch	                        (rev 0)
+++ branches/Branch_4_8/gforge/debian/patches/use-nusoap-from-distro.dpatch	2009-11-18 17:11:24 UTC (rev 8388)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## use-nusoap-from-distro.dpatch by Olivier Berger <olivier.berger at it-sudparis.eu>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use the Debian nusoap from libusoap-php
+
+ at DPATCH@
+
+=== modified file 'gforge/www/soap/index.php'
+--- gforge/www/soap/index.php	2009-04-03 14:47:39 +0000
++++ gforge/www/soap/index.php	2009-11-14 08:25:56 +0000
+@@ -11,7 +11,8 @@
+ 
+ $uri = 'http://'.$sys_default_domain;
+ // 1. include client and server
+-require_once $gfwww.'soap/nusoap.php';
++#require_once $gfwww.'soap/nusoap.php';
++require_once '/usr/share/php/nusoap/nusoap.php';
+ //$debug = true;
+ // 2. instantiate server object
+ $server = new soap_server();
+

Modified: branches/Branch_4_8/gforge/debian/rules
===================================================================
--- branches/Branch_4_8/gforge/debian/rules	2009-11-18 17:11:14 UTC (rev 8387)
+++ branches/Branch_4_8/gforge/debian/rules	2009-11-18 17:11:24 UTC (rev 8388)
@@ -129,6 +129,9 @@
 	# Remove Snoopy class from binary packages (provided by libphp-snoopy)
 	for i in $(addprefix $(CURDIR)/debian/,$(shell dh_listpackages)) ; do find $$i -name Snoopy.class.php | xargs rm -rf ; done
 
+	# Remove nusoap class from binary packages (provided by libnusoap-php)
+	for i in $(addprefix $(CURDIR)/debian/,$(shell dh_listpackages)) ; do find $$i -name nusoap.php | xargs rm -rf ; done
+
 	# Remove potential SCM artefacts from binary packages
 	for i in $(addprefix $(CURDIR)/debian/,$(shell dh_listpackages)) ; do find $$i -name .svn -or -name {arch} -or -name .arch-ids -or -name .bzr -or -name .cvsignore | xargs rm -rf ; done
 	# Also remove uuencoded files




More information about the Fusionforge-commits mailing list