[Pkg-cups-devel] r120 - cupsys/branches/cups-1.2/debian/patches
Kenshi Muto
kmuto at costa.debian.org
Thu Mar 30 15:28:26 UTC 2006
Author: kmuto
Date: Thu Mar 30 15:28:25 2006
New Revision: 120
Modified:
cupsys/branches/cups-1.2/debian/patches/00list
cupsys/branches/cups-1.2/debian/patches/04_freebsd.dpatch
cupsys/branches/cups-1.2/debian/patches/07_removecvstag.dpatch
Log:
remove garbage from 07_removecvstag
Modified: cupsys/branches/cups-1.2/debian/patches/00list
==============================================================================
--- cupsys/branches/cups-1.2/debian/patches/00list (original)
+++ cupsys/branches/cups-1.2/debian/patches/00list Thu Mar 30 15:28:25 2006
@@ -1,6 +1,7 @@
01_cupsimage.dpatch
#02_configure.dpatch
#03_manext.dpatch
+03_clean.dpatch
04_freebsd.dpatch
05_avoidunknowngroup.dpatch
07_removecvstag.dpatch
Modified: cupsys/branches/cups-1.2/debian/patches/04_freebsd.dpatch
==============================================================================
--- cupsys/branches/cups-1.2/debian/patches/04_freebsd.dpatch (original)
+++ cupsys/branches/cups-1.2/debian/patches/04_freebsd.dpatch Thu Mar 30 15:28:25 2006
@@ -6,8 +6,8 @@
@DPATCH@
diff -urNad cupsys-1.1.99.r5357~/backend/parallel.c cupsys-1.1.99.r5357/backend/parallel.c
---- cupsys-1.1.99.r5357~/backend/parallel.c 2006-03-30 14:15:57.000000000 +0000
-+++ cupsys-1.1.99.r5357/backend/parallel.c 2006-03-30 14:23:59.000000000 +0000
+--- cupsys-1.1.99.r5357~/backend/parallel.c 2006-03-07 22:07:44.000000000 +0000
++++ cupsys-1.1.99.r5357/backend/parallel.c 2006-03-30 15:21:44.000000000 +0000
@@ -695,7 +695,7 @@
printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d\"\n", device, i + 1);
}
@@ -19,7 +19,7 @@
char device[255]; /* Device filename */
diff -urNad cupsys-1.1.99.r5357~/backend/serial.c cupsys-1.1.99.r5357/backend/serial.c
--- cupsys-1.1.99.r5357~/backend/serial.c 2006-03-07 22:07:44.000000000 +0000
-+++ cupsys-1.1.99.r5357/backend/serial.c 2006-03-30 14:24:53.000000000 +0000
++++ cupsys-1.1.99.r5357/backend/serial.c 2006-03-30 15:21:44.000000000 +0000
@@ -661,10 +661,10 @@
void
list_devices(void)
@@ -44,7 +44,7 @@
char device[255]; /* Device filename */
diff -urNad cupsys-1.1.99.r5357~/backend/usb-unix.c cupsys-1.1.99.r5357/backend/usb-unix.c
--- cupsys-1.1.99.r5357~/backend/usb-unix.c 2006-03-09 19:22:36.000000000 +0000
-+++ cupsys-1.1.99.r5357/backend/usb-unix.c 2006-03-30 14:25:13.000000000 +0000
++++ cupsys-1.1.99.r5357/backend/usb-unix.c 2006-03-30 15:21:44.000000000 +0000
@@ -397,7 +397,7 @@
}
#elif defined(__hpux)
@@ -56,7 +56,7 @@
diff -urNad cupsys-1.1.99.r5357~/backend/usb.c cupsys-1.1.99.r5357/backend/usb.c
--- cupsys-1.1.99.r5357~/backend/usb.c 2006-02-24 03:15:13.000000000 +0000
-+++ cupsys-1.1.99.r5357/backend/usb.c 2006-03-30 14:25:27.000000000 +0000
++++ cupsys-1.1.99.r5357/backend/usb.c 2006-03-30 15:21:44.000000000 +0000
@@ -72,7 +72,7 @@
#ifdef __APPLE__
@@ -68,7 +68,7 @@
/*
diff -urNad cupsys-1.1.99.r5357~/config-scripts/cups-directories.m4 cupsys-1.1.99.r5357/config-scripts/cups-directories.m4
--- cupsys-1.1.99.r5357~/config-scripts/cups-directories.m4 2006-03-20 19:06:50.000000000 +0000
-+++ cupsys-1.1.99.r5357/config-scripts/cups-directories.m4 2006-03-30 14:22:34.000000000 +0000
++++ cupsys-1.1.99.r5357/config-scripts/cups-directories.m4 2006-03-30 15:21:44.000000000 +0000
@@ -135,7 +135,7 @@
"/System/Library/StartupItems/PrintingServices")
;;
@@ -79,8 +79,8 @@
if test -d /sbin/init.d; then
# SuSE
diff -urNad cupsys-1.1.99.r5357~/configure cupsys-1.1.99.r5357/configure
---- cupsys-1.1.99.r5357~/configure 2006-03-30 11:37:48.000000000 +0000
-+++ cupsys-1.1.99.r5357/configure 2006-03-30 14:26:17.000000000 +0000
+--- cupsys-1.1.99.r5357~/configure 2006-03-30 15:20:38.000000000 +0000
++++ cupsys-1.1.99.r5357/configure 2006-03-30 15:21:44.000000000 +0000
@@ -8264,7 +8264,7 @@
;;
Modified: cupsys/branches/cups-1.2/debian/patches/07_removecvstag.dpatch
==============================================================================
--- cupsys/branches/cups-1.2/debian/patches/07_removecvstag.dpatch (original)
+++ cupsys/branches/cups-1.2/debian/patches/07_removecvstag.dpatch Thu Mar 30 15:28:25 2006
@@ -7,7 +7,7 @@
@DPATCH@
diff -urNad cupsys-1.1.99.r5357~/conf/Makefile cupsys-1.1.99.r5357/conf/Makefile
--- cupsys-1.1.99.r5357~/conf/Makefile 2006-03-05 16:48:12.000000000 +0000
-+++ cupsys-1.1.99.r5357/conf/Makefile 2006-03-30 14:31:30.000000000 +0000
++++ cupsys-1.1.99.r5357/conf/Makefile 2006-03-30 15:22:37.000000000 +0000
@@ -65,6 +65,8 @@
chgrp $(CUPS_GROUP) $(SERVERROOT)/$$file.N || true; \
else \
@@ -26,41 +26,3 @@
chgrp $(CUPS_GROUP) $(SERVERROOT)/$$file || true; \
done
-if test x$(PAMDIR) != x; then \
-diff -urNad cupsys-1.1.99.r5357~/conf/Makefile.rej cupsys-1.1.99.r5357/conf/Makefile.rej
---- cupsys-1.1.99.r5357~/conf/Makefile.rej 1970-01-01 00:00:00.000000000 +0000
-+++ cupsys-1.1.99.r5357/conf/Makefile.rej 2006-03-30 14:28:23.000000000 +0000
-@@ -0,0 +1,34 @@
-+***************
-+*** 57,62 ****
-+ $(INSTALL_DATA) $$file $(SERVERROOT)/$$file.N ; \
-+ else \
-+ $(INSTALL_DATA) $$file $(SERVERROOT) ; \
-+ fi ; \
-+ done
-+ for file in $(REPLACE); do \
-+--- 57,64 ----
-+ $(INSTALL_DATA) $$file $(SERVERROOT)/$$file.N ; \
-+ else \
-+ $(INSTALL_DATA) $$file $(SERVERROOT) ; \
-++ grep -v "\$$Id:" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
-++ mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
-+ fi ; \
-+ done
-+ for file in $(REPLACE); do \
-+***************
-+*** 64,69 ****
-+ $(MV) $(SERVERROOT)/$$file $(SERVERROOT)/$$file.O ; \
-+ fi ; \
-+ $(INSTALL_DATA) $$file $(SERVERROOT) ; \
-+ done
-+ -if test x$(PAMDIR) != x$(BUILDROOT); then \
-+ $(INSTALL_DIR) $(PAMDIR); \
-+--- 66,73 ----
-+ $(MV) $(SERVERROOT)/$$file $(SERVERROOT)/$$file.O ; \
-+ fi ; \
-+ $(INSTALL_DATA) $$file $(SERVERROOT) ; \
-++ grep -v "\$$Id:" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
-++ mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
-+ done
-+ -if test x$(PAMDIR) != x$(BUILDROOT); then \
-+ $(INSTALL_DIR) $(PAMDIR); \
More information about the Pkg-cups-devel
mailing list