[Pkg-cups-devel] r93 - in cupsys/branches/cups-1.2/debian: . patches

[Martin Pitt]

Author: mpitt
Date: Thu Dec 22 13:03:52 2005
New Revision: 93

Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/patches/02_configure.dpatch
Log:
revert revision 88 (02_configure.dpatch), that was just an unclean
file because of a dpatch bug


Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog	(original)
+++ cupsys/branches/cups-1.2/debian/changelog	Thu Dec 22 13:03:52 2005
@@ -17,7 +17,6 @@
   * Removed example descriptions from init.d script.
 
   [ Martin Pitt ]
-  * debian/patches/02_configure.dpatch: Adapt to r4885.
   * Move forcefully killing of cupsd if start-stop-daemon fails from
     postinst to init script, where it belongs to. Do not kill all running
     cupsd processes, but only the one in the pid file; this will unbreak cupsd

Modified: cupsys/branches/cups-1.2/debian/patches/02_configure.dpatch
==============================================================================
--- cupsys/branches/cups-1.2/debian/patches/02_configure.dpatch	(original)
+++ cupsys/branches/cups-1.2/debian/patches/02_configure.dpatch	Thu Dec 22 13:03:52 2005
@@ -5,10 +5,10 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad cupsys~/configure cupsys/configure
---- cupsys~/configure	2005-12-21 16:51:00.000000000 +0100
-+++ cupsys/configure	2005-12-21 16:54:42.000000000 +0100
-@@ -7329,9 +7329,9 @@
+diff -urNad cupsys-1.1.99.b1.r4841~/configure cupsys-1.1.99.b1.r4841/configure
+--- cupsys-1.1.99.b1.r4841~/configure	2005-11-16 12:26:04.000000000 +0000
++++ cupsys-1.1.99.b1.r4841/configure	2005-11-16 12:31:18.548920363 +0000
+@@ -7280,9 +7280,9 @@
                          ;;
                  Linux | GNU)
                          # Linux and HURD
@@ -21,7 +21,7 @@
                          ;;
  	esac
  else
-@@ -7406,125 +7406,6 @@
+@@ -7357,65 +7357,6 @@
      		OPTIM="-fPIC $OPTIM"
  	fi
  
@@ -56,66 +56,6 @@
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  OPTIM="$OPTIM -fpie"
--				LDFLAGS="$LDFLAGS -pie"
--				echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--CFLAGS="$OLDCFLAGS"
--				echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--			;;
--	esac
--
--	case $uname in
--		Linux*)
--			echo "$as_me:$LINENO: checking if GCC supports -fpie" >&5
--echo $ECHO_N "checking if GCC supports -fpie... $ECHO_C" >&6
--
--			OLDCFLAGS="$CFLAGS"
--			CFLAGS="$CFLAGS -fpie"
--			cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5