diff options
| -rw-r--r-- | debian/NEWS | 18 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/patches/cups.patch | 25 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
4 files changed, 22 insertions, 27 deletions
diff --git a/debian/NEWS b/debian/NEWS new file mode 100644 index 0000000000..70f4d77a45 --- /dev/null +++ b/debian/NEWS @@ -0,0 +1,18 @@ +samba (3.0.26a-2) unstable; urgency=low + + * Default printing system has changed from BSD to CUPS + + Previous versions of this package were configured to use BSD lpr as the + default printing system. With this version of Samba, the default has + been changed to CUPS for consistency with the current default printer + handling in the rest of the system. + + If you wish to continue using the BSD printing interface from Samba, you + will need to set "printing = bsd" manually in /etc/samba/smb.conf. If + you wish to use CUPS printing but have previously set any of the + "print command", "lpq command", or "lprm command" options in smb.conf, + you will want to remove these settings from your config. Otherwise, if + you have the cupsys package installed, Samba should begin to use it + automatically with no action on your part. + + -- Steve Langasek <vorlon@debian.org> Wed, 14 Nov 2007 17:19:36 -0800 diff --git a/debian/changelog b/debian/changelog index bedac8b665..439a898e02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,9 @@ samba (3.0.26a-2) UNRELEASED; urgency=low * Enforce creation of the pid directory (/var/run/samba) in the samba init script, for compatibility with systems that use a tmpfs for /var/run. Closes: #451270. + * debian/patches/cups.patch, debian/NEWS: drop the patch to force bsd + as the default printing system, as CUPS is now the dominant/default + printing system for Linux. [ Debconf translations ] * Hebrew added. Closes: #444054 @@ -35,7 +38,7 @@ samba (3.0.26a-2) UNRELEASED; urgency=low reporting and contributions from Launchpad's #156686 Closes: #449422 - -- Steve Langasek <vorlon@debian.org> Wed, 14 Nov 2007 14:03:23 -0800 + -- Steve Langasek <vorlon@debian.org> Wed, 14 Nov 2007 17:45:29 -0800 samba (3.0.26a-1) unstable; urgency=low diff --git a/debian/patches/cups.patch b/debian/patches/cups.patch deleted file mode 100644 index 43d6aaa423..0000000000 --- a/debian/patches/cups.patch +++ /dev/null @@ -1,25 +0,0 @@ -Goal: Do not make CUPS the default printing system - -Fixes: ? - -Status wrt upstream: Debian specific - -Note: We need to decide whether it's still reasonable to use "printing=bsd" - as a default. Probably provide a debconf-supported way to upgrade - -Index: samba-3.0.25c/source/include/includes.h -=================================================================== ---- samba-3.0.25c.orig/source/include/includes.h 2007-08-26 13:07:03.425508276 +0200 -+++ samba-3.0.25c/source/include/includes.h 2007-08-26 13:08:58.419896656 +0200 -@@ -811,10 +811,7 @@ - #endif - - #ifndef DEFAULT_PRINTING --#ifdef HAVE_CUPS --#define DEFAULT_PRINTING PRINT_CUPS --#define PRINTCAP_NAME "cups" --#elif defined(SYSV) -+#if defined(SYSV) - #define DEFAULT_PRINTING PRINT_SYSV - #define PRINTCAP_NAME "lpstat" - #else diff --git a/debian/patches/series b/debian/patches/series index 03851edb04..2e1d63672d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -cups.patch documentation.patch fhs-newpaths.patch fhs-filespaths.patch |