[SCM] jack-audio-connection-kit/ubuntu: Merge branch 'master' into ubuntu
themuso-guest at users.alioth.debian.org
themuso-guest at users.alioth.debian.org
Mon Aug 8 04:16:24 UTC 2011
Replace hardcoded architecture list by linux-any (Closes: #634361)
Changelog and release
Regenerate control
Include jackd1 python examples
Drop d-shlibs from libjack-dev
Bump standards version
Merge commit 'upstream/0.121.0+svn4469'
Imported Upstream version 0.121.0+svn4469
Enable SH4 patch
Apply patch to enable jackd on Renesas SH (Closes: #623295)
Start new upload
Don't use /dev/shm on non-Linux archictures (Closes: #618982)
Changelog entries and release
Merge commit 'upstream/0.120.1+svn4142'
Imported Upstream version 0.120.1+svn4142
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/ubuntu
X-Git-Reftype: branch
X-Git-Oldrev: c7c288933560a18a208e674396982a87fbfeb359
X-Git-Newrev: 92e52fb09b9daa211d197449f10c10250dcf6279
The following commit has been merged in the ubuntu branch:
commit 0f9426f319162ebdf01eb02842b8fc8f4fb1e05b
Merge: c7c288933560a18a208e674396982a87fbfeb359 6956c714173f047edecf45aaa0f64b7a7f21dfa0
Author: Luke Yelavich <themuso at ubuntu.com>
Date: Mon Aug 8 13:51:11 2011 +1000
Merge branch 'master' into ubuntu
Conflicts:
debian/changelog
debian/control
debian/control.in
diff --combined debian/changelog
index 8bd1443,c245265..c1234eb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,18 +1,41 @@@
++jack-audio-connection-kit (1:0.121.0+svn4469-2ubuntu1) UNRELEASED; urgency=low
++
++ * Merge from Debian experimental. Remaining changes: (LP: #685345)
++ - debian/control: Drop libcelt-dev build dependency, it's in universe.
++ - Ubuntu-specific changes to gbp.conf
++
++ -- Luke Yelavich <themuso at ubuntu.com> Mon, 08 Aug 2011 14:08:24 +1000
++
+ jack-audio-connection-kit (1:0.121.0+svn4469-2) unstable; urgency=low
+
+ * Don't use /dev/shm on non-Linux archictures (Closes: #618982)
+ * Apply patch to enable jackd on Renesas SH (Closes: #623295)
+ * Imported Upstream version 0.121.0+svn4469
+ * Include python example code in the example directory
+
+ -- Adrian Knoth <adi at drcomp.erfurt.thur.de> Thu, 23 Jun 2011 18:25:28 +0200
+
+ jack-audio-connection-kit (1:0.120.1+svn4142-1) unstable; urgency=low
+
+ * Imported Upstream version 0.120.1+svn4142
+
+ -- Adrian Knoth <adi at drcomp.erfurt.thur.de> Thu, 03 Mar 2011 14:07:32 +0100
+
+jack-audio-connection-kit (1:0.118+svn4104-1ubuntu2) natty; urgency=low
+
+ * debian/rules: Explicitly set --libdir=/usr/lib as the configure script
+ decides to use $prefix/lib64 if on a 64-bit system, causing an FTBFS, as
+ the package install files look in usr/lib
+
+ -- Luke Yelavich <themuso at ubuntu.com> Mon, 14 Feb 2011 21:49:54 +1100
+
+jack-audio-connection-kit (1:0.118+svn4104-1ubuntu1) natty; urgency=low
+
+ * Merge from Debian experimental. Remaining changes: (LP: #685345)
+ - debian/control: Drop libcelt-dev build dependency, it's in universe.
+
+ -- Luke Yelavich <themuso at ubuntu.com> Mon, 14 Feb 2011 20:58:38 +1100
+
jack-audio-connection-kit (1:0.118+svn4104-1) experimental; urgency=low
* Add Brazilian Portuguese translation (Closes: #607408)
@@@ -22,13 -22,6 +45,13 @@@
-- Adrian Knoth <adi at drcomp.erfurt.thur.de> Wed, 12 Jan 2011 17:28:44 +0100
+jack-audio-connection-kit (1:0.118+svn4089-1ubuntu1) natty; urgency=low
+
+ * Merge from Debian experimental. Remaining changes: (LP: #685345)
+ - debian/control: Drop libcelt-dev build dependency, it's in universe.
+
+ -- Artur Rona <ari-tczew at ubuntu.com> Sun, 05 Dec 2010 01:20:49 +0100
+
jack-audio-connection-kit (1:0.118+svn4089-1) experimental; urgency=low
* Imported Upstream version 0.118+svn4089
@@@ -36,13 -29,6 +59,13 @@@
-- Adrian Knoth <adi at drcomp.erfurt.thur.de> Tue, 23 Nov 2010 15:53:55 +0100
+jack-audio-connection-kit (1:0.118+svn3796-8ubuntu1) natty; urgency=low
+
+ * Merge from debian unstable. Remaining changes:
+ - debian/control: Drop libcelt-dev build dependency, its in universe
+
+ -- Luke Yelavich <themuso at ubuntu.com> Tue, 23 Nov 2010 14:13:35 +1100
+
jack-audio-connection-kit (1:0.118+svn3796-8) unstable; urgency=low
[ Jonas Smedegaard ]
@@@ -55,13 -41,6 +78,13 @@@
-- Adrian Knoth <adi at drcomp.erfurt.thur.de> Mon, 15 Nov 2010 15:03:16 +0100
+jack-audio-connection-kit (1:0.118+svn3796-7ubuntu1) maverick; urgency=low
+
+ * Merge from debian unstable. Remaining changes:
+ - debian/control: Drop libcelt-dev build dependency, its in universe
+
+ -- Luke Yelavich <themuso at ubuntu.com> Fri, 16 Jul 2010 15:09:55 +1000
+
jack-audio-connection-kit (1:0.118+svn3796-7) unstable; urgency=low
* Make RTPRIO handling more robust (Closes: #588008, #587977)
@@@ -129,13 -108,6 +152,13 @@@ jack-audio-connection-kit (1:0.118+svn3
-- Adrian Knoth <adi at drcomp.erfurt.thur.de> Mon, 14 Jun 2010 17:47:11 +0200
+jack-audio-connection-kit (1.9.5~dfsg-13ubuntu1) maverick; urgency=low
+
+ * Merge from Debian unstable, remaining changes:
+ - debian/control: Drop libcelt-dev build dependency, its in universe
+
+ -- Luke Yelavich <themuso at ubuntu.com> Wed, 26 May 2010 17:15:51 +1000
+
jack-audio-connection-kit (1.9.5~dfsg-13) unstable; urgency=low
* Fix FTBFS on hppa (Closes: #580824)
@@@ -314,21 -286,6 +337,21 @@@ jack-audio-connection-kit (1.9.4+svn384
-- Adrian Knoth <adi at drcomp.erfurt.thur.de> Thu, 19 Nov 2009 15:34:47 +0100
+jack-audio-connection-kit (0.118+svn3796-1ubuntu2) lucid; urgency=low
+
+ * No change rebuild against latest libffado.
+
+ -- Onkar Shinde <onkarshinde at ubuntu.com> Tue, 23 Feb 2010 20:00:55 +0530
+
+jack-audio-connection-kit (0.118+svn3796-1ubuntu1) lucid; urgency=low
+
+ * Merge from Debian testing, remaining changes:
+ - debian/control: Drop build-dependencies on libcelt-dev and
+ libfreebob0-dev in anticipation of re-promotion to main
+ - debian/{jackd-firewire.install,rules}: Drop references to freebob
+
+ -- Daniel T Chen <crimsun at ubuntu.com> Sun, 13 Dec 2009 14:59:06 -0500
+
jack-audio-connection-kit (0.118+svn3796-1) unstable; urgency=low
[ Jonathan Wiltshire ]
@@@ -403,19 -360,6 +426,19 @@@ jack-audio-connection-kit (0.116.2+svn3
-- Adrian Knoth <adi at drcomp.erfurt.thur.de> Mon, 30 Mar 2009 15:56:14 +0200
+jack-audio-connection-kit (0.116.1-4ubuntu2) karmic; urgency=low
+
+ * No change rebuild against latest libffado.
+
+ -- Onkar Shinde <onkarshinde at ubuntu.com> Fri, 18 Sep 2009 10:09:14 +0530
+
+jack-audio-connection-kit (0.116.1-4ubuntu1) karmic; urgency=low
+
+ * Merge from debian unstable, remaining changes (LP: #380452):
+ - Add libffado-dev for amd64, i386, lpia, and powerpc to build-depends.
+
+ -- Nick Ellery <nick.ellery at ubuntu.com> Mon, 25 May 2009 20:05:32 -0700
+
jack-audio-connection-kit (0.116.1-4) unstable; urgency=low
* Bugfix: FTBFS on kFreeBSD (Closes: #510127)
@@@ -430,26 -374,6 +453,26 @@@
-- Reinhard Tartler <siretart at tauware.de> Tue, 24 Feb 2009 23:04:00 +0100
+jack-audio-connection-kit (0.116.1-3ubuntu3) jaunty; urgency=low
+
+ * Only require libffado-dev on powerpc, lpia, i386, and amd64; this
+ library doesn't appear to have been ported yet to other archs.
+
+ -- Steve Langasek <steve.langasek at ubuntu.com> Thu, 26 Mar 2009 09:23:39 +0000
+
+jack-audio-connection-kit (0.116.1-3ubuntu2) jaunty; urgency=low
+
+ * Added libffado-dev to build-deps. (LP: #332640)
+
+ -- Andrew Hunter <andrew at aehunter.net> Sat, 21 Feb 2009 14:09:13 -0500
+
+jack-audio-connection-kit (0.116.1-3ubuntu1) jaunty; urgency=low
+
+ * Merge from debian unstable, remaining changes (LP: #316137):
+ - Redirect stderr in bash completion.
+
+ -- Nick Ellery <nick.ellery at ubuntu.com> Sun, 11 Jan 2009 11:00:26 -0800
+
jack-audio-connection-kit (0.116.1-3) unstable; urgency=low
* Don't install *.la files in libjack-dev. (Closes: #510673)
@@@ -457,13 -381,6 +480,13 @@@
-- Reinhard Tartler <siretart at tauware.de> Fri, 09 Jan 2009 08:28:07 +0100
+jack-audio-connection-kit (0.116.1-2ubuntu1) jaunty; urgency=low
+
+ * Merge from debian unstable, remaining changes (LP: #311692):
+ - Redirect stderr in bash completion.
+
+ -- Nick Ellery <nick.ellery at ubuntu.com> Sat, 27 Dec 2008 00:19:02 -0800
+
jack-audio-connection-kit (0.116.1-2) unstable; urgency=low
* Build-Depend on libsamplerate-dev and libcelt-dev (Closes: #509579)
@@@ -473,13 -390,6 +496,13 @@@
-- Free Ekanayaka <freee at debian.org> Wed, 24 Dec 2008 16:49:34 +0000
+jack-audio-connection-kit (0.116.1-1ubuntu1) jaunty; urgency=low
+
+ * Merge from debian unstable, remaining changes (LP: #310039):
+ - Redirect stderr in bash completion.
+
+ -- Nick Ellery <nick.ellery at ubuntu.com> Sat, 20 Dec 2008 10:45:22 -0800
+
jack-audio-connection-kit (0.116.1-1) unstable; urgency=low
[ Asheesh Laroia ]
@@@ -493,13 -403,6 +516,13 @@@
-- Free Ekanayaka <freee at debian.org> Mon, 15 Dec 2008 12:11:54 +0100
+jack-audio-connection-kit (0.115.6-1ubuntu1) jaunty; urgency=low
+
+ * Merge from Debian unstable, remaining Ubuntu changes:
+ - Redirect stderr in bash completion (Debian #504488).
+
+ -- Luca Falavigna <dktrkranz at ubuntu.com> Sat, 06 Dec 2008 11:05:15 +0100
+
jack-audio-connection-kit (0.115.6-1) unstable; urgency=low
* New Upstream Version
@@@ -510,27 -413,12 +533,27 @@@
-- Free Ekanayaka <freee at debian.org> Sun, 30 Nov 2008 19:53:26 +0100
+jack-audio-connection-kit (0.109.2-4ubuntu1) jaunty; urgency=low
+
+ * Merge from debian unstable, remaining changes (LP: #293583):
+ - Redirect stderr in bash completion.
+
+ -- Nathan Handler <nhandler at ubuntu.com> Tue, 04 Nov 2008 06:37:43 -0600
+
jack-audio-connection-kit (0.109.2-4) unstable; urgency=low
* Added init script to start jackd at system startup
-- Free Ekanayaka <freee at debian.org> Wed, 17 Sep 2008 14:43:18 +0200
+jack-audio-connection-kit (0.109.2-3ubuntu1) intrepid; urgency=low
+
+ * Merge from debian unstable, remaining changes (LP: #239490):
+ - Redirect stderr in bash completion.
+ - Update maintainer field as per spec.
+
+ -- Nathan Handler <nathan.handler at gmail.com> Thu, 12 Jun 2008 11:14:43 -0500
+
jack-audio-connection-kit (0.109.2-3) unstable; urgency=low
* Included patches and changelog entry from NMU 0.109.2-1.1
@@@ -543,14 -431,6 +566,14 @@@ jack-audio-connection-kit (0.109.2-2) u
-- Free Ekanayaka <freee at debian.org> Mon, 12 May 2008 20:37:38 +0100
+jack-audio-connection-kit (0.109.2-1.1ubuntu1) intrepid; urgency=low
+
+ * Merge from debian unstable, remaining changes:
+ - Redirect stderr in bash completion.
+ - Update maintainer field as per spec.
+
+ -- Luke Yelavich <luke.yelavich at canonical.com> Mon, 05 May 2008 11:41:51 +1000
+
jack-audio-connection-kit (0.109.2-1.1) unstable; urgency=low
* Non-maintainer upload.
@@@ -562,28 -442,12 +585,28 @@@
-- Kurt Roeckx <kurt at roeckx.be> Sat, 15 Mar 2008 11:49:05 +0000
+jack-audio-connection-kit (0.109.2-1ubuntu1) hardy; urgency=low
+
+ * Merge from debian unstable, remaining changes:
+ - Redirect stderr in bash completion.
+ - Update maintainer field as per spec.
+
+ -- Luke Yelavich <themuso at ubuntu.com> Sat, 02 Feb 2008 17:18:35 +1100
+
jack-audio-connection-kit (0.109.2-1) unstable; urgency=low
* New upstream release
-- Free Ekanayaka <freee at debian.org> Thu, 31 Jan 2008 21:25:22 +0000
+jack-audio-connection-kit (0.109.0-1ubuntu1) hardy; urgency=low
+
+ * Merge from debian unstable, remaining changes:
+ - Redirect stderr in bash completion.
+ - Update maintainer field as per spec.
+
+ -- Luke Yelavich <themuso at ubuntu.com> Wed, 23 Jan 2008 09:22:11 +0000
+
jack-audio-connection-kit (0.109.0-1) unstable; urgency=low
* New upstream release
@@@ -594,12 -458,6 +617,12 @@@
-- Free Ekanayaka <freee at debian.org> Tue, 22 Jan 2008 13:23:13 +0000
+jack-audio-connection-kit (0.103.0-6ubuntu1) gutsy; urgency=low
+
+ * Redirect stderr in bash completion (LP: #139995).
+
+ -- Evan Dandrea <evand at ubuntu.com> Tue, 18 Sep 2007 11:40:09 -0400
+
jack-audio-connection-kit (0.103.0-6) unstable; urgency=low
* debian/jackd.README.Debian:
@@@ -1163,4 -1021,3 +1186,4 @@@ jack (0.4.7-1) unstable; urgency=lo
file release.
-- Junichi Uekawa <dancer at debian.org> Sun, 23 Dec 2001 17:13:22 +0900
+
diff --combined debian/control
index 5508834,f56a9dc..57d972d
--- a/debian/control
+++ b/debian/control
@@@ -1,8 -1,7 +1,8 @@@
Source: jack-audio-connection-kit
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>,
Free Ekanayaka <freee at debian.org>,
Jonas Smedegaard <dr at jones.dk>,
@@@ -11,12 -10,13 +11,12 @@@
Build-Depends: libtool,
automake1.11,
autoconf,
- cdbs (>= 0.4.53),
+ cdbs (>= 0.4.85~),
debhelper (>= 7.0.1),
dh-buildinfo,
d-shlibs,
doxygen,
libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libcelt-dev (>= 0.7.0),
libffado-dev (>= 2.0.0) [amd64 i386 powerpc],
libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libreadline-dev,
@@@ -26,7 -26,7 +26,7 @@@
patchutils,
po-debconf,
type-handling
- Standards-Version: 3.9.1
+ Standards-Version: 3.9.2
DM-Upload-Allowed: yes
Homepage: http://jackaudio.org/
Vcs-Git: git://git.debian.org/git/pkg-multimedia/jack-audio-connection-kit.git
@@@ -95,7 -95,8 +95,8 @@@ Depends: ${devlibs:Depends}
${misc:Depends},
pkg-config,
${shlibs:Depends}
- Provides: libjack0.100.0-dev
+ Provides: libjack0.100.0-dev,
+ libjack-dev-session
Description: JACK Audio Connection Kit (development files)
JACK is a low-latency sound server, allowing multiple applications to
connect to one audio device, and to share audio between themselves.
diff --combined debian/control.in
index dfa983a,747ca0d..44b10b8
--- a/debian/control.in
+++ b/debian/control.in
@@@ -1,8 -1,7 +1,8 @@@
Source: jack-audio-connection-kit
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>,
Free Ekanayaka <freee at debian.org>,
Jonas Smedegaard <dr at jones.dk>,
@@@ -11,9 -10,10 +11,9 @@@
Build-Depends: @cdbs@,
d-shlibs,
doxygen,
- libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libasound2-dev [linux-any],
- libcelt-dev (>= 0.7.0),
libffado-dev (>= 2.0.0) [amd64 i386 powerpc],
- libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libraw1394-dev [linux-any],
libreadline-dev,
libsamplerate-dev,
libsndfile1-dev,
@@@ -21,7 -21,7 +21,7 @@@
patchutils,
po-debconf,
type-handling
- Standards-Version: 3.9.1
+ Standards-Version: 3.9.2
DM-Upload-Allowed: yes
Homepage: http://jackaudio.org/
Vcs-Git: git://git.debian.org/git/pkg-multimedia/jack-audio-connection-kit.git
@@@ -90,7 -90,8 +90,8 @@@ Depends: ${devlibs:Depends}
${misc:Depends},
pkg-config,
${shlibs:Depends}
- Provides: libjack0.100.0-dev
+ Provides: libjack0.100.0-dev,
+ libjack-dev-session
Description: JACK Audio Connection Kit (development files)
JACK is a low-latency sound server, allowing multiple applications to
connect to one audio device, and to share audio between themselves.
diff --combined debian/gbp.conf
index d6bc349,1615f89..db23ca3
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,6 -1,6 +1,6 @@@
[DEFAULT]
upstream-branch = upstream
-debian-branch = master
+debian-branch = ubuntu
upstream-tag = upstream/%(version)s
--debian-tag = debian/%(version)s
++debian-tag = ubuntu/%(version)s
pristine-tar = True
diff --combined debian/rules
index de274fd,7adfc51..3511b1b
--- a/debian/rules
+++ b/debian/rules
@@@ -30,7 -30,7 +30,7 @@@ DEB_UPSTREAM_URL = http://jackaudio.org
#unused, TODO get this soname from configure.in
#DEB_SONAME_VERSION := 0.91.1-0
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-resize \
+DEB_CONFIGURE_EXTRA_FLAGS := --libdir=/usr/lib --enable-resize \
--enable-timestamps --disable-iec61883 --with-oldtrans \
--disable-ensure-mlock --enable-sse=yes --enable-static=yes
# --enable-posix-shm
@@@ -50,6 -50,8 +50,8 @@@ endi
ifeq (linux-gnu,$(DEB_HOST_GNU_SYSTEM))
DEB_CONFIGURE_EXTRA_FLAGS += --with-default-tmpdir=/dev/shm
+ else
+ DEB_CONFIGURE_EXTRA_FLAGS += --with-default-tmpdir=/tmp
endif
ifneq (,$(filter doopt,$(DEB_BUILD_OPTIONS)))
@@@ -94,14 -96,6 +96,6 @@@ install/jackd1:
dh_install -pjackd1 debian/tmp/usr/lib/jack/jack_alsa.so
endif
- binary-post-install/libjack0::
- d-devlibdeps \
- --override s/libffado2-dev/libffado-dev/ \
- --override s/libcelt0-0-dev/libcelt-dev/ \
- debian/libjack-dev.substvars \
- debian/tmp/usr/lib/*.so \
- debian/tmp/usr/lib/jack/*.so
-
.PHONY: faq
# this target fetches the FAQ from the JACK homepage
faq:
--
Debian packaging for jack-audio-connection-kit
More information about the pkg-multimedia-commits
mailing list