[SCM] jackd2/ubuntu: Merge branch 'master' into ubuntu
themuso-guest at users.alioth.debian.org
themuso-guest at users.alioth.debian.org
Mon Feb 14 09:32:00 UTC 2011
Changelog and release
Enable no-self-connect patch
Add no-self-connect patch.
Changelog and release
Regenerate control
Refresh VCS version to r4104
Provide libjack-dev-session
Add Brazilian Portuguese translation.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/ubuntu
X-Git-Reftype: branch
X-Git-Oldrev: 5bbc568942efbe841afc0cd55f3110250bcde645
X-Git-Newrev: 95670e18737611c20541ab6e03a06890767c41e9
The following commit has been merged in the ubuntu branch:
commit 5c36cbb08b50f40b89e90bdd8ee0ac76d60fa039
Merge: 5bbc568942efbe841afc0cd55f3110250bcde645 7a6dc718f2d2f7ef0fff1f1785110efeef404696
Author: Luke Yelavich <themuso at ubuntu.com>
Date: Mon Feb 14 20:22:32 2011 +1100
Merge branch 'master' into ubuntu
Conflicts:
debian/changelog
diff --combined debian/changelog
index 3325334,8dcd092..3c1c9a5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,17 +1,33 @@@
++jackd2 (1.9.6~dfsg.1-5ubuntu1) 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, 14 Feb 2011 20:20:21 +1100
++
+ jackd2 (1.9.6~dfsg.1-5) experimental; urgency=low
+
+ * Add no-self-connect patch to provide better ladish support.
+
+ -- Adrian Knoth <adi at drcomp.erfurt.thur.de> Sat, 29 Jan 2011 19:00:05 +0100
+
+ jackd2 (1.9.6~dfsg.1-4) experimental; urgency=low
+
+ * Add Brazilian Portuguese translation.
+ * Provide libjack-dev-session
+ * Refresh VCS version to r4104
+
+ -- 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
@@@ -21,14 -27,6 +43,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.
@@@ -47,14 -45,6 +69,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)
@@@ -67,13 -57,6 +89,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 17c55e1,d24daa3..ad6a02c
--- a/debian/control
+++ b/debian/control
@@@ -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,
debhelper (>= 6),
@@@ -20,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/
@@@ -97,6 -97,7 +97,7 @@@ Depends: libjack-jackd2-0 (= ${binary:V
Conflicts: libjack0.100.0-dev (<< 0.102.20-2),
libjack-dev
Provides: libjack0.100.0-dev,
+ libjack-dev-session,
libjack-dev
Replaces: libjack0.71.2-0 (<< 0.75.0-1)
Description: JACK Audio Connection Kit (development files)
diff --combined debian/control.in
index b9108be,26f1007..1029fa8
--- 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,
@@@ -18,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/
@@@ -95,6 -95,7 +95,7 @@@ Depends: libjack-jackd2-0 (= ${binary:V
Conflicts: libjack0.100.0-dev (<< 0.102.20-2),
libjack-dev
Provides: libjack0.100.0-dev,
+ libjack-dev-session,
libjack-dev
Replaces: libjack0.71.2-0 (<< 0.75.0-1)
Description: JACK Audio Connection Kit (development files)
--
jackd2 packaging
More information about the pkg-multimedia-commits
mailing list