[Pkg-php-commits] r1027 - in php5/trunk/debian: . patches

Raphael Geissert atomo64-guest at alioth.debian.org
Thu May 1 05:00:46 UTC 2008


tags 413712 pending
tags 429981 pending
tags 434351 pending
tags 471324 pending
tags 478613 pending
thanks

Author: atomo64-guest
Date: 2008-05-01 05:00:45 +0000 (Thu, 01 May 2008)
New Revision: 1027

Added:
   php5/trunk/debian/patches/manpage_spelling.patch
Modified:
   php5/trunk/debian/NEWS
   php5/trunk/debian/changelog
   php5/trunk/debian/control
   php5/trunk/debian/patches/series
   php5/trunk/debian/rules
Log:
debian/rules: removed bashisms (Closes: #478613)
debian/control: add a notice about Suhosin being applied (Closes: #471324)
 + Additionally make sure the PHP boilerplate is the same for each package
debian/patches/manpage_spelling.patch:
 - fix spelling mistakes in man page (Closes: #413712)
debian/NEWS: s/suhosin/Suhosin (Closes: #434351)
debian/control: removed ORed postgresql-dev build-dep (Closes: #429981)
 + postgresql-dev is a transitional package since etch


Modified: php5/trunk/debian/NEWS
===================================================================
--- php5/trunk/debian/NEWS	2008-04-28 02:04:28 UTC (rev 1026)
+++ php5/trunk/debian/NEWS	2008-05-01 05:00:45 UTC (rev 1027)
@@ -1,6 +1,6 @@
 php5 (5.2.3-2) unstable; urgency=low
 
-  The suhosin patch is now enabled by default!
+  The Suhosin patch is now enabled by default!
 
   For more information, see
   <http://www.hardened-php.net/suhosin/index.html>.

Modified: php5/trunk/debian/changelog
===================================================================
--- php5/trunk/debian/changelog	2008-04-28 02:04:28 UTC (rev 1026)
+++ php5/trunk/debian/changelog	2008-05-01 05:00:45 UTC (rev 1027)
@@ -17,12 +17,20 @@
   * Build a php5-dbg package with the debug symbols of all the SAPIs
    + Bump debhelper dependency to >= 5 as dh_strip behaves differently.
   * debian/watch: refactored so it can actually be used to download the tarball
+  * debian/rules: removed bashisms (Closes: #478613)
+  * debian/control: add a notice about Suhosin being applied (Closes: #471324)
+    + Additionally make sure the PHP boilerplate is the same for each package
+  * debian/patches/manpage_spelling.patch:
+    - fix spelling mistakes in man page (Closes: #413712)
+  * debian/NEWS: s/suhosin/Suhosin (Closes: #434351)
+  * debian/control: removed ORed postgresql-dev build-dep (Closes: #429981)
+    + postgresql-dev is a transitional package since etch
 
   [ Steve Langasek ]
   * Step down from the PHP maintenance team, removing myself from uploaders.
     So long, and thanks for all the fish!
 
- -- Raphael Geissert <atomo64 at gmail.com>  Fri, 18 Apr 2008 22:57:06 -0500
+ -- Raphael Geissert <atomo64 at gmail.com>  Wed, 30 Apr 2008 23:57:29 -0500
 
 php5 (5.2.5-3) unstable; urgency=high
 

Modified: php5/trunk/debian/control
===================================================================
--- php5/trunk/debian/control	2008-04-28 02:04:28 UTC (rev 1026)
+++ php5/trunk/debian/control	2008-05-01 05:00:45 UTC (rev 1027)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian PHP Maintainers <pkg-php-maint at lists.alioth.debian.org>
 Uploaders: Adam Conrad <adconrad at 0c3.net>, Jeroen van Wolffelaar <jeroen at wolffelaar.nl>, Ondřej Surý <ondrej at debian.org>, Sean Finney <seanius at debian.org>
-Build-Depends: apache2-prefork-dev (>= 2.0.53-3), autoconf, automake1.4, bison, chrpath, debhelper (>= 5), firebird2.0-dev [i386 amd64 powerpc sparc] | firebird1.5-dev [i386 amd64] | firebird2-dev [i386 amd64], flex (>= 2.5.4), freetds-dev, libapr1-dev (>= 1.2.7-8), libbz2-dev (>= 1.0.0), libc-client-dev, libcurl4-openssl-dev | libcurl-dev, libdb4.6-dev, libexpat1-dev (>= 1.95.2-2.1), libfreetype6-dev, libgcrypt11-dev, libgd2-xpm-dev (>= 2.0.28-3), libgmp3-dev, libjpeg62-dev, libkrb5-dev, libldap2-dev, libmcrypt-dev, libmhash-dev (>= 0.8.8), libmysqlclient15-dev, libncurses5-dev, libpam0g-dev, libpcre3-dev (>= 6.6), libpng12-dev, libpq-dev | postgresql-dev, libpspell-dev, librecode-dev, libsasl2-dev, libsnmp-dev, libsqlite0-dev, libssl-dev (>= 0.9.6), libt1-dev, libtidy-dev, libtool (>= 1.4.2-4), libwrap0-dev, libxmltok1-dev, libxml2-dev (>= 2.4.14), libxslt1-dev (>= 1.0.18), quilt, re2c, unixodbc-dev, zlib1g-dev (>= 1.0.9)
+Build-Depends: apache2-prefork-dev (>= 2.0.53-3), autoconf, automake1.4, bison, chrpath, debhelper (>= 5), firebird2.0-dev [i386 amd64 powerpc sparc] | firebird1.5-dev [i386 amd64] | firebird2-dev [i386 amd64], flex (>= 2.5.4), freetds-dev, libapr1-dev (>= 1.2.7-8), libbz2-dev (>= 1.0.0), libc-client-dev, libcurl4-openssl-dev | libcurl-dev, libdb4.6-dev, libexpat1-dev (>= 1.95.2-2.1), libfreetype6-dev, libgcrypt11-dev, libgd2-xpm-dev (>= 2.0.28-3), libgmp3-dev, libjpeg62-dev, libkrb5-dev, libldap2-dev, libmcrypt-dev, libmhash-dev (>= 0.8.8), libmysqlclient15-dev, libncurses5-dev, libpam0g-dev, libpcre3-dev (>= 6.6), libpng12-dev, libpq-dev, libpspell-dev, librecode-dev, libsasl2-dev, libsnmp-dev, libsqlite0-dev, libssl-dev (>= 0.9.6), libt1-dev, libtidy-dev, libtool (>= 1.4.2-4), libwrap0-dev, libxmltok1-dev, libxml2-dev (>= 2.4.14), libxslt1-dev (>= 1.0.18), quilt, re2c, unixodbc-dev, zlib1g-dev (>= 1.0.9)
 Build-Conflicts: bind-dev
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/pkg-php/php5/trunk
@@ -22,7 +22,7 @@
  PHP5 is an HTML-embedded scripting language. Much of its syntax is borrowed
  from C, Java and Perl with a couple of unique PHP-specific features thrown
  in. The goal of the language is to allow web developers to write dynamically
- generated pages quickly.
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
 
 Package: php5-common
 Architecture: any
@@ -36,7 +36,7 @@
  PHP5 is an HTML-embedded scripting language. Much of its syntax is borrowed
  from C, Java and Perl with a couple of unique PHP-specific features thrown
  in. The goal of the language is to allow web developers to write dynamically
- generated pages quickly.
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
 
 Package: libapache2-mod-php5
 Architecture: any
@@ -54,7 +54,7 @@
  PHP5 is an HTML-embedded scripting language. Much of its syntax is borrowed
  from C, Java and Perl with a couple of unique PHP-specific features thrown
  in. The goal of the language is to allow web developers to write dynamically
- generated pages quickly.
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
 
 Package: php5-cgi
 Architecture: any
@@ -73,7 +73,7 @@
  PHP5 is an HTML-embedded scripting language. Much of its syntax is borrowed
  from C, Java and Perl with a couple of unique PHP-specific features thrown
  in. The goal of the language is to allow web developers to write dynamically
- generated pages quickly.
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
 
 Package: php5-cli
 Architecture: any
@@ -91,7 +91,7 @@
  PHP5 is an HTML-embedded scripting language. Much of its syntax is borrowed
  from C, Java and Perl with a couple of unique PHP-specific features thrown
  in. The goal of the language is to allow web developers to write dynamically
- generated pages quickly.
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
 
 Package: php5-dev
 Depends: autoconf, automake1.4, libssl-dev, libtool, shtool, php5-common (>= ${binary:Version})
@@ -103,8 +103,8 @@
  .
  PHP5 is an HTML-embedded scripting language. Much of its syntax is borrowed
  from C, Java and Perl with a couple of unique PHP-specific features thrown
- in. The goal of the language is to allow web developers to write
- dynamically generated pages quickly.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
 
 Package: php5-dbg
 Depends: php5-cli (= ${binary:Version}) | php5-cgi (= ${binary:Version}) | libapache2-mod-php5 (= ${binary:Version})
@@ -118,8 +118,8 @@
  .
  PHP5 is an HTML-embedded scripting language. Much of its syntax is borrowed
  from C, Java and Perl with a couple of unique PHP-specific features thrown
- in. The goal of the language is to allow web developers to write
- dynamically generated pages quickly.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
 
 Package: php-pear
 Architecture: all
@@ -136,8 +136,8 @@
  .
  PHP5 is an HTML-embedded scripting language. Much of its syntax is borrowed
  from C, Java and Perl with a couple of unique PHP-specific features thrown
- in. The goal of the language is to allow web developers to write
- dynamically generated pages quickly.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
 
 Package: php5-curl
 Architecture: any
@@ -147,8 +147,8 @@
  .
  PHP5 is an HTML-embedded scripting language. Much of its syntax is borrowed
  from C, Java and Perl with a couple of unique PHP-specific features thrown
- in. The goal of the language is to allow web developers to write
- dynamically generated pages quickly.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
 
 Package: php5-gd
 Architecture: any
@@ -159,8 +159,8 @@
  .
  PHP5 is an HTML-embedded scripting language. Much of its syntax is borrowed
  from C, Java and Perl with a couple of unique PHP-specific features thrown
- in. The goal of the language is to allow web developers to write
- dynamically generated pages quickly.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
 
 Package: php5-gmp
 Architecture: any
@@ -171,8 +171,8 @@
  .
  PHP5 is an HTML-embedded scripting language. Much of its syntax is borrowed
  from C, Java and Perl with a couple of unique PHP-specific features thrown
- in. The goal of the language is to allow web developers to write
- dynamically generated pages quickly.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
 
 Package: php5-imap
 Architecture: any
@@ -182,8 +182,8 @@
  .
  PHP5 is an HTML-embedded scripting language. Much of its syntax is borrowed
  from C, Java and Perl with a couple of unique PHP-specific features thrown
- in. The goal of the language is to allow web developers to write
- dynamically generated pages quickly.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
 
 Package: php5-interbase
 Architecture: i386 amd64 powerpc sparc
@@ -193,8 +193,8 @@
  .
  PHP5 is an HTML-embedded scripting language. Much of its syntax is borrowed
  from C, Java and Perl with a couple of unique PHP-specific features thrown
- in. The goal of the language is to allow web developers to write
- dynamically generated pages quickly.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
 
 Package: php5-ldap
 Architecture: any
@@ -204,8 +204,8 @@
  .
  PHP5 is an HTML-embedded scripting language. Much of its syntax is borrowed
  from C, Java and Perl with a couple of unique PHP-specific features thrown
- in. The goal of the language is to allow web developers to write
- dynamically generated pages quickly.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
 
 Package: php5-mcrypt
 Architecture: any
@@ -215,8 +215,8 @@
  .
  PHP5 is an HTML-embedded scripting language. Much of its syntax is borrowed
  from C, Java and Perl with a couple of unique PHP-specific features thrown
- in. The goal of the language is to allow web developers to write
- dynamically generated pages quickly.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
 
 Package: php5-mhash
 Architecture: any
@@ -226,8 +226,8 @@
  .
  PHP5 is an HTML-embedded scripting language. Much of its syntax is borrowed
  from C, Java and Perl with a couple of unique PHP-specific features thrown
- in. The goal of the language is to allow web developers to write
- dynamically generated pages quickly.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
 
 Package: php5-mysql
 Architecture: any
@@ -243,8 +243,8 @@
  .
  PHP5 is an HTML-embedded scripting language. Much of its syntax is borrowed
  from C, Java and Perl with a couple of unique PHP-specific features thrown
- in. The goal of the language is to allow web developers to write
- dynamically generated pages quickly.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
 
 Package: php5-odbc
 Architecture: any
@@ -256,8 +256,8 @@
  .
  PHP5 is an HTML-embedded scripting language. Much of its syntax is borrowed
  from C, Java and Perl with a couple of unique PHP-specific features thrown
- in. The goal of the language is to allow web developers to write
- dynamically generated pages quickly.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
 
 Package: php5-pgsql
 Architecture: any
@@ -269,8 +269,8 @@
  .
  PHP5 is an HTML-embedded scripting language. Much of its syntax is borrowed
  from C, Java and Perl with a couple of unique PHP-specific features thrown
- in. The goal of the language is to allow web developers to write
- dynamically generated pages quickly.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
 
 Package: php5-pspell
 Architecture: any
@@ -280,8 +280,8 @@
  .
  PHP5 is an HTML-embedded scripting language. Much of its syntax is borrowed
  from C, Java and Perl with a couple of unique PHP-specific features thrown
- in. The goal of the language is to allow web developers to write
- dynamically generated pages quickly.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
 
 Package: php5-recode
 Architecture: any
@@ -291,8 +291,8 @@
  .
  PHP5 is an HTML-embedded scripting language. Much of its syntax is borrowed
  from C, Java and Perl with a couple of unique PHP-specific features thrown
- in. The goal of the language is to allow web developers to write
- dynamically generated pages quickly.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
 
 Package: php5-snmp
 Architecture: any
@@ -302,8 +302,8 @@
  .
  PHP5 is an HTML-embedded scripting language. Much of its syntax is borrowed
  from C, Java and Perl with a couple of unique PHP-specific features thrown
- in. The goal of the language is to allow web developers to write
- dynamically generated pages quickly.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
 
 Package: php5-sqlite
 Architecture: any
@@ -316,8 +316,8 @@
  .
  PHP5 is an HTML-embedded scripting language. Much of its syntax is borrowed
  from C, Java and Perl with a couple of unique PHP-specific features thrown
- in. The goal of the language is to allow web developers to write
- dynamically generated pages quickly.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
 
 Package: php5-sybase
 Architecture: any
@@ -330,8 +330,8 @@
  .
  PHP5 is an HTML-embedded scripting language. Much of its syntax is borrowed
  from C, Java and Perl with a couple of unique PHP-specific features thrown
- in. The goal of the language is to allow web developers to write
- dynamically generated pages quickly.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
 
 Package: php5-tidy
 Architecture: any
@@ -346,8 +346,8 @@
  .
  PHP5 is an HTML-embedded scripting language. Much of its syntax is borrowed
  from C, Java and Perl with a couple of unique PHP-specific features thrown
- in. The goal of the language is to allow web developers to write
- dynamically generated pages quickly.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
 
 Package: php5-xmlrpc
 Architecture: any
@@ -357,8 +357,8 @@
  .
  PHP5 is an HTML-embedded scripting language. Much of its syntax is borrowed
  from C, Java and Perl with a couple of unique PHP-specific features thrown
- in. The goal of the language is to allow web developers to write
- dynamically generated pages quickly.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
 
 Package: php5-xsl
 Architecture: any
@@ -368,6 +368,6 @@
  .
  PHP5 is an HTML-embedded scripting language. Much of its syntax is borrowed
  from C, Java and Perl with a couple of unique PHP-specific features thrown
- in. The goal of the language is to allow web developers to write
- dynamically generated pages quickly.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
 

Added: php5/trunk/debian/patches/manpage_spelling.patch
===================================================================
--- php5/trunk/debian/patches/manpage_spelling.patch	                        (rev 0)
+++ php5/trunk/debian/patches/manpage_spelling.patch	2008-05-01 05:00:45 UTC (rev 1027)
@@ -0,0 +1,22 @@
+Index: php5-5.2.5/sapi/cli/php.1.in
+===================================================================
+--- php5-5.2.5.orig/sapi/cli/php.1.in	2008-04-30 23:26:21.000000000 -0500
++++ php5-5.2.5/sapi/cli/php.1.in	2008-04-30 23:26:58.000000000 -0500
+@@ -69,7 +69,7 @@
+ You can access the input line by \fB$argn\fP. While processing the input lines
+ .B $argi 
+ contains the number of the actual line being processed. Further more
+-the paramters \-B and \-E can be used to execute 
++the parameters \-B and \-E can be used to execute 
+ .IR code
+ (see \-r) before and
+ after all input lines have been processed respectively. Notice that the
+@@ -339,7 +339,7 @@
+ Using this PHP command you can count the lines being input.
+ .TP
+ \fIphp \-R '@$l+=count(file($argn));' \-E 'echo "Lines:$l\\n";'\fP
+-In this example PHP expects each input line beeing a file. It counts all lines 
++In this example PHP expects each input line being a file. It counts all lines 
+ of the files specified by each input line and shows the summarized result. 
+ You may combine this with tools like find and change the php scriptlet.
+ .TP

Modified: php5/trunk/debian/patches/series
===================================================================
--- php5/trunk/debian/patches/series	2008-04-28 02:04:28 UTC (rev 1026)
+++ php5/trunk/debian/patches/series	2008-05-01 05:00:45 UTC (rev 1027)
@@ -29,3 +29,4 @@
 suhosin.patch
 fix_broken_upstream_tests.patch
 use_embedded_timezonedb.patch
+manpage_spelling.patch

Modified: php5/trunk/debian/rules
===================================================================
--- php5/trunk/debian/rules	2008-04-28 02:04:28 UTC (rev 1026)
+++ php5/trunk/debian/rules	2008-05-01 05:00:45 UTC (rev 1027)
@@ -339,10 +339,10 @@
 	# remove netware and win32 headers that we don't want
 	cd debian/libapache2-mod-php5/usr/include/php5/ && \
 		  rm -f TSRM/readdir.h \
-			TSRM/tsrm_config.{nw,w32}.h \
-			TSRM/tsrm_{nw,win32}.h \
-			Zend/zend_config.{nw,w32}.h \
-			main/config.{nw,w32}.h \
+			TSRM/tsrm_config.nw.h TSRM/tsrm_config.w32.h\
+			TSRM/tsrm_nw.h TSRM/tsrm_win32.h\
+			Zend/zend_config.nw.h Zend/zend_config.w32.h\
+			main/config.nw.h main/config.w32.h\
 			main/win95nt.h
 
 	# install PEAR




More information about the Pkg-php-commits mailing list