[php-maint] Bug#338315: Patch to switch to dpatch

Sven Mueller sm at ciphirelabs.com
Wed Nov 9 15:19:29 UTC 2005


Package php5
Tags 338315 +patch
thanks

Hi.

I just switched php5-5.0.5-3 to dpatch, the corresponding patch is
attached to this mail. Now I "only" need to get the mysqli extension to
be built like the other extensions.

regards,
Sven

-- 
"Writing a book is like washing an elephant: there's no good
 place to begin or end, and it's hard to keep track of what
 you've already covered."  -- Anonymous



-- 
------------------------ [ SECURITY NOTICE ]
------------------------
To: 338315 at bugs.debian.org, control at bugs.debian.org.
For your security, sm at ciphirelabs.com
digitally signed this message on 09 November 2005 at 15:19:30 UTC.
Verify this digital signature at http://www.ciphire.com/verify.
------------------- [ CIPHIRE DIGITAL SIGNATURE ]
-------------------
Q2lwaGlyZSBTaWcuAjgzMzgzMTVAYnVncy5kZWJpYW4ub3JnLCBjb250cm9sQGJ1Z3MuZ
GViaWFuLm9yZwBzbUBjaXBoaXJlbGFicy5jb20AZW1haWwgYm9keQBEAQAAfAB8AAAAAQ
AAAIITckNEAQAADAIAAgACAAIAIO6PNQd7u0hoWPE1MjmrD+TzPS/3qOVmmRegyvQ3CCi
ZAQCnuIkRe8QblUuWRKg8D1Jzp7/vTiDqCk3Lxb1z96KR7a2ubZaarn2kriAlHBIToosj
/LPPY8VHzyZRFFuUzuioU2lnRW5k
--------------------- [ END DIGITAL SIGNATURE ]
---------------------
-------------- next part --------------
diff -ubNr php5-5.0.5.orig/debian/changelog php5-5.0.5/debian/changelog
--- php5-5.0.5.orig/debian/changelog	2005-11-09 16:04:45.000000000 +0100
+++ php5-5.0.5/debian/changelog	2005-11-09 16:04:07.000000000 +0100
@@ -1,3 +1,9 @@
+php5 (5.0.5-4) unstable; urgency=low
+
+  * Move patch system to dpatch 
+
+ -- Sven Mueller <debian at incase.de>  Wed,  9 Nov 2005 15:51:25 +0100
+
 php5 (5.0.5-3) unstable; urgency=low
 
   * Build-Depend on libcurl3-openssl-dev, since libcurl3-dev is going away
diff -ubNr php5-5.0.5.orig/debian/dpatch-run php5-5.0.5/debian/dpatch-run
--- php5-5.0.5.orig/debian/dpatch-run	1970-01-01 01:00:00.000000000 +0100
+++ php5-5.0.5/debian/dpatch-run	2005-11-09 16:04:07.000000000 +0100
@@ -0,0 +1,56 @@
+#!/bin/bash
+
+# derived from dpatch.lib.sh from the dpatch package
+
+set -e
+
+dpatch_lib_patch ()
+{
+	if test "x${DPATCH_LIB_NO_DEFAULT}" = "x"; then
+		patch -p1 --dry-run $* && patch -p1 $*
+		return
+	fi
+	dpatch_patch $*
+}
+
+dpatch_lib_unpatch ()
+{
+	if test "x${DPATCH_LIB_NO_DEFAULT}" = "x"; then
+		patch -p1 --dry-run $* && patch -p1 -R $*
+		return
+	fi
+	dpatch_unpatch $*
+}
+
+
+case $0 in
+	*/dpatch-run)
+		patch=$1
+		action=$2
+		workdir=$3
+		;;
+	*)
+		patch=$0
+		action=$1
+		workdir=$2
+		;;
+esac
+
+if test "x$action" = "x"; then
+    echo "$(basename ${patch}): script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--g0 -f --no-backup-if-mismatch} ${workdir:+-d ${workdir}}"
+
+case "${action}" in
+	-patch) dpatch_lib_patch ${patch_opts} < ${patch};;
+	-unpatch) dpatch_lib_unpatch ${patch_opts} < ${patch};;
+	*)
+	        echo "$(basename ${patch}): script expects -patch|-unpatch as argument" >&2
+		exit 1;;
+esac
+
+exit 0
+
diff -ubNr php5-5.0.5.orig/debian/patches/001-libtool_fixes.patch php5-5.0.5/debian/patches/001-libtool_fixes.patch
--- php5-5.0.5.orig/debian/patches/001-libtool_fixes.patch	2005-11-09 16:04:45.000000000 +0100
+++ php5-5.0.5/debian/patches/001-libtool_fixes.patch	2005-11-09 16:16:57.000000000 +0100
@@ -1,3 +1,10 @@
+#! /bin/sh debian/dpatch-run
+## 001-libtool_fixes.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: no description
+
+ at DPATCH@
 diff -urN php4-4.3.4.orig/TSRM/configure.in php4-4.3.4/TSRM/configure.in
 --- php4-4.3.4.orig/TSRM/configure.in	2001-08-08 06:26:21.000000000 -0400
 +++ php4-4.3.4/TSRM/configure.in	2004-02-16 00:57:50.000000000 -0500
diff -ubNr php5-5.0.5.orig/debian/patches/002-static_openssl.patch php5-5.0.5/debian/patches/002-static_openssl.patch
--- php5-5.0.5.orig/debian/patches/002-static_openssl.patch	2005-11-09 16:04:45.000000000 +0100
+++ php5-5.0.5/debian/patches/002-static_openssl.patch	2005-11-09 16:16:57.000000000 +0100
@@ -1,3 +1,10 @@
+#! /bin/sh debian/dpatch-run
+## 002-static_openssl.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: no description
+
+ at DPATCH@
 diff -urN php4-4.3.4.orig/acinclude.m4 php4-4.3.4/acinclude.m4
 --- php4-4.3.4.orig/acinclude.m4	2004-02-16 01:01:22.000000000 -0500
 +++ php4-4.3.4/acinclude.m4	2004-02-16 01:03:12.000000000 -0500
diff -ubNr php5-5.0.5.orig/debian/patches/004-ldap_fix.patch php5-5.0.5/debian/patches/004-ldap_fix.patch
--- php5-5.0.5.orig/debian/patches/004-ldap_fix.patch	2005-11-09 16:04:45.000000000 +0100
+++ php5-5.0.5/debian/patches/004-ldap_fix.patch	2005-11-09 16:16:57.000000000 +0100
@@ -1,3 +1,10 @@
+#! /bin/sh debian/dpatch-run
+## 004-ldap_fix.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: no description
+
+ at DPATCH@
 --- php4-4.3.4.orig/ext/ldap/ldap.c
 +++ php4-4.3.4/ext/ldap/ldap.c
 @@ -1353,7 +1353,7 @@
diff -ubNr php5-5.0.5.orig/debian/patches/006-debian_quirks.patch php5-5.0.5/debian/patches/006-debian_quirks.patch
--- php5-5.0.5.orig/debian/patches/006-debian_quirks.patch	2005-11-09 16:04:45.000000000 +0100
+++ php5-5.0.5/debian/patches/006-debian_quirks.patch	2005-11-09 16:16:57.000000000 +0100
@@ -1,3 +1,10 @@
+#! /bin/sh debian/dpatch-run
+## 006-debian_quirks.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: no description
+
+ at DPATCH@
 diff -uNr php-5.0.4.orig/configure.in php-5.0.4/configure.in
 --- php-5.0.4.orig/configure.in	2005-03-30 23:43:12.000000000 +0200
 +++ php-5.0.4/configure.in	2005-04-27 11:15:29.276399240 +0200
diff -ubNr php5-5.0.5.orig/debian/patches/00list php5-5.0.5/debian/patches/00list
--- php5-5.0.5.orig/debian/patches/00list	1970-01-01 01:00:00.000000000 +0100
+++ php5-5.0.5/debian/patches/00list	2005-11-09 16:16:58.000000000 +0100
@@ -0,0 +1,26 @@
+001-libtool_fixes.patch
+002-static_openssl.patch
+004-ldap_fix.patch
+006-debian_quirks.patch
+013-force_getaddrinfo.patch
+017-pread_pwrite_disable.patch
+027-readline_is_editline.patch
+029-php.ini_paranoid.patch
+033-we_WANT_libtool.patch
+034-apache2_umask_fix.patch
+036-fd_setsize_fix.patch
+038-round_test_fix.patch
+041-shut_up_snmp.patch
+043-recode_size_t.patch
+044-strtod_arm_fix.patch
+045-exif_nesting_level.patch
+047-zts_with_dl.patch
+049-exported-headers.patch
+052-phpinfo_no_configure.patch
+053-extension_api.patch
+054-open_basedir_slash.patch
+055-gd_safe_mode_checks.patch
+100-recode_is_shared.patch
+101-sqlite_is_shared.patch
+104-64_bit_serialize.patch
+105-64_bit_imagettftext.patch
diff -ubNr php5-5.0.5.orig/debian/patches/013-force_getaddrinfo.patch php5-5.0.5/debian/patches/013-force_getaddrinfo.patch
--- php5-5.0.5.orig/debian/patches/013-force_getaddrinfo.patch	2005-11-09 16:04:45.000000000 +0100
+++ php5-5.0.5/debian/patches/013-force_getaddrinfo.patch	2005-11-09 16:16:57.000000000 +0100
@@ -1,3 +1,10 @@
+#! /bin/sh debian/dpatch-run
+## 013-force_getaddrinfo.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: no description
+
+ at DPATCH@
 --- php4-4.3.10/configure.in	2004-12-15 17:00:57.000000000 -0700
 +++ php4-4.3.10/configure.in	2004-12-15 17:03:30.000000000 -0700
 @@ -581,50 +581,50 @@
diff -ubNr php5-5.0.5.orig/debian/patches/017-pread_pwrite_disable.patch php5-5.0.5/debian/patches/017-pread_pwrite_disable.patch
--- php5-5.0.5.orig/debian/patches/017-pread_pwrite_disable.patch	2005-11-09 16:04:45.000000000 +0100
+++ php5-5.0.5/debian/patches/017-pread_pwrite_disable.patch	2005-11-09 16:16:57.000000000 +0100
@@ -1,3 +1,10 @@
+#! /bin/sh debian/dpatch-run
+## 017-pread_pwrite_disable.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: no description
+
+ at DPATCH@
 --- php4-4.3.8/acinclude.m4.orig	2004-08-09 07:41:27.000000000 -0600
 +++ php4-4.3.8/acinclude.m4	2004-08-09 07:42:19.000000000 -0600
 @@ -347,7 +347,7 @@
diff -ubNr php5-5.0.5.orig/debian/patches/027-readline_is_editline.patch php5-5.0.5/debian/patches/027-readline_is_editline.patch
--- php5-5.0.5.orig/debian/patches/027-readline_is_editline.patch	2005-11-09 16:04:45.000000000 +0100
+++ php5-5.0.5/debian/patches/027-readline_is_editline.patch	2005-11-09 16:16:58.000000000 +0100
@@ -1,3 +1,10 @@
+#! /bin/sh debian/dpatch-run
+## 027-readline_is_editline.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: no description
+
+ at DPATCH@
 --- php4-4.3.9/ext/readline/config.m4	2003-09-30 20:54:04.000000000 -0600
 +++ php4-4.3.9/ext/readline/config.m4	2004-10-04 21:40:38.000000000 -0600
 @@ -10,7 +10,7 @@
diff -ubNr php5-5.0.5.orig/debian/patches/029-php.ini_paranoid.patch php5-5.0.5/debian/patches/029-php.ini_paranoid.patch
--- php5-5.0.5.orig/debian/patches/029-php.ini_paranoid.patch	2005-11-09 16:04:45.000000000 +0100
+++ php5-5.0.5/debian/patches/029-php.ini_paranoid.patch	2005-11-09 16:16:58.000000000 +0100
@@ -1,3 +1,10 @@
+#! /bin/sh debian/dpatch-run
+## 029-php.ini_paranoid.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: no description
+
+ at DPATCH@
 diff -Nru php4-4.3.9.orig/php.ini-paranoid php4-4.3.9/php.ini-paranoid
 --- php4-4.3.9.orig/php.ini-paranoid	1970-01-01 01:00:00.000000000 +0100
 +++ php4-4.3.9/php.ini-paranoid	2004-11-13 17:09:30.000000000 +0100
diff -ubNr php5-5.0.5.orig/debian/patches/033-we_WANT_libtool.patch php5-5.0.5/debian/patches/033-we_WANT_libtool.patch
--- php5-5.0.5.orig/debian/patches/033-we_WANT_libtool.patch	2005-11-09 16:04:45.000000000 +0100
+++ php5-5.0.5/debian/patches/033-we_WANT_libtool.patch	2005-11-09 16:16:58.000000000 +0100
@@ -1,3 +1,10 @@
+#! /bin/sh debian/dpatch-run
+## 033-we_WANT_libtool.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: no description
+
+ at DPATCH@
 --- php4-4.3.10/build/build2.mk.orig	2005-02-06 00:49:53.000000000 -0700
 +++ php4-4.3.10/build/build2.mk	2005-02-06 00:51:58.000000000 -0700
 @@ -55,6 +55,11 @@
diff -ubNr php5-5.0.5.orig/debian/patches/034-apache2_umask_fix.patch php5-5.0.5/debian/patches/034-apache2_umask_fix.patch
--- php5-5.0.5.orig/debian/patches/034-apache2_umask_fix.patch	2005-11-09 16:04:45.000000000 +0100
+++ php5-5.0.5/debian/patches/034-apache2_umask_fix.patch	2005-11-09 16:16:58.000000000 +0100
@@ -1,3 +1,10 @@
+#! /bin/sh debian/dpatch-run
+## 034-apache2_umask_fix.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: no description
+
+ at DPATCH@
 
 Save and restore umask across requests correctly.
 
diff -ubNr php5-5.0.5.orig/debian/patches/036-fd_setsize_fix.patch php5-5.0.5/debian/patches/036-fd_setsize_fix.patch
--- php5-5.0.5.orig/debian/patches/036-fd_setsize_fix.patch	2005-11-09 16:04:45.000000000 +0100
+++ php5-5.0.5/debian/patches/036-fd_setsize_fix.patch	2005-11-09 16:16:58.000000000 +0100
@@ -1,3 +1,10 @@
+#! /bin/sh debian/dpatch-run
+## 036-fd_setsize_fix.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: no description
+
+ at DPATCH@
 diff -urN php-5.0.4.orig/ext/sockets/sockets.c php-5.0.4/ext/sockets/sockets.c
 --- php-5.0.4.orig/ext/sockets/sockets.c	2005-02-15 00:44:31.000000000 +0100
 +++ php-5.0.4/ext/sockets/sockets.c	2005-04-10 17:32:15.851738072 +0200
diff -ubNr php5-5.0.5.orig/debian/patches/038-round_test_fix.patch php5-5.0.5/debian/patches/038-round_test_fix.patch
--- php5-5.0.5.orig/debian/patches/038-round_test_fix.patch	2005-11-09 16:04:45.000000000 +0100
+++ php5-5.0.5/debian/patches/038-round_test_fix.patch	2005-11-09 16:16:58.000000000 +0100
@@ -1,3 +1,10 @@
+#! /bin/sh debian/dpatch-run
+## 038-round_test_fix.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: no description
+
+ at DPATCH@
 Index: ext/standard/config.m4
 ===================================================================
 RCS file: /repository/php-src/ext/standard/config.m4,v
diff -ubNr php5-5.0.5.orig/debian/patches/041-shut_up_snmp.patch php5-5.0.5/debian/patches/041-shut_up_snmp.patch
--- php5-5.0.5.orig/debian/patches/041-shut_up_snmp.patch	2005-11-09 16:04:45.000000000 +0100
+++ php5-5.0.5/debian/patches/041-shut_up_snmp.patch	2005-11-09 16:16:58.000000000 +0100
@@ -1,3 +1,10 @@
+#! /bin/sh debian/dpatch-run
+## 041-shut_up_snmp.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: no description
+
+ at DPATCH@
 --- php4-4.3.10/ext/snmp/snmp.c	2005-03-23 00:32:06.000000000 -0700
 +++ php4-4.3.10/ext/snmp/snmp.c	2005-03-23 00:30:18.000000000 -0700
 @@ -214,7 +214,9 @@
diff -ubNr php5-5.0.5.orig/debian/patches/043-recode_size_t.patch php5-5.0.5/debian/patches/043-recode_size_t.patch
--- php5-5.0.5.orig/debian/patches/043-recode_size_t.patch	2005-11-09 16:04:45.000000000 +0100
+++ php5-5.0.5/debian/patches/043-recode_size_t.patch	2005-11-09 16:16:58.000000000 +0100
@@ -1,3 +1,10 @@
+#! /bin/sh debian/dpatch-run
+## 043-recode_size_t.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: no description
+
+ at DPATCH@
 --- php-5.0.4/ext/recode/recode.c	2005-07-13 14:43:06.000000000 +1000
 +++ php-5.0.4/ext/recode/recode.c	2005-07-13 14:43:45.000000000 +1000
 @@ -130,8 +130,8 @@
diff -ubNr php5-5.0.5.orig/debian/patches/044-strtod_arm_fix.patch php5-5.0.5/debian/patches/044-strtod_arm_fix.patch
--- php5-5.0.5.orig/debian/patches/044-strtod_arm_fix.patch	2005-11-09 16:04:45.000000000 +0100
+++ php5-5.0.5/debian/patches/044-strtod_arm_fix.patch	2005-11-09 16:16:58.000000000 +0100
@@ -1,3 +1,10 @@
+#! /bin/sh debian/dpatch-run
+## 044-strtod_arm_fix.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: no description
+
+ at DPATCH@
 --- php4-4.3.10/Zend/zend_strtod.c	2005-02-14 17:17:51.000000000 -0700
 +++ php4-4.3.10/Zend/zend_strtod.c	2005-02-14 17:18:31.000000000 -0700
 @@ -123,13 +123,25 @@
diff -ubNr php5-5.0.5.orig/debian/patches/045-exif_nesting_level.patch php5-5.0.5/debian/patches/045-exif_nesting_level.patch
--- php5-5.0.5.orig/debian/patches/045-exif_nesting_level.patch	2005-11-09 16:04:45.000000000 +0100
+++ php5-5.0.5/debian/patches/045-exif_nesting_level.patch	2005-11-09 16:16:58.000000000 +0100
@@ -1,3 +1,10 @@
+#! /bin/sh debian/dpatch-run
+## 045-exif_nesting_level.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: no description
+
+ at DPATCH@
 --- php4-4.3.10/ext/exif/exif.c.orig	2005-02-14 16:13:09.000000000 -0700
 +++ php4-4.3.10/ext/exif/exif.c	2005-02-14 16:13:40.000000000 -0700
 @@ -96,7 +96,7 @@
diff -ubNr php5-5.0.5.orig/debian/patches/047-zts_with_dl.patch php5-5.0.5/debian/patches/047-zts_with_dl.patch
--- php5-5.0.5.orig/debian/patches/047-zts_with_dl.patch	2005-11-09 16:04:45.000000000 +0100
+++ php5-5.0.5/debian/patches/047-zts_with_dl.patch	2005-11-09 16:16:58.000000000 +0100
@@ -1,3 +1,10 @@
+#! /bin/sh debian/dpatch-run
+## 047-zts_with_dl.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: no description
+
+ at DPATCH@
 diff -urN php-5.0.4.orig/ext/standard/dl.c php-5.0.4/ext/standard/dl.c
 --- php-5.0.4.orig/ext/standard/dl.c	2005-04-10 18:08:47.677529904 +0200
 +++ php-5.0.4/ext/standard/dl.c	2005-04-10 18:09:04.163023728 +0200
diff -ubNr php5-5.0.5.orig/debian/patches/049-exported-headers.patch php5-5.0.5/debian/patches/049-exported-headers.patch
--- php5-5.0.5.orig/debian/patches/049-exported-headers.patch	2005-11-09 16:04:45.000000000 +0100
+++ php5-5.0.5/debian/patches/049-exported-headers.patch	2005-11-09 16:16:58.000000000 +0100
@@ -1,3 +1,10 @@
+#! /bin/sh debian/dpatch-run
+## 049-exported-headers.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: no description
+
+ at DPATCH@
 diff -uNr php-5.0.4.orig/scripts/Makefile.frag php-5.0.4/scripts/Makefile.frag
 --- php-5.0.4.orig/scripts/Makefile.frag	2005-02-28 06:28:25.000000000 +0100
 +++ php-5.0.4/scripts/Makefile.frag	2005-04-26 11:48:18.421951904 +0200
diff -ubNr php5-5.0.5.orig/debian/patches/052-phpinfo_no_configure.patch php5-5.0.5/debian/patches/052-phpinfo_no_configure.patch
--- php5-5.0.5.orig/debian/patches/052-phpinfo_no_configure.patch	2005-11-09 16:04:45.000000000 +0100
+++ php5-5.0.5/debian/patches/052-phpinfo_no_configure.patch	2005-11-09 16:16:58.000000000 +0100
@@ -1,3 +1,10 @@
+#! /bin/sh debian/dpatch-run
+## 052-phpinfo_no_configure.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: no description
+
+ at DPATCH@
 --- php4-4.3.11/ext/standard/info.c.orig	2005-07-10 06:23:11.000000000 +1000
 +++ php4-4.3.11/ext/standard/info.c	2005-07-10 06:23:33.000000000 +1000
 @@ -441,7 +441,7 @@
diff -ubNr php5-5.0.5.orig/debian/patches/053-extension_api.patch php5-5.0.5/debian/patches/053-extension_api.patch
--- php5-5.0.5.orig/debian/patches/053-extension_api.patch	2005-11-09 16:04:45.000000000 +0100
+++ php5-5.0.5/debian/patches/053-extension_api.patch	2005-11-09 16:16:58.000000000 +0100
@@ -1,3 +1,10 @@
+#! /bin/sh debian/dpatch-run
+## 053-extension_api.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: no description
+
+ at DPATCH@
 diff -ur php-5.0.4/configure.in php5-5.0.4/configure.in
 --- php-5.0.4/configure.in	2005-03-31 07:43:12.000000000 +1000
 +++ php5-5.0.4/configure.in	2005-07-31 02:35:46.000000000 +1000
diff -ubNr php5-5.0.5.orig/debian/patches/054-open_basedir_slash.patch php5-5.0.5/debian/patches/054-open_basedir_slash.patch
--- php5-5.0.5.orig/debian/patches/054-open_basedir_slash.patch	2005-11-09 16:04:45.000000000 +0100
+++ php5-5.0.5/debian/patches/054-open_basedir_slash.patch	2005-11-09 16:16:58.000000000 +0100
@@ -1,3 +1,10 @@
+#! /bin/sh debian/dpatch-run
+## 054-open_basedir_slash.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: no description
+
+ at DPATCH@
 --- php-5.0.5/main/fopen_wrappers.c	2005-07-16 12:14:44.000000000 +0000
 +++ php-5.0.5/main/fopen_wrappers.c	2005-09-26 09:07:55.000000000 +0000
 @@ -109,8 +109,8 @@
diff -ubNr php5-5.0.5.orig/debian/patches/055-gd_safe_mode_checks.patch php5-5.0.5/debian/patches/055-gd_safe_mode_checks.patch
--- php5-5.0.5.orig/debian/patches/055-gd_safe_mode_checks.patch	2005-11-09 16:04:45.000000000 +0100
+++ php5-5.0.5/debian/patches/055-gd_safe_mode_checks.patch	2005-11-09 16:16:58.000000000 +0100
@@ -1,3 +1,10 @@
+#! /bin/sh debian/dpatch-run
+## 055-gd_safe_mode_checks.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: no description
+
+ at DPATCH@
 ===================================================================
 RCS file: /repository/php-src/ext/gd/gd.c,v
 retrieving revision 1.294.2.12
diff -ubNr php5-5.0.5.orig/debian/patches/100-recode_is_shared.patch php5-5.0.5/debian/patches/100-recode_is_shared.patch
--- php5-5.0.5.orig/debian/patches/100-recode_is_shared.patch	2005-11-09 16:04:45.000000000 +0100
+++ php5-5.0.5/debian/patches/100-recode_is_shared.patch	2005-11-09 16:16:58.000000000 +0100
@@ -1,3 +1,10 @@
+#! /bin/sh debian/dpatch-run
+## 100-recode_is_shared.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: no description
+
+ at DPATCH@
 --- php-5.0.4/ext/recode/config9.m4.orig	2005-07-13 04:06:02.000000000 +1000
 +++ php-5.0.4/ext/recode/config9.m4	2005-07-13 04:06:28.000000000 +1000
 @@ -8,6 +8,6 @@
diff -ubNr php5-5.0.5.orig/debian/patches/101-sqlite_is_shared.patch php5-5.0.5/debian/patches/101-sqlite_is_shared.patch
--- php5-5.0.5.orig/debian/patches/101-sqlite_is_shared.patch	2005-11-09 16:04:45.000000000 +0100
+++ php5-5.0.5/debian/patches/101-sqlite_is_shared.patch	2005-11-09 16:16:58.000000000 +0100
@@ -1,3 +1,10 @@
+#! /bin/sh debian/dpatch-run
+## 101-sqlite_is_shared.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: no description
+
+ at DPATCH@
 diff -ur php-5.0.4/ext/sqlite/config.m4 php5-5.0.4/ext/sqlite/config.m4
 --- php-5.0.4/ext/sqlite/config.m4	2005-01-10 08:05:16.000000000 +1100
 +++ php5-5.0.4/ext/sqlite/config.m4	2005-07-17 02:06:05.000000000 +1000
diff -ubNr php5-5.0.5.orig/debian/patches/104-64_bit_serialize.patch php5-5.0.5/debian/patches/104-64_bit_serialize.patch
--- php5-5.0.5.orig/debian/patches/104-64_bit_serialize.patch	2005-11-09 16:04:45.000000000 +0100
+++ php5-5.0.5/debian/patches/104-64_bit_serialize.patch	2005-11-09 16:16:58.000000000 +0100
@@ -1,3 +1,10 @@
+#! /bin/sh debian/dpatch-run
+## 104-64_bit_serialize.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: no description
+
+ at DPATCH@
 --- php-5.0.4/ext/standard/incomplete_class.c.bug34435	2004-11-25 20:28:37.000000000 +0000
 +++ php-5.0.4/ext/standard/incomplete_class.c	2005-09-09 13:00:39.000000000 +0100
 @@ -122,7 +122,7 @@
diff -ubNr php5-5.0.5.orig/debian/patches/105-64_bit_imagettftext.patch php5-5.0.5/debian/patches/105-64_bit_imagettftext.patch
--- php5-5.0.5.orig/debian/patches/105-64_bit_imagettftext.patch	2005-11-09 16:04:45.000000000 +0100
+++ php5-5.0.5/debian/patches/105-64_bit_imagettftext.patch	2005-11-09 16:16:58.000000000 +0100
@@ -1,3 +1,10 @@
+#! /bin/sh debian/dpatch-run
+## 105-64_bit_imagettftext.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: no description
+
+ at DPATCH@
 ===================================================================
 RCS file: /repository/php-src/ext/gd/gd.c,v
 retrieving revision 1.307
diff -ubNr php5-5.0.5.orig/debian/rules php5-5.0.5/debian/rules
--- php5-5.0.5.orig/debian/rules	2005-11-09 16:04:45.000000000 +0100
+++ php5-5.0.5/debian/rules	2005-11-09 16:04:07.000000000 +0100
@@ -31,6 +31,9 @@
 CFLAGS = -O2 -Wall -fsigned-char -fno-strict-aliasing
 LFSFLAGS = -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 
+# enable dpatch usage
+include /usr/share/dpatch/dpatch.make
+
 # Enable IEEE-conformant floating point math on alphas (not the default)
 ifeq (alpha-linux,$(PHP5_HOST_GNU_TYPE))
   CFLAGS += -mieee
@@ -92,34 +95,6 @@
 		--with-mime-magic=$(MAGIC_MIME) \
 		--with-exec-dir=/usr/lib/php5/libexec
 
-patch: patch-stamp
-patch-stamp:
-	dh_testdir
-	for patch in debian/patches/*.patch; do \
-	        echo '->'`basename $$patch`:; \
-		if ! patch -p1 --ignore-whitespace --dry-run < $$patch; \
-		then \
-			exit 1; \
-		fi; \
-	        patch -p1 --ignore-whitespace < $$patch; \
-	done
-	sed -i -e 's/EXTRA_VERSION=""/EXTRA_VERSION="-$(PHP5_DEBIAN_REVISION)"/' configure.in
-	rm -f aclocal.m4 config.sub config.guess ltmain.sh
-	./buildconf --force
-	touch patch-stamp
-
-unpatch:
-	dh_testdir
-	sed -i -e 's/EXTRA_VERSION="-$(PHP5_DEBIAN_REVISION)"/EXTRA_VERSION=""/' configure.in
-	if [ -f patch-stamp ]; then \
-		for patch in `ls debian/patches/*.patch | sort -r`; do \
-			patch -p1 -R --ignore-whitespace < $$patch; \
-		done; \
-		rm -f aclocal.m4 config.sub config.guess ltmain.sh; \
-		./buildconf --force; \
-	fi
-	rm -f patch-stamp
-
 build: build-apache-stamp build-apache2-stamp build-cgi-stamp build-cli-stamp
 build-apache-stamp: configure-apache-stamp
 	dh_testdir
@@ -252,7 +227,8 @@
 	   Zend/
 	touch configure-cli-stamp
 
-clean: unpatch
+clean: clean-patched unpatch
+clean-patched:
 	dh_testdir
 	dh_testroot
 	rm -f configure-apache-stamp build-apache-stamp
-------------- next part --------------
------------------------ [ SECURITY NOTICE ]
------------------------
sm at ciphirelabs.com digitally signed "php5-5.0.5-3-to-dpatch.diff"
------------------- [ CIPHIRE DIGITAL SIGNATURE ]
-------------------
Q2lwaGlyZSBTaWcuAkIzMzgzMTVAYnVncy5kZWJpYW4ub3JnLCBjb250cm9sQGJ1Z3MuZ
GViaWFuLm9yZwBzbUBjaXBoaXJlbGFicy5jb20AInBocDUtNS4wLjUtMy10by1kcGF0Y2
guZGlmZiIAE1gAAHwAfAAAAAEAAACCE3JDE1gAADICAAIAAgACACDujzUHe7tIaFjxNTI
5qw/k8z0v96jlZpkXoMr0NwgomQEAp7iJEXvEG5VLlkSoPA9Sc6e/704g6gpNy8W9c/ei
ke3bfkJCVIwIu9Me+wDNb/48rKIfSGSYITOqoKLN0+KOILzSFUblU2lnRW5k
--------------------- [ END DIGITAL SIGNATURE ]
---------------------


More information about the pkg-php-maint mailing list