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

Mon Aug 8 04:39:15 UTC 2011

Replace hardcoded architecture list by linux-any (Closes: #634296)
sh4.patch applied upstream, add corresponding DEP3 note.
Enable SH4 patch
Add patch to support SH4 architectures (Closes: #622713)
Update Brazilian Portuguese translation (Closes: #621097)
Changelog and release
Disable 1001_connect.patch
Recreate no-self-connect patch from upstream.
Drop VCS sync patch
Disable VCS update patch
Merge commit 'upstream/1.9.7_dfsg'
Imported Upstream version 1.9.7~dfsg
Build with --mixed on i386 to be compatible with amd64.
Delete .DS_Store from upstream branch.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/ubuntu
X-Git-Reftype: branch
X-Git-Oldrev: 95670e18737611c20541ab6e03a06890767c41e9
X-Git-Newrev: 0da2696535863b6d669167a05cd4969ba4ca72a6

The following commit has been merged in the ubuntu branch:
commit ca09fdef472cf8ce766373c9ee74ff1c8ea2f1e2
Merge: 95670e18737611c20541ab6e03a06890767c41e9 eb6f28bf6368d3c95a75596a8415a3166a7ae754
Author: Luke Yelavich <themuso at ubuntu.com>
Date:   Mon Aug 8 14:32:46 2011 +1000

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

diff --combined debian/changelog
index 072965c,db49542..4a5f88e

--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,13 +1,29 @@@
++jackd2 (1.9.7~dfsg-1ubuntu1) UNRELEASED; urgency=low
++
++  * Merge from debian experimental, remaining changes:
++    - Drop libcelt build dependency
++    - debian/gbp.conf: Set debian-branch to ubuntu
++
++ -- Luke Yelavich <themuso at ubuntu.com>  Mon, 08 Aug 2011 14:33:26 +1000
++
+ jackd2 (1.9.7~dfsg-1) unstable; urgency=low
+ 
+   * New upstream version 1.9.7 (ALSA resume, new latency API)
+   * Build with --mixed on i386 to be compatible with amd64.
+   * Don't patch jack_connect for fast consecutive calls anymore, it's now
+     using the same code as in jackd1 and waits for the port connection to
+     appear.
+ 
+  -- Adrian Knoth <adi at drcomp.erfurt.thur.de>  Thu, 31 Mar 2011 13:54:50 +0200
+ 
 +jackd2 (1.9.6~dfsg.1-5ubuntu1) natty; urgency=low
 +
 +  * Merge from debian experimental, remaining changes:
 +    - Drop libcelt build dependency
 +    - debian/gbp.conf: Set debian-branch to ubuntu
 +
 + -- Luke Yelavich <themuso at ubuntu.com>  Mon, 14 Feb 2011 20:28:17 +1100
 +
  jackd2 (1.9.6~dfsg.1-5) experimental; urgency=low
  
    * Add no-self-connect patch to provide better ladish support.
@@@ -20,14 -22,6 +38,14 @@@ jackd2 (1.9.6~dfsg.1-4) experimental; u
  
   -- Adrian Knoth <adi at drcomp.erfurt.thur.de>  Wed, 12 Jan 2011 17:46:58 +0100
  
 +jackd2 (1.9.6~dfsg.1-3ubuntu1) natty; 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:53:46 +1100
 +
  jackd2 (1.9.6~dfsg.1-3) experimental; urgency=low
  
    * Sync to upstream r4089
@@@ -43,14 -37,6 +61,14 @@@ jackd2 (1.9.6~dfsg.1-2) unstable; urgen
  
   -- 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.
@@@ -69,14 -55,6 +87,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)
@@@ -89,13 -67,6 +107,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.in
index 1029fa8,4d2ac4b..fd8f18d
--- a/debian/control.in
+++ b/debian/control.in
@@@ -1,24 -1,24 +1,24 @@@
  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],
+  libasound2-dev (>= 1.0.18) [linux-any],
   libdbus-1-dev,
   libexpat1-dev,
   libsndfile1-dev,
   libncurses-dev,
   libreadline-dev,
-  libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+  libraw1394-dev [linux-any],
   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/

-- 
jackd2 packaging

