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

bdrung at users.alioth.debian.org bdrung at users.alioth.debian.org
Sat Apr 9 16:56:22 UTC 2011


Release 1.3.12-17 to Debian unstable.
Bump Standards-Version to 3.9.2 (no changes required).
Build against libsbsms.
Build against portSMF.
Add Applied-Upstream tag to patches.
Add Applied-Upstream tag to patches.
Drop article from the description synopsis.
Add Applied-Upstream tag to patches.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/ubuntu
X-Git-Reftype: branch
X-Git-Oldrev: 649c3bfacd16c5684076249579bb5fae61874893
X-Git-Newrev: 70bcb4368094903f54338940bd44e426457a18e9

The following commit has been merged in the ubuntu branch:
commit ae8c5a1ae6c4f565e6a7f14da71fbafcb63d0185
Merge: 649c3bfacd16c5684076249579bb5fae61874893 57e35f528f9a57317eb94ba8e4f25d203ba04ca3
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sat Apr 9 18:52:42 2011 +0200

    Merge branch 'master' into ubuntu

diff --combined debian/changelog
index 22c21b6,4720a26..253b634
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,13 +1,22 @@@
+ audacity (1.3.12-17) unstable; urgency=low
+ 
+   * Drop article from the description synopsis.
+   * Add Applied-Upstream tag to patches.
+   * Build against portSMF.
+   * Build against libsbsms.
+   * Bump Standards-Version to 3.9.2 (no changes required).
+ 
+  -- 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.
@@@ -14,28 -15,12 +24,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 ]
@@@ -46,32 -31,12 +56,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 8578b50,a7c240f..ba2e1a7
--- a/debian/control
+++ b/debian/control
@@@ -1,12 -1,11 +1,12 @@@
  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.1
+ Standards-Version: 3.9.2
  Build-Depends: autotools-dev,
                 debhelper (>= 7.0.50~),
                 gettext,
@@@ -20,7 -19,6 +20,7 @@@
                 libid3tag0-dev,
                 libjack-dev,
                 libmad0-dev (>= 0.14.2b),
 +               libmp3lame-dev,
                 libogg-dev (>= 1.0.0),
                 libportsmf-dev,
                 libsamplerate0-dev (>= 0.1.2),
@@@ -41,8 -39,8 +41,8 @@@ 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: A fast, cross-platform audio editor
+ 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
   digital audio.  Audacity features digital effects and spectrum
@@@ -57,7 -55,7 +57,7 @@@ Depends: ${misc:Depends
  Recommends: audacity
  Breaks: audacity (<= 1.3.6-2)
  Replaces: audacity (<= 1.3.6-2)
- Description: A fast, cross-platform audio editor (data)
+ Description: fast, cross-platform audio editor (data)
   Audacity is a multi-track audio editor for Linux/Unix, MacOS and
   Windows.  It is designed for easy recording, playing and editing of
   digital audio.  Audacity features digital effects and spectrum
@@@ -71,7 -69,7 +71,7 @@@ Section: debu
  Priority: extra
  Architecture: any
  Depends: audacity (= ${binary:Version}), ${misc:Depends}
- Description: A fast, cross-platform audio editor (debug)
+ Description: fast, cross-platform audio editor (debug)
   Audacity is a multi-track audio editor for Linux/Unix, MacOS and
   Windows.  It is designed for easy recording, playing and editing of
   digital audio.  Audacity features digital effects and spectrum

-- 
Audacity debian packaging



More information about the pkg-multimedia-commits mailing list