[Pkg-php-commits] r1459 - pear/php-xml-parser/trunk/debian

[Thomas Goirand]

tags 580383 pending
thanks

Author: zigo
Date: 2010-12-04 07:39:07 +0000 (Sat, 04 Dec 2010)
New Revision: 1459

Modified:
   pear/php-xml-parser/trunk/debian/changelog
   pear/php-xml-parser/trunk/debian/control
   pear/php-xml-parser/trunk/debian/rules
Log:
* Replaced a call of dpatch apply-all by a dependency on the patch target
  of /usr/share/dpatch/dpatch.make in the build: target.
* Added myself as uploader.
* Fixes PHP 5.3.x warning due to ereg() and return of a reference, which are
  now deprecated (Closes: #580383).
* Bumps Standard-Version to 3.9.1.
* Added debian/source/format and debian/README.source

Modified: pear/php-xml-parser/trunk/debian/changelog
===================================================================
--- pear/php-xml-parser/trunk/debian/changelog	2010-11-25 18:00:59 UTC (rev 1458)
+++ pear/php-xml-parser/trunk/debian/changelog	2010-12-04 07:39:07 UTC (rev 1459)
@@ -1,3 +1,20 @@
+php-xml-parser (1.3.2-3) unstable; urgency=low
+
+  * Replaced a call of dpatch apply-all by a dependency on the patch target
+    of /usr/share/dpatch/dpatch.make in the build: target.
+
+ -- Thomas Goirand <zigo at debian.org>  Fri, 10 Sep 2010 00:27:11 +0800
+
+php-xml-parser (1.3.2-2) unstable; urgency=low
+
+  * Added myself as uploader.
+  * Fixes PHP 5.3.x warning due to ereg() and return of a reference, which are
+    now deprecated (Closes: #580383).
+  * Bumps Standard-Version to 3.9.1.
+  * Added debian/source/format and debian/README.source
+
+ -- Thomas Goirand <zigo at debian.org>  Wed, 01 Sep 2010 02:02:16 +0800
+
 php-xml-parser (1.3.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: pear/php-xml-parser/trunk/debian/control
===================================================================
--- pear/php-xml-parser/trunk/debian/control	2010-11-25 18:00:59 UTC (rev 1458)
+++ pear/php-xml-parser/trunk/debian/control	2010-12-04 07:39:07 UTC (rev 1459)
@@ -2,9 +2,9 @@
 Section: php
 Priority: optional
 Maintainer: Debian PHP Maintainers <pkg-php-maint at lists.alioth.debian.org>
-Uploaders: Thijs Kinkhorst <thijs at debian.org>
-Build-Depends: debhelper (>= 7)
-Standards-Version: 3.8.4
+Uploaders: Thijs Kinkhorst <thijs at debian.org>, Thomas Goirand <zigo at debian.org>
+Build-Depends: debhelper (>= 7), dpatch
+Standards-Version: 3.9.1
 Build-Depends-Indep: php-pear
 Vcs-Svn: svn://svn.debian.org/pkg-php/pear/php-xml-parser/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-php/pear/php-xml-parser/trunk

Modified: pear/php-xml-parser/trunk/debian/rules
===================================================================
--- pear/php-xml-parser/trunk/debian/rules	2010-11-25 18:00:59 UTC (rev 1458)
+++ pear/php-xml-parser/trunk/debian/rules	2010-12-04 07:39:07 UTC (rev 1459)
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpatch/dpatch.make
+
 DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
 DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
 DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
@@ -15,11 +17,11 @@
 
 build: build-stamp
 
-build-stamp: configure-stamp 
+build-stamp: configure-stamp patch
 	dh_testdir
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	if [ -f $(pear_pkg)/package.xml ]; then \
@@ -43,6 +45,7 @@
 	rm -rf debian/$(package)/usr/share/php/.depdb;
 	rm -rf debian/$(package)/usr/share/php/.registry/.channel.pecl.php.net;
 	rm -rf debian/$(package)/usr/share/php/.registry/.channel.__uri;
+	rm -rf debian/$(package)/usr/share/php/.registry/.channel.doc.php.net;
 	rm -rf debian/$(package)/tmp
 
 	# remove duplicated files, these files are in /usr/share/doc/package