[SCM] jackd2/ubuntu: Merge branch 'master' into ubuntu

[themuso-guest at users.alioth.debian.org]

Changelog and release
Regenerate control
Explicitly depend on python.
Remove generated manpages in the clean target
Refresh VCS patch
Re-enable svn update patch
Sync to upstream r4089
Changelog and release
Remove audio.conf.disabled upon purge (Closes: #603457)
Strip .DS_Store, an OSX specific folder db.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/ubuntu
X-Git-Reftype: branch
X-Git-Oldrev: f9abd06dd17f654bea7cf7404ec66399fb871826
X-Git-Newrev: 5bbc568942efbe841afc0cd55f3110250bcde645

The following commit has been merged in the ubuntu branch:
commit a4c0a008a1a63e890c30700efc573519ead40a90
Merge: 40b4e9991e8fd1108f596d98a70f41fb8e1ad162 3e5631d7c19ca60a28b0bb2db137e279c7bb8b3d
Author: Luke Yelavich <themuso at ubuntu.com>
Date:   Tue Nov 23 13:52:03 2010 +1100

    Merge branch 'master' into ubuntu
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 8927df0,cc02da7..c14db1f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,18 +1,34 @@@
++jackd2 (1.9.6~dfsg.1-3ubuntu1) UNRELEASED; urgency=low
++
++  * Merge from debian unstable, remaining changes:
++    - Drop libcelt build dependency
++    - debian/gbp.conf: Set debian-branch to ubuntu
++
++ -- Luke Yelavich <themuso at ubuntu.com>  Tue, 23 Nov 2010 13:51:26 +1100
++
+ jackd2 (1.9.6~dfsg.1-3) experimental; urgency=low
+ 
+   * Sync to upstream r4089
+   * Includes: jack-session support, fixes ALSA suspend/resume and machine
+     lock-up after FFADO crashes
+ 
+  -- Adrian Knoth <adi at drcomp.erfurt.thur.de>  Mon, 22 Nov 2010 19:31:37 +0100
+ 
+ jackd2 (1.9.6~dfsg.1-2) unstable; urgency=low
+ 
+   * Strip .DS_Store, an OSX specific folder db.
+   * Remove audio.conf.disabled upon purge (Closes: #603457)
+ 
+  -- Adrian Knoth <adi at drcomp.erfurt.thur.de>  Mon, 15 Nov 2010 15:05:33 +0100
+ 
 +jackd2 (1.9.6~dfsg-1ubuntu1) natty; urgency=low
 +
 +  * Merge from debian unstable, remaining changes:
 +    - Drop libcelt build dependency
 +    - debian/gbp.conf: Set debian-branch to ubuntu
 +
 + -- Luke Yelavich <luke at barbiton>  Wed, 27 Oct 2010 08:43:24 -0400
 +
  jackd2 (1.9.6~dfsg-1) unstable; urgency=low
  
    * New upstream release.
@@@ -24,14 -31,6 +47,14 @@@
  
   -- Adrian Knoth <adi at drcomp.erfurt.thur.de>  Mon, 25 Oct 2010 16:31:10 +0200
  
 +jackd2 (1.9.5~dfsg-19ubuntu1) maverick; urgency=low
 +
 +  * Merge from debian unstable, remaining changes:
 +    - Drop libcelt build dependency
 +  * debian/gbp.conf: Set debian-branch to ubuntu
 +
 + -- Luke Yelavich <themuso at ubuntu.com>  Mon, 09 Aug 2010 09:46:12 +1000
 +
  jackd2 (1.9.5~dfsg-19) unstable; urgency=low
  
    * Fix FTBFS on kFreeBSD and sparc (Closes: #591247)
@@@ -44,13 -43,6 +67,13 @@@ jackd2 (1.9.5~dfsg-18) unstable; urgenc
  
   -- Adrian Knoth <adi at drcomp.erfurt.thur.de>  Fri, 30 Jul 2010 17:57:43 +0200
  
 +jackd2 (1.9.5~dfsg-17ubuntu1) maverick; urgency=low
 +
 +  * debian/control: Drop libcelt build dependency, in preparation for jackd2
 +    moving to main
 +
 + -- Luke Yelavich <themuso at ubuntu.com>  Tue, 20 Jul 2010 16:39:44 +0200
 +
  jackd2 (1.9.5~dfsg-17) unstable; urgency=low
  
    * Augment sigsegv.c patch to support SH4 CPUs (Closes: #588124)
diff --combined debian/control
index 3975b48,3e0fd96..17c55e1
--- a/debian/control
+++ b/debian/control
@@@ -1,14 -1,14 +1,15 @@@
  Source: jackd2
  Section: sound
  Priority: optional
 -Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 +Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
 +XSBC-Original-Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
  Uploaders: Adrian Knoth <adi at drcomp.erfurt.thur.de>, Jonas Smedegaard <dr at jones.dk>, Reinhard Tartler <siretart at tauware.de>
  Build-Depends: cdbs,
   debhelper (>= 6),
   dh-buildinfo,
   d-shlibs,
   python,
+  python-support,
   libsamplerate-dev,
   libasound2-dev (>= 1.0.18) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
   libdbus-1-dev,
@@@ -19,7 -19,8 +20,7 @@@
   libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
   libffado-dev (>= 2.0.0) [amd64 i386 powerpc],
   g++-multilib [amd64],
 - po-debconf,
 - libcelt-dev (>= 0.7.0)
 + po-debconf
  Standards-Version: 3.9.1
  DM-Upload-Allowed: yes
  Homepage: http://jackaudio.org/
@@@ -36,6 -37,7 +37,7 @@@ Conflicts: jack-daemon
  	jackd (<< 3)
  Depends: ${shlibs:Depends},
   ${misc:Depends},
+  ${python:Depends},
   coreutils (>= 4.0),
   python-dbus,
   debconf | debconf-2.0,
diff --combined debian/control.in
index 7230999,ad83391..b9108be
--- a/debian/control.in
+++ b/debian/control.in
@@@ -1,12 -1,12 +1,13 @@@
  Source: jackd2
  Section: sound
  Priority: optional
 -Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 +Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
 +XSBC-Original-Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
  Uploaders: Adrian Knoth <adi at drcomp.erfurt.thur.de>, Jonas Smedegaard <dr at jones.dk>, Reinhard Tartler <siretart at tauware.de>
  Build-Depends: @cdbs@,
   d-shlibs,
   python,
+  python-support,
   libsamplerate-dev,
   libasound2-dev (>= 1.0.18) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
   libdbus-1-dev,
@@@ -17,7 -17,8 +18,7 @@@
   libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
   libffado-dev (>= 2.0.0) [amd64 i386 powerpc],
   g++-multilib [amd64],
 - po-debconf,
 - libcelt-dev (>= 0.7.0)
 + po-debconf
  Standards-Version: 3.9.1
  DM-Upload-Allowed: yes
  Homepage: http://jackaudio.org/
@@@ -34,6 -35,7 +35,7 @@@ Conflicts: jack-daemon
  	jackd (<< 3)
  Depends: ${shlibs:Depends},
   ${misc:Depends},
+  ${python:Depends},
   coreutils (>= 4.0),
   python-dbus,
   debconf | debconf-2.0,

-- 
jackd2 packaging