[arch-commits] Commit in audacity/repos (4 files)

[Eric Bélanger]

    Date: Friday, December 12, 2008 @ 21:24:12
  Author: eric
Revision: 21424

Merged revisions 21421 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/audacity/trunk

........
  r21421 | eric | 2008-12-12 19:02:09 -0500 (Fri, 12 Dec 2008) | 2 lines
  
  upgpkg: audacity 1.3.6-2
      Added install scriptlet to update mime database (close FS#11398), Added soundtouch support (close FS#9056), Added ChangeLog
........

Added:
  audacity/repos/extra-i686/ChangeLog
    (from rev 21421, audacity/trunk/ChangeLog)
  audacity/repos/extra-i686/audacity.install
    (from rev 21421, audacity/trunk/audacity.install)
Modified:
  audacity/repos/extra-i686/	(properties)
  audacity/repos/extra-i686/PKGBUILD

------------------+
 ChangeLog        |    6 ++++++
 PKGBUILD         |   40 +++++++++++++++++-----------------------
 audacity.install |   12 ++++++++++++
 3 files changed, 35 insertions(+), 23 deletions(-)


Property changes on: audacity/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /audacity/trunk:1-18505
   + /audacity/trunk:1-21423

Copied: audacity/repos/extra-i686/ChangeLog (from rev 21421, audacity/trunk/ChangeLog)
===================================================================
--- extra-i686/ChangeLog	                        (rev 0)
+++ extra-i686/ChangeLog	2008-12-13 02:24:12 UTC (rev 21424)
@@ -0,0 +1,6 @@
+2008-12-07  Eric Belanger  <eric at archlinux.org>
+
+	* audacity 1.3.6-2
+	* Added install scriptlet to update mime database (close FS#11398)
+	* Added soundtouch support (close FS#9056)
+	* Added ChangeLog

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-12-13 00:10:06 UTC (rev 21423)
+++ extra-i686/PKGBUILD	2008-12-13 02:24:12 UTC (rev 21424)
@@ -1,22 +1,22 @@
 # $Id$
-# Maintainer: Alexander Baldeck <alexander at archlinux.org>
+# Maintainer: Eric Belanger <eric at archlinux.org>
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 # Contributor: dorphell <dorphell at archlinux.org>
 
 pkgname=audacity
 pkgver=1.3.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Audacity is a program that lets you manipulate digital audio waveforms"
 arch=('i686' 'x86_64')
 url="http://audacity.sourceforge.net/"
 license=('GPL')
 depends=('libvorbis' 'libmad' 'libid3tag' 'wxgtk' 'libsamplerate' \
-         'lame' 'shared-mime-info' 'redland' 'jack-audio-connection-kit')
-makedepends=('zip' 'python' 'pkgconfig')
+         'lame' 'shared-mime-info' 'desktop-file-utils' 'redland' 'jack-audio-connection-kit')
+makedepends=('zip' 'python' 'pkgconfig' 'soundtouch')
 options=('!makeflags')
+install=audacity.install
 source=(http://downloads.sourceforge.net/sourceforge/audacity/${pkgname}-src-${pkgver}.tar.bz2 \
-        audacity.xpm
-        audacity16.xpm)
+        audacity.xpm audacity16.xpm)
 md5sums=('a59d30bcedd017c5b3ac7bcecf7a1628' 'c8f7f7851638eedf84d05a1afde797b2'\
          '5e94ccbfb665e8356dc4172a3673b4d4')
 sha1sums=('d02edac1dafb0c6f6fb12d29505c63b72fb1b116'
@@ -24,25 +24,19 @@
           'a208a4ed129c73f97347bab929c7758a345e8e9a')
 
 build() {
-  cd ${startdir}/src/${pkgname}-src-${pkgver}
+  cd ${srcdir}/${pkgname}-src-${pkgver}
 
   WX_CONFIG=/usr/bin/wx-config \
-    ./configure --prefix=/usr \
-                --with-portaudio=v19 \
-                --with-libsamplerate=system \
-                --without-libresample \
-                --with-libmad=system \
-                --with-id3tag=system \
-                --with-flac=system \
-                --with-vorbis=system \
-                --with-libexpat=system \
-                --with-libsndfile=system \
-                --enable-unicode
+  ./configure --prefix=/usr \
+     --with-portaudio=v19 --with-libsamplerate=system \
+     --without-libresample --with-libmad=system \
+     --with-id3tag=system --with-flac=system \
+     --with-vorbis=system --with-libexpat=system \
+     --with-libsndfile=system --with-soundtouch \
+     --enable-unicode || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg INSTALL_PATH=${startdir}/pkg install
+  make DESTDIR=${pkgdir} install || return 1
 
-  install -m644 ${startdir}/src/audacity.xpm \
-                ${startdir}/pkg/usr/share/${pkgname}/audacity.xpm
-  install -m644 ${startdir}/src/audacity16.xpm \
-                ${startdir}/pkg/usr/share/${pkgname}/audacity16.xpm
+  install -m644 ../audacity.xpm ${pkgdir}/usr/share/${pkgname}/audacity.xpm || return 1
+  install -m644 ../audacity16.xpm ${pkgdir}/usr/share/${pkgname}/audacity16.xpm || return 1
 }

Copied: audacity/repos/extra-i686/audacity.install (from rev 21421, audacity/trunk/audacity.install)
===================================================================
--- extra-i686/audacity.install	                        (rev 0)
+++ extra-i686/audacity.install	2008-12-13 02:24:12 UTC (rev 21424)
@@ -0,0 +1,12 @@
+post_install() {
+  update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}