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

Martin Pitt mpitt at costa.debian.org
Thu Dec 22 13:11:50 UTC 2005


Author: mpitt
Date: Thu Dec 22 13:11:49 2005
New Revision: 94

Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/patches/02_configure.dpatch
Log:
Adapt debian/patches/02_configure.dpatch to r4885 for real this time

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:11:49 2005
@@ -17,6 +17,7 @@
   * Removed example descriptions from init.d script.
 
   [ Martin Pitt ]
+  * Adapt debian/patches/02_configure.dpatch 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
@@ -31,7 +32,7 @@
   * debian/rules: In clean rule, clean up a lot of files that are left behind
     by 'make clean'.
 
- -- Martin Pitt <mpitt at debian.org>  Thu, 22 Dec 2005 13:57:19 +0100
+ -- Martin Pitt <mpitt at debian.org>  Thu, 22 Dec 2005 14:11:13 +0100
 
 cupsys (1.1.99.b1.r4876-1) unstable; urgency=low
 

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:11:49 2005
@@ -5,10 +5,10 @@
 ## DP: No description.
 
 @DPATCH@
-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 @@
+diff -urNad cupsys~/configure cupsys/configure
+--- cupsys~/configure	2005-12-17 06:01:03.000000000 +0100
++++ cupsys/configure	2005-12-22 14:10:20.000000000 +0100
+@@ -7329,9 +7329,9 @@
                          ;;
                  Linux | GNU)
                          # Linux and HURD
@@ -21,7 +21,7 @@
                          ;;
  	esac
  else
-@@ -7357,65 +7357,6 @@
+@@ -7406,66 +7406,6 @@
      		OPTIM="-fPIC $OPTIM"
  	fi
  
@@ -56,7 +56,8 @@
 -  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'
+-	 { 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=$?



More information about the Pkg-cups-devel mailing list