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

Tue Nov 23 03:12:22 UTC 2010

Finalize changelog
Don't remove manpages anymore.
Merge branch 'master' of git://git.debian.org/pkg-multimedia/jackd2
Update changelog (just bumping timestamp, to indicate that previous commit should be suppressed: generally use 'git dch last-commit-touching-changelog' is the way to go.
Fix relax inclusion of CDBS snippet utils.mk: only required when in DEB_MAINTAINER_MODE; not wanted in backports to Debian stable.
Update changelog.
Merge commit 'upstream/1.9.6_dfsg'
Imported Upstream version 1.9.6~dfsg
Update changelog, control file and copyright hints.
Avoid (when upstream source next (re)packaged) unneeded and possibly sourceless binary ./macosx/libcelt.a.
Update copyright file: Extend some copyright years.
Ease building with git-buildpackage: Git-ignore quilt .pc dir, and add source local-options.
Drop superfluous supression of build-dependency resolving applying only to now obsolete test releases of CDBS.
Unfuzz patches.
Regenerate debian/control
Depend on python-dbus (Closes: #595520)
Unapply patches after git-buildpackage
regenerate control
Don't suggest libjackasyn0, nobody really uses it.
Regenerate debian/control
Make libjack-jackd2-dev provide libjack-dev.
Start new upload
Drop obsolete patch
Drop obsolete patch.
Drop obsolete patch.
Disable obsolete patches.
Merge commit 'upstream/1.9.6.dfsg'
Imported Upstream version 1.9.6~dfsg
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 982e843395f3b08e28fdb16c0a7271f4cea4f981
Merge: f9abd06dd17f654bea7cf7404ec66399fb871826 82fdd6f0b83182bd9e5ad6e941e3afdc3c29ceb2
Author: Luke Yelavich <themuso at ubuntu.com>
Date:   Tue Oct 26 20:07:52 2010 -0400

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

diff --combined debian/changelog
index 8ceb1c6,17740fb..d1770ad

--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,21 +1,37 @@@
++jackd2 (1.9.6~dfsg-1ubuntu1) 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, 26 Oct 2010 20:07:05 -0400
++
+ jackd2 (1.9.6~dfsg-1) unstable; urgency=low
+ 
+   * New upstream release.
+ 
+   [ Adrian Knoth ]
+   * jackrec is now called jack_rec (like in jackd1)
+   * Make libjack-jackd2-dev provide libjack-dev.
+   * Don't suggest libjackasyn0, nobody really uses it.
+   * Depend on python-dbus (Closes: #595520)
+ 
+   [ Jonas Smedegaard ]
+   * Unfuzz patches.
+   * Update copyright file: Extend some copyright years.
+   * Extend repackaging of upstream source to strip unneeded and possibly
+     sourceless binary ./macosx/libcelt.a.
+ 
+  -- 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)
@@@ -18,13 -28,6 +44,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 e4dfbce,ce51bca..3975b48
--- a/debian/control
+++ b/debian/control
@@@ -1,11 -1,11 +1,12 @@@
  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,
   libsamplerate-dev,
@@@ -18,7 -18,8 +19,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,15 -37,14 +37,14 @@@ Conflicts: jack-daemon
  Depends: ${shlibs:Depends},
   ${misc:Depends},
   coreutils (>= 4.0),
-  python,
+  python-dbus,
   debconf | debconf-2.0,
   libjack-jackd2-0 (= ${binary:Version})
  Recommends: qjackctl,
   libpam-modules,
   jackd2-firewire [amd64 i386 powerpc]
  Suggests: jack-tools,
-  meterbridge,
-  libjackasyn0
+  meterbridge
  Description: JACK Audio Connection Kit (server and example clients)
   JACK is a low-latency sound server, allowing multiple applications to
   connect to one audio device, and to share audio between themselves.
@@@ -94,7 -94,8 +94,8 @@@ Depends: libjack-jackd2-0 (= ${binary:V
   libdbus-1-dev
  Conflicts: libjack0.100.0-dev (<< 0.102.20-2),
   libjack-dev
- Provides: libjack0.100.0-dev
+ Provides: libjack0.100.0-dev,
+  libjack-dev
  Replaces: libjack0.71.2-0 (<< 0.75.0-1)
  Description: JACK Audio Connection Kit (development files)
   JACK is a low-latency sound server, allowing multiple applications to
diff --combined debian/control.in
index 0165fe6,f17fe7a..7230999
--- a/debian/control.in
+++ b/debian/control.in
@@@ -1,8 -1,7 +1,8 @@@
  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,
@@@ -17,7 -16,8 +17,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/
@@@ -35,15 -35,14 +35,14 @@@ Conflicts: jack-daemon
  Depends: ${shlibs:Depends},
   ${misc:Depends},
   coreutils (>= 4.0),
-  python,
+  python-dbus,
   debconf | debconf-2.0,
   libjack-jackd2-0 (= ${binary:Version})
  Recommends: qjackctl,
   libpam-modules,
   jackd2-firewire [amd64 i386 powerpc]
  Suggests: jack-tools,
-  meterbridge,
-  libjackasyn0
+  meterbridge
  Description: JACK Audio Connection Kit (server and example clients)
   JACK is a low-latency sound server, allowing multiple applications to
   connect to one audio device, and to share audio between themselves.
@@@ -93,7 -92,8 +92,8 @@@ Depends: libjack-jackd2-0 (= ${binary:V
   libdbus-1-dev
  Conflicts: libjack0.100.0-dev (<< 0.102.20-2),
   libjack-dev
- Provides: libjack0.100.0-dev
+ Provides: libjack0.100.0-dev,
+  libjack-dev
  Replaces: libjack0.71.2-0 (<< 0.75.0-1)
  Description: JACK Audio Connection Kit (development files)
   JACK is a low-latency sound server, allowing multiple applications to

-- 
jackd2 packaging

