[Pkg-php-commits] r1019 - pear/php-net-socket/trunk/debian

[Thijs Kinkhorst]

Author: thijs
Date: 2008-04-21 23:37:44 +0000 (Mon, 21 Apr 2008)
New Revision: 1019

Modified:
   pear/php-net-socket/trunk/debian/changelog
   pear/php-net-socket/trunk/debian/compat
   pear/php-net-socket/trunk/debian/control
   pear/php-net-socket/trunk/debian/rules
Log:
* New upstream release.
* Various package cleanups: sync build system with other PEAR
  packages, use debhelper level 5, add homepage field, update
  standards version.

Modified: pear/php-net-socket/trunk/debian/changelog
===================================================================
--- pear/php-net-socket/trunk/debian/changelog	2008-04-19 05:10:30 UTC (rev 1018)
+++ pear/php-net-socket/trunk/debian/changelog	2008-04-21 23:37:44 UTC (rev 1019)
@@ -1,3 +1,12 @@
+php-net-socket (1.0.8-1) unstable; urgency=low
+
+  * New upstream release.
+  * Various package cleanups: sync build system with other PEAR
+    packages, use debhelper level 5, add homepage field, update
+    standards version.
+
+ -- Thijs Kinkhorst <thijs at debian.org>  Mon, 31 Mar 2008 20:58:31 +0200
+
 php-net-socket (1.0.6-2) unstable; urgency=low
 
   * Need to replace php4-pear (<< 4:4.4.0-0), yes the epoch matters.

Modified: pear/php-net-socket/trunk/debian/compat
===================================================================
--- pear/php-net-socket/trunk/debian/compat	2008-04-19 05:10:30 UTC (rev 1018)
+++ pear/php-net-socket/trunk/debian/compat	2008-04-21 23:37:44 UTC (rev 1019)
@@ -1 +1 @@
-4
+5

Modified: pear/php-net-socket/trunk/debian/control
===================================================================
--- pear/php-net-socket/trunk/debian/control	2008-04-19 05:10:30 UTC (rev 1018)
+++ pear/php-net-socket/trunk/debian/control	2008-04-21 23:37:44 UTC (rev 1019)
@@ -2,9 +2,12 @@
 Section: web
 Priority: optional
 Maintainer: Debian PHP Maintainers <pkg-php-maint at lists.alioth.debian.org>
-Uploaders: Adam Conrad <adconrad at 0c3.net>, Ondřej Surý <ondrej at debian.org>
-Build-Depends: debhelper (>= 4.0) 
-Standards-Version: 3.6.2
+Uploaders: Thijs Kinkhorst <thijs at debian.org>
+Build-Depends: debhelper (>= 5)
+Standards-Version: 3.7.3
+Homepage: http://pear.php.net/package/Net_Socket
+Vcs-Svn: svn://svn.debian.org/pkg-php/pear/php-net-socket/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-php/pear/php-net-socket/trunk
 
 Package: php-net-socket
 Architecture: all
@@ -15,5 +18,3 @@
  blocking and non-blocking operation, with different reading
  and writing modes (byte-wise, block-wise, line-wise and special
  formats like network byte-order ip addresses).
- .
- Homepage: http://pear.php.net/package/Net_Socket

Modified: pear/php-net-socket/trunk/debian/rules
===================================================================
--- pear/php-net-socket/trunk/debian/rules	2008-04-19 05:10:30 UTC (rev 1018)
+++ pear/php-net-socket/trunk/debian/rules	2008-04-21 23:37:44 UTC (rev 1019)
@@ -1,35 +1,76 @@
 #!/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 Net_Socket)
+package = php-net-socket
 
+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 Socket.php debian/$(source)/usr/share/php/Net/
-	
-	# 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/Net_Socket-${DEB_UPSTREAM_VERSION}.tgz -O php-net-socket_${DEB_UPSTREAM_VERSION}.orig.tar.gz
+