[Pkg-cups-devel] r313 - cupsys/branches/cups-1.2-ubuntu/debian/patches

[Martin Pitt]

Author: mpitt
Date: Mon Jul 24 07:39:59 2006
New Revision: 313

Modified:
   cupsys/branches/cups-1.2-ubuntu/debian/patches/00list
   cupsys/branches/cups-1.2-ubuntu/debian/patches/02_configure.dpatch

Log:
remove cruft from debian/patches/02_configure.dpatch

Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/00list
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/00list	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/00list	Mon Jul 24 07:39:59 2006
@@ -20,7 +20,7 @@
 #48_stdlib.dpatch
 53_usr_share_ppd_support.dpatch
 55_ppd_okidata_name.dpatch
-#56_dirsvc.dpatch
+56_dirsvc.dpatch
 #57_cupsaddsmb.dpatch
 #58_fixdestc.dpatch
 #59_de_docroot.dpatch

Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/02_configure.dpatch
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/02_configure.dpatch	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/02_configure.dpatch	Mon Jul 24 07:39:59 2006
@@ -23,32 +23,3 @@
  			;;
  	esac
  else
-diff -urNad cups-1.2~/configure.rej cups-1.2/configure.rej
---- cups-1.2~/configure.rej	1970-01-01 01:00:00.000000000 +0100
-+++ cups-1.2/configure.rej	2006-07-21 18:45:32.000000000 +0200
-@@ -0,0 +1,25 @@
-+***************
-+*** 7856,7866 ****
-+                  IRIX | Linux | GNU)
-+                          # IRIX, Linux, and HURD...
-+  			if test $exec_prefix != /usr; then
-+- 				DSOFLAGS="-Wl,-rpath,\$(libdir) $DSOFLAGS"
-+- 				DSO32FLAGS="-Wl,-rpath,\$(LIB32DIR) $DSO32FLAGS"
-+- 				DSO64FLAGS="-Wl,-rpath,\$(LIB64DIR) $DSO64FLAGS"
-+- 				LDFLAGS="$LDFLAGS -Wl,-rpath,\$(libdir)"
-+- 				EXPORT_LDFLAGS="-Wl,-rpath,\$(libdir)"
-+  			fi
-+  			;;
-+  	esac
-+--- 7856,7866 ----
-+                  IRIX | Linux | GNU)
-+                          # IRIX, Linux, and HURD...
-+  			if test $exec_prefix != /usr; then
-++ 				DSOFLAGS="$DSOFLAGS"
-++ 				DSO32FLAGS="$DSO32FLAGS"
-++ 				DSO64FLAGS="$DSO64FLAGS"
-++ 				LDFLAGS="$LDFLAGS"
-++ 				EXPORT_LDFLAGS=""
-+  			fi
-+  			;;
-+  	esac