Refresh patchesdebian/5.6.1+dfsg-1

47 files changed, 189 insertions, 189 deletions

diff --git a/debian/patches/0001-Fix-ZEND_MM_ALIGNMENT-on-m64k.patch b/debian/patches/0001-Fix-ZEND_MM_ALIGNMENT-on-m64k.patch
index 1c257c6bb..11ec0c6f6 100644
--- a/debian/patches/0001-Fix-ZEND_MM_ALIGNMENT-on-m64k.patch
+++ b/debian/patches/0001-Fix-ZEND_MM_ALIGNMENT-on-m64k.patch
@@ -7,8 +7,8 @@ Subject: [PATCH] Fix ZEND_MM_ALIGNMENT on m64k
  Zend/Zend.m4 | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
---- php5.orig/Zend/Zend.m4
-+++ php5/Zend/Zend.m4
+--- a/Zend/Zend.m4
++++ b/Zend/Zend.m4
 @@ -263,7 +263,7 @@ typedef union _mm_align_test {
  
  int main()
diff --git a/debian/patches/001-libtool_fixes.patch b/debian/patches/001-libtool_fixes.patch
index cf581442a..f7a5023e2 100644
--- a/debian/patches/001-libtool_fixes.patch
+++ b/debian/patches/001-libtool_fixes.patch
@@ -1,5 +1,5 @@
---- php5.orig/TSRM/configure.in
-+++ php5/TSRM/configure.in
+--- a/TSRM/configure.in
++++ b/TSRM/configure.in
 @@ -17,9 +17,6 @@ TSRM_BASIC_CHECKS
  TSRM_THREADS_CHECKS
  	
@@ -10,9 +10,9 @@
  
  dnl TSRM_PTHREAD
  
---- php5.orig/configure.in
-+++ php5/configure.in
-@@ -1402,9 +1402,6 @@ AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [],
+--- a/configure.in
++++ b/configure.in
+@@ -1416,9 +1416,6 @@ AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [],
  ])
  AC_PROG_LIBTOOL
  
diff --git a/debian/patches/002-static_openssl.patch b/debian/patches/002-static_openssl.patch
index 0016af453..9969c8297 100644
--- a/debian/patches/002-static_openssl.patch
+++ b/debian/patches/002-static_openssl.patch
@@ -1,5 +1,5 @@
---- php5.orig/acinclude.m4
-+++ php5/acinclude.m4
+--- a/acinclude.m4
++++ b/acinclude.m4
 @@ -2392,9 +2392,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
  
      PHP_ADD_INCLUDE($OPENSSL_INCDIR)
diff --git a/debian/patches/006-debian_quirks.patch b/debian/patches/006-debian_quirks.patch
index 9cc56cbd7..c8e91b404 100644
--- a/debian/patches/006-debian_quirks.patch
+++ b/debian/patches/006-debian_quirks.patch
@@ -4,9 +4,9 @@ Origin: vendor
 Forwarded: not-needed
 Last-Update: 2010-01-18
 
---- php5.orig/configure.in
-+++ php5/configure.in
-@@ -1071,7 +1071,7 @@ if test "$PHP_CLI" = "no"; then
+--- a/configure.in
++++ b/configure.in
+@@ -1085,7 +1085,7 @@ if test "$PHP_CLI" = "no"; then
  fi
  
  PHP_ARG_WITH(pear, [whether to install PEAR],
@@ -15,7 +15,7 @@ Last-Update: 2010-01-18
    --without-pear          Do not install PEAR], DEFAULT, yes)
  
  if test "$PHP_PEAR" != "no"; then
-@@ -1101,7 +1101,7 @@ dnl
+@@ -1115,7 +1115,7 @@ dnl
    if test "$PHP_PEAR" = "DEFAULT" || test "$PHP_PEAR" = "yes"; then
      case $PHP_LAYOUT in
        GNU) PEAR_INSTALLDIR=$datadir/pear;;
@@ -24,7 +24,7 @@ Last-Update: 2010-01-18
      esac
    fi
  
-@@ -1156,12 +1156,12 @@ test "$program_suffix" = "NONE" && progr
+@@ -1170,12 +1170,12 @@ test "$program_suffix" = "NONE" && progr
  
  case $libdir in
    '${exec_prefix}/lib')
@@ -39,7 +39,7 @@ Last-Update: 2010-01-18
      ;;
  esac
  
-@@ -1228,7 +1228,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd
+@@ -1242,7 +1242,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"`
@@ -48,8 +48,8 @@ Last-Update: 2010-01-18
  
  exec_prefix=$old_exec_prefix
  libdir=$old_libdir
---- php5.orig/ext/ext_skel
-+++ php5/ext/ext_skel
+--- a/ext/ext_skel
++++ b/ext/ext_skel
 @@ -70,7 +70,7 @@ if test -d "$extname" ; then
  fi
  
@@ -59,8 +59,8 @@ Last-Update: 2010-01-18
  fi
  
  ## convert skel_dir to full path
---- php5.orig/php.ini-development
-+++ php5/php.ini-development
+--- a/php.ini-development
++++ b/php.ini-development
 @@ -711,7 +711,7 @@ default_charset = "UTF-8"
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
@@ -70,8 +70,8 @@ Last-Update: 2010-01-18
  ;
  ; Windows: "\path1;\path2"
  ;include_path = ".;c:\php\includes"
---- php5.orig/php.ini-production
-+++ php5/php.ini-production
+--- a/php.ini-production
++++ b/php.ini-production
 @@ -709,7 +709,7 @@ default_charset = "UTF-8"
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
@@ -131,8 +131,8 @@ Last-Update: 2010-01-18
  
  ;;;;;;;;;;;;;;;;;;;
  ; Module Settings ;
---- php5.orig/sapi/cli/php.1.in
-+++ php5/sapi/cli/php.1.in
+--- a/sapi/cli/php.1.in
++++ b/sapi/cli/php.1.in
 @@ -365,13 +365,14 @@ Shows configuration for extension
  Show configuration file names
  .SH FILES
@@ -152,9 +152,9 @@ Last-Update: 2010-01-18
 +The configuration file for the version of PHP that apache2 uses.
  .SH EXAMPLES
  .TP 5
- \fIphp \-r 'echo "Hello World\\n";'\fP
---- php5.orig/scripts/Makefile.frag
-+++ php5/scripts/Makefile.frag
+ \fI@program_prefix@php \-r 'echo "Hello World\\n";'\fP
+--- a/scripts/Makefile.frag
++++ b/scripts/Makefile.frag
 @@ -3,8 +3,8 @@
  # Build environment install
  #
@@ -166,8 +166,8 @@ Last-Update: 2010-01-18
  
  BUILD_FILES = \
  	scripts/phpize.m4 \
---- php5.orig/scripts/php-config.in
-+++ php5/scripts/php-config.in
+--- a/scripts/php-config.in
++++ b/scripts/php-config.in
 @@ -6,9 +6,9 @@ datarootdir="@datarootdir@"
  exec_prefix="@exec_prefix@"
  version="@PHP_VERSION@"
@@ -181,8 +181,8 @@ Last-Update: 2010-01-18
  libs="@EXTRA_LIBS@"
  extension_dir='@EXTENSION_DIR@'
  man_dir=`eval echo @mandir@`
---- php5.orig/scripts/phpize.in
-+++ php5/scripts/phpize.in
+--- a/scripts/phpize.in
++++ b/scripts/phpize.in
 @@ -4,8 +4,8 @@
  prefix='@prefix@'
  datarootdir='@datarootdir@'
diff --git a/debian/patches/033-we_WANT_libtool.patch b/debian/patches/033-we_WANT_libtool.patch
index d8232357c..068afb307 100644
--- a/debian/patches/033-we_WANT_libtool.patch
+++ b/debian/patches/033-we_WANT_libtool.patch
@@ -11,8 +11,8 @@ Origin: vendor
 Forwarded: no
 Last-Update: 2010-01-18
 
---- php5.orig/build/build2.mk
-+++ php5/build/build2.mk
+--- a/build/build2.mk
++++ b/build/build2.mk
 @@ -46,7 +46,8 @@ $(TOUCH_FILES):
  
  aclocal.m4: configure.in acinclude.m4
diff --git a/debian/patches/044-strtod_arm_fix.patch b/debian/patches/044-strtod_arm_fix.patch
index 4a46bc909..ee26461c2 100644
--- a/debian/patches/044-strtod_arm_fix.patch
+++ b/debian/patches/044-strtod_arm_fix.patch
@@ -1,5 +1,5 @@
---- php5.orig/Zend/zend_strtod.c
-+++ php5/Zend/zend_strtod.c
+--- a/Zend/zend_strtod.c
++++ b/Zend/zend_strtod.c
 @@ -152,14 +152,25 @@ typedef unsigned long int uint32_t;
  #define IEEE_LITTLE_ENDIAN
  #endif
diff --git a/debian/patches/053-extension_api.patch b/debian/patches/053-extension_api.patch
index 02b383211..64f93ee50 100644
--- a/debian/patches/053-extension_api.patch
+++ b/debian/patches/053-extension_api.patch
@@ -5,9 +5,9 @@ Origin: vendor
 Forwarded: no
 Last-Update: 2010-01-18
 
---- php5.orig/configure.in
-+++ php5/configure.in
-@@ -1180,8 +1180,10 @@ dnl Build extension directory path
+--- a/configure.in
++++ b/configure.in
+@@ -1194,8 +1194,10 @@ 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 //'`
  
@@ -19,7 +19,7 @@ Last-Update: 2010-01-18
    if test "$oldstyleextdir" = "yes"; then
      if test "$PHP_DEBUG" = "1"; then
        part1=debug
-@@ -1324,6 +1326,7 @@ PHP_SUBST(CXX)
+@@ -1338,6 +1340,7 @@ PHP_SUBST(CXX)
  PHP_SUBST(CXXFLAGS)
  PHP_SUBST(CXXFLAGS_CLEAN)
  PHP_SUBST_OLD(DEBUG_CFLAGS)
@@ -27,8 +27,8 @@ Last-Update: 2010-01-18
  PHP_SUBST_OLD(EXTENSION_DIR)
  PHP_SUBST_OLD(EXTRA_LDFLAGS)
  PHP_SUBST_OLD(EXTRA_LDFLAGS_PROGRAM)
---- php5.orig/scripts/php-config.in
-+++ php5/scripts/php-config.in
+--- a/scripts/php-config.in
++++ b/scripts/php-config.in
 @@ -19,6 +19,7 @@ php_cli_binary=NONE
  php_cgi_binary=NONE
  configure_options="@CONFIGURE_OPTIONS@"
diff --git a/debian/patches/057-no_apache_installed.patch b/debian/patches/057-no_apache_installed.patch
index 939b78801..9b7a84cbd 100644
--- a/debian/patches/057-no_apache_installed.patch
+++ b/debian/patches/057-no_apache_installed.patch
@@ -3,8 +3,8 @@ Origin: vendor
 Forwarded: no
 Last-Update: 2010-01-18
 
---- php5.orig/sapi/apache2handler/config.m4
-+++ php5/sapi/apache2handler/config.m4
+--- a/sapi/apache2handler/config.m4
++++ b/sapi/apache2handler/config.m4
 @@ -58,14 +58,6 @@ if test "$PHP_APXS2" != "no"; then
  
    APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS"
@@ -20,8 +20,8 @@ Last-Update: 2010-01-18
    APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
    if test -z `$APXS -q SYSCONFDIR`; then
      INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
---- php5.orig/sapi/apache/config.m4
-+++ php5/sapi/apache/config.m4
+--- a/sapi/apache/config.m4
++++ b/sapi/apache/config.m4
 @@ -56,12 +56,6 @@ if test "$PHP_APXS" != "no"; then
    APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
    APACHE_INCLUDE=-I$APXS_INCLUDEDIR
@@ -35,8 +35,8 @@ Last-Update: 2010-01-18
    for flag in $APXS_CFLAGS; do
      case $flag in
      -D*) APACHE_CPPFLAGS="$APACHE_CPPFLAGS $flag";;
---- php5.orig/sapi/apache2filter/config.m4
-+++ php5/sapi/apache2filter/config.m4
+--- a/sapi/apache2filter/config.m4
++++ b/sapi/apache2filter/config.m4
 @@ -59,14 +59,6 @@ if test "$PHP_APXS2FILTER" != "no"; then
  
    APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS"
@@ -52,8 +52,8 @@ Last-Update: 2010-01-18
    APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
    if test -z `$APXS -q SYSCONFDIR`; then
      INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
---- php5.orig/sapi/apache_hooks/config.m4
-+++ php5/sapi/apache_hooks/config.m4
+--- a/sapi/apache_hooks/config.m4
++++ b/sapi/apache_hooks/config.m4
 @@ -57,12 +57,6 @@ if test "$PHP_APACHE_HOOKS" != "no"; the
    APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
    APACHE_INCLUDE=-I$APXS_INCLUDEDIR
diff --git a/debian/patches/100-recode_is_shared.patch b/debian/patches/100-recode_is_shared.patch
index 22d7ea787..a91302c35 100644
--- a/debian/patches/100-recode_is_shared.patch
+++ b/debian/patches/100-recode_is_shared.patch
@@ -4,8 +4,8 @@ Origin: vendor
 Forwarded: no
 Last-Update: 2010-01-18
 
---- php5.orig/ext/recode/config9.m4
-+++ php5/ext/recode/config9.m4
+--- a/ext/recode/config9.m4
++++ b/ext/recode/config9.m4
 @@ -13,6 +13,6 @@ if test "$PHP_RECODE" != "no"; then
    fi
  
diff --git a/debian/patches/112-proc_open.patch b/debian/patches/112-proc_open.patch
index fe7997b74..81ba59b6e 100644
--- a/debian/patches/112-proc_open.patch
+++ b/debian/patches/112-proc_open.patch
@@ -1,5 +1,5 @@
---- php5.orig/ext/standard/proc_open.c
-+++ php5/ext/standard/proc_open.c
+--- a/ext/standard/proc_open.c
++++ b/ext/standard/proc_open.c
 @@ -62,7 +62,7 @@
   * */
  #ifdef PHP_CAN_SUPPORT_PROC_OPEN
diff --git a/debian/patches/113-php.ini_securitynotes.patch b/debian/patches/113-php.ini_securitynotes.patch
index 692de768e..389998fc6 100644
--- a/debian/patches/113-php.ini_securitynotes.patch
+++ b/debian/patches/113-php.ini_securitynotes.patch
@@ -3,8 +3,8 @@ Origin: vendor
 Forwarded: not-needed
 Last-Update: 2010-01-18
 
---- php5.orig/php.ini-development
-+++ php5/php.ini-development
+--- a/php.ini-development
++++ b/php.ini-development
 @@ -296,6 +296,12 @@ serialize_precision = 17
  ; or per-virtualhost web server configuration file. This directive is
  ; *NOT* affected by whether Safe Mode is turned On or Off.
diff --git a/debian/patches/dont-gitclean-in-build.patch b/debian/patches/dont-gitclean-in-build.patch
index b09f80408..5738f0990 100644
--- a/debian/patches/dont-gitclean-in-build.patch
+++ b/debian/patches/dont-gitclean-in-build.patch
@@ -7,8 +7,8 @@ Description: Don't run git-clean via buildconf
  .
  This patch doesn't need to go upstream, as they likely don't want to support
  having a patch system on top of their source.
---- php5.orig/build/build.mk
-+++ php5/build/build.mk
+--- a/build/build.mk
++++ b/build/build.mk
 @@ -63,6 +63,5 @@ gitclean-work:
  	@if (test ! -f '.git/info/exclude' || grep -s "git-ls-files" .git/info/exclude); then \
  		(echo "Rebuild .git/info/exclude" && echo '*.o' > .git/info/exclude && git svn propget svn:ignore | grep -v config.nice >> .git/info/exclude); \
diff --git a/debian/patches/expose_all_built_and_installed_apis.patch b/debian/patches/expose_all_built_and_installed_apis.patch
index 9c3dd3190..7c9956774 100644
--- a/debian/patches/expose_all_built_and_installed_apis.patch
+++ b/debian/patches/expose_all_built_and_installed_apis.patch
@@ -1,5 +1,5 @@
---- php5.orig/scripts/man1/php-config.1.in
-+++ php5/scripts/man1/php-config.1.in
+--- a/scripts/man1/php-config.1.in
++++ b/scripts/man1/php-config.1.in
 @@ -44,7 +44,7 @@ Full path to php CLI or CGI binary
  .TP
  .PD 0
@@ -9,8 +9,8 @@
  .TP
  .PD 0
  .B \-\-configure-options
---- php5.orig/scripts/php-config.in
-+++ php5/scripts/php-config.in
+--- a/scripts/php-config.in
++++ b/scripts/php-config.in
 @@ -18,9 +18,12 @@ exe_extension="@EXEEXT@"
  php_cli_binary=NONE
  php_cgi_binary=NONE
diff --git a/debian/patches/force_libmysqlclient_r.patch b/debian/patches/force_libmysqlclient_r.patch
index 94d1c999f..c9c89c70c 100644
--- a/debian/patches/force_libmysqlclient_r.patch
+++ b/debian/patches/force_libmysqlclient_r.patch
@@ -6,8 +6,8 @@ Origin: other, http://bugs.debian.org/469081
 Forwarded: not-needed
 Last-Update: 2010-01-18
 
---- php5.orig/ext/mysql/config.m4
-+++ php5/ext/mysql/config.m4
+--- a/ext/mysql/config.m4
++++ b/ext/mysql/config.m4
 @@ -77,7 +77,7 @@ elif test "$PHP_MYSQL" != "no"; then
  Note that the MySQL client library is not bundled anymore!])
    fi
@@ -17,8 +17,8 @@ Last-Update: 2010-01-18
      MYSQL_LIBNAME=mysqlclient_r
    else
      MYSQL_LIBNAME=mysqlclient
---- php5.orig/ext/mysqli/config.m4
-+++ php5/ext/mysqli/config.m4
+--- a/ext/mysqli/config.m4
++++ b/ext/mysqli/config.m4
 @@ -26,7 +26,7 @@ elif test "$PHP_MYSQLI" != "no"; then
      MYSQL_LIB_CFG='--libmysqld-libs'
      dnl mysqlnd doesn't support embedded, so we have to add some extra stuff
@@ -28,8 +28,8 @@ Last-Update: 2010-01-18
      MYSQL_LIB_CFG='--libs_r'
      MYSQL_LIB_NAME='mysqlclient_r'
    else
---- php5.orig/ext/pdo_mysql/config.m4
-+++ php5/ext/pdo_mysql/config.m4
+--- a/ext/pdo_mysql/config.m4
++++ b/ext/pdo_mysql/config.m4
 @@ -55,7 +55,7 @@ if test "$PHP_PDO_MYSQL" != "no"; then
        if test "x$SED" = "x"; then
          AC_PATH_PROG(SED, sed)
diff --git a/debian/patches/fpm-config.patch b/debian/patches/fpm-config.patch
index e64c60a7a..464c65573 100644
--- a/debian/patches/fpm-config.patch
+++ b/debian/patches/fpm-config.patch
@@ -4,8 +4,8 @@ Origin: vendor
 Forwarded: not-needed
 Last-Update: 2010-07-30
 
---- php5.orig/sapi/fpm/php-fpm.conf.in
-+++ php5/sapi/fpm/php-fpm.conf.in
+--- a/sapi/fpm/php-fpm.conf.in
++++ b/sapi/fpm/php-fpm.conf.in
 @@ -12,7 +12,7 @@
  ; Relative path can also be used. They will be prefixed by:
  ;  - the global prefix if it's been set (-p argument)
diff --git a/debian/patches/hack-phpdbg-to-explicitly-link-with-libedit.patch b/debian/patches/hack-phpdbg-to-explicitly-link-with-libedit.patch
index be6154d99..c88840841 100644
--- a/debian/patches/hack-phpdbg-to-explicitly-link-with-libedit.patch
+++ b/debian/patches/hack-phpdbg-to-explicitly-link-with-libedit.patch
@@ -1,5 +1,5 @@
---- php5.orig/sapi/phpdbg/config.m4
-+++ php5/sapi/phpdbg/config.m4
+--- a/sapi/phpdbg/config.m4
++++ b/sapi/phpdbg/config.m4
 @@ -22,7 +22,9 @@ if test "$PHP_PHPDBG" != "no"; then
    PHP_PHPDBG_FILES="phpdbg.c phpdbg_parser.c phpdbg_lexer.c phpdbg_prompt.c phpdbg_help.c phpdbg_break.c phpdbg_print.c phpdbg_bp.c phpdbg_opcode.c phpdbg_list.c phpdbg_utils.c phpdbg_info.c phpdbg_cmd.c phpdbg_set.c phpdbg_frame.c phpdbg_watch.c phpdbg_btree.c"
  
diff --git a/debian/patches/hurd-noptrace.diff b/debian/patches/hurd-noptrace.diff
index 012f0f841..3072d03ba 100644
--- a/debian/patches/hurd-noptrace.diff
+++ b/debian/patches/hurd-noptrace.diff
@@ -1,5 +1,5 @@
---- php5.orig/sapi/fpm/config.m4
-+++ php5/sapi/fpm/config.m4
+--- a/sapi/fpm/config.m4
++++ b/sapi/fpm/config.m4
 @@ -147,6 +147,11 @@ AC_DEFUN([AC_FPM_TRACE],
          pid_t child;
          int status;
diff --git a/debian/patches/libtool2.2.patch b/debian/patches/libtool2.2.patch
index 0c1fa6c21..d54bad124 100644
--- a/debian/patches/libtool2.2.patch
+++ b/debian/patches/libtool2.2.patch
@@ -1,5 +1,5 @@
---- php5.orig/scripts/phpize.in
-+++ php5/scripts/phpize.in
+--- a/scripts/phpize.in
++++ b/scripts/phpize.in
 @@ -6,10 +6,16 @@ datarootdir='@datarootdir@'
  exec_prefix="`eval echo @exec_prefix@`"
  phpdir="$prefix/lib/php5/build"
diff --git a/debian/patches/lp564920-fix-big-files.patch b/debian/patches/lp564920-fix-big-files.patch
index 2487db488..90373bdd8 100644
--- a/debian/patches/lp564920-fix-big-files.patch
+++ b/debian/patches/lp564920-fix-big-files.patch
@@ -3,8 +3,8 @@ Author: Marc Deslauriers <marc.deslauriers@ubuntu.com>
 Bug: http://bugs.php.net/bug.php?id=52102
 Ubuntu-Bug: https://bugs.edge.launchpad.net/ubuntu/+source/php5/+bug/564920
 
---- php5.orig/main/streams/plain_wrapper.c
-+++ php5/main/streams/plain_wrapper.c
+--- a/main/streams/plain_wrapper.c
++++ b/main/streams/plain_wrapper.c
 @@ -627,7 +627,13 @@ static int php_stdiop_set_option(php_str
  				
  				switch (value) {
diff --git a/debian/patches/php-5.2.4-embed.patch b/debian/patches/php-5.2.4-embed.patch
index 54dd84ec1..e84745696 100644
--- a/debian/patches/php-5.2.4-embed.patch
+++ b/debian/patches/php-5.2.4-embed.patch
@@ -1,5 +1,5 @@
---- php5.orig/sapi/embed/config.m4
-+++ php5/sapi/embed/config.m4
+--- a/sapi/embed/config.m4
++++ b/sapi/embed/config.m4
 @@ -12,7 +12,7 @@ if test "$PHP_EMBED" != "no"; then
    case "$PHP_EMBED" in
      yes|shared)
diff --git a/debian/patches/php-5.2.4-norpath.patch b/debian/patches/php-5.2.4-norpath.patch
index 6a34c1c5a..abb954b1d 100644
--- a/debian/patches/php-5.2.4-norpath.patch
+++ b/debian/patches/php-5.2.4-norpath.patch
@@ -1,5 +1,5 @@
---- php5.orig/acinclude.m4
-+++ php5/acinclude.m4
+--- a/acinclude.m4
++++ b/acinclude.m4
 @@ -432,6 +432,7 @@ AC_DEFUN([PHP_EVAL_INCLINE],[
  dnl internal, don't use
  AC_DEFUN([_PHP_ADD_LIBPATH_GLOBAL],[
diff --git a/debian/patches/php-5.3.3-macropen.patch b/debian/patches/php-5.3.3-macropen.patch
index 189799158..b7ba48204 100644
--- a/debian/patches/php-5.3.3-macropen.patch
+++ b/debian/patches/php-5.3.3-macropen.patch
@@ -1,5 +1,5 @@
---- php5.orig/ext/dba/dba.c
-+++ php5/ext/dba/dba.c
+--- a/ext/dba/dba.c
++++ b/ext/dba/dba.c
 @@ -930,7 +930,7 @@ static void php_dba_open(INTERNAL_FUNCTI
  		}
  	}
@@ -9,8 +9,8 @@
  		dba_close(info TSRMLS_CC);
  		php_error_docref2(NULL TSRMLS_CC, Z_STRVAL_PP(args[0]), Z_STRVAL_PP(args[1]), E_WARNING, "Driver initialization failed for handler: %s%s%s", hptr->name, error?": ":"", error?error:"");
  		FREENOW;
---- php5.orig/ext/dba/dba_db3.c
-+++ php5/ext/dba/dba_db3.c
+--- a/ext/dba/dba_db3.c
++++ b/ext/dba/dba_db3.c
 @@ -91,7 +91,7 @@ DBA_OPEN_FUNC(db3)
  
  	if ((err=db_create(&dbp, NULL, 0)) == 0) {
@@ -20,8 +20,8 @@
  			dba_db3_data *data;
  
  			data = pemalloc(sizeof(*data), info->flags&DBA_PERSISTENT);
---- php5.orig/ext/dba/dba_db4.c
-+++ php5/ext/dba/dba_db4.c
+--- a/ext/dba/dba_db4.c
++++ b/ext/dba/dba_db4.c
 @@ -126,9 +126,9 @@ DBA_OPEN_FUNC(db4)
  	    dbp->set_errcall(dbp, php_dba_db4_errcall_fcn);
  	    if (
diff --git a/debian/patches/php-5.3.9-gnusrc.patch b/debian/patches/php-5.3.9-gnusrc.patch
index 706e3fec3..a910f1869 100644
--- a/debian/patches/php-5.3.9-gnusrc.patch
+++ b/debian/patches/php-5.3.9-gnusrc.patch
@@ -1,5 +1,5 @@
---- php5.orig/configure.in
-+++ php5/configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -136,6 +136,8 @@ AC_DEFUN([PHP_EXT_DIR],[ext/$1])dnl
  AC_DEFUN([PHP_EXT_SRCDIR],[$abs_srcdir/ext/$1])dnl
  AC_DEFUN([PHP_ALWAYS_SHARED],[])dnl
@@ -9,8 +9,8 @@
  dnl Setting up the PHP version based on the information above.
  dnl -------------------------------------------------------------------------
  
---- php5.orig/ext/interbase/interbase.c
-+++ php5/ext/interbase/interbase.c
+--- a/ext/interbase/interbase.c
++++ b/ext/interbase/interbase.c
 @@ -22,7 +22,6 @@
  #include "config.h"
  #endif
@@ -19,8 +19,8 @@
  
  #include "php.h"
  
---- php5.orig/ext/pdo_firebird/firebird_driver.c
-+++ php5/ext/pdo_firebird/firebird_driver.c
+--- a/ext/pdo_firebird/firebird_driver.c
++++ b/ext/pdo_firebird/firebird_driver.c
 @@ -20,7 +20,6 @@
  #include "config.h"
  #endif
@@ -29,8 +29,8 @@
  
  #include "php.h"
  #ifdef ZEND_ENGINE_2
---- php5.orig/ext/standard/file.c
-+++ php5/ext/standard/file.c
+--- a/ext/standard/file.c
++++ b/ext/standard/file.c
 @@ -112,9 +112,6 @@ php_file_globals file_globals;
  #endif
  
@@ -41,8 +41,8 @@
  # include <fnmatch.h>
  #endif
  
---- php5.orig/ext/zlib/zlib_fopen_wrapper.c
-+++ php5/ext/zlib/zlib_fopen_wrapper.c
+--- a/ext/zlib/zlib_fopen_wrapper.c
++++ b/ext/zlib/zlib_fopen_wrapper.c
 @@ -19,8 +19,6 @@
  
  /* $Id$ */
@@ -52,8 +52,8 @@
  #include "php.h"
  #include "php_zlib.h"
  #include "fopen_wrappers.h"
---- php5.orig/main/php.h
-+++ php5/main/php.h
+--- a/main/php.h
++++ b/main/php.h
 @@ -31,6 +31,7 @@
  #define YYDEBUG 0
  #define PHP_DEFAULT_CHARSET "UTF-8"
@@ -62,8 +62,8 @@
  #include "php_version.h"
  #include "zend.h"
  #include "zend_qsort.h"
---- php5.orig/main/streams/cast.c
-+++ php5/main/streams/cast.c
+--- a/main/streams/cast.c
++++ b/main/streams/cast.c
 @@ -18,7 +18,6 @@
  
  /* $Id$ */
@@ -72,8 +72,8 @@
  #include "php.h"
  #include "php_globals.h"
  #include "php_network.h"
---- php5.orig/main/streams/memory.c
-+++ php5/main/streams/memory.c
+--- a/main/streams/memory.c
++++ b/main/streams/memory.c
 @@ -18,7 +18,6 @@
  
  /* $Id$ */
@@ -82,8 +82,8 @@
  #include "php.h"
  
  PHPAPI int php_url_decode(char *str, int len);
---- php5.orig/main/streams/streams.c
-+++ php5/main/streams/streams.c
+--- a/main/streams/streams.c
++++ b/main/streams/streams.c
 @@ -21,7 +21,6 @@
  
  /* $Id$ */
@@ -92,8 +92,8 @@
  #include "php.h"
  #include "php_globals.h"
  #include "php_network.h"
---- php5.orig/Zend/zend_language_parser.c
-+++ php5/Zend/zend_language_parser.c
+--- a/Zend/zend_language_parser.c
++++ b/Zend/zend_language_parser.c
 @@ -75,6 +75,8 @@
  
  /* Copy the first part of user declarations.  */
diff --git a/debian/patches/php-5.3.9-mysqlnd.patch b/debian/patches/php-5.3.9-mysqlnd.patch
index 25a61b2b1..8b8bf1921 100644
--- a/debian/patches/php-5.3.9-mysqlnd.patch
+++ b/debian/patches/php-5.3.9-mysqlnd.patch
@@ -1,5 +1,5 @@
---- php5.orig/ext/mysqlnd/mysqlnd.c
-+++ php5/ext/mysqlnd/mysqlnd.c
+--- a/ext/mysqlnd/mysqlnd.c
++++ b/ext/mysqlnd/mysqlnd.c
 @@ -946,7 +946,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, connec
  		if (host_len == sizeof("localhost") - 1 && !strncasecmp(host, "localhost", host_len)) {
  			DBG_INF_FMT("socket=%s", socket_or_pipe? socket_or_pipe:"n/a");
@@ -9,8 +9,8 @@
  			}
  			transport_len = mnd_sprintf(&transport, 0, "unix://%s", socket_or_pipe);
  			unix_socket = TRUE;
---- php5.orig/ext/pdo_mysql/pdo_mysql.c
-+++ php5/ext/pdo_mysql/pdo_mysql.c
+--- a/ext/pdo_mysql/pdo_mysql.c
++++ b/ext/pdo_mysql/pdo_mysql.c
 @@ -50,7 +50,7 @@ ZEND_DECLARE_MODULE_GLOBALS(pdo_mysql)
  #  define PDO_MYSQL_UNIX_ADDR PHP_MYSQL_UNIX_SOCK_ADDR
  # else
diff --git a/debian/patches/php-5.4.0-dlopen.patch b/debian/patches/php-5.4.0-dlopen.patch
index e04c80a8c..169a13ecd 100644
--- a/debian/patches/php-5.4.0-dlopen.patch
+++ b/debian/patches/php-5.4.0-dlopen.patch
@@ -1,5 +1,5 @@
---- php5.orig/Zend/zend.h
-+++ php5/Zend/zend.h
+--- a/Zend/zend.h
++++ b/Zend/zend.h
 @@ -90,11 +90,11 @@
  # endif
  
diff --git a/debian/patches/php-5.4.7-libdb.patch b/debian/patches/php-5.4.7-libdb.patch
index 993863058..04349a71f 100644
--- a/debian/patches/php-5.4.7-libdb.patch
+++ b/debian/patches/php-5.4.7-libdb.patch
@@ -1,5 +1,5 @@
---- php5.orig/ext/dba/config.m4
-+++ php5/ext/dba/config.m4
+--- a/ext/dba/config.m4
++++ b/ext/dba/config.m4
 @@ -312,57 +312,13 @@ if test "$PHP_DB4" != "no"; then
    dbdp4="/usr/local/BerkeleyDB.4."
    dbdp5="/usr/local/BerkeleyDB.5."
@@ -60,8 +60,8 @@
  fi
  PHP_DBA_STD_RESULT(db4,Berkeley DB4)
  
---- php5.orig/ext/dba/dba.c
-+++ php5/ext/dba/dba.c
+--- a/ext/dba/dba.c
++++ b/ext/dba/dba.c
 @@ -52,6 +52,10 @@
  #include "php_qdbm.h"
  #include "php_tcadb.h"
diff --git a/debian/patches/php-5.4.7-odbctimer.patch b/debian/patches/php-5.4.7-odbctimer.patch
index 1547bb15e..6a3f77ae2 100644
--- a/debian/patches/php-5.4.7-odbctimer.patch
+++ b/debian/patches/php-5.4.7-odbctimer.patch
@@ -7,8 +7,8 @@ Subject: [PATCH] Fixed bug #63171, script hangs if odbc call during timeout
  ext/odbc/php_odbc.c |   21 ++++++++++++++-------
  1 file changed, 14 insertions(+), 7 deletions(-)
 
---- php5.orig/ext/odbc/php_odbc.c
-+++ php5/ext/odbc/php_odbc.c
+--- a/ext/odbc/php_odbc.c
++++ b/ext/odbc/php_odbc.c
 @@ -431,7 +431,8 @@ static void _free_odbc_result(zend_rsrc_
  			efree(res->values);
  			res->values = NULL;
diff --git a/debian/patches/php-5.4.8-ldap_r.patch b/debian/patches/php-5.4.8-ldap_r.patch
index 3273e3a33..5d5915549 100644
--- a/debian/patches/php-5.4.8-ldap_r.patch
+++ b/debian/patches/php-5.4.8-ldap_r.patch
@@ -1,8 +1,8 @@
 
 Use -lldap_r by default.
 
---- php5.orig/ext/ldap/config.m4
-+++ php5/ext/ldap/config.m4
+--- a/ext/ldap/config.m4
++++ b/ext/ldap/config.m4
 @@ -117,7 +117,10 @@ if test "$PHP_LDAP" != "no"; then
      LDAP_PTHREAD=
    fi
diff --git a/debian/patches/php-5.4.9-fixheader.patch b/debian/patches/php-5.4.9-fixheader.patch
index fc00c0739..b5914a255 100644
--- a/debian/patches/php-5.4.9-fixheader.patch
+++ b/debian/patches/php-5.4.9-fixheader.patch
@@ -1,9 +1,9 @@
 
 Make generated php_config.h constant across rebuilds.
 
---- php5.orig/configure.in
-+++ php5/configure.in
-@@ -1265,7 +1265,7 @@ fi
+--- a/configure.in
++++ b/configure.in
+@@ -1279,7 +1279,7 @@ fi
  EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS"
  EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS"
  
@@ -12,7 +12,7 @@ Make generated php_config.h constant across rebuilds.
  AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date])
  
  case $host_alias in
-@@ -1276,7 +1276,7 @@ case $host_alias in
+@@ -1290,7 +1290,7 @@ case $host_alias in
    AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[hardcode for each of the cross compiler host])
    ;;
  *)
diff --git a/debian/patches/php-5.4.9-phpinfo.patch b/debian/patches/php-5.4.9-phpinfo.patch
index af60f057d..2a70f6ee0 100644
--- a/debian/patches/php-5.4.9-phpinfo.patch
+++ b/debian/patches/php-5.4.9-phpinfo.patch
@@ -3,8 +3,8 @@ Drop "Configure Command" from phpinfo as it doesn't
 provide any useful information.
 The available extensions are not related to this command.
 
---- php5.orig/ext/standard/info.c
-+++ php5/ext/standard/info.c
+--- a/ext/standard/info.c
++++ b/ext/standard/info.c
 @@ -743,9 +743,6 @@ PHPAPI void php_print_info(int flag TSRM
  #ifdef ARCHITECTURE
  		php_info_print_table_row(2, "Architecture", ARCHITECTURE);
@@ -15,8 +15,8 @@ The available extensions are not related to this command.
  
  		if (sapi_module.pretty_name) {
  			php_info_print_table_row(2, "Server API", sapi_module.pretty_name );
---- php5.orig/ext/standard/tests/general_functions/phpinfo.phpt
-+++ php5/ext/standard/tests/general_functions/phpinfo.phpt
+--- a/ext/standard/tests/general_functions/phpinfo.phpt
++++ b/ext/standard/tests/general_functions/phpinfo.phpt
 @@ -20,7 +20,6 @@ PHP Version => %s
  
  System => %s
diff --git a/debian/patches/php-5.6.0-noNO.patch b/debian/patches/php-5.6.0-noNO.patch
index c32dd1bc4..35ebf4e57 100644
--- a/debian/patches/php-5.6.0-noNO.patch
+++ b/debian/patches/php-5.6.0-noNO.patch
@@ -1,5 +1,5 @@
---- php5.orig/ext/standard/tests/strings/setlocale_variation2.phpt
-+++ php5/ext/standard/tests/strings/setlocale_variation2.phpt
+--- a/ext/standard/tests/strings/setlocale_variation2.phpt
++++ b/ext/standard/tests/strings/setlocale_variation2.phpt
 @@ -52,6 +52,7 @@ $all_system_locales = list_system_locale
  //try different locale names	
  $failure_locale = array();
diff --git a/debian/patches/php-5.6.0-oldpcre.patch b/debian/patches/php-5.6.0-oldpcre.patch
index 34e235678..b3e8eb36b 100644
--- a/debian/patches/php-5.6.0-oldpcre.patch
+++ b/debian/patches/php-5.6.0-oldpcre.patch
@@ -1,5 +1,5 @@
---- php5.orig/ext/pcre/tests/bug37911.phpt
-+++ php5/ext/pcre/tests/bug37911.phpt
+--- a/ext/pcre/tests/bug37911.phpt
++++ b/ext/pcre/tests/bug37911.phpt
 @@ -37,5 +37,5 @@ array(3) {
    string(4) "blub"
  }
@@ -7,8 +7,8 @@
 -Warning: preg_replace_callback(): Compilation failed: group name must start with a non-digit at offset %d in %sbug37911.php on line %d
 +Warning: preg_replace_callback(): Numeric named subpatterns are not allowed in %sbug37911.php on line %d
  NULL
---- php5.orig/ext/pcre/tests/grep2.phpt
-+++ php5/ext/pcre/tests/grep2.phpt
+--- a/ext/pcre/tests/grep2.phpt
++++ b/ext/pcre/tests/grep2.phpt
 @@ -40,12 +40,6 @@ array(1) {
    string(1) "1"
  }
@@ -24,8 +24,8 @@
  }
 -bool(false)
 +bool(true)
---- php5.orig/ext/pcre/tests/match_flags3.phpt
-+++ php5/ext/pcre/tests/match_flags3.phpt
+--- a/ext/pcre/tests/match_flags3.phpt
++++ b/ext/pcre/tests/match_flags3.phpt
 @@ -42,5 +42,5 @@ array(1) {
    }
  }
diff --git a/debian/patches/php-fpm-getallheaders.patch b/debian/patches/php-fpm-getallheaders.patch
index de938153b..ddd9a31e8 100644
--- a/debian/patches/php-fpm-getallheaders.patch
+++ b/debian/patches/php-fpm-getallheaders.patch
@@ -7,8 +7,8 @@ Subject: [PATCH 1/2] getallheaders for php-fpm #62596
  sapi/fpm/fpm/fpm_main.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 80 insertions(+)
 
---- php5.orig/sapi/fpm/fpm/fpm_main.c
-+++ php5/sapi/fpm/fpm/fpm_main.c
+--- a/sapi/fpm/fpm/fpm_main.c
++++ b/sapi/fpm/fpm/fpm_main.c
 @@ -115,6 +115,8 @@ struct sigaction act, old_term, old_quit
  
  static void (*php_php_import_environment_variables)(zval *array_ptr TSRMLS_DC);
diff --git a/debian/patches/php-fpm-listen-on-unix-socket.patch b/debian/patches/php-fpm-listen-on-unix-socket.patch
index 045608ed9..c7d94ed6f 100644
--- a/debian/patches/php-fpm-listen-on-unix-socket.patch
+++ b/debian/patches/php-fpm-listen-on-unix-socket.patch
@@ -1,5 +1,5 @@
---- php5.orig/sapi/fpm/php-fpm.conf.in
-+++ php5/sapi/fpm/php-fpm.conf.in
+--- a/sapi/fpm/php-fpm.conf.in
++++ b/sapi/fpm/php-fpm.conf.in
 @@ -160,7 +160,7 @@ group = @php_fpm_group@
  ;                            specific port;
  ;   '/path/to/unix/socket' - to listen on a unix socket.
diff --git a/debian/patches/php-fpm-m68k.patch b/debian/patches/php-fpm-m68k.patch
index d5cd55983..378cae607 100644
--- a/debian/patches/php-fpm-m68k.patch
+++ b/debian/patches/php-fpm-m68k.patch
@@ -3,8 +3,8 @@ Origin: libgcc 4.7
 Bug: https://bugs.php.net/bug.php?id=60925
 Author: Thorsten Glaser <tg@debian.org>
 
---- php5.orig/sapi/fpm/fpm/fpm_atomic.h
-+++ php5/sapi/fpm/fpm/fpm_atomic.h
+--- a/sapi/fpm/fpm/fpm_atomic.h
++++ b/sapi/fpm/fpm/fpm_atomic.h
 @@ -5,6 +5,12 @@
  #ifndef FPM_ATOMIC_H
  #define FPM_ATOMIC_H 1
diff --git a/debian/patches/php-fpm-man-section-and-cleanup.patch b/debian/patches/php-fpm-man-section-and-cleanup.patch
index 07f5b8d0f..41e47c757 100644
--- a/debian/patches/php-fpm-man-section-and-cleanup.patch
+++ b/debian/patches/php-fpm-man-section-and-cleanup.patch
@@ -5,8 +5,8 @@ Origin: vendor
 Forwarded: http://bugs.php.net/52476
 Last-Update: 2010-07-29
 
---- php5.orig/sapi/fpm/php-fpm.8.in
-+++ php5/sapi/fpm/php-fpm.8.in
+--- a/sapi/fpm/php-fpm.8.in
++++ b/sapi/fpm/php-fpm.8.in
 @@ -126,22 +126,8 @@ The configuration file for the php-fpm d
  .TP
  .B php.ini
diff --git a/debian/patches/php-fpm-sysconfdir.patch b/debian/patches/php-fpm-sysconfdir.patch
index 12f6ed4d8..2d030887a 100644
--- a/debian/patches/php-fpm-sysconfdir.patch
+++ b/debian/patches/php-fpm-sysconfdir.patch
@@ -1,5 +1,5 @@
---- php5.orig/sapi/fpm/fpm/fpm_conf.c
-+++ php5/sapi/fpm/fpm/fpm_conf.c
+--- a/sapi/fpm/fpm/fpm_conf.c
++++ b/sapi/fpm/fpm/fpm_conf.c
 @@ -1650,7 +1650,7 @@ int fpm_conf_init_main(int test_conf, in
  		char *tmp;
  
diff --git a/debian/patches/php5-fpm-do-reload-on-SIGHUP.patch b/debian/patches/php5-fpm-do-reload-on-SIGHUP.patch
index 6a111d7a7..023fa49fb 100644
--- a/debian/patches/php5-fpm-do-reload-on-SIGHUP.patch
+++ b/debian/patches/php5-fpm-do-reload-on-SIGHUP.patch
@@ -1,5 +1,5 @@
---- php5.orig/sapi/fpm/fpm/fpm_events.c
-+++ php5/sapi/fpm/fpm/fpm_events.c
+--- a/sapi/fpm/fpm/fpm_events.c
++++ b/sapi/fpm/fpm/fpm_events.c
 @@ -113,6 +113,11 @@ static void fpm_got_signal(struct fpm_ev
  				zlog(ZLOG_NOTICE, "Reloading in progress ...");
  				fpm_pctl(FPM_PCTL_STATE_RELOADING, FPM_PCTL_ACTION_SET);
@@ -12,8 +12,8 @@
  		}
  
  		if (fpm_globals.is_child) {
---- php5.orig/sapi/fpm/fpm/fpm_signals.c
-+++ php5/sapi/fpm/fpm/fpm_signals.c
+--- a/sapi/fpm/fpm/fpm_signals.c
++++ b/sapi/fpm/fpm/fpm_signals.c
 @@ -160,6 +160,7 @@ static void sig_handler(int signo) /* {{
  		[SIGINT]  = 'I',
  		[SIGUSR1] = '1',
@@ -38,8 +38,8 @@
  	    0 > sigaction(SIGCHLD,  &act_dfl,  0) ||
  	    0 > sigaction(SIGQUIT,  &act,      0)) {
  
---- php5.orig/sapi/fpm/php-fpm.8.in
-+++ php5/sapi/fpm/php-fpm.8.in
+--- a/sapi/fpm/php-fpm.8.in
++++ b/sapi/fpm/php-fpm.8.in
 @@ -137,7 +137,7 @@ Once started, php-fpm then responds to s
  .TP
  .B SIGUSR1 			\fPre-open log file
diff --git a/debian/patches/qdbm-is-usr_include_qdbm.patch b/debian/patches/qdbm-is-usr_include_qdbm.patch
index 2469b9b7c..1bb562c6a 100644
--- a/debian/patches/qdbm-is-usr_include_qdbm.patch
+++ b/debian/patches/qdbm-is-usr_include_qdbm.patch
@@ -5,8 +5,8 @@ Origin: vendor
 Forwarded: not-needed
 Last-Update: 2010-02-21
 
---- php5.orig/ext/dba/config.m4
-+++ php5/ext/dba/config.m4
+--- a/ext/dba/config.m4
++++ b/ext/dba/config.m4
 @@ -113,6 +113,10 @@ if test "$PHP_QDBM" != "no"; then
        THIS_PREFIX=$i
        THIS_INCLUDE=$i/include/depot.h
diff --git a/debian/patches/session_save_path.patch b/debian/patches/session_save_path.patch
index 295e237cd..1ab818de7 100644
--- a/debian/patches/session_save_path.patch
+++ b/debian/patches/session_save_path.patch
@@ -5,8 +5,8 @@ Origin: vendor
 Forwarded: not-needed
 Last-Update: 2010-05-01
 
---- php5.orig/ext/session/session.c
-+++ php5/ext/session/session.c
+--- a/ext/session/session.c
++++ b/ext/session/session.c
 @@ -803,7 +803,7 @@ static ZEND_INI_MH(OnUpdateSmartStr) /*
  /* {{{ PHP_INI
   */
@@ -16,8 +16,8 @@ Last-Update: 2010-05-01
  	STD_PHP_INI_ENTRY("session.name",               "PHPSESSID", PHP_INI_ALL, OnUpdateName, session_name,       php_ps_globals,    ps_globals)
  	PHP_INI_ENTRY("session.save_handler",           "files",     PHP_INI_ALL, OnUpdateSaveHandler)
  	STD_PHP_INI_BOOLEAN("session.auto_start",       "0",         PHP_INI_PERDIR, OnUpdateBool,   auto_start,         php_ps_globals,    ps_globals)
---- php5.orig/php.ini-development
-+++ php5/php.ini-development
+--- a/php.ini-development
++++ b/php.ini-development
 @@ -1423,7 +1423,7 @@ session.save_handler = files
  ; where MODE is the octal representation of the mode. Note that this
  ; does not overwrite the process's umask.
@@ -27,8 +27,8 @@ Last-Update: 2010-05-01
  
  ; Whether to use strict session mode.
  ; Strict session mode does not accept uninitialized session ID and regenerate
---- php5.orig/php.ini-production
-+++ php5/php.ini-production
+--- a/php.ini-production
++++ b/php.ini-production
 @@ -1372,7 +1372,7 @@ session.save_handler = files
  ; where MODE is the octal representation of the mode. Note that this
  ; does not overwrite the process's umask.
diff --git a/debian/patches/strcmp_null-OnUpdateErrorLog.patch b/debian/patches/strcmp_null-OnUpdateErrorLog.patch
index deeb20680..6d9302378 100644
--- a/debian/patches/strcmp_null-OnUpdateErrorLog.patch
+++ b/debian/patches/strcmp_null-OnUpdateErrorLog.patch
@@ -1,5 +1,5 @@
 --- /dev/null
-+++ php5/tests/func/null-new_val.phpt
++++ b/tests/func/null-new_val.phpt
 @@ -0,0 +1,10 @@
 +--TEST--
 +ini_restore strcmp NULL new_val
diff --git a/debian/patches/sybase-alias.patch b/debian/patches/sybase-alias.patch
index 81973e9fe..048f6d7e9 100644
--- a/debian/patches/sybase-alias.patch
+++ b/debian/patches/sybase-alias.patch
@@ -1,5 +1,5 @@
---- php5.orig/ext/mssql/php_mssql.c
-+++ php5/ext/mssql/php_mssql.c
+--- a/ext/mssql/php_mssql.c
++++ b/ext/mssql/php_mssql.c
 @@ -178,6 +178,38 @@ const zend_function_entry mssql_function
   	PHP_FE(mssql_execute,				arginfo_mssql_execute)
  	PHP_FE(mssql_free_statement,		arginfo_mssql_free_statement)
diff --git a/debian/patches/temporary-path-fixes-for-multiarch.patch b/debian/patches/temporary-path-fixes-for-multiarch.patch
index 1965eb91c..29b4be1bd 100644
--- a/debian/patches/temporary-path-fixes-for-multiarch.patch
+++ b/debian/patches/temporary-path-fixes-for-multiarch.patch
@@ -7,8 +7,8 @@ Bug-Ubuntu: https://bugs.launchpad.net/bugs/739977
 Forwarded: not-needed
 Reviewed-by: Steve Langasek <steve.langasek@ubuntu.com>
 
---- php5.orig/ext/dba/config.m4
-+++ php5/ext/dba/config.m4
+--- a/ext/dba/config.m4
++++ b/ext/dba/config.m4
 @@ -239,7 +239,7 @@ AC_DEFUN([PHP_DBA_DB_CHECK],[
      AC_MSG_ERROR([DBA: Could not find necessary header file(s).])
    fi
@@ -18,8 +18,8 @@ Reviewed-by: Steve Langasek <steve.langasek@ubuntu.com>
        lib_found="";
        PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/$PHP_LIBDIR, -l$LIB,[
          AC_TRY_LINK([
---- php5.orig/ext/pcre/config0.m4
-+++ php5/ext/pcre/config0.m4
+--- a/ext/pcre/config0.m4
++++ b/ext/pcre/config0.m4
 @@ -21,7 +21,7 @@ PHP_ARG_WITH(pcre-regex,,
      AC_MSG_RESULT([$PCRE_INCDIR])
  
@@ -29,8 +29,8 @@ Reviewed-by: Steve Langasek <steve.langasek@ubuntu.com>
        test -f $j/libpcre.a || test -f $j/libpcre.$SHLIB_SUFFIX_NAME && PCRE_LIBDIR=$j
      done
      
---- php5.orig/acinclude.m4
-+++ php5/acinclude.m4
+--- a/acinclude.m4
++++ b/acinclude.m4
 @@ -2282,7 +2282,7 @@ AC_DEFUN([PHP_SETUP_KERBEROS],[
      fi
  
@@ -49,8 +49,8 @@ Reviewed-by: Steve Langasek <steve.langasek@ubuntu.com>
          OPENSSL_LIBDIR=$i/$PHP_LIBDIR
        fi
        test -n "$OPENSSL_INCDIR" && test -n "$OPENSSL_LIBDIR" && break
---- php5.orig/ext/ldap/config.m4
-+++ php5/ext/ldap/config.m4
+--- a/ext/ldap/config.m4
++++ b/ext/ldap/config.m4
 @@ -117,7 +117,7 @@ if test "$PHP_LDAP" != "no"; then
      LDAP_PTHREAD=
    fi
@@ -60,8 +60,8 @@ Reviewed-by: Steve Langasek <steve.langasek@ubuntu.com>
      PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
      PHP_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
  
---- php5.orig/ext/mssql/config.m4
-+++ php5/ext/mssql/config.m4
+--- a/ext/mssql/config.m4
++++ b/ext/mssql/config.m4
 @@ -38,7 +38,7 @@ if test "$PHP_MSSQL" != "no"; then
      fi
    fi  
@@ -71,8 +71,8 @@ Reviewed-by: Steve Langasek <steve.langasek@ubuntu.com>
       AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.[a|so])
    fi
  
---- php5.orig/ext/pdo_dblib/config.m4
-+++ php5/ext/pdo_dblib/config.m4
+--- a/ext/pdo_dblib/config.m4
++++ b/ext/pdo_dblib/config.m4
 @@ -46,7 +46,7 @@ if test "$PHP_PDO_DBLIB" != "no"; then
      PHP_LIBDIR=lib
    fi
@@ -82,8 +82,8 @@ Reviewed-by: Steve Langasek <steve.langasek@ubuntu.com>
       AC_MSG_ERROR(Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.[a|so])
    fi
  
---- php5.orig/ext/mysql/config.m4
-+++ php5/ext/mysql/config.m4
+--- a/ext/mysql/config.m4
++++ b/ext/mysql/config.m4
 @@ -94,17 +94,15 @@ Note that the MySQL client library is no
    fi
  
@@ -108,8 +108,8 @@ Reviewed-by: Steve Langasek <steve.langasek@ubuntu.com>
      AC_MSG_ERROR([Cannot find lib$MYSQL_LIBNAME under $MYSQL_DIR.
  Note that the MySQL client library is not bundled anymore!])
    fi
---- php5.orig/ext/gmp/config.m4
-+++ php5/ext/gmp/config.m4
+--- a/ext/gmp/config.m4
++++ b/ext/gmp/config.m4
 @@ -9,6 +9,7 @@ if test "$PHP_GMP" != "no"; then
  
    for i in $PHP_GMP /usr/local /usr; do
diff --git a/debian/patches/use_embedded_timezonedb.patch b/debian/patches/use_embedded_timezonedb.patch
index 6f9aaec3a..4e38262fc 100644
--- a/debian/patches/use_embedded_timezonedb.patch
+++ b/debian/patches/use_embedded_timezonedb.patch
@@ -17,8 +17,8 @@ r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert)
 r2: add filesystem trawl to set up name alias index
 r1: initial revision
 
---- php5.orig/ext/date/lib/parse_tz.c
-+++ php5/ext/date/lib/parse_tz.c
+--- a/ext/date/lib/parse_tz.c
++++ b/ext/date/lib/parse_tz.c
 @@ -18,8 +18,22 @@
  
  /* $Id$ */
@@ -619,8 +619,8 @@ r1: initial revision
  	} else {
  		tmp = NULL;
  	}
---- php5.orig/ext/date/lib/timelib.m4
-+++ php5/ext/date/lib/timelib.m4
+--- a/ext/date/lib/timelib.m4
++++ b/ext/date/lib/timelib.m4
 @@ -78,3 +78,17 @@ stdlib.h
  
  dnl Check for strtoll, atoll
diff --git a/debian/patches/use_embedded_timezonedb_fixes.patch b/debian/patches/use_embedded_timezonedb_fixes.patch
index 3d89f0c05..ae8d1827a 100644
--- a/debian/patches/use_embedded_timezonedb_fixes.patch
+++ b/debian/patches/use_embedded_timezonedb_fixes.patch
@@ -5,8 +5,8 @@ Description: Silence warnings about using the default system timezone info
  set the timezone explicitly), though with our use of the system timezonedb
  patch, we actually feel quite comfortable using the default timezone info.
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=571762
---- php5.orig/ext/date/tests/date_default_timezone_set-1.phpt
-+++ php5/ext/date/tests/date_default_timezone_set-1.phpt
+--- a/ext/date/tests/date_default_timezone_set-1.phpt
++++ b/ext/date/tests/date_default_timezone_set-1.phpt
 @@ -22,9 +22,6 @@ date.timezone=
  	echo date(DATE_ISO8601, $date4), "\n";
  ?>
diff --git a/debian/patches/use_system_timezone.patch b/debian/patches/use_system_timezone.patch
index 4a7a8fa8c..1d3cd9b7f 100644
--- a/debian/patches/use_system_timezone.patch
+++ b/debian/patches/use_system_timezone.patch
@@ -15,8 +15,8 @@ To be used in tandem with use_embedded_timezonedb.patch and use_embedded_timezon
 
 ---
 
---- php5.orig/ext/date/php_date.c
-+++ php5/ext/date/php_date.c
+--- a/ext/date/php_date.c
++++ b/ext/date/php_date.c
 @@ -978,6 +978,23 @@ static char* guess_timezone(const timeli
  		DATEG(timezone_valid) = 1;
  		return DATEG(default_timezone);
diff --git a/debian/patches/zlib-largefile-function-renaming.patch b/debian/patches/zlib-largefile-function-renaming.patch
index ce13a31c7..3d7057093 100644
--- a/debian/patches/zlib-largefile-function-renaming.patch
+++ b/debian/patches/zlib-largefile-function-renaming.patch
@@ -1,5 +1,5 @@
---- php5.orig/ext/zlib/zlib.c
-+++ php5/ext/zlib/zlib.c
+--- a/ext/zlib/zlib.c
++++ b/ext/zlib/zlib.c
 @@ -34,6 +34,18 @@
  #include "ext/standard/php_string.h"
  #include "php_zlib.h"