[Pkg-samba-maint] r3229 - in branches/samba/experimental/debian: . patches

bubulle at alioth.debian.org bubulle at alioth.debian.org
Fri Jan 15 22:20:15 UTC 2010 

tags 555462 pending
tags 561148 pending
tags 552250 pending
tags 558116 pending
thanks

Author: bubulle
Date: 2010-01-15 22:20:15 +0000 (Fri, 15 Jan 2010)
New Revision: 3229

Modified:
   branches/samba/experimental/debian/changelog
   branches/samba/experimental/debian/control
   branches/samba/experimental/debian/patches/adapt_machine_creation_script.patch
   branches/samba/experimental/debian/patches/documentation.patch
   branches/samba/experimental/debian/patches/series
   branches/samba/experimental/debian/watch
Log:
Resync with trunk


Modified: branches/samba/experimental/debian/changelog
===================================================================
--- branches/samba/experimental/debian/changelog	2010-01-15 21:59:36 UTC (rev 3228)
+++ branches/samba/experimental/debian/changelog	2010-01-15 22:20:15 UTC (rev 3229)
@@ -1,26 +1,49 @@
-samba (2:3.5.0~pre2-1) UNRELEASED-experimental; urgency=low
+samba (2:3.5.0~rc1~dfsg-1) UNRELEASED-experimental; urgency=low
 
   [ Christian Perrier ]
   * New upstream pre-release
+
+ -- Christian Perrier <bubulle at debian.org>  Sun, 08 Nov 2009 15:04:24 +0100
+
+samba (2:3.4.4~dfsg-1) unstable; urgency=low
+
+  * New upstream version.
+  * Drop all RFC files from upstream source, therefore using a "~dfsg"
+    suffix to upstream version number.
+  * Bugs fixed upstream:
+    - fixed list of workgroup servers in libsmbclient. 
+      Closes: #555462, #561148
+    - fixed documentation of the credentials file format in
+      mount.cifs(8). Closes: #552250
+
+ -- Christian Perrier <bubulle at debian.org>  Thu, 14 Jan 2010 20:16:34 +0100
+
+samba (2:3.4.3-2) unstable; urgency=low
+
+  [ Christian Perrier ]
   * Switch to source format 3.0 (quilt)
   * Better adapt "add machine script" example to adduser
     Thanks to Heiko Schlittermann for the suggestion
     Closes: #555466
-  * Add --with-cifs-umount to configure
 
-  [ Mathieu Parent ]
-  * Raise ctdb build-dep version to 1.0.103
-    (new CTDB control CTDB_CONTROL_TRANS2_ACTIVE)
-  * Explicit ctdb path (--with-ctdb=/usr) 
-  * Removed --without-smbmount configure option, as smbmount as been 
-    removed in commit e1b32594c70ee57f16c84adb7910aa5c84a560f8
-  * Raise libtalloc-dev build-dep to 2.0.1 as required by configure
-
   [ Steve Langasek ]
-  * debian/rules: drop --with-cifsmount, --with-cifsupcall arguments, these
-    are now always set by default on Linux
+  * The "I hate non-declarative alternatives" upload:
+    - debian/samba{,-common}.prerm: don't call update-alternatives --remove
+      on upgrade, /do/ call it on other invocations of the prerm script.  If
+      these tools ever go away, the removal needs to be handled on upgrade by
+      the maintainer scripts of the new package version.
+    - debian/samba{,-common-bin}.postinst: call update-alternatives
+      unconditionally, don't second-guess the maintainer script arguments.
+    - debian/samba.postinst: call update-alternatives after the debconf
+      handling, not before; debconf triggers a re-exec of the script so
+      anything done before invoking debconf is wasted because it will be
+      re-done, and if there's already a debconf frontend running when this
+      is called, the not-redirected update-alternatives output will confuse
+      it.  Closes: #558116.
+    - debian/samba-common.prerm: move to samba-common-bin, this is the package
+      that owns these binaries.
 
- -- Christian Perrier <bubulle at debian.org>  Sun, 08 Nov 2009 15:04:24 +0100
+ -- Christian Perrier <bubulle at debian.org>  Thu, 17 Dec 2009 16:53:13 +0100
 
 samba (2:3.4.3-1) unstable; urgency=low
 

Modified: branches/samba/experimental/debian/control
===================================================================
--- branches/samba/experimental/debian/control	2010-01-15 21:59:36 UTC (rev 3228)
+++ branches/samba/experimental/debian/control	2010-01-15 22:20:15 UTC (rev 3229)
@@ -15,7 +15,7 @@
 Build-Conflicts: libfam-dev
 Standards-Version: 3.8.3
 Homepage: http://www.samba.org
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-samba/trunk/samba
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-samba/trunk/samba/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-samba/trunk/samba
 
 Package: samba

Modified: branches/samba/experimental/debian/patches/adapt_machine_creation_script.patch
===================================================================
--- branches/samba/experimental/debian/patches/adapt_machine_creation_script.patch	2010-01-15 21:59:36 UTC (rev 3228)
+++ branches/samba/experimental/debian/patches/adapt_machine_creation_script.patch	2010-01-15 22:20:15 UTC (rev 3229)
@@ -3,16 +3,16 @@
 Bug-Debian: http://bugs.debian.org/346234
 Forwarded: not-needed
 
-Index: b/docs/manpages/smb.conf.5
+Index: samba/docs/manpages/smb.conf.5
 ===================================================================
---- a/docs/manpages/smb.conf.5	2009-11-08 15:54:27.000000000 +0100
-+++ b/docs/manpages/smb.conf.5	2009-11-08 15:55:35.000000000 +0100
-@@ -1153,8 +1153,8 @@
+--- samba.orig/docs/manpages/smb.conf.5
++++ samba/docs/manpages/smb.conf.5
+@@ -877,8 +877,8 @@
  Default:
- \fI\fIadd machine script\fR\fR\fI = \fR\fI\FC\F[]\fR\fI \fR
+ \fI\fIadd machine script\fR\fR\fI = \fR\fI\fR\fI \fR
  .sp
 -Example:
--\fI\fIadd machine script\fR\fR\fI = \fR\fI\FC/usr/sbin/adduser \-n \-g machines \-c Machine \-d /var/lib/nobody \-s /bin/false %u\F[]\fR\fI \fR
+-\fI\fIadd machine script\fR\fR\fI = \fR\fI/usr/sbin/adduser \-n \-g machines \-c Machine \-d /var/lib/nobody \-s /bin/false %u\fR\fI \fR
 +Example for Debian:
 +\fI\fIadd machine script\fR\fR\fI = \fR\fI\FC/usr/sbin/adduser \-\-disabled-password \-\-ingroup machines \-\-gecos Machine \-\-home /var/lib/samba \-\-shell /bin/false %u\F[]\fR\fI \fR
  .RE

Modified: branches/samba/experimental/debian/patches/documentation.patch
===================================================================
--- branches/samba/experimental/debian/patches/documentation.patch	2010-01-15 21:59:36 UTC (rev 3228)
+++ branches/samba/experimental/debian/patches/documentation.patch	2010-01-15 22:20:15 UTC (rev 3229)
@@ -15,9 +15,9 @@
 -Swat is included as binary package with most distributions\&. The package manager in this case takes care of the installation and configuration\&. This section is only for those who have compiled swat from scratch\&.
 -.PP
 -After you compile SWAT you need to run
--\FCmake install \F[]
+-make install
 -to install the
--\FCswat\F[]
+-swat
 -binary and the various help files and images\&. A default install would put these in:
 -.sp
 -.RS 4
@@ -267,20 +267,20 @@
 +/var/run/samba/winbindd_privileged/pipe
  .RS 4
  The UNIX pipe over which \'privileged\' clients communicate with the
- \FCwinbindd\F[]
+ winbindd
  program\&. For security reasons, access to some winbindd functions \- like those needed by the
- \FCntlm_auth\F[]
+ ntlm_auth
 -utility \- is restricted\&. By default, only users in the \'root\' group will get this access, however the administrator may change the group permissions on $LOCKDIR/winbindd_privileged to allow programs like \'squid\' to use ntlm_auth\&. Note that the winbind client will only attempt to connect to the winbindd daemon if both the
--\FC$LOCKDIR/winbindd_privileged\F[]
+-$LOCKDIR/winbindd_privileged
 +utility \- is restricted\&. By default, only users in the \'root\' group will get this access, however the administrator may change the group permissions on /var/run/samba/winbindd_privileged to allow programs like \'squid\' to use ntlm_auth\&. Note that the winbind client will only attempt to connect to the winbindd daemon if both the
-+\FC/var/run/samba/winbindd_privileged\F[]
++/var/run/samba/winbindd_privileged
  directory and
--\FC$LOCKDIR/winbindd_privileged/pipe\F[]
-+\FC/var/run/samba/winbindd_privileged/pipe\F[]
+-$LOCKDIR/winbindd_privileged/pipe
++/var/run/samba/winbindd_privileged/pipe
  file are owned by root\&.
  .RE
  .PP
-@@ -789,15 +789,12 @@
+@@ -567,15 +567,12 @@
  Implementation of name service switch library\&.
  .RE
  .PP
@@ -290,7 +290,7 @@
 -Storage for the Windows NT rid to UNIX user/group id mapping\&. The lock directory is specified when Samba is initially compiled using the
 -\fI\-\-with\-lockdir\fR
 -option\&. This directory is by default
--\FC/usr/local/samba/var/locks \F[]\&.
+-/usr/local/samba/var/locks\&.
 +Storage for the Windows NT rid to UNIX user/group id mapping\&.
  .RE
  .PP

Modified: branches/samba/experimental/debian/patches/series
===================================================================
--- branches/samba/experimental/debian/patches/series	2010-01-15 21:59:36 UTC (rev 3228)
+++ branches/samba/experimental/debian/patches/series	2010-01-15 22:20:15 UTC (rev 3229)
@@ -10,6 +10,5 @@
 usershare.patch
 smbtar-bashism.patch
 no-unnecessary-cups.patch
-fix-manpages-warnings.patch
 codepages-location.patch
 autoconf.patch

Modified: branches/samba/experimental/debian/watch
===================================================================
--- branches/samba/experimental/debian/watch	2010-01-15 21:59:36 UTC (rev 3228)
+++ branches/samba/experimental/debian/watch	2010-01-15 22:20:15 UTC (rev 3229)
@@ -1,2 +1,3 @@
 version=3
+opts=dversionmangle=s/\~dfsg// \
 http://www.samba.org/samba/ftp/stable/samba-(\d[\w.]+).tar.gz

More information about the Pkg-samba-maint mailing list