[Pkg-php-commits] [php/debian-sid] Refreshed debian/patches/006-debian_quirks.patch

[Ondřej Surý]

---
 debian/patches/006-debian_quirks.patch |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/patches/006-debian_quirks.patch b/debian/patches/006-debian_quirks.patch
index 6f43255..bb946ac 100644
--- a/debian/patches/006-debian_quirks.patch
+++ b/debian/patches/006-debian_quirks.patch
@@ -6,7 +6,7 @@ Last-Update: 2010-01-18
 
 --- a/configure.in
 +++ b/configure.in
-@@ -1021,7 +1021,7 @@ if test "$PHP_CLI" = "no"; then
+@@ -1005,7 +1005,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
-@@ -1051,7 +1051,7 @@ dnl
+@@ -1035,7 +1035,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
  
-@@ -1106,12 +1106,12 @@ test "$program_suffix" = "NONE" && progr
+@@ -1090,12 +1090,12 @@ test "$program_suffix" = "NONE" && progr
  
  case $libdir in
    '${exec_prefix}/lib')
@@ -39,7 +39,7 @@ Last-Update: 2010-01-18
      ;;
  esac
  
-@@ -1176,7 +1176,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd
+@@ -1161,7 +1161,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"`
@@ -161,8 +161,8 @@ Last-Update: 2010-01-18
    *** Pike version:             $PIKE_VERSION"
 --- a/sapi/cli/php.1.in
 +++ b/sapi/cli/php.1.in
-@@ -306,13 +306,14 @@ Shows configuration for extension
- .B name
+@@ -309,13 +309,14 @@ Shows configuration for extension
+ Show configuration file names
  .SH FILES
  .TP 15
 -.B php\-cli.ini
@@ -180,7 +180,7 @@ 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
+ \fIphp \-r 'echo "Hello World\\n";'\fP
 --- a/scripts/Makefile.frag
 +++ b/scripts/Makefile.frag
 @@ -3,8 +3,8 @@
-- 
1.6.3.3