[SCM] soundtouch/master: Drop 00_upstream_fixes.patch - merged upstream.

micove-guest at users.alioth.debian.org micove-guest at users.alioth.debian.org
Sat Jul 16 23:55:08 UTC 2011


The following commit has been merged in the master branch:
commit d4d015a4fc4eca872c56bf682e17cce718ad9434
Author: Miguel Colon <debian.micove at gmail.com>
Date:   Sat Jul 16 19:41:19 2011 -0400

    Drop 00_upstream_fixes.patch - merged upstream.

diff --git a/debian/patches/00_upstream_fixes.patch b/debian/patches/00_upstream_fixes.patch
deleted file mode 100644
index e347c97..0000000
--- a/debian/patches/00_upstream_fixes.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Description: Changes meant for version 1.5.0 but missing.
- Removed references to obsoleted 'soundtouch-1.4.pc.in' replacing these with
- 'soundtouch.pc.in'.
- .
- Bump version from 1.4.0 to 1.5.0.
- .
- Remove when version > 1.5.0 is released.
-Forwarded: not-needed
-Author: Olli Parviainen <oparviai at iki.fi> 
-Applied-Upstream: http://soundtouch.svn.sourceforge.net/viewvc/soundtouch?view=revision&revision=89
-Last-Update: 2011-02-25
---- soundtouch-1.5.0.orig/Makefile.am
-+++ soundtouch-1.5.0/Makefile.am
-@@ -1,6 +1,6 @@
- ## Process this file with automake to create Makefile.in
- ##
--## $Id: Makefile.am 38 2008-12-25 17:00:23Z oparviai $
-+## $Id$
- ##
- ## Copyright (C) 2003 - David W. Durham
- ## 
-@@ -52,7 +52,7 @@ EXTRA_DIST=                  \
-        README.html
- 
- pkgconfigdir = $(libdir)/pkgconfig
--pkgconfig_DATA = soundtouch-1.4.pc
-+pkgconfig_DATA = soundtouch.pc
- 
- ## This removes stuff from the distribution which may be present
- ## from a cvs checkout or other build reasons
---- soundtouch-1.5.0.orig/configure.ac
-+++ soundtouch-1.5.0/configure.ac
-@@ -1,6 +1,6 @@
- dnl SoundTouch configure.ac, by David W. Durham
- dnl
--dnl $Id: configure.ac 38 2008-12-25 17:00:23Z oparviai $
-+dnl $Id$
- dnl
- dnl This file is part of SoundTouch, an audio processing library for pitch/time adjustments
- dnl 
-@@ -19,7 +19,7 @@ dnl this program; if not, write to the F
- dnl Place - Suite 330, Boston, MA  02111-1307, USA
- # Process this file with autoconf to produce a configure script.
- 
--AC_INIT(SoundTouch, 1.4.0, [http://www.surina.net/soundtouch])
-+AC_INIT(SoundTouch, 1.5.0, [http://www.surina.net/soundtouch])
- AC_CONFIG_AUX_DIR(config)
- AM_CONFIG_HEADER([include/soundtouch_config.h])
- AM_INIT_AUTOMAKE
-@@ -129,7 +129,7 @@ AC_CONFIG_FILES([
- ])
- 
- AC_OUTPUT(
--	soundtouch-1.4.pc
-+	soundtouch.pc
- )
- 
- dnl use 'echo' to put stuff here if you want a message to the builder
diff --git a/debian/patches/series b/debian/patches/series
index 605723a..051447a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-00_upstream_fixes.patch
 01_remove_sse.patch
 02_nostrip.patch
 03_WavFile.patch

-- 
soundtouch packaging



More information about the pkg-multimedia-commits mailing list