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

[vorlon at alioth.debian.org]

tags 470138 pending
thanks

Author: vorlon
Date: 2008-03-09 11:04:52 +0000 (Sun, 09 Mar 2008)
New Revision: 1758

Removed:
   trunk/samba/debian/patches/cups.patch
Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/patches/series
   trunk/samba/debian/samba-common.files
Log:
  - cups.patch
* Brown paper bag: fix samba-common.files to list all of the smb.conf
  templates, not just the current one.  Closes: #470138.

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2008-03-09 10:35:03 UTC (rev 1757)
+++ trunk/samba/debian/changelog	2008-03-09 11:04:52 UTC (rev 1758)
@@ -1,5 +1,6 @@
 samba (3.0.28a-1) UNRELEASED; urgency=low
 
+  [ Christian Perrier ]
   * New upstream release. This fixes the following Debian bugs:
     - Prevent nmbd from shutting down when no network
       interfaces can be located. Closes: #433449
@@ -9,7 +10,12 @@
     - cifs-umount-same-user.patch
     - get_global_sam_sid-non-root.patch
     - chgpasswd.patch
+    - cups.patch
 
+  [ Steve Langasek ]
+  * Brown paper bag: fix samba-common.files to list all of the smb.conf
+    templates, not just the current one.  Closes: #470138.
+
  -- Christian Perrier <bubulle at debian.org>  Sun, 09 Mar 2008 08:57:28 +0100
 
 samba (3.0.28-3) unstable; urgency=low

Deleted: trunk/samba/debian/patches/cups.patch
===================================================================
--- trunk/samba/debian/patches/cups.patch	2008-03-09 10:35:03 UTC (rev 1757)
+++ trunk/samba/debian/patches/cups.patch	2008-03-09 11:04:52 UTC (rev 1758)
@@ -1,78 +0,0 @@
-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.28a/source/include/includes.h
-===================================================================
---- samba-3.0.28a.orig/source/include/includes.h
-+++ samba-3.0.28a/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
-@@ -809,23 +796,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.28a/source/lib/replace/system/printing.h
-===================================================================
---- samba-3.0.28a.orig/source/lib/replace/system/printing.h
-+++ samba-3.0.28a/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	2008-03-09 10:35:03 UTC (rev 1757)
+++ trunk/samba/debian/patches/series	2008-03-09 11:04:52 UTC (rev 1758)
@@ -14,6 +14,5 @@
 autoconf.patch
 smbpasswd-syslog.patch
 usershare.patch
-cups.patch
 disable-weak-auth.patch
 gcc42-arm-workaround.patch

Modified: trunk/samba/debian/samba-common.files
===================================================================
--- trunk/samba/debian/samba-common.files	2008-03-09 10:35:03 UTC (rev 1757)
+++ trunk/samba/debian/samba-common.files	2008-03-09 11:04:52 UTC (rev 1758)
@@ -15,6 +15,6 @@
 usr/share/man/man8/smbpasswd.8
 usr/share/samba/lowcase.dat
 usr/share/samba/panic-action
-usr/share/samba/smb.conf
+usr/share/samba/smb.conf*
 usr/share/samba/upcase.dat
 usr/share/samba/valid.dat