[Pkg-php-commits] r1045 - pear/php-mail/trunk/debian

Thijs Kinkhorst thijs at alioth.debian.org
Sun May 4 13:31:07 UTC 2008


Author: thijs
Date: 2008-05-04 13:31:07 +0000 (Sun, 04 May 2008)
New Revision: 1045

Modified:
   pear/php-mail/trunk/debian/changelog
   pear/php-mail/trunk/debian/control
   pear/php-mail/trunk/debian/rules
Log:
update packaging to the way we do it now, and release


Modified: pear/php-mail/trunk/debian/changelog
===================================================================
--- pear/php-mail/trunk/debian/changelog	2008-05-04 12:20:38 UTC (rev 1044)
+++ pear/php-mail/trunk/debian/changelog	2008-05-04 13:31:07 UTC (rev 1045)
@@ -1,4 +1,4 @@
-php-mail (1.1.14-1) UNRELEASED; urgency=low
+php-mail (1.1.14-1) unstable; urgency=low
 
   [ Martin Lohmeier ]
   * new upstream version (Closes: #421841)
@@ -7,8 +7,9 @@
 
   [ Thijs Kinkhorst ]
   * Make debian/copyright current.
+  * Make use of modern-day PEAR package building.
 
- -- Thijs Kinkhorst <thijs at debian.org>  Mon, 31 Mar 2008 20:42:07 +0200
+ -- Thijs Kinkhorst <thijs at debian.org>  Sun, 04 May 2008 15:28:29 +0200
 
 php-mail (1.1.6-2) unstable; urgency=low
 

Modified: pear/php-mail/trunk/debian/control
===================================================================
--- pear/php-mail/trunk/debian/control	2008-05-04 12:20:38 UTC (rev 1044)
+++ pear/php-mail/trunk/debian/control	2008-05-04 13:31:07 UTC (rev 1045)
@@ -13,7 +13,7 @@
 Package: php-mail
 Architecture: all
 Depends: php-pear
-Recommends: php-net-smtp (>= 1.1.0)
+Recommends: php-net-smtp
 Replaces: php4-pear (<< 4:4.4.0-0)
 Description: PHP PEAR module for sending email
  PEAR's Mail:: package defines the interface for implementing mailers

Modified: pear/php-mail/trunk/debian/rules
===================================================================
--- pear/php-mail/trunk/debian/rules	2008-05-04 12:20:38 UTC (rev 1044)
+++ pear/php-mail/trunk/debian/rules	2008-05-04 13:31:07 UTC (rev 1045)
@@ -1,37 +1,75 @@
 #!/usr/bin/make -f
 
-source=$(shell dpkg-parsechangelog | grep '^Source: ' | sed -e 's/^Source: //')
+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/-[^-]*$$//')
 
-build:
-	# Nothing to do here
+PEAR ?= /usr/bin/pear
+pear_pkg = $(shell ls |grep Mail)
+package = php-mail
 
+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
-	dh_clean
+	if [ -f $(pear_pkg)/package.xml ]; then \
+		rm $(pear_pkg)/package.xml; \
+	fi
+	dh_clean build-stamp configure-stamp
 
-binary: binary-arch binary-indep
-	# Nothing to do here
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
 
-binary-arch:
-	# Nothing to do here
+	# 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)/tmp
 
-binary-indep:
+	# 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_installdirs
-	
-	# Custom package actions
-	cp Mail.php debian/$(source)/usr/share/php/
-	cp Mail/* debian/$(source)/usr/share/php/Mail/
-	cp tests/* debian/$(source)/usr/share/php/tests/
-	
-	# Rest of the debhelper scripts
 	dh_testroot
-	dh_installchangelogs
 	dh_installdocs
+	dh_installexamples
+	dh_installchangelogs 
+	dh_compress
 	dh_fixperms
-	dh_compress
+	dh_installdeb
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
-.PHONY: binary binary-arch binary-indep build clean
+
+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/Mail-${DEB_UPSTREAM_VERSION}.tgz -O php-mail_${DEB_UPSTREAM_VERSION}.orig.tar.gz




More information about the Pkg-php-commits mailing list