[SCM] soundtouch/master: Update 01_upstream_fixes.patch: Do not install the soundtouch-1.4.pc file.

micove-guest at users.alioth.debian.org micove-guest at users.alioth.debian.org
Sat Feb 26 02:33:00 UTC 2011


The following commit has been merged in the master branch:
commit a8193b76a70fbc730249205fb69aefd3b030e48f
Author: Miguel Colon <debian.micove at gmail.com>
Date:   Fri Feb 25 21:27:19 2011 -0500

    Update 01_upstream_fixes.patch: Do not install the soundtouch-1.4.pc file.
    
    File was never in Debian before and it's obsolete.
    Going to be removed in the next version that it's almost out.

diff --git a/debian/patches/01_upstream_fixes.patch b/debian/patches/01_upstream_fixes.patch
index 8cb51c1..e347c97 100644
--- a/debian/patches/01_upstream_fixes.patch
+++ b/debian/patches/01_upstream_fixes.patch
@@ -1,16 +1,35 @@
-Description: Fix obsolete version references.
- Removed references to obsoleted 'soundtouch-1.4.pc.in' replacing these with 
+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'.
  .
- Mantain soundtouch-1.4.pc for compatibility.
+ 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: 2010-12-28
---- a/configure.ac
-+++ b/configure.ac
+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
@@ -19,7 +38,7 @@ Last-Update: 2010-12-28
  dnl
  dnl This file is part of SoundTouch, an audio processing library for pitch/time adjustments
  dnl 
-@@ -19,7 +19,7 @@
+@@ -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.
  
@@ -28,39 +47,12 @@ Last-Update: 2010-12-28
  AC_CONFIG_AUX_DIR(config)
  AM_CONFIG_HEADER([include/soundtouch_config.h])
  AM_INIT_AUTOMAKE
-@@ -129,6 +129,7 @@
+@@ -129,7 +129,7 @@ AC_CONFIG_FILES([
  ])
  
  AC_OUTPUT(
+-	soundtouch-1.4.pc
 +	soundtouch.pc
- 	soundtouch-1.4.pc
  )
  
---- a/soundtouch-1.4.pc.in
-+++ b/soundtouch-1.4.pc.in
-@@ -1,3 +1,6 @@
-+# This file is obsoleted but provided for backwards compatibility 
-+# with legacy package environments
-+
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
---- a/Makefile.am
-+++ b/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 @@
-        README.html
- 
- pkgconfigdir = $(libdir)/pkgconfig
--pkgconfig_DATA = soundtouch-1.4.pc
-+pkgconfig_DATA = soundtouch.pc soundtouch-1.4.pc
- 
- ## This removes stuff from the distribution which may be present
- ## from a cvs checkout or other build reasons
+ dnl use 'echo' to put stuff here if you want a message to the builder

-- 
soundtouch packaging



More information about the pkg-multimedia-commits mailing list