[Pkg-samba-maint] r1593 - in trunk/samba/debian: . patches

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2007-11-23 18:52:35 +0000 (Fri, 23 Nov 2007)
New Revision: 1593

Added:
   trunk/samba/debian/patches/cups.patch
Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/patches/series
Log:
Add a *new* debian/patches/cups.patch to *enable* cups as the default
printing system, because since the original introduction of this patch
in Debian there was a regression upstream that caused cups to never be
selected as the default print system.



Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2007-11-22 07:04:41 UTC (rev 1592)
+++ trunk/samba/debian/changelog	2007-11-23 18:52:35 UTC (rev 1593)
@@ -7,12 +7,16 @@
     - debian/patches/cifs-umount-trailing-slashes.patch: merged upstream.
   * Drop the deprecated "printer admin" example from the default smb.conf.
     Closes: #451273.
+  * Add a *new* debian/patches/cups.patch to *enable* cups as the default
+    printing system, because since the original introduction of this patch
+    in Debian there was a regression upstream that caused cups to never be
+    selected as the default print system.
 
   [ Christian Perrier ]
   * Update the "built by" part of README.debian
   * Remove the very outdated parts of README.debian
 
- -- Christian Perrier <bubulle at debian.org>  Wed, 21 Nov 2007 19:50:06 +0000
+ -- Steve Langasek <vorlon at debian.org>  Fri, 23 Nov 2007 10:45:47 -0800
 
 samba (3.0.27-1) unstable; urgency=low
 

Added: trunk/samba/debian/patches/cups.patch
===================================================================
--- trunk/samba/debian/patches/cups.patch	                        (rev 0)
+++ trunk/samba/debian/patches/cups.patch	2007-11-23 18:52:35 UTC (rev 1593)
@@ -0,0 +1,78 @@
+Goal: restore print system selection from 3.0.24, so that cups is again
+treated as the default print system when it's available
+
+Author: Steve Langasek <vorlon at debian.org>
+
+Upstream status: submitted as bugzilla bug #5101
+
+Index: samba-3.0.27a/source/include/includes.h
+===================================================================
+--- samba-3.0.27a.orig/source/include/includes.h
++++ samba-3.0.27a/source/include/includes.h
+@@ -54,19 +54,6 @@
+ 
+ #include "local.h"
+ 
+-#ifdef AIX
+-#define DEFAULT_PRINTING PRINT_AIX
+-#define PRINTCAP_NAME "/etc/qconfig"
+-#endif
+-
+-#ifdef HPUX
+-#define DEFAULT_PRINTING PRINT_HPUX
+-#endif
+-
+-#ifdef QNX
+-#define DEFAULT_PRINTING PRINT_QNX
+-#endif
+-
+ #ifdef SUNOS4
+ /* on SUNOS4 termios.h conflicts with sys/ioctl.h */
+ #undef HAVE_TERMIOS_H
+@@ -810,23 +797,6 @@
+ #define QSORT_CAST (int (*)(const void *, const void *))
+ #endif
+ 
+-#ifndef DEFAULT_PRINTING
+-#ifdef HAVE_CUPS
+-#define DEFAULT_PRINTING PRINT_CUPS
+-#define PRINTCAP_NAME "cups"
+-#elif defined(SYSV)
+-#define DEFAULT_PRINTING PRINT_SYSV
+-#define PRINTCAP_NAME "lpstat"
+-#else
+-#define DEFAULT_PRINTING PRINT_BSD
+-#define PRINTCAP_NAME "/etc/printcap"
+-#endif
+-#endif
+-
+-#ifndef PRINTCAP_NAME
+-#define PRINTCAP_NAME "/etc/printcap"
+-#endif
+-
+ #ifndef SIGCLD
+ #define SIGCLD SIGCHLD
+ #endif
+Index: samba-3.0.27a/source/lib/replace/system/printing.h
+===================================================================
+--- samba-3.0.27a.orig/source/lib/replace/system/printing.h
++++ samba-3.0.27a/source/lib/replace/system/printing.h
+@@ -37,8 +37,18 @@
+ #endif
+ 
+ #ifndef DEFAULT_PRINTING
++#ifdef HAVE_CUPS
++#define DEFAULT_PRINTING PRINT_CUPS
++#define PRINTCAP_NAME "cups"
++#elif defined(SYSV)
++#define DEFAULT_PRINTING PRINT_SYSV
++#define PRINTCAP_NAME "lpstat"
++#else
+ #define DEFAULT_PRINTING PRINT_BSD
++#define PRINTCAP_NAME "/etc/printcap"
++#endif
+ #endif
++
+ #ifndef PRINTCAP_NAME
+ #define PRINTCAP_NAME "/etc/printcap"
+ #endif

Modified: trunk/samba/debian/patches/series
===================================================================
--- trunk/samba/debian/patches/series	2007-11-22 07:04:41 UTC (rev 1592)
+++ trunk/samba/debian/patches/series	2007-11-23 18:52:35 UTC (rev 1593)
@@ -23,3 +23,4 @@
 get_global_sam_sid-non-root.patch
 usershare.patch
 chgpasswd.patch
+cups.patch