[Pkg-php-commits] [php/debian-sid] quilt refresh for new upstream release

[Sean Finney]

---
 debian/patches/001-libtool_fixes.patch       |    2 +-
 debian/patches/004-ldap_fix.patch            |    4 ++--
 debian/patches/006-debian_quirks.patch       |    8 ++++----
 debian/patches/013-force_getaddrinfo.patch   |    2 +-
 debian/patches/053-extension_api.patch       |    4 ++--
 debian/patches/bad_whatis_entries.patch      |    2 +-
 debian/patches/use_embedded_timezonedb.patch |    2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/debian/patches/001-libtool_fixes.patch b/debian/patches/001-libtool_fixes.patch
index 072882a..af8eb7d 100644
--- a/debian/patches/001-libtool_fixes.patch
+++ b/debian/patches/001-libtool_fixes.patch
@@ -12,7 +12,7 @@
  
 --- php.orig/configure.in
 +++ php/configure.in
-@@ -1354,9 +1354,6 @@ AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [],
+@@ -1357,9 +1357,6 @@ AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [],
  ])
  AC_PROG_LIBTOOL
  
diff --git a/debian/patches/004-ldap_fix.patch b/debian/patches/004-ldap_fix.patch
index 67008d1..2fda128 100644
--- a/debian/patches/004-ldap_fix.patch
+++ b/debian/patches/004-ldap_fix.patch
@@ -1,6 +1,6 @@
 --- php.orig/ext/ldap/ldap.c
 +++ php/ext/ldap/ldap.c
-@@ -1237,7 +1237,7 @@ PHP_FUNCTION(ldap_explode_dn)
+@@ -1239,7 +1239,7 @@ PHP_FUNCTION(ldap_explode_dn)
  	}
  
  	i=0;
@@ -9,7 +9,7 @@
  	count = i;
  
  	array_init(return_value);
-@@ -1247,7 +1247,8 @@ PHP_FUNCTION(ldap_explode_dn)
+@@ -1249,7 +1249,8 @@ PHP_FUNCTION(ldap_explode_dn)
  		add_index_string(return_value, i, ldap_value[i], 1);
  	}
  
diff --git a/debian/patches/006-debian_quirks.patch b/debian/patches/006-debian_quirks.patch
index 87d1a63..a565326 100644
--- a/debian/patches/006-debian_quirks.patch
+++ b/debian/patches/006-debian_quirks.patch
@@ -1,6 +1,6 @@
 --- php.orig/configure.in
 +++ php/configure.in
-@@ -1029,7 +1029,7 @@ if test "$PHP_CLI" = "no"; then
+@@ -1032,7 +1032,7 @@ if test "$PHP_CLI" = "no"; then
  fi
  
  PHP_ARG_WITH(pear, [whether to install PEAR],
@@ -9,7 +9,7 @@
    --without-pear          Do not install PEAR], DEFAULT, yes)
  
  if test "$PHP_PEAR" != "no"; then
-@@ -1059,7 +1059,7 @@ dnl
+@@ -1062,7 +1062,7 @@ dnl
    if test "$PHP_PEAR" = "DEFAULT" || test "$PHP_PEAR" = "yes"; then
      case $PHP_LAYOUT in
        GNU) PEAR_INSTALLDIR=$datadir/pear;;
@@ -18,7 +18,7 @@
      esac
    fi
  
-@@ -1114,12 +1114,12 @@ test "$program_suffix" = "NONE" && progr
+@@ -1117,12 +1117,12 @@ test "$program_suffix" = "NONE" && progr
  
  case $libdir in
    '${exec_prefix}/lib')
@@ -33,7 +33,7 @@
      ;;
  esac
  
-@@ -1184,7 +1184,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd
+@@ -1187,7 +1187,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd
  EXPANDED_DATADIR=$datadir
  EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
  EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
diff --git a/debian/patches/013-force_getaddrinfo.patch b/debian/patches/013-force_getaddrinfo.patch
index 408f1d4..5a93f02 100644
--- a/debian/patches/013-force_getaddrinfo.patch
+++ b/debian/patches/013-force_getaddrinfo.patch
@@ -1,6 +1,6 @@
 --- php.orig/configure.in
 +++ php/configure.in
-@@ -639,50 +639,50 @@ asprintf \
+@@ -642,50 +642,50 @@ asprintf \
  
  dnl Check for getaddrinfo, should be a better way, but...
  dnl Also check for working getaddrinfo
diff --git a/debian/patches/053-extension_api.patch b/debian/patches/053-extension_api.patch
index ac73fae..72deb02 100644
--- a/debian/patches/053-extension_api.patch
+++ b/debian/patches/053-extension_api.patch
@@ -1,6 +1,6 @@
 --- php.orig/configure.in
 +++ php/configure.in
-@@ -1138,8 +1138,13 @@ dnl Build extension directory path
+@@ -1141,8 +1141,13 @@ dnl Build extension directory path
  
  ZEND_MODULE_API_NO=`$EGREP '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modules.h|$SED 's/#define ZEND_MODULE_API_NO //'`
  
@@ -15,7 +15,7 @@
    if test "$oldstyleextdir" = "yes"; then
      if test "$PHP_DEBUG" = "1"; then
        part1=debug
-@@ -1284,6 +1289,7 @@ PHP_SUBST(CXX)
+@@ -1287,6 +1292,7 @@ PHP_SUBST(CXX)
  PHP_SUBST(CXXFLAGS)
  PHP_SUBST(CXXFLAGS_CLEAN)
  PHP_SUBST_OLD(DEBUG_CFLAGS)
diff --git a/debian/patches/bad_whatis_entries.patch b/debian/patches/bad_whatis_entries.patch
index d651e01..7ec62f7 100644
--- a/debian/patches/bad_whatis_entries.patch
+++ b/debian/patches/bad_whatis_entries.patch
@@ -1,7 +1,7 @@
 --- php.orig/sapi/cli/php.1.in
 +++ php/sapi/cli/php.1.in
 @@ -1,6 +1,5 @@
- .TH PHP 1 "2008" "The PHP Group" "Scripting Language"
+ .TH PHP 1 "2009" "The PHP Group" "Scripting Language"
  .SH NAME
 -.TP 15
  php \- PHP Command Line Interface 'CLI'
diff --git a/debian/patches/use_embedded_timezonedb.patch b/debian/patches/use_embedded_timezonedb.patch
index efc9299..2bbdb38 100644
--- a/debian/patches/use_embedded_timezonedb.patch
+++ b/debian/patches/use_embedded_timezonedb.patch
@@ -293,7 +293,7 @@ r1: initial revision
 +
 --- php.orig/ext/date/php_date.c
 +++ php/ext/date/php_date.c
-@@ -847,6 +847,11 @@ static char* guess_timezone(const timeli
+@@ -852,6 +852,11 @@ static char* guess_timezone(const timeli
  	if (DATEG(default_timezone) && (strlen(DATEG(default_timezone)) > 0) && timelib_timezone_id_is_valid(DATEG(default_timezone), tzdb)) {
  		return DATEG(default_timezone);
  	}
-- 
1.6.3.3