[SCM] audacity/ubuntu: Merge branch 'master' into ubuntu
bdrung at users.alioth.debian.org
bdrung at users.alioth.debian.org
Sat May 28 16:41:49 UTC 2011
Release 1.3.13-4 to Debian unstable.
Bump required libav version to 0.6
Unbreak compilation against 0.7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/ubuntu
X-Git-Reftype: branch
X-Git-Oldrev: 31de584b664293a9b85a3eddba4d405755b06767
X-Git-Newrev: 0454b36ca14827c39a2e610fd5f31f2ce525d455
The following commit has been merged in the ubuntu branch:
commit 7f615cb3a0257b485f3dc8de2ec5e8a8befa3447
Merge: 31de584b664293a9b85a3eddba4d405755b06767 5b76f9593f03ada71c50d6fab1860650f1a54350
Author: Benjamin Drung <bdrung at debian.org>
Date: Sat May 28 18:22:02 2011 +0200
Merge branch 'master' into ubuntu
diff --combined debian/changelog
index ea73622,8ea7f15..627e081
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,11 +1,18 @@@
+ audacity (1.3.13-4) unstable; urgency=low
+
+ * libav-0.7.patch: Unbreak compilation against libav 0.7.
+ Thanks to Reinhard Tartler for the patch (Closes: #628201)
+ * Bump required libav version to 0.6 (Closes: #628138)
+
+ -- Benjamin Drung <bdrung at debian.org> Sat, 28 May 2011 13:41:09 +0200
+
+audacity (1.3.13-3ubuntu1) natty; urgency=low
+
+ * Merge from Debian unstable. Remaining changes:
+ - Build against libmp3lame.
+
+ -- Benjamin Drung <bdrung at ubuntu.com> Sat, 23 Apr 2011 12:11:15 +0200
+
audacity (1.3.13-3) unstable; urgency=low
* Apply followup commits for fixing upstream bug #367.
@@@ -12,26 -13,12 +20,26 @@@
-- Benjamin Drung <bdrung at debian.org> Sat, 23 Apr 2011 11:43:42 +0200
+audacity (1.3.13-2ubuntu1) natty; urgency=low
+
+ * Merge from Debian unstable. Remaining changes:
+ - Build against libmp3lame.
+
+ -- Benjamin Drung <bdrung at ubuntu.com> Sun, 17 Apr 2011 19:02:55 +0200
+
audacity (1.3.13-2) unstable; urgency=low
* Apply two upstream fixes for the upstream bugs #350 and #367.
-- Benjamin Drung <bdrung at debian.org> Sun, 17 Apr 2011 18:43:04 +0200
+audacity (1.3.13-1ubuntu1) natty; urgency=low
+
+ * Merge from Debian unstable (LP: #759314). Remaining changes:
+ - Build against libmp3lame.
+
+ -- Benjamin Drung <bdrung at ubuntu.com> Wed, 13 Apr 2011 02:00:19 +0200
+
audacity (1.3.13-1) unstable; urgency=low
* New upstream release (LP: #608948, #690226, #694778, #713584, #753323).
@@@ -42,13 -29,6 +50,13 @@@
-- Benjamin Drung <bdrung at debian.org> Wed, 13 Apr 2011 01:43:29 +0200
+audacity (1.3.12-17ubuntu1) natty; urgency=low
+
+ * Merge from Debian unstable. Remaining changes:
+ - Build against libmp3lame.
+
+ -- Benjamin Drung <bdrung at ubuntu.com> Sat, 09 Apr 2011 18:53:18 +0200
+
audacity (1.3.12-17) unstable; urgency=low
* Drop article from the description synopsis.
@@@ -59,15 -39,6 +67,15 @@@
-- Benjamin Drung <bdrung at debian.org> Sat, 09 Apr 2011 18:25:32 +0200
+audacity (1.3.12-16ubuntu1) natty; urgency=low
+
+ * Merge from Debian unstable. Remaining changes:
+ - Build against portSMF.
+ - Build against libsbsms.
+ * Build against libmp3lame.
+
+ -- Benjamin Drung <bdrung at ubuntu.com> Fri, 11 Mar 2011 17:47:09 +0100
+
audacity (1.3.12-16) unstable; urgency=low
* Split and update disable-dynamic-loading.patch.
@@@ -75,28 -46,12 +83,28 @@@
-- Benjamin Drung <bdrung at debian.org> Fri, 11 Mar 2011 17:10:04 +0100
+audacity (1.3.12-15ubuntu1) natty; urgency=low
+
+ * Merge from Debian unstable. Remaining changes:
+ - Build against portSMF.
+ - Build against libsbsms.
+
+ -- Benjamin Drung <bdrung at ubuntu.com> Wed, 09 Mar 2011 12:29:45 +0100
+
audacity (1.3.12-15) unstable; urgency=low
* Fix crash on WMA export (LP: #695648).
-- Benjamin Drung <bdrung at debian.org> Wed, 09 Mar 2011 12:09:51 +0100
+audacity (1.3.12-14ubuntu1) natty; urgency=low
+
+ * Merge from Debian unstable. Remaining changes:
+ - Build against portSMF.
+ - Build against libsbsms.
+
+ -- Benjamin Drung <bdrung at ubuntu.com> Mon, 28 Feb 2011 20:31:41 +0100
+
audacity (1.3.12-14) unstable; urgency=low
[ Fabian Greffrath ]
@@@ -107,32 -62,12 +115,32 @@@
-- Benjamin Drung <bdrung at debian.org> Mon, 28 Feb 2011 15:04:39 +0100
+audacity (1.3.12-13ubuntu1) natty; urgency=low
+
+ * Merge from Debian unstable. Remaining changes:
+ - Build against portSMF.
+ - Build against libsbsms.
+
+ -- Benjamin Drung <bdrung at ubuntu.com> Sat, 26 Feb 2011 23:33:16 +0100
+
audacity (1.3.12-13) unstable; urgency=low
* Compile against system portAudio (Closes: #323711).
-- Benjamin Drung <bdrung at debian.org> Sat, 26 Feb 2011 23:02:54 +0100
+audacity (1.3.12-12ubuntu2) natty; urgency=low
+
+ * Build against libsbsms.
+
+ -- Benjamin Drung <bdrung at ubuntu.com> Thu, 24 Feb 2011 22:28:02 +0100
+
+audacity (1.3.12-12ubuntu1) natty; urgency=low
+
+ * Build against portSMF.
+
+ -- Benjamin Drung <bdrung at ubuntu.com> Sat, 19 Feb 2011 19:21:53 +0100
+
audacity (1.3.12-12) unstable; urgency=low
* Rebuild against the newest soundtouch.
diff --combined debian/control
index ef9fd44,ba32c27..7fb786b
--- a/debian/control
+++ b/debian/control
@@@ -1,8 -1,7 +1,8 @@@
Source: audacity
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: Free Ekanayaka <freee at debian.org>,
Benjamin Drung <bdrung at debian.org>,
David Henningsson <diwic at ubuntu.com>
@@@ -12,16 -11,15 +12,16 @@@ Build-Depends: autoconf
debhelper (>= 7.0.50~),
gettext,
libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libavcodec-dev (>= 3:0.svn20090204),
- libavformat-dev (>= 3:0.svn20090204),
- libavutil-dev (>= 3:0.svn20090204),
+ libavcodec-dev (>= 4:0.6),
+ libavformat-dev (>= 4:0.6),
+ libavutil-dev (>= 4:0.6),
libexpat1-dev,
libflac++-dev,
libgtk2.0-dev,
libid3tag0-dev,
libjack-dev,
libmad0-dev (>= 0.14.2b),
+ libmp3lame-dev,
libogg-dev (>= 1.0.0),
libportsmf-dev,
libsamplerate0-dev (>= 0.1.2),
@@@ -41,7 -39,7 +41,7 @@@ Vcs-Browser: http://git.debian.org/?p=p
Package: audacity
Architecture: any
Depends: audacity-data (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
-Suggests: ladspa-plugin, libmp3lame0
+Suggests: ladspa-plugin
Description: fast, cross-platform audio editor
Audacity is a multi-track audio editor for Linux/Unix, MacOS and
Windows. It is designed for easy recording, playing and editing of
--
Audacity debian packaging
More information about the pkg-multimedia-commits
mailing list