[Pkg-nagios-changes] [pkg-nagios] r1715 - nagios3/trunk/debian/patches

Alexander Wirt formorer at alioth.debian.org
Sat Aug 29 07:29:33 UTC 2009 

Author: formorer
Date: 2009-08-29 07:29:33 +0000 (Sat, 29 Aug 2009)
New Revision: 1715

Modified:
   nagios3/trunk/debian/patches/55_remove_php.dpatch
Log:
Update remove php patch


Modified: nagios3/trunk/debian/patches/55_remove_php.dpatch
===================================================================
--- nagios3/trunk/debian/patches/55_remove_php.dpatch	2009-08-27 11:28:30 UTC (rev 1714)
+++ nagios3/trunk/debian/patches/55_remove_php.dpatch	2009-08-29 07:29:33 UTC (rev 1715)
@@ -6,29 +6,37 @@
 
 @DPATCH@
 diff -urNad nagios3-3.2.0~/configure nagios3-3.2.0/configure
---- nagios3-3.2.0~/configure	2009-08-27 07:49:36.000000000 +0200
-+++ nagios3-3.2.0/configure	2009-08-27 07:52:29.000000000 +0200
-@@ -3746,7 +3746,7 @@
- ac_given_srcdir=$srcdir
- ac_given_INSTALL="$INSTALL"
+--- nagios3-3.2.0~/configure	2009-08-29 09:20:03.000000000 +0200
++++ nagios3-3.2.0/configure	2009-08-29 09:20:44.000000000 +0200
+@@ -7158,7 +7158,7 @@
+ fi
  
--trap 'rm -fr `echo "Makefile subst pkginfo base/Makefile common/Makefile contrib/Makefile cgi/Makefile html/Makefile module/Makefile xdata/Makefile daemon-init t-tap/Makefile include/config.h include/snprintf.h include/cgiutils.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-+trap 'rm -fr `echo "Makefile subst pkginfo base/Makefile common/Makefile contrib/Makefile cgi/Makefile html/Makefile module/Makefile xdata/Makefile daemon-init t-tap/Makefile include/config.h include/snprintf.h include/cgiutils.h html/index.html html/side.html" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
- EOF
- cat >> $CONFIG_STATUS <<EOF
  
-@@ -3884,7 +3884,7 @@
+-                                                                                                                        ac_config_files="$ac_config_files Makefile subst pkginfo base/Makefile common/Makefile contrib/Makefile cgi/Makefile html/Makefile module/Makefile xdata/Makefile daemon-init t-tap/Makefile"
++                                                                                                                        ac_config_files="$ac_config_files Makefile subst pkginfo base/Makefile common/Makefile contrib/Makefile cgi/Makefile html/Makefile module/Makefile xdata/Makefile daemon-init t-tap/Makefile html/side.html html/index.html"
  
- cat >> $CONFIG_STATUS <<EOF
  
--CONFIG_FILES=\${CONFIG_FILES-"Makefile subst pkginfo base/Makefile common/Makefile contrib/Makefile cgi/Makefile html/Makefile module/Makefile xdata/Makefile daemon-init t-tap/Makefile"}
-+CONFIG_FILES=\${CONFIG_FILES-"Makefile subst pkginfo base/Makefile common/Makefile contrib/Makefile cgi/Makefile html/Makefile module/Makefile xdata/Makefile daemon-init t-tap/Makefile html/side.html html/index.html"}
- EOF
- cat >> $CONFIG_STATUS <<\EOF
- for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+ test "x$prefix" = xNONE && prefix=$ac_default_prefix
+@@ -7639,6 +7639,8 @@
+   "contrib/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;;
+   "cgi/Makefile" ) CONFIG_FILES="$CONFIG_FILES cgi/Makefile" ;;
+   "html/Makefile" ) CONFIG_FILES="$CONFIG_FILES html/Makefile" ;;
++  "html/side.html" ) CONFIG_FILES="$CONFIG_FILES html/side.html" ;;
++  "html/index.html" ) CONFIG_FILES="CONFIG_FILES html/index.htm" ;; 
+   "module/Makefile" ) CONFIG_FILES="$CONFIG_FILES module/Makefile" ;;
+   "xdata/Makefile" ) CONFIG_FILES="$CONFIG_FILES xdata/Makefile" ;;
+   "daemon-init" ) CONFIG_FILES="$CONFIG_FILES daemon-init" ;;
+@@ -8478,7 +8480,6 @@
+ 
+ 
+ perl subst include/locations.h
+-perl subst html/config.inc.php
+ 
+ 
+ echo ""
 diff -urNad nagios3-3.2.0~/configure.in nagios3-3.2.0/configure.in
---- nagios3-3.2.0~/configure.in	2009-08-12 20:28:10.000000000 +0200
-+++ nagios3-3.2.0/configure.in	2009-08-27 07:51:58.000000000 +0200
+--- nagios3-3.2.0~/configure.in	2009-08-29 09:20:03.000000000 +0200
++++ nagios3-3.2.0/configure.in	2009-08-29 09:20:07.000000000 +0200
 @@ -786,7 +786,7 @@
  
  AC_PATH_PROG(PERL,perl)
@@ -39,8 +47,8 @@
  
  perl subst include/locations.h
 diff -urNad nagios3-3.2.0~/html/Makefile.in nagios3-3.2.0/html/Makefile.in
---- nagios3-3.2.0~/html/Makefile.in	2009-08-27 07:48:18.000000000 +0200
-+++ nagios3-3.2.0/html/Makefile.in	2009-08-27 07:51:58.000000000 +0200
+--- nagios3-3.2.0~/html/Makefile.in	2009-08-29 09:20:03.000000000 +0200
++++ nagios3-3.2.0/html/Makefile.in	2009-08-29 09:20:07.000000000 +0200
 @@ -28,7 +28,7 @@
  	rm -f stylesheets/*~
  
@@ -77,7 +85,7 @@
  install-unstripped:
  	$(MAKE) install
 diff -urNad nagios3-3.2.0~/html/config.inc.php.in nagios3-3.2.0/html/config.inc.php.in
---- nagios3-3.2.0~/html/config.inc.php.in	2009-08-27 07:48:18.000000000 +0200
+--- nagios3-3.2.0~/html/config.inc.php.in	2009-08-29 09:20:03.000000000 +0200
 +++ nagios3-3.2.0/html/config.inc.php.in	1970-01-01 01:00:00.000000000 +0100
 @@ -1,20 +0,0 @@
 -<?php
@@ -101,7 +109,7 @@
 -
 -?>
 diff -urNad nagios3-3.2.0~/html/includes/utils.inc.php nagios3-3.2.0/html/includes/utils.inc.php
---- nagios3-3.2.0~/html/includes/utils.inc.php	2009-08-27 07:48:18.000000000 +0200
+--- nagios3-3.2.0~/html/includes/utils.inc.php	2009-08-29 09:20:03.000000000 +0200
 +++ nagios3-3.2.0/html/includes/utils.inc.php	1970-01-01 01:00:00.000000000 +0100
 @@ -1,473 +0,0 @@
 -<?php
@@ -580,7 +588,7 @@
 \ No newline at end of file
 diff -urNad nagios3-3.2.0~/html/index.html.in nagios3-3.2.0/html/index.html.in
 --- nagios3-3.2.0~/html/index.html.in	1970-01-01 01:00:00.000000000 +0100
-+++ nagios3-3.2.0/html/index.html.in	2009-08-27 07:51:58.000000000 +0200
++++ nagios3-3.2.0/html/index.html.in	2009-08-29 09:20:07.000000000 +0200
 @@ -0,0 +1,28 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 +
@@ -611,7 +619,7 @@
 +
 +</HTML>
 diff -urNad nagios3-3.2.0~/html/index.php nagios3-3.2.0/html/index.php
---- nagios3-3.2.0~/html/index.php	2009-08-27 07:48:18.000000000 +0200
+--- nagios3-3.2.0~/html/index.php	2009-08-29 09:20:03.000000000 +0200
 +++ nagios3-3.2.0/html/index.php	1970-01-01 01:00:00.000000000 +0100
 @@ -1,29 +0,0 @@
 -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
@@ -645,7 +653,7 @@
 -
 diff -urNad nagios3-3.2.0~/html/main.html nagios3-3.2.0/html/main.html
 --- nagios3-3.2.0~/html/main.html	1970-01-01 01:00:00.000000000 +0100
-+++ nagios3-3.2.0/html/main.html	2009-08-27 07:51:58.000000000 +0200
++++ nagios3-3.2.0/html/main.html	2009-08-29 09:20:07.000000000 +0200
 @@ -0,0 +1,91 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 +
@@ -739,7 +747,7 @@
 +</body>
 +</html>
 diff -urNad nagios3-3.2.0~/html/main.php nagios3-3.2.0/html/main.php
---- nagios3-3.2.0~/html/main.php	2009-08-27 07:48:18.000000000 +0200
+--- nagios3-3.2.0~/html/main.php	2009-08-29 09:20:03.000000000 +0200
 +++ nagios3-3.2.0/html/main.php	1970-01-01 01:00:00.000000000 +0100
 @@ -1,78 +0,0 @@
 -<?php
@@ -822,7 +830,7 @@
 -
 diff -urNad nagios3-3.2.0~/html/side.html.in nagios3-3.2.0/html/side.html.in
 --- nagios3-3.2.0~/html/side.html.in	1970-01-01 01:00:00.000000000 +0100
-+++ nagios3-3.2.0/html/side.html.in	2009-08-27 07:51:58.000000000 +0200
++++ nagios3-3.2.0/html/side.html.in	2009-08-29 09:20:07.000000000 +0200
 @@ -0,0 +1,277 @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 +
@@ -1102,7 +1110,7 @@
 +</BODY>
 +</HTML>
 diff -urNad nagios3-3.2.0~/html/side.php nagios3-3.2.0/html/side.php
---- nagios3-3.2.0~/html/side.php	2009-08-27 07:48:18.000000000 +0200
+--- nagios3-3.2.0~/html/side.php	2009-08-29 09:20:03.000000000 +0200
 +++ nagios3-3.2.0/html/side.php	1970-01-01 01:00:00.000000000 +0100
 @@ -1,127 +0,0 @@
 -<?php

More information about the Pkg-nagios-changes mailing list