[Pkg-php-commits] r965 - pear/php-db/trunk/debian

Sun Jan 20 17:25:18 UTC 2008

tags 357098 pending
tags 384269 pending
thanks

Author: thijs
Date: 2008-01-20 17:25:18 +0000 (Sun, 20 Jan 2008)
New Revision: 965

Modified:
   pear/php-db/trunk/debian/changelog
   pear/php-db/trunk/debian/docs
   pear/php-db/trunk/debian/rules
Log:
newest version does include package.xml, return to Martin's PEAR
based installer.
Do not ship tests in the binary package.


Modified: pear/php-db/trunk/debian/changelog
===================================================================

--- pear/php-db/trunk/debian/changelog	2008-01-20 16:58:40 UTC (rev 964)
+++ pear/php-db/trunk/debian/changelog	2008-01-20 17:25:18 UTC (rev 965)
@@ -1,20 +1,27 @@
-php-db (1.7.6-3) unstable; urgency=low
-  
+php-db (1.7.13-1) unstable; urgency=low
+
   * NOT RELEASED YET
 
   [ Martin Lohmeier ]
+  * New upstream release.
+    + Fixes parsing of postgresql FETCH (Closes: #357098)
+    + Fixes @package_version@ variable (Closes: #384269).
   * Updated to PHP License 3.01 as upstream did (Closes: #332608)
   * Add debian/watch file.
   * Add Vcs-Svn field to debian/control.
   * Updated to debhelper 6.
   * Updated to standard version 3.7.3.
   * Add Homepage to debian/control.
+  * New build system using PEAR.
 
   [ Thijs Kinkhorst ]
-  * Fix bashism in debian/rules (Closes: #457437).
+  * Even newer upstream release.
+  * Cleanup packaging.
+  * Do not install tests, these are not really relevant in the binary
+    package (Closes: #457437).
   * Update package description.
 
- -- Thijs Kinkhorst <thijs at debian.org>  Sun, 20 Jan 2008 17:51:03 +0100
+ -- Thijs Kinkhorst <thijs at debian.org>  Sun, 20 Jan 2008 18:10:28 +0100
 
 php-db (1.7.6-2) unstable; urgency=low
 

Modified: pear/php-db/trunk/debian/docs
===================================================================
--- pear/php-db/trunk/debian/docs	2008-01-20 16:58:40 UTC (rev 964)
+++ pear/php-db/trunk/debian/docs	2008-01-20 17:25:18 UTC (rev 965)
@@ -1 +1 @@
-doc/*
+DB-*/doc/*

Modified: pear/php-db/trunk/debian/rules
===================================================================
--- pear/php-db/trunk/debian/rules	2008-01-20 16:58:40 UTC (rev 964)
+++ pear/php-db/trunk/debian/rules	2008-01-20 17:25:18 UTC (rev 965)
@@ -1,42 +1,78 @@
 #!/usr/bin/make -f
 
-source=$(shell dpkg-parsechangelog | grep '^Source: ' | sed -e 's/^Source: //')
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-build:
-	# Nothing to do here
+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/-[^-]*$$//')
 
-clean:
+PEAR ?= /usr/bin/pear
+pear_pkg = $(shell ls |grep DB)
+package = php-db
+
+configure: configure-stamp
+configure-stamp:
 	dh_testdir
-	dh_testroot
-	dh_clean
+	touch configure-stamp
 
-binary: binary-arch binary-indep
-	# Nothing to do here
+build: build-stamp
 
-binary-arch:
-	# Nothing to do here
+build-stamp: configure-stamp 
+	dh_testdir
+	touch build-stamp
 
-binary-indep:
+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
 
-	# Custom package actions
-	cp DB.php debian/$(source)/usr/share/php/
-	cp DB/* debian/$(source)/usr/share/php/DB/
-	cp -r tests/* debian/$(source)/usr/share/php/tests/
-	chmod 755 debian/$(source)/usr/share/php/tests/driver/run.cvs \
-		debian/$(source)/usr/share/php/tests/run.cvs
+	# 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
 
-	# Rest of the debhelper scripts
+	# 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/DB/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_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/DB-${DEB_UPSTREAM_VERSION}.tgz -O php-db_${DEB_UPSTREAM_VERSION}.orig.tar.gz


