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

Kenshi Muto kmuto at costa.debian.org
Sun Nov 13 06:38:41 UTC 2005 

Author: kmuto
Date: Sun Nov 13 06:38:39 2005
New Revision: 32

Added:
   cupsys/branches/cups-1.2/debian/patches/03_manext.dpatch
   cupsys/branches/cups-1.2/debian/patches/04_freebsd.dpatch
Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/cupsys-client.files
   cupsys/branches/cups-1.2/debian/cupsys.files
   cupsys/branches/cups-1.2/debian/patches/00list
   cupsys/branches/cups-1.2/debian/rules
Log:
add kfreebsd patch and manpage extension patch. cupsys and cupsys-client include some new files.

Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog	(original)
+++ cupsys/branches/cups-1.2/debian/changelog	Sun Nov 13 06:38:39 2005
@@ -1,8 +1,15 @@
 cupsys (1.1.99.b1.r4748-4) UNRELEASED; urgency=low
 
   * EXPERIMENTAL
-  * 00_r4815.dpatch: Taken from r4815.
+  * 00_r4835.dpatch: Taken from r4835.
+    Well, r4835 removes some files. It means dpkg-buildpackage always
+    fails when we rebuild source. Maybe it's time to change orig source.
+    Moved obsolete patches to patches/obsolete.
   * 48_stdlib.dpatch: Fix FTBFS for arm, mips, and mipsel.
+  * 03_manext.dpatch: Don't use upstream's manpage file handling.
+    Debian uses dh_installman.
+  * 04_freebsd.dpatch: Apply Brian's patch to support GNU/kFreeBSD
+    (closes: #338266)
 
  -- Kenshi Muto <kmuto at debian.org>  Fri,  4 Nov 2005 13:56:27 +0000
 

Modified: cupsys/branches/cups-1.2/debian/cupsys-client.files
==============================================================================
--- cupsys/branches/cups-1.2/debian/cupsys-client.files	(original)
+++ cupsys/branches/cups-1.2/debian/cupsys-client.files	Sun Nov 13 06:38:39 2005
@@ -19,10 +19,10 @@
 usr/share/man/man1/lpstat.1
 usr/share/man/man1/cancel.1
 usr/share/man/man8/cupsaddsmb.8
-usr/share/man/man8/enable.8
+usr/share/man/man8/cupsenable.8
 usr/share/man/man8/lpadmin.8
 usr/share/man/man8/lpinfo.8
 usr/share/man/man8/lpmove.8
 usr/share/man/man8/reject.8
-usr/share/man/man8/disable.8
+usr/share/man/man8/cupsdisable.8
 usr/share/man/man8/accept.8

Modified: cupsys/branches/cups-1.2/debian/cupsys.files
==============================================================================
--- cupsys/branches/cups-1.2/debian/cupsys.files	(original)
+++ cupsys/branches/cups-1.2/debian/cupsys.files	Sun Nov 13 06:38:39 2005
@@ -17,6 +17,8 @@
 usr/lib/cups/filter/rastertoepson
 usr/lib/cups/filter/rastertohp
 usr/lib/cups/filter/texttops
+usr/lib/cups/filter/rastertolabel
+usr/lib/cups/notifier
 usr/sbin/cupsd
 usr/share/cups/banners
 usr/share/cups/charsets

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	Sun Nov 13 06:38:39 2005
@@ -1,6 +1,8 @@
 #00_r4815.dpatch
 00_r4835.dpatch
 02_configure.dpatch
+03_manext.dpatch
+04_freebsd.dpatch
 05_avoidunknowngroup.dpatch
 06_replacepdftops.dpatch
 07_removecvstag.dpatch

Added: cupsys/branches/cups-1.2/debian/patches/03_manext.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2/debian/patches/03_manext.dpatch	Sun Nov 13 06:38:39 2005
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_manext.dpatch by Kenshi Muto <kmuto at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: man extension is handled by dh_installman
+
+ at DPATCH@
+diff -urNad cupsys-1.1.99.b1.r4748~/configure cupsys-1.1.99.b1.r4748/configure
+--- cupsys-1.1.99.b1.r4748~/configure	2005-11-13 05:43:35.335953549 +0000
++++ cupsys-1.1.99.b1.r4748/configure	2005-11-13 05:44:05.965263310 +0000
+@@ -7140,9 +7140,9 @@
+ 		;;
+ 	Linux* | GNU*)
+ 		# Linux and GNU Hurd
+-		MAN1EXT=1.gz
+-		MAN5EXT=5.gz
+-		MAN8EXT=8.gz
++		MAN1EXT=1
++		MAN5EXT=5
++		MAN8EXT=8
+ 		MAN8DIR=8
+ 		;;
+ 	*)

Added: cupsys/branches/cups-1.2/debian/patches/04_freebsd.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2/debian/patches/04_freebsd.dpatch	Sun Nov 13 06:38:39 2005
@@ -0,0 +1,80 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_freebsd.dpatch by Kenshi Muto <kmuto at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: man extension is handled by dh_installman
+
+ at DPATCH@
+diff -urNad cupsys-1.1.99.b1.r4748~/backend/parallel.c cupsys-1.1.99.b1.r4748/backend/parallel.c
+--- cupsys-1.1.99.b1.r4748~/backend/parallel.c	2005-09-26 19:33:58.000000000 +0000
++++ cupsys-1.1.99.b1.r4748/backend/parallel.c	2005-11-13 05:45:50.959187142 +0000
+@@ -720,7 +720,7 @@
+       printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d\"\n", device, i + 1);
+     }
+   }
+-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD_kernel__)
+   int	i;			/* Looping var */
+   int	fd;			/* File descriptor */
+   char	device[255];		/* Device filename */
+diff -urNad cupsys-1.1.99.b1.r4748~/backend/serial.c cupsys-1.1.99.b1.r4748/backend/serial.c
+--- cupsys-1.1.99.b1.r4748~/backend/serial.c	2005-09-26 19:33:58.000000000 +0000
++++ cupsys-1.1.99.b1.r4748/backend/serial.c	2005-11-13 05:46:33.265710269 +0000
+@@ -650,10 +650,10 @@
+ void
+ list_devices(void)
+ {
+-#if defined(__hpux) || defined(__sgi) || defined(__sun) || defined(__FreeBSD__) || defined(__OpenBSD__)
++#if defined(__hpux) || defined(__sgi) || defined(__sun) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
+   static char	*funky_hex = "0123456789abcdefghijklmnopqrstuvwxyz";
+ 				/* Funky hex numbering used for some devices */
+-#endif /* __hpux || __sgi || __sun || __FreeBSD__ || __OpenBSD__ */
++#endif /* __hpux || __sgi || __sun || __FreeBSD__ || __OpenBSD__ || __FreeBSD_kernel__ */
+ 
+ #if defined(__linux) || defined(linux) || defined(__linux__)
+   int	i;		/* Looping var */
+@@ -900,7 +900,7 @@
+       printf("serial serial:%s?baud=38400 \"Unknown\" \"Serial Port #%d\"\n",
+              device, i + 1);
+   }
+-#elif defined(__FreeBSD__) || defined(__OpenBSD__)
++#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
+   int	i, j;		/* Looping vars */
+   int	fd;		/* File descriptor */
+   char	device[255];	/* Device filename */
+diff -urNad cupsys-1.1.99.b1.r4748~/backend/usb-unix.c cupsys-1.1.99.b1.r4748/backend/usb-unix.c
+--- cupsys-1.1.99.b1.r4748~/backend/usb-unix.c	2005-11-13 05:45:25.019158647 +0000
++++ cupsys-1.1.99.b1.r4748/backend/usb-unix.c	2005-11-13 05:46:48.892318008 +0000
+@@ -628,7 +628,7 @@
+   }
+ #elif defined(__hpux)
+ #elif defined(__osf)
+-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
+   int   i;                      /* Looping var */
+   char  device[255];            /* Device filename */
+ 
+diff -urNad cupsys-1.1.99.b1.r4748~/backend/usb.c cupsys-1.1.99.b1.r4748/backend/usb.c
+--- cupsys-1.1.99.b1.r4748~/backend/usb.c	2005-09-26 19:33:58.000000000 +0000
++++ cupsys-1.1.99.b1.r4748/backend/usb.c	2005-11-13 05:47:08.534311093 +0000
+@@ -72,7 +72,7 @@
+ 
+ #ifdef __APPLE__
+ #  include "usb-darwin.c"
+-#elif defined(__linux) || defined(__sun) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#elif defined(__linux) || defined(__sun) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
+ #  include "usb-unix.c"
+ #else
+ /*
+diff -urNad cupsys-1.1.99.b1.r4748~/config-scripts/cups-directories.m4 cupsys-1.1.99.b1.r4748/config-scripts/cups-directories.m4
+--- cupsys-1.1.99.b1.r4748~/config-scripts/cups-directories.m4	2005-11-13 05:45:25.050153901 +0000
++++ cupsys-1.1.99.b1.r4748/config-scripts/cups-directories.m4	2005-11-13 05:47:31.651772214 +0000
+@@ -115,7 +115,7 @@
+ 			INITDDIR="/System/Library/StartupItems/PrintingServices"
+ 			;;
+ 
+-		Linux | GNU)
++		Linux | GNU | GNU/k*BSD*)
+ 			# Linux/HURD seems to choose an init.d directory at random...
+ 			if test -d /sbin/init.d; then
+ 				# SuSE

Modified: cupsys/branches/cups-1.2/debian/rules
==============================================================================
--- cupsys/branches/cups-1.2/debian/rules	(original)
+++ cupsys/branches/cups-1.2/debian/rules	Sun Nov 13 06:38:39 2005
@@ -18,7 +18,7 @@
 
 unpatch: deapply-dpatches
 
-DEB_CONFIGURE_EXTRA_FLAGS := --with-optim=$(DEB_OPTFLAGS) --with-cups-group=lpadmin --mandir=/usr/share/man --with-docdir=/usr/share/cups/doc-root --enable-slp --enable-libpaper --enable-ssl --enable-gnutls --disable-openssl
+DEB_CONFIGURE_EXTRA_FLAGS := --with-optim=$(DEB_OPTFLAGS) --with-cups-group=lpadmin --mandir=/usr/share/man --with-docdir=/usr/share/cups/doc-root --enable-slp --enable-libpaper --enable-ssl --enable-gnutls --disable-openssl --enable-threads
 DEB_MAKE_INSTALL_TARGET := install BUILDROOT=$(DEB_DESTDIR)
 #DESTDIR=$(DEB_DESTDIR) BINDIR=$(DEB_DESTDIR)/usr/bin SBINDIR=$(DEB_DESTDIR)/usr/sbin INCLUDEDIR=$(DEB_DESTDIR)/usr/include LIBDIR=$(DEB_DESTDIR)/usr/lib SERVERBIN=$(DEB_DESTDIR)/usr/lib/cups SERVERROOT=$(DEB_DESTDIR)/etc/cups BUILDROOT=$(DEB_DESTDIR)
 
@@ -32,7 +32,7 @@
 	-rm filter/libcupsimage.a
 	-rm pdftops/libxpdf.a
 	-rm scheduler/testdirsvc scheduler/testdirsvc.o
-	-rm cups/testfile cups/testfile.o
+	-rm cups/testfile cups/testfile.o cups/http-addrlist.o
 	-rm backend/http
 	-rm systemv/disable systemv/enable systemv/reject
 	-rm cups-config cups.list conf/cupsd.conf conf/pam.conf

More information about the Pkg-cups-devel mailing list