[Pkg-php-commits] r1467 - pear/php-net-smtp/trunk/debian

[Guillaume Delacour]

Author: kcd-guest
Date: 2011-05-07 11:30:24 +0000 (Sat, 07 May 2011)
New Revision: 1467

Modified:
   pear/php-net-smtp/trunk/debian/changelog
   pear/php-net-smtp/trunk/debian/compat
   pear/php-net-smtp/trunk/debian/control
   pear/php-net-smtp/trunk/debian/rules
Log:
New upstream release 1.5.2

Modified: pear/php-net-smtp/trunk/debian/changelog
===================================================================
--- pear/php-net-smtp/trunk/debian/changelog	2011-05-07 10:48:03 UTC (rev 1466)
+++ pear/php-net-smtp/trunk/debian/changelog	2011-05-07 11:30:24 UTC (rev 1467)
@@ -1,3 +1,15 @@
+php-net-smtp (1.5.2-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/control:
+    + Bump to Standards-Version 3.9.2, no changes needed
+    + Bump to debhelper 7
+    + Add Build-Depends on cdbs
+  * debian/compat: Bump to debhelper 7
+  * debian/rules: rewrite using cdbs template
+
+ -- Guillaume Delacour <gui at iroqwa.org>  Sat, 07 May 2011 13:25:24 +0200
+
 php-net-smtp (1.4.2-3) unstable; urgency=low
 
   * debian/control: Remove Breaks: and move php-pear (>= 5.3.1-4) from Depends

Modified: pear/php-net-smtp/trunk/debian/compat
===================================================================
--- pear/php-net-smtp/trunk/debian/compat	2011-05-07 10:48:03 UTC (rev 1466)
+++ pear/php-net-smtp/trunk/debian/compat	2011-05-07 11:30:24 UTC (rev 1467)
@@ -1 +1 @@
-5
+7

Modified: pear/php-net-smtp/trunk/debian/control
===================================================================
--- pear/php-net-smtp/trunk/debian/control	2011-05-07 10:48:03 UTC (rev 1466)
+++ pear/php-net-smtp/trunk/debian/control	2011-05-07 11:30:24 UTC (rev 1467)
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Debian PHP Maintainers <pkg-php-maint at lists.alioth.debian.org>
 Uploaders: Guillaume Delacour <gui at iroqwa.org>, Thomas Goirand <zigo at debian.org>
-Build-Depends: debhelper (>= 5) , dh-make-php (>= 0.2.3)
+Build-Depends: debhelper (>= 7) , dh-make-php (>= 0.2.3), cdbs
 Build-Depends-Indep: php-pear
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
 Homepage: http://pear.php.net/package/Net_SMTP
 Vcs-Svn: svn://svn.debian.org/pkg-php/pear/php-net-smtp/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-php/pear/php-net-smtp/trunk

Modified: pear/php-net-smtp/trunk/debian/rules
===================================================================
--- pear/php-net-smtp/trunk/debian/rules	2011-05-07 10:48:03 UTC (rev 1466)
+++ pear/php-net-smtp/trunk/debian/rules	2011-05-07 11:30:24 UTC (rev 1467)
@@ -1,81 +1,16 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+DEB_COMPRESS_EXCLUDE_ALL=package.xml
 
-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/-[^-]*$$//')
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/pear.mk
 
-PEAR ?= /usr/bin/pear
-pear_pkg = $(shell ls |grep Net_SMTP)
-package = php-net-smtp
+install/php-net-smtp::
+	# Creating AUTHORS file
+	grep "@author" Net_SMTP*/* -R | sed -e 's/.*@author//' -e 's/^ *//' -e 's/>.*/>/' \
+		| sort | uniq > AUTHORS
+	# remove empty hidden dir (dh-make-php should do it)
+	rm -rf $(CURDIR)/debian/$(package)/usr/share/php/.registry/.channel.doc.php.net/
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	touch configure-stamp
-
-build: build-stamp
-
-build-stamp: configure-stamp
-	dh_testdir
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	if [ -f $(pear_pkg)/package.xml ]; then \
-		rm $(pear_pkg)/package.xml; \
-	fi
-	dh_clean build-stamp configure-stamp
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	# 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;
-	rm -f debian/$(package)/usr/share/php/.filemap;
-	rm -f debian/$(package)/usr/share/php/.lock;
-	rm -rf debian/$(package)/usr/share/php/.channels;
-	rm -rf debian/$(package)/usr/share/php/.depdblock;
-	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
-	rm -rf debian/$(package)/usr/share/php/docs;
-	rm -rf debian/$(package)/usr/share/php/tests;
-	rm -rf debian/$(package)/usr/share/php/data/Log/misc;
-
-# Build architecture-dependent files here.
-binary-arch: build install
-# We have nothing to do by default.
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installexamples
-	dh_installchangelogs
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
-
-get-orig-source:
-	wget http://download.pear.php.net/package/Net_SMTP-${DEB_UPSTREAM_VERSION}.tgz -O php-net-smtp_${DEB_UPSTREAM_VERSION}.orig.tar.gz
+clean/php-net-smtp::
+	rm -f AUTHORS