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

Guillaume Delacour kcd-guest at alioth.debian.org
Thu Nov 25 18:01:17 UTC 2010


Author: kcd-guest
Date: 2010-11-25 18:00:59 +0000 (Thu, 25 Nov 2010)
New Revision: 1458

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/examples
   pear/php-net-smtp/trunk/debian/rules
Log:
Revert changes to work on 1.4.2-2

Modified: pear/php-net-smtp/trunk/debian/changelog
===================================================================
--- pear/php-net-smtp/trunk/debian/changelog	2010-11-23 13:27:57 UTC (rev 1457)
+++ pear/php-net-smtp/trunk/debian/changelog	2010-11-25 18:00:59 UTC (rev 1458)
@@ -1,13 +1,3 @@
-php-net-smtp (1.4.4-1) unstable; urgency=low
-
-  * New upstream release
-  * debian/rules: complete rewrite based on cdbs (dh-make-php template)
-  * debian/control:
-    + Depends on debhelper >= 7 ( + debian/compat)
-    + Bump to Standards-Version 3.9.1, no changes needed
-
- -- Guillaume Delacour <gui at iroqwa.org>  Mon, 22 Nov 2010 15:47:53 +0100
-
 php-net-smtp (1.4.2-2) unstable; urgency=low
 
   * Added a Conflicts: php-pear (<< 5.3), and now depends on php-pear (>= 5.3)

Modified: pear/php-net-smtp/trunk/debian/compat
===================================================================
--- pear/php-net-smtp/trunk/debian/compat	2010-11-23 13:27:57 UTC (rev 1457)
+++ pear/php-net-smtp/trunk/debian/compat	2010-11-25 18:00:59 UTC (rev 1458)
@@ -1 +1 @@
-7
+5

Modified: pear/php-net-smtp/trunk/debian/control
===================================================================
--- pear/php-net-smtp/trunk/debian/control	2010-11-23 13:27:57 UTC (rev 1457)
+++ pear/php-net-smtp/trunk/debian/control	2010-11-25 18:00:59 UTC (rev 1458)
@@ -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 (>= 7) , dh-make-php (>= 0.2.3), cdbs
+Build-Depends: debhelper (>= 5) , dh-make-php (>= 0.2.3)
 Build-Depends-Indep: php-pear
-Standards-Version: 3.9.1
+Standards-Version: 3.8.4
 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
@@ -13,8 +13,8 @@
 Package: php-net-smtp
 Architecture: all
 Depends: php-pear (>= 5.3), php-net-socket (>= 1.0.7), ${misc:Depends}
-Breaks: php-pear (<< 5.3)
 Recommends: php-auth-sasl
+Pre-Depends: php-pear (>= 5.3)
 Description: PHP PEAR module implementing SMTP protocol
  Provides an implementation of the SMTP protocol using
  PEAR's Net_Socket class.

Modified: pear/php-net-smtp/trunk/debian/examples
===================================================================
--- pear/php-net-smtp/trunk/debian/examples	2010-11-23 13:27:57 UTC (rev 1457)
+++ pear/php-net-smtp/trunk/debian/examples	2010-11-25 18:00:59 UTC (rev 1458)
@@ -1 +1,2 @@
 Net_SMTP-*/docs/examples/*
+Net_SMTP-*/tests/*

Modified: pear/php-net-smtp/trunk/debian/rules
===================================================================
--- pear/php-net-smtp/trunk/debian/rules	2010-11-23 13:27:57 UTC (rev 1457)
+++ pear/php-net-smtp/trunk/debian/rules	2010-11-25 18:00:59 UTC (rev 1458)
@@ -1,11 +1,81 @@
 #!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
 
-DEB_COMPRESS_EXCLUDE_ALL=package.xml
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/pear.mk
+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/-[^-]*$$//')
 
-common-install-indep::
-	# remove empty hidden dir
-	rmdir $(DEB_DESTDIR)usr/share/php/.registry/.channel.doc.php.net/
+PEAR ?= /usr/bin/pear
+pear_pkg = $(shell ls |grep Net_SMTP)
+package = php-net-smtp
 
+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




More information about the Pkg-php-commits mailing list