[Pkg-cups-devel] r86 - in cupsys/trunk/debian: . patches

[Kenshi Muto]

Author: kmuto
Date: Sun Dec 18 03:42:11 2005
New Revision: 86

Added:
   cupsys/trunk/debian/patches/04_freebsd.dpatch   (contents, props changed)
Modified:
   cupsys/trunk/debian/changelog
   cupsys/trunk/debian/patches/00list
Log:
apply kFreeBSD patch

Modified: cupsys/trunk/debian/changelog
==============================================================================
--- cupsys/trunk/debian/changelog	(original)
+++ cupsys/trunk/debian/changelog	Sun Dec 18 03:42:11 2005
@@ -9,6 +9,7 @@
   * Updated German debconf translation.
   * Updated Czech debconf translation. (closes: #343716)
   * Removed example descriptions from init.d script. (closes: #334842)
+  * Apply kFreeBSD patch. (closes: 338266)
 
  -- Kenshi Muto <kmuto at debian.org>  Fri, 16 Dec 2005 21:05:47 +0900
 

Modified: cupsys/trunk/debian/patches/00list
==============================================================================
--- cupsys/trunk/debian/patches/00list	(original)
+++ cupsys/trunk/debian/patches/00list	Sun Dec 18 03:42:11 2005
@@ -2,6 +2,7 @@
 02_configure.dpatch
 03_cupsimage.dpatch
 04_cupsconfig.dpatch
+04_freebsd.dpatch
 05_avoidunknowngroup.dpatch
 06_replacepdftops.dpatch
 07_removecvstag.dpatch

Added: cupsys/trunk/debian/patches/04_freebsd.dpatch
==============================================================================
--- (empty file)
+++ cupsys/trunk/debian/patches/04_freebsd.dpatch	Sun Dec 18 03:42:11 2005
@@ -0,0 +1,92 @@
+#! /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: No description.
+
+ at DPATCH@
+diff -urNad cupsys-1.1.23~/backend/parallel.c cupsys-1.1.23/backend/parallel.c
+--- cupsys-1.1.23~/backend/parallel.c	2005-12-18 12:35:04.000000000 +0900
++++ cupsys-1.1.23/backend/parallel.c	2005-12-18 12:38:20.000000000 +0900
+@@ -633,7 +633,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.23~/backend/serial.c cupsys-1.1.23/backend/serial.c
+--- cupsys-1.1.23~/backend/serial.c	2005-12-18 12:35:03.000000000 +0900
++++ cupsys-1.1.23/backend/serial.c	2005-12-18 12:38:20.000000000 +0900
+@@ -542,10 +542,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 */
+@@ -792,7 +792,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.23~/backend/usb-unix.c cupsys-1.1.23/backend/usb-unix.c
+--- cupsys-1.1.23~/backend/usb-unix.c	2005-01-04 04:29:44.000000000 +0900
++++ cupsys-1.1.23/backend/usb-unix.c	2005-12-18 12:38:20.000000000 +0900
+@@ -544,7 +544,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.23~/backend/usb.c cupsys-1.1.23/backend/usb.c
+--- cupsys-1.1.23~/backend/usb.c	2005-01-04 04:29:44.000000000 +0900
++++ cupsys-1.1.23/backend/usb.c	2005-12-18 12:38:20.000000000 +0900
+@@ -71,7 +71,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.23~/config-scripts/cups-directories.m4 cupsys-1.1.23/config-scripts/cups-directories.m4
+--- cupsys-1.1.23~/config-scripts/cups-directories.m4	2005-01-04 04:29:45.000000000 +0900
++++ cupsys-1.1.23/config-scripts/cups-directories.m4	2005-12-18 12:38:20.000000000 +0900
+@@ -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
+diff -urNad cupsys-1.1.23~/configure cupsys-1.1.23/configure
+--- cupsys-1.1.23~/configure	2005-12-18 12:38:19.000000000 +0900
++++ cupsys-1.1.23/configure	2005-12-18 12:39:26.000000000 +0900
+@@ -6820,7 +6820,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