[Pkg-samba-maint] [samba] 01/01: Merge support for upstart jobs

[Steve Langasek]

This is an automated email from the git hooks/post-receive script.

vorlon pushed a commit to branch master
in repository samba.

commit 49a1d61ac3ab702e0fd65c8535bd1a74ee419035
Merge: 9afd003 133bcf4
Author: Steve Langasek <steve.langasek at canonical.com>
Date:   Mon Aug 12 07:40:33 2013 +0200

    Merge support for upstart jobs

 debian/changelog                 |   10 ++++
 debian/control                   |    4 +-
 debian/rules                     |    4 +-
 debian/samba-common.dhcp         |    2 +-
 debian/samba.init                |  115 --------------------------------------
 debian/samba.logrotate           |    2 +-
 debian/samba.maintscript         |    1 +
 debian/samba.nmbd.init           |   87 ++++++++++++++++++++++++++++
 debian/samba.nmbd.upstart        |   21 +++++++
 debian/samba.postinst            |    2 +
 debian/samba.reload-smbd.upstart |   12 ++++
 debian/samba.smbd.init           |   88 +++++++++++++++++++++++++++++
 debian/samba.smbd.upstart        |   19 +++++++
 debian/winbind.init              |    9 +++
 debian/winbind.upstart           |   19 +++++++
 15 files changed, 275 insertions(+), 120 deletions(-)

diff --cc debian/changelog
index 42ad1af,6276ed9..fba1368
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,33 -1,15 +1,43 @@@
 -samba (2:3.6.15-2) UNRELEASED; urgency=low
++samba (2:3.6.17-2) UNRELEASED; urgency=low
+ 
 -  * Drop support for running smbd from inetd; this is not well-supported
 -    upstream, and can't correctly handle all of the long-running services
 -    that are needed as part of modern samba.  Closes: #707622.
+   * Split the samba init script into nmbd and smbd init scripts, for better
+     alignment with how init systems other than sysvinit work.  This also
+     drops the override of the arguments to update-rc.d in debian/rules,
+     no longer needed in the post-insserv world.
+   * Add upstart jobs from Ubuntu for smbd, nmbd, and winbind.
+ 
 - -- Steve Langasek <vorlon at debian.org>  Mon, 13 May 2013 11:57:53 -0700
++ -- Steve Langasek <vorlon at debian.org>  Mon, 12 Aug 2013 10:45:24 +0200
++
 +samba (2:3.6.17-1) unstable; urgency=high
 +
 +  * Team upload.
 +  * New upstream security release. Closes: #718781
 +    Fixes CVE-2013-4124: Denial of service - CPU loop and memory allocation
 +
 + -- Ivo De Decker <ivo.dedecker at ugent.be>  Mon, 05 Aug 2013 13:46:23 +0200
 +
 +samba (2:3.6.16-2) unstable; urgency=high
 +
 +  * Team upload.
 +  * Make build-dep on libtevent-dev explicit.
 +  * Fix waf-as-source.patch to make sure unpacking works in recent build
 +    environment. Closes: #716932 
 +
 + -- Ivo De Decker <ivo.dedecker at ugent.be>  Tue, 16 Jul 2013 22:01:04 +0200
 +
 +samba (2:3.6.16-1) unstable; urgency=low
 +
 +  * Team upload.
 +
 +  [ Steve Langasek ]
 +  * Drop support for running smbd from inetd; this is not well-supported
 +    upstream, and can't correctly handle all of the long-running services
 +    that are needed as part of modern samba.  Closes: #707622.
 +
 +  [ Ivo De Decker ]
 +  * New upstream release
 +
 + -- Ivo De Decker <ivo.dedecker at ugent.be>  Wed, 19 Jun 2013 21:05:07 +0200
  
  samba (2:3.6.15-1) unstable; urgency=high
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git