[Pkg-php-commits] r961 - in pear: php-auth/trunk/debian php-auth-sasl/trunk/debian php-cache/trunk/debian php-date/trunk/debian php-db/trunk/debian php-file/trunk/debian php-http/trunk/debian php-http-request/trunk/debian php-log/trunk/debian php-mdb2/trunk/debian php-mdb2-driver-mysql/trunk/debian php-net-checkip/trunk/debian php-net-dime/trunk/debian php-net-ftp/trunk/debian php-net-ldap/trunk/debian php-net-sieve/trunk/debian php-net-smtp/trunk/debian php-text-highlighter/trunk/debian php-xml-serializer/trunk/debian php-xml-util/trunk/debian skeleton/debian

Thijs Kinkhorst thijs at alioth.debian.org
Sat Jan 19 18:29:43 UTC 2008


Author: thijs
Date: 2008-01-19 18:29:43 +0000 (Sat, 19 Jan 2008)
New Revision: 961

Modified:
   pear/php-auth-sasl/trunk/debian/rules
   pear/php-auth/trunk/debian/rules
   pear/php-cache/trunk/debian/rules
   pear/php-date/trunk/debian/rules
   pear/php-db/trunk/debian/rules
   pear/php-file/trunk/debian/rules
   pear/php-http-request/trunk/debian/rules
   pear/php-http/trunk/debian/rules
   pear/php-log/trunk/debian/rules
   pear/php-mdb2-driver-mysql/trunk/debian/rules
   pear/php-mdb2/trunk/debian/rules
   pear/php-net-checkip/trunk/debian/rules
   pear/php-net-dime/trunk/debian/rules
   pear/php-net-ftp/trunk/debian/rules
   pear/php-net-ldap/trunk/debian/rules
   pear/php-net-sieve/trunk/debian/rules
   pear/php-net-smtp/trunk/debian/rules
   pear/php-text-highlighter/trunk/debian/rules
   pear/php-xml-serializer/trunk/debian/rules
   pear/php-xml-util/trunk/debian/rules
   pear/skeleton/debian/rules
Log:
add '-f' to pear install, otherwise installation fails on a system
that has the package already installed (PEAR will tell us that the
package is already installed so no more action necessary).


Modified: pear/php-auth/trunk/debian/rules
===================================================================
--- pear/php-auth/trunk/debian/rules	2008-01-19 18:24:58 UTC (rev 960)
+++ pear/php-auth/trunk/debian/rules	2008-01-19 18:29:43 UTC (rev 961)
@@ -31,7 +31,7 @@
 
 	# Add here commands to install the package into debian/package.
 	cp package.xml $(pear_pkg)/package.xml;
-	$(PEAR) install -n -R debian/$(package) $(pear_pkg)/package.xml;
+	$(PEAR) install -f -n -R debian/$(package) $(pear_pkg)/package.xml;
 	rm -f debian/$(package)/usr/share/php/.filemap;
 	rm -f debian/$(package)/usr/share/php/.lock;
 	rm -rf debian/$(package)/usr/share/php/.channels;

Modified: pear/php-auth-sasl/trunk/debian/rules
===================================================================
--- pear/php-auth-sasl/trunk/debian/rules	2008-01-19 18:24:58 UTC (rev 960)
+++ pear/php-auth-sasl/trunk/debian/rules	2008-01-19 18:29:43 UTC (rev 961)
@@ -40,7 +40,7 @@
 
 	# Add here commands to install the package into debian/package.
 	cp package.xml $(pear_pkg)/package.xml;
-	$(PEAR) install -n -R debian/$(package) $(pear_pkg)/package.xml;
+	$(PEAR) install -f -n -R debian/$(package) $(pear_pkg)/package.xml;
 	rm -f debian/$(package)/usr/share/php/.filemap;
 	rm -f debian/$(package)/usr/share/php/.lock;
 	rm -rf debian/$(package)/usr/share/php/.channels;

Modified: pear/php-cache/trunk/debian/rules
===================================================================
--- pear/php-cache/trunk/debian/rules	2008-01-19 18:24:58 UTC (rev 960)
+++ pear/php-cache/trunk/debian/rules	2008-01-19 18:29:43 UTC (rev 961)
@@ -40,7 +40,7 @@
 
 	# Add here commands to install the package into debian/package.
 	cp package.xml $(pear_pkg)/package.xml;
-	$(PEAR) install -n -R debian/$(package) $(pear_pkg)/package.xml;
+	$(PEAR) install -f -n -R debian/$(package) $(pear_pkg)/package.xml;
 	rm -f debian/$(package)/usr/share/php/.filemap;
 	rm -f debian/$(package)/usr/share/php/.lock;
 	rm -rf debian/$(package)/usr/share/php/.channels;

Modified: pear/php-date/trunk/debian/rules
===================================================================
--- pear/php-date/trunk/debian/rules	2008-01-19 18:24:58 UTC (rev 960)
+++ pear/php-date/trunk/debian/rules	2008-01-19 18:29:43 UTC (rev 961)
@@ -31,7 +31,7 @@
 
 	# Add here commands to install the package into debian/package.
 	cp package.xml $(pear_pkg)/package.xml;
-	$(PEAR) install -n -f -R debian/$(package) $(pear_pkg)/package.xml;
+	$(PEAR) install -f -n -f -R debian/$(package) $(pear_pkg)/package.xml;
 	rm -f debian/$(package)/usr/share/php/.filemap;
 	rm -f debian/$(package)/usr/share/php/.lock;
 	rm -rf debian/$(package)/usr/share/php/.channels;

Modified: pear/php-db/trunk/debian/rules
===================================================================
--- pear/php-db/trunk/debian/rules	2008-01-19 18:24:58 UTC (rev 960)
+++ pear/php-db/trunk/debian/rules	2008-01-19 18:29:43 UTC (rev 961)
@@ -38,7 +38,7 @@
 
 	# Add here commands to install the package into debian/package.
 	cp package.xml $(pear_pkg)/package.xml;
-	$(PEAR) install -n -R debian/$(package) $(pear_pkg)/package.xml;
+	$(PEAR) install -f -n -R debian/$(package) $(pear_pkg)/package.xml;
 	rm -f debian/$(package)/usr/share/php/.filemap;
 	rm -f debian/$(package)/usr/share/php/.lock;
 	rm -rf debian/$(package)/usr/share/php/.channels;

Modified: pear/php-file/trunk/debian/rules
===================================================================
--- pear/php-file/trunk/debian/rules	2008-01-19 18:24:58 UTC (rev 960)
+++ pear/php-file/trunk/debian/rules	2008-01-19 18:29:43 UTC (rev 961)
@@ -33,7 +33,7 @@
 
     # Add here commands to install the package into debian/package.
 	cp package.xml $(pear_pkg)/package.xml;
-	$(PEAR) install -n -R debian/$(package) $(pear_pkg)/package.xml;
+	$(PEAR) install -f -n -R debian/$(package) $(pear_pkg)/package.xml;
 	rm -f debian/$(package)/usr/share/php/.filemap;
 	rm -f debian/$(package)/usr/share/php/.lock;
 	rm -rf debian/$(package)/usr/share/php/.channels;

Modified: pear/php-http/trunk/debian/rules
===================================================================
--- pear/php-http/trunk/debian/rules	2008-01-19 18:24:58 UTC (rev 960)
+++ pear/php-http/trunk/debian/rules	2008-01-19 18:29:43 UTC (rev 961)
@@ -40,7 +40,7 @@
 
 	# Add here commands to install the package into debian/package.
 	cp package.xml $(pear_pkg)/package.xml;
-	$(PEAR) install -n -R debian/$(package) $(pear_pkg)/package.xml;
+	$(PEAR) install -f -n -R debian/$(package) $(pear_pkg)/package.xml;
 	rm -f debian/$(package)/usr/share/php/.filemap;
 	rm -f debian/$(package)/usr/share/php/.lock;
 	rm -rf debian/$(package)/usr/share/php/.channels;

Modified: pear/php-http-request/trunk/debian/rules
===================================================================
--- pear/php-http-request/trunk/debian/rules	2008-01-19 18:24:58 UTC (rev 960)
+++ pear/php-http-request/trunk/debian/rules	2008-01-19 18:29:43 UTC (rev 961)
@@ -34,7 +34,7 @@
 
 	# Add here commands to install the package into debian/package.
 	cp package.xml $(pear_pkg)/package.xml;
-	$(PEAR) install -n -R debian/$(package) $(pear_pkg)/package.xml;
+	$(PEAR) install -f -n -R debian/$(package) $(pear_pkg)/package.xml;
 	rm -f debian/$(package)/usr/share/php/.filemap;
 	rm -f debian/$(package)/usr/share/php/.lock;
 	rm -rf debian/$(package)/usr/share/php/.channels;

Modified: pear/php-log/trunk/debian/rules
===================================================================
--- pear/php-log/trunk/debian/rules	2008-01-19 18:24:58 UTC (rev 960)
+++ pear/php-log/trunk/debian/rules	2008-01-19 18:29:43 UTC (rev 961)
@@ -39,7 +39,7 @@
 
 	# Add here commands to install the package into debian/package.
 	cp package.xml $(pear_pkg)/package.xml;
-	$(PEAR) install -n -R debian/$(package) $(pear_pkg)/package.xml;
+	$(PEAR) install -f -n -R debian/$(package) $(pear_pkg)/package.xml;
 	rm -f debian/$(package)/usr/share/php/.filemap;
 	rm -f debian/$(package)/usr/share/php/.lock;
 	rm -rf debian/$(package)/usr/share/php/.channels;

Modified: pear/php-mdb2/trunk/debian/rules
===================================================================
--- pear/php-mdb2/trunk/debian/rules	2008-01-19 18:24:58 UTC (rev 960)
+++ pear/php-mdb2/trunk/debian/rules	2008-01-19 18:29:43 UTC (rev 961)
@@ -40,7 +40,7 @@
 
 	# Add here commands to install the package into debian/package.
 	cp package.xml $(pear_pkg)/package.xml;
-	$(PEAR) install -f -n -R debian/$(package) $(pear_pkg)/package.xml;
+	$(PEAR) install -f -f -n -R debian/$(package) $(pear_pkg)/package.xml;
 	rm -f debian/$(package)/usr/share/php/.filemap;
 	rm -f debian/$(package)/usr/share/php/.lock;
 	rm -rf debian/$(package)/usr/share/php/.channels;

Modified: pear/php-mdb2-driver-mysql/trunk/debian/rules
===================================================================
--- pear/php-mdb2-driver-mysql/trunk/debian/rules	2008-01-19 18:24:58 UTC (rev 960)
+++ pear/php-mdb2-driver-mysql/trunk/debian/rules	2008-01-19 18:29:43 UTC (rev 961)
@@ -40,7 +40,7 @@
 
 	# Add here commands to install the package into debian/package.
 	cp package.xml $(pear_pkg)/package.xml;
-	$(PEAR) install -f -n -R debian/$(package) $(pear_pkg)/package.xml;
+	$(PEAR) install -f -f -n -R debian/$(package) $(pear_pkg)/package.xml;
 	rm -f debian/$(package)/usr/share/php/.filemap;
 	rm -f debian/$(package)/usr/share/php/.lock;
 	rm -rf debian/$(package)/usr/share/php/.channels;

Modified: pear/php-net-checkip/trunk/debian/rules
===================================================================
--- pear/php-net-checkip/trunk/debian/rules	2008-01-19 18:24:58 UTC (rev 960)
+++ pear/php-net-checkip/trunk/debian/rules	2008-01-19 18:29:43 UTC (rev 961)
@@ -40,7 +40,7 @@
 
 	# Add here commands to install the package into debian/package.
 	cp package.xml $(pear_pkg)/package.xml;
-	$(PEAR) install -n -R debian/$(package) $(pear_pkg)/package.xml;
+	$(PEAR) install -f -n -R debian/$(package) $(pear_pkg)/package.xml;
 	rm -f debian/$(package)/usr/share/php/.filemap;
 	rm -f debian/$(package)/usr/share/php/.lock;
 	rm -rf debian/$(package)/usr/share/php/.channels;

Modified: pear/php-net-dime/trunk/debian/rules
===================================================================
--- pear/php-net-dime/trunk/debian/rules	2008-01-19 18:24:58 UTC (rev 960)
+++ pear/php-net-dime/trunk/debian/rules	2008-01-19 18:29:43 UTC (rev 961)
@@ -36,7 +36,7 @@
 
 	# Add here commands to install the package into debian/package.
 	cp package.xml $(pear_pkg)/package.xml;
-	$(PEAR) install -n -R debian/$(package) $(pear_pkg)/package.xml;
+	$(PEAR) install -f -n -R debian/$(package) $(pear_pkg)/package.xml;
 	rm -f debian/$(package)/usr/share/php/.filemap;
 	rm -f debian/$(package)/usr/share/php/.lock;
 	rm -rf debian/$(package)/usr/share/php/.channels;

Modified: pear/php-net-ftp/trunk/debian/rules
===================================================================
--- pear/php-net-ftp/trunk/debian/rules	2008-01-19 18:24:58 UTC (rev 960)
+++ pear/php-net-ftp/trunk/debian/rules	2008-01-19 18:29:43 UTC (rev 961)
@@ -37,7 +37,7 @@
 
 	# Add here commands to install the package into debian/package.
 	cp package.xml $(pear_pkg)/package.xml;
-	$(PEAR) install -n -R debian/$(package) $(pear_pkg)/package.xml;
+	$(PEAR) install -f -n -R debian/$(package) $(pear_pkg)/package.xml;
 	rm -f debian/$(package)/usr/share/php/.filemap;
 	rm -f debian/$(package)/usr/share/php/.lock;
 	rm -rf debian/$(package)/usr/share/php/.channels;

Modified: pear/php-net-ldap/trunk/debian/rules
===================================================================
--- pear/php-net-ldap/trunk/debian/rules	2008-01-19 18:24:58 UTC (rev 960)
+++ pear/php-net-ldap/trunk/debian/rules	2008-01-19 18:29:43 UTC (rev 961)
@@ -36,7 +36,7 @@
 
 	# Add here commands to install the package into debian/package.
 	cp package.xml $(pear_pkg)/package.xml;
-	$(PEAR) install -n -R debian/$(package) $(pear_pkg)/package.xml;
+	$(PEAR) install -f -n -R debian/$(package) $(pear_pkg)/package.xml;
 	rm -f debian/$(package)/usr/share/php/.filemap;
 	rm -f debian/$(package)/usr/share/php/.lock;
 	rm -rf debian/$(package)/usr/share/php/.channels;

Modified: pear/php-net-sieve/trunk/debian/rules
===================================================================
--- pear/php-net-sieve/trunk/debian/rules	2008-01-19 18:24:58 UTC (rev 960)
+++ pear/php-net-sieve/trunk/debian/rules	2008-01-19 18:29:43 UTC (rev 961)
@@ -36,7 +36,7 @@
 
 	# Add here commands to install the package into debian/package.
 	cp package.xml $(pear_pkg)/package.xml;
-	$(PEAR) install -n -R debian/$(package) $(pear_pkg)/package.xml;
+	$(PEAR) install -f -n -R debian/$(package) $(pear_pkg)/package.xml;
 	rm -f debian/$(package)/usr/share/php/.filemap;
 	rm -f debian/$(package)/usr/share/php/.lock;
 	rm -rf debian/$(package)/usr/share/php/.channels;

Modified: pear/php-net-smtp/trunk/debian/rules
===================================================================
--- pear/php-net-smtp/trunk/debian/rules	2008-01-19 18:24:58 UTC (rev 960)
+++ pear/php-net-smtp/trunk/debian/rules	2008-01-19 18:29:43 UTC (rev 961)
@@ -40,7 +40,7 @@
 
 	# Add here commands to install the package into debian/package.
 	cp package.xml $(pear_pkg)/package.xml;
-	$(PEAR) install -n -R debian/$(package) $(pear_pkg)/package.xml;
+	$(PEAR) install -f -n -R debian/$(package) $(pear_pkg)/package.xml;
 	rm -f debian/$(package)/usr/share/php/.filemap;
 	rm -f debian/$(package)/usr/share/php/.lock;
 	rm -rf debian/$(package)/usr/share/php/.channels;

Modified: pear/php-text-highlighter/trunk/debian/rules
===================================================================
--- pear/php-text-highlighter/trunk/debian/rules	2008-01-19 18:24:58 UTC (rev 960)
+++ pear/php-text-highlighter/trunk/debian/rules	2008-01-19 18:29:43 UTC (rev 961)
@@ -40,7 +40,7 @@
 
 	# Add here commands to install the package into debian/package.
 	cp package.xml $(pear_pkg)/package.xml
-	$(PEAR) install -n -R debian/$(package) $(pear_pkg)/package.xml
+	$(PEAR) install -f -n -R debian/$(package) $(pear_pkg)/package.xml
 	rm -f debian/$(package)/usr/share/php/.filemap
 	rm -f debian/$(package)/usr/share/php/.lock
 	rm -rf debian/$(package)/usr/share/php/.channels

Modified: pear/php-xml-serializer/trunk/debian/rules
===================================================================
--- pear/php-xml-serializer/trunk/debian/rules	2008-01-19 18:24:58 UTC (rev 960)
+++ pear/php-xml-serializer/trunk/debian/rules	2008-01-19 18:29:43 UTC (rev 961)
@@ -36,7 +36,7 @@
 
 	# Add here commands to install the package into debian/package.
 	cp package.xml $(pear_pkg)/package.xml;
-	$(PEAR) install -n -R debian/$(package) $(pear_pkg)/package.xml;
+	$(PEAR) install -f -n -R debian/$(package) $(pear_pkg)/package.xml;
 	rm -f debian/$(package)/usr/share/php/.filemap;
 	rm -f debian/$(package)/usr/share/php/.lock;
 	rm -rf debian/$(package)/usr/share/php/.channels;

Modified: pear/php-xml-util/trunk/debian/rules
===================================================================
--- pear/php-xml-util/trunk/debian/rules	2008-01-19 18:24:58 UTC (rev 960)
+++ pear/php-xml-util/trunk/debian/rules	2008-01-19 18:29:43 UTC (rev 961)
@@ -47,7 +47,7 @@
 
 	# Add here commands to install the package into debian/php-xml-util.
 	cp package.xml $(pear_pkg)/package.xml;
-	$(PEAR) install -n -R debian/$(package) $(pear_pkg)/package.xml;
+	$(PEAR) install -f -n -R debian/$(package) $(pear_pkg)/package.xml;
 	rm -f debian/$(package)/usr/share/php/.filemap;
 	rm -f debian/$(package)/usr/share/php/.lock;
 	rm -rf debian/$(package)/usr/share/php/.channels;

Modified: pear/skeleton/debian/rules
===================================================================
--- pear/skeleton/debian/rules	2008-01-19 18:24:58 UTC (rev 960)
+++ pear/skeleton/debian/rules	2008-01-19 18:29:43 UTC (rev 961)
@@ -40,7 +40,7 @@
 
 	# Add here commands to install the package into debian/package.
 	cp package.xml $(pear_pkg)/package.xml;
-	$(PEAR) install -n -R debian/$(package) $(pear_pkg)/package.xml;
+	$(PEAR) install -f -n -R debian/$(package) $(pear_pkg)/package.xml;
 	rm -f debian/$(package)/usr/share/php/.filemap;
 	rm -f debian/$(package)/usr/share/php/.lock;
 	rm -rf debian/$(package)/usr/share/php/.channels;




More information about the Pkg-php-commits mailing list