[SCM] audacity/ubuntu: Merge branch 'master' into ubuntu
bdrung at users.alioth.debian.org
bdrung at users.alioth.debian.org
Wed Apr 13 00:02:18 UTC 2011
Release 1.3.13-1 to Debian unstable.
Refresh disable-dynamic-ffmpeg.patch.
Use local sbsms due to an API change.
Drop configure.patch and run ./autogen.sh on build time instead.
Refresh disable dynamic loading patches.
Drop 13 upstream applied patches.
Merge commit 'upstream/1.3.13'
Imported Upstream version 1.3.13
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/ubuntu
X-Git-Reftype: branch
X-Git-Oldrev: 70bcb4368094903f54338940bd44e426457a18e9
X-Git-Newrev: 972310afc3db8cc31d3536eb2eb2917ca82a7343
The following commit has been merged in the ubuntu branch:
commit 27411cb2c61357c3ba8ae6ca969da7ad2a6daddb
Merge: 70bcb4368094903f54338940bd44e426457a18e9 a2e7baa3f0ff67ddd0472c494ee12a6518fb9a0d
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Wed Apr 13 01:57:55 2011 +0200
Merge branch 'master' into ubuntu
diff --combined debian/changelog
index a9aef29,938f451..08cfe3d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,13 +1,20 @@@
+ audacity (1.3.13-1) unstable; urgency=low
+
+ * New upstream release (LP: #608948, #690226, #694778, #713584, #753323).
+ * Drop 13 upstream applied patches.
+ * Refresh disable dynamic loading patches.
+ * Drop configure.patch and run ./autogen.sh on build time instead.
+ * Use local sbsms due to an API change.
+
+ -- 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.
@@@ -15,15 -18,6 +25,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.
@@@ -31,28 -25,12 +41,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 ]
@@@ -63,32 -41,12 +73,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 ba2e1a7,fe2e283..ef9fd44
--- a/debian/control
+++ b/debian/control
@@@ -1,13 -1,13 +1,14 @@@
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>
Standards-Version: 3.9.2
- Build-Depends: autotools-dev,
+ Build-Depends: autoconf,
+ automake,
debhelper (>= 7.0.50~),
gettext,
libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
@@@ -20,11 -20,9 +21,10 @@@
libid3tag0-dev,
libjack-dev,
libmad0-dev (>= 0.14.2b),
+ libmp3lame-dev,
libogg-dev (>= 1.0.0),
libportsmf-dev,
libsamplerate0-dev (>= 0.1.2),
- libsbsms-dev (>= 1.6.0),
libsndfile1-dev (>= 1.0.0),
libsoundtouch-dev (>= 1.3.1-2),
libtwolame-dev (>= 0.3.9),
@@@ -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
diff --combined debian/rules
index 00572d8,7651235..5db3cdb
--- a/debian/rules
+++ b/debian/rules
@@@ -7,7 -7,7 +7,7 @@@ configure_flags :=
--disable-dynamic-loading \
--with-expat=system \
--with-ffmpeg=system \
- --with-lame=local \
+ --with-lame=system \
--with-libflac=system \
--with-libid3tag=system \
--with-libmad=system \
@@@ -19,7 -19,7 +19,7 @@@
--with-libvorbis=system \
--with-midi=system \
--with-portaudio=system \
- --with-sbsms=system \
+ --with-sbsms=local \
--with-soundtouch=system \
$(NULL)
@@@ -27,6 -27,7 +27,7 @@@
dh $@ --parallel
override_dh_auto_configure:
+ ./autogen.sh
dh_auto_configure -- $(configure_flags)
override_dh_auto_install:
--
Audacity debian packaging
More information about the pkg-multimedia-commits
mailing list