[Pkg-php-commits] r969 - pear/php-log/trunk/debian

[Gregory Colpart]

tags 417567 pending
tags 424821 pending
thanks

Author: reg-guest
Date: 2008-01-21 00:47:26 +0000 (Mon, 21 Jan 2008)
New Revision: 969

Modified:
   pear/php-log/trunk/debian/changelog
   pear/php-log/trunk/debian/control
   pear/php-log/trunk/debian/copyright
   pear/php-log/trunk/debian/rules
   pear/php-log/trunk/debian/watch
Log:
Import php-log 1.9.11 from Debian archive


Modified: pear/php-log/trunk/debian/changelog
===================================================================
--- pear/php-log/trunk/debian/changelog	2008-01-21 00:42:11 UTC (rev 968)
+++ pear/php-log/trunk/debian/changelog	2008-01-21 00:47:26 UTC (rev 969)
@@ -1,14 +1,11 @@
-php-log (1.9.10-1) unstable; urgency=low
+php-log (1.9.11-1) unstable; urgency=low
 
-  * NOT RELEASED YET
-  * new upstream release
-  * new maintainer (Closes: #383010)
-  * get-orig-source target for debian/rules
-  * mention new maintainer in debian/copyright
-  * add XS-X-Vcs-Svn to debian/control
-  * add debian/conpat file
+  * New upstream release. (Closes: #417567)
+  * Updated debian/watch file.
+  * Remove debian/package/tmp created directory.
+  * Removed php4 support. (Closes: #424821)
 
- -- Martin Lohmeier <martin at mein-horde.de>  Sun,  4 Mar 2007 14:36:02 +0100
+ -- Jose Carlos Medeiros <debian at psabs.com.br>  Wed, 16 May 2007 20:42:26 -0300
 
 php-log (1.9.8-1) unstable; urgency=low
 

Modified: pear/php-log/trunk/debian/control
===================================================================
--- pear/php-log/trunk/debian/control	2008-01-21 00:42:11 UTC (rev 968)
+++ pear/php-log/trunk/debian/control	2008-01-21 00:47:26 UTC (rev 969)
@@ -1,22 +1,21 @@
 Source: php-log
 Section: web
 Priority: optional
-Maintainer: Debian PHP Maintainers <pkg-php-maint at lists.alioth.debian.org>
+Maintainer: Jose Carlos Medeiros <debian at psabs.com.br>
 Uploaders: Ola Lundqvist <opal at debian.org>
 Build-Depends-Indep: php-pear
 Build-Depends: debhelper (>= 5)
-Vcs-Svn: svn://svn.debian.org/pkg-php/pear/php-log/trunk
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-php/pear/php-log/trunk
-Homepage: http://pear.php.net/package/Log/
-Standards-Version: 3.7.3
+Standards-Version: 3.7.2
 
 Package: php-log
 Architecture: all
-Depends: php4-pear (>= 4:4.3.0) | php-pear
-Suggests: php-db (>= 1.3), php4-sqlite | php5-sqlite, php-mdb2
+Depends: php-pear
+Suggests: php-db (>= 1.3), php5-sqlite, php-mdb2
 Replaces: php4-pear-log (<= 1.9.3-1)
 Conflicts: php4-pear-log (<= 1.9.3-2)
 Description: Log module for PEAR
  The Log framework provides an abstracted logging system.  It supports
  logging to console, file, syslog, SQL, and mcal targets.  It also provides
  a subject - observer mechanism.
+ .
+  Homepage: http://pear.php.net/package/Log/

Modified: pear/php-log/trunk/debian/copyright
===================================================================
--- pear/php-log/trunk/debian/copyright	2008-01-21 00:42:11 UTC (rev 968)
+++ pear/php-log/trunk/debian/copyright	2008-01-21 00:47:26 UTC (rev 969)
@@ -1,6 +1,5 @@
 This package was debianized by Nils Rennebarth <nils at debian.org> on
-Sun, 30 Jun 2002 10:48:24 +0200 and is currently maintained by the
-Debian PHP Maintainers <pkg-php-maint at lists.alioth.debian.org>
+Sun, 30 Jun 2002 10:48:24 +0200.
 
 It was downloaded from http://pear.php.net/package/Log/download
 

Modified: pear/php-log/trunk/debian/rules
===================================================================
--- pear/php-log/trunk/debian/rules	2008-01-21 00:42:11 UTC (rev 968)
+++ pear/php-log/trunk/debian/rules	2008-01-21 00:47:26 UTC (rev 969)
@@ -5,9 +5,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatibility version to use.
-#export DH_COMPAT=5
-
 PEAR ?= /usr/bin/pear
 pear_pkg = $(shell ls |grep Log)
 package = php-log
@@ -39,7 +36,7 @@
 
 	# 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;
+	$(PEAR) install -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;
@@ -53,12 +50,15 @@
 	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.
+	# remove created tmp dir
+	rm -rf debian/$(package)/tmp
 
 # Build architecture-independent files here.
 binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installdocs
@@ -73,6 +73,3 @@
 
 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/Log-${DEB_UPSTREAM_VERSION}.tgz -O php-log_${DEB_UPSTREAM_VERSION}.orig.tar.gz

Modified: pear/php-log/trunk/debian/watch
===================================================================
--- pear/php-log/trunk/debian/watch	2008-01-21 00:42:11 UTC (rev 968)
+++ pear/php-log/trunk/debian/watch	2008-01-21 00:47:26 UTC (rev 969)
@@ -1,2 +1,2 @@
 version=3
-http://pear.php.net/package/Log http://download.pear.php.net/package/Log-([\d.RC]+).tgz
+http://pear.php.net/package/Log/ http://download.pear.php.net/package/Log-([\d.]+)\.tgz