[SCM] csound/master: Refresh patches with -p -ab

fsateler at users.alioth.debian.org fsateler at users.alioth.debian.org
Tue Feb 22 02:14:06 UTC 2011 

The following commit has been merged in the master branch:
commit a9a180428d4764d723b1b6d5d7e79b454f1d2ed8
Author: Felipe Sateler <fsateler at debian.org>
Date:   Fri Feb 18 16:56:22 2011 -0300

    Refresh patches with -p -ab

diff --git a/debian/patches/1000-use-system-stk.diff b/debian/patches/1000-use-system-stk.diff
index 5ab22e9..6c34c73 100644
--- a/debian/patches/1000-use-system-stk.diff
+++ b/debian/patches/1000-use-system-stk.diff
@@ -4,10 +4,8 @@ Description: Enable use of system STK instead of a bundled copy
  another of the same name.
 Author: Felipe Sateler <fsateler at gmail.com>
 Forwarded: no
-Index: csound-5.13.0~dfsg/SConstruct
-===================================================================
---- csound-5.13.0~dfsg.orig/SConstruct	2011-01-17 22:59:28.000000000 -0300
-+++ csound-5.13.0~dfsg/SConstruct	2011-01-18 20:25:07.000000000 -0300
+--- a/SConstruct
++++ b/SConstruct
 @@ -800,6 +800,7 @@
  pulseaudioFound = configure.CheckHeader("pulse/simple.h", language = "C")
  #else:
diff --git a/debian/patches/1003-abi-plugin-dir.diff b/debian/patches/1003-abi-plugin-dir.diff
index 7b1ff42..56e8943 100644
--- a/debian/patches/1003-abi-plugin-dir.diff
+++ b/debian/patches/1003-abi-plugin-dir.diff
@@ -2,10 +2,8 @@ Description: Append library version to plugin dir
  Install plugins into a versioned directory to allow co-installation of
  different versions of the library.
 Author: Felipe Sateler <fsateler at gmail.com>
-Index: csound-5.13.0~dfsg/SConstruct
-===================================================================
---- csound-5.13.0~dfsg.orig/SConstruct	2011-01-17 22:44:52.000000000 -0300
-+++ csound-5.13.0~dfsg/SConstruct	2011-01-17 22:44:55.000000000 -0300
+--- a/SConstruct
++++ b/SConstruct
 @@ -950,6 +950,7 @@
              tmp = '%s/lib64/csound/plugins' % commonEnvironment['prefix']
          if commonEnvironment['useDouble'] != '0':
diff --git a/debian/patches/1004-fix-csoundac-csnd-linkage.diff b/debian/patches/1004-fix-csoundac-csnd-linkage.diff
index 0ffb971..545f7bc 100644
--- a/debian/patches/1004-fix-csoundac-csnd-linkage.diff
+++ b/debian/patches/1004-fix-csoundac-csnd-linkage.diff
@@ -1,8 +1,8 @@
 Description: Correct linkage of csnd library to CsoundAC
 Forwarded: no
 Author: Felipe Sateler <fsateler at debian.org>
---- csound-5.13.0~dfsg.orig/SConstruct	2011-01-17 22:39:54.000000000 -0300
-+++ csound-5.13.0~dfsg/SConstruct	2011-01-17 22:40:30.000000000 -0300
+--- a/SConstruct
++++ b/SConstruct
 @@ -2418,12 +2418,10 @@
          acEnvironment.Prepend(LIBS = pythonLibs)
      if musicXmlFound:
diff --git a/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff b/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff
index e920de9..8c413ec 100644
--- a/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff
+++ b/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff
@@ -4,10 +4,8 @@ Description: Avoid non-free scansyn plugin
  to prevent build failures. We don't remove them at the same time as the
  opcodes themselves to keep repacking of the source minimal.
 Author: Felipe Sateler <fsateler at gmail.com>
-Index: csound-5.13.0~dfsg/SConstruct
-===================================================================
---- csound-5.13.0~dfsg.orig/SConstruct	2011-01-17 22:45:00.000000000 -0300
-+++ csound-5.13.0~dfsg/SConstruct	2011-01-17 22:45:06.000000000 -0300
+--- a/SConstruct
++++ b/SConstruct
 @@ -1656,8 +1656,6 @@
  makePlugin(pluginEnvironment, 'pitch',
             ['Opcodes/pitch.c', 'Opcodes/pitch0.c', 'Opcodes/spectra.c'])
diff --git a/debian/patches/2001-lua-link.diff b/debian/patches/2001-lua-link.diff
index 537dccb..205102d 100644
--- a/debian/patches/2001-lua-link.diff
+++ b/debian/patches/2001-lua-link.diff
@@ -3,10 +3,8 @@ Description: Do not link against lua library
  doesn't help at all. All lua-using programs will load the library, not
  the modules.
 Author: Felipe Sateler <fsateler at gmail.com>
-Index: csound-5.13.0~dfsg/SConstruct
-===================================================================
---- csound-5.13.0~dfsg.orig/SConstruct	2011-01-17 22:45:06.000000000 -0300
-+++ csound-5.13.0~dfsg/SConstruct	2011-01-17 22:45:09.000000000 -0300
+--- a/SConstruct
++++ b/SConstruct
 @@ -1485,7 +1485,7 @@
          if getPlatform() == 'win32':
              luaWrapperEnvironment.Prepend(LIBS = ['csnd','lua51'])
diff --git a/debian/patches/2002-csoundac.diff b/debian/patches/2002-csoundac.diff
index 45e479a..6661d2c 100644
--- a/debian/patches/2002-csoundac.diff
+++ b/debian/patches/2002-csoundac.diff
@@ -1,9 +1,7 @@
 Description: Enable support for building CsoundAC as a shared library
 Author: Felipe Sateler <fsateler at gmail.com>
-Index: csound-5.13.0~dfsg/SConstruct
-===================================================================
---- csound-5.13.0~dfsg.orig/SConstruct	2011-01-17 22:45:09.000000000 -0300
-+++ csound-5.13.0~dfsg/SConstruct	2011-01-17 22:45:10.000000000 -0300
+--- a/SConstruct
++++ b/SConstruct
 @@ -2438,8 +2438,6 @@
          acEnvironment.Append(LINKFLAGS = ['-Wl,-rpath-link,.'])
          acEnvironment.Append(LIBS = ['fltk_images'])
diff --git a/debian/patches/2004-fix-gettext.diff b/debian/patches/2004-fix-gettext.diff
index 270c9c6..d8e20c2 100644
--- a/debian/patches/2004-fix-gettext.diff
+++ b/debian/patches/2004-fix-gettext.diff
@@ -1,9 +1,7 @@
 Description: Set the correct path to search for locales
 Author: Felipe Sateler <fsateler at gmail.com>
-Index: csound-5.13.0~dfsg/Top/getstring.c
-===================================================================
---- csound-5.13.0~dfsg.orig/Top/getstring.c	2011-01-17 22:44:44.000000000 -0300
-+++ csound-5.13.0~dfsg/Top/getstring.c	2011-01-17 22:45:11.000000000 -0300
+--- a/Top/getstring.c
++++ b/Top/getstring.c
 @@ -63,10 +63,8 @@
  /*       setlocale (LC_MESSAGES, s);    /\* Set to particular value *\/ */
  /*    textdomain("csound5"); */  /* This is not needed when using dgettext */
diff --git a/debian/patches/2006-apidocs-font.patch b/debian/patches/2006-apidocs-font.patch
index d6223ef..2ea2e51 100644
--- a/debian/patches/2006-apidocs-font.patch
+++ b/debian/patches/2006-apidocs-font.patch
@@ -1,9 +1,7 @@
 Description: Use DejaVu font in doxygen config
 Author: Felipe Sateler <fsateler at gmail.com>
-Index: csound-5.13.0~dfsg/Doxyfile
-===================================================================
---- csound-5.13.0~dfsg.orig/Doxyfile	2011-01-17 22:44:44.000000000 -0300
-+++ csound-5.13.0~dfsg/Doxyfile	2011-01-17 22:45:13.000000000 -0300
+--- a/Doxyfile
++++ b/Doxyfile
 @@ -1376,6 +1376,8 @@
  
  DOT_FONTPATH           = 
diff --git a/debian/patches/2007-apidoc-dotpath.patch b/debian/patches/2007-apidoc-dotpath.patch
index ff906a4..a6b6330 100644
--- a/debian/patches/2007-apidoc-dotpath.patch
+++ b/debian/patches/2007-apidoc-dotpath.patch
@@ -1,9 +1,7 @@
 Description: Leave dotpath blank in doxygen config
 Author: Felipe Sateler <fsateler at gmail.com>
-Index: csound-5.13.0~dfsg/Doxyfile
-===================================================================
---- csound-5.13.0~dfsg.orig/Doxyfile	2011-01-17 22:45:13.000000000 -0300
-+++ csound-5.13.0~dfsg/Doxyfile	2011-01-17 22:45:14.000000000 -0300
+--- a/Doxyfile
++++ b/Doxyfile
 @@ -1459,7 +1459,7 @@
  # The tag DOT_PATH can be used to specify the path where the dot tool can be 
  # found. If left blank, it is assumed the dot tool can be found in the path.
diff --git a/debian/patches/2008-apidoc-listings-pkg.patch b/debian/patches/2008-apidoc-listings-pkg.patch
index 939ad87..99b6543 100644
--- a/debian/patches/2008-apidoc-listings-pkg.patch
+++ b/debian/patches/2008-apidoc-listings-pkg.patch
@@ -1,9 +1,7 @@
 Description: Use listings package in doxygen TeX header
 Author: Felipe Sateler <fsateler at gmail.com>
-Index: csound-5.13.0~dfsg/refman_header.tex
-===================================================================
---- csound-5.13.0~dfsg.orig/refman_header.tex	2011-01-17 22:44:44.000000000 -0300
-+++ csound-5.13.0~dfsg/refman_header.tex	2011-01-17 22:45:17.000000000 -0300
+--- a/refman_header.tex
++++ b/refman_header.tex
 @@ -36,6 +36,7 @@
  \fi
  \usepackage[utf8]{inputenc}
diff --git a/debian/patches/2010-disable-multithread-sparc.patch b/debian/patches/2010-disable-multithread-sparc.patch
index 1acadbd..c447864 100644
--- a/debian/patches/2010-disable-multithread-sparc.patch
+++ b/debian/patches/2010-disable-multithread-sparc.patch
@@ -4,10 +4,8 @@ Description: Drop spinlock implementation when on SPARC
  proper solution.
  This custom implementation of spinlocks is likely to go away.
 Author: Felipe Sateler <fsateler at gmail.com>
-Index: csound-5.13.0~dfsg/SConstruct
-===================================================================
---- csound-5.13.0~dfsg.orig/SConstruct	2011-01-17 22:45:10.000000000 -0300
-+++ csound-5.13.0~dfsg/SConstruct	2011-01-17 22:45:18.000000000 -0300
+--- a/SConstruct
++++ b/SConstruct
 @@ -769,7 +769,9 @@
      useOpenMP = True;
  else:
diff --git a/debian/patches/2011-no-link-csoundac-python.diff b/debian/patches/2011-no-link-csoundac-python.diff
index 4c76ae6..a9b56b0 100644
--- a/debian/patches/2011-no-link-csoundac-python.diff
+++ b/debian/patches/2011-no-link-csoundac-python.diff
@@ -1,9 +1,7 @@
 Description: Avoid linking with the python library, csoundac doesn't need it.
 Author: Felipe Sateler <fsateler at gmail.com>
-Index: csound-5.13.0~dfsg/SConstruct
-===================================================================
---- csound-5.13.0~dfsg.orig/SConstruct	2011-01-17 22:45:18.000000000 -0300
-+++ csound-5.13.0~dfsg/SConstruct	2011-01-17 22:45:19.000000000 -0300
+--- a/SConstruct
++++ b/SConstruct
 @@ -2415,7 +2415,8 @@
      acEnvironment.Append(LINKFLAGS = pythonLinkFlags)
      acEnvironment.Append(LIBPATH = pythonLibraryPath)
diff --git a/debian/patches/2012-luaCsnd-soname.diff b/debian/patches/2012-luaCsnd-soname.diff
index a71d8ea..df47ac7 100644
--- a/debian/patches/2012-luaCsnd-soname.diff
+++ b/debian/patches/2012-luaCsnd-soname.diff
@@ -1,7 +1,5 @@
-Index: csound-5.13.0~dfsg/SConstruct
-===================================================================
---- csound-5.13.0~dfsg.orig/SConstruct	2011-01-17 22:45:19.000000000 -0300
-+++ csound-5.13.0~dfsg/SConstruct	2011-01-17 22:45:22.000000000 -0300
+--- a/SConstruct
++++ b/SConstruct
 @@ -1488,6 +1488,8 @@
              luaWrapperEnvironment.Prepend(LIBS = ['csnd','lua51'])
          else:
diff --git a/debian/patches/2013-no-rawwave-defined.diff b/debian/patches/2013-no-rawwave-defined.diff
index c8a265d..fa8bac8 100644
--- a/debian/patches/2013-no-rawwave-defined.diff
+++ b/debian/patches/2013-no-rawwave-defined.diff
@@ -1,9 +1,7 @@
 Description: Do not print error message when RAWwAVE_PATH is undefined
  In Debian, we know where they are.
-Index: csound-5.13.0~dfsg/Opcodes/stk/stkOpcodes.cpp
-===================================================================
---- csound-5.13.0~dfsg.orig/Opcodes/stk/stkOpcodes.cpp	2011-01-17 22:44:44.000000000 -0300
-+++ csound-5.13.0~dfsg/Opcodes/stk/stkOpcodes.cpp	2011-01-17 22:45:23.000000000 -0300
+--- a/Opcodes/stk/stkOpcodes.cpp
++++ b/Opcodes/stk/stkOpcodes.cpp
 @@ -681,19 +681,13 @@
        const char *path = csound->GetEnv(csound, "RAWWAVE_PATH");
      if(!path)

-- 
csound packaging

More information about the pkg-multimedia-commits mailing list