[SCM] csound packaging branch, master, updated. debian/5.11.1.dfsg-4-35-g387e15e

js at users.alioth.debian.org js at users.alioth.debian.org
Wed Apr 14 11:21:41 UTC 2010 

The following commit has been merged in the master branch:
commit 387e15e9747fd3ee3bf1807cd06619fecee1a032
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Apr 14 13:17:42 2010 +0200

    Refresh patches, using shortening quilt options --no-timestamps --no-index -pab.

diff --git a/debian/patches/0000-fix-continuation-segfaults.diff b/debian/patches/0000-fix-continuation-segfaults.diff
index b888a0d..9f74972 100644
--- a/debian/patches/0000-fix-continuation-segfaults.diff
+++ b/debian/patches/0000-fix-continuation-segfaults.diff
@@ -1,10 +1,8 @@
 Description: Fix a segfault when an ending \ is used to split a line in the
  orchestra.
 Origin: upstream, commit:1.114, commit:1.117
-Index: csound-5.12.1~dfsg/Engine/rdorch.c
-===================================================================
---- csound-5.12.1~dfsg.orig/Engine/rdorch.c	2010-04-03 20:50:41.000000000 -0300
-+++ csound-5.12.1~dfsg/Engine/rdorch.c	2010-04-03 20:53:43.000000000 -0300
+--- a/Engine/rdorch.c
++++ b/Engine/rdorch.c
 @@ -546,14 +546,14 @@
          else
            ungetorchar(csound, c2);
diff --git a/debian/patches/1000-use-system-stk.diff b/debian/patches/1000-use-system-stk.diff
index 6a449e5..c8327f0 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.12.1~dfsg/SConstruct
-===================================================================
---- csound-5.12.1~dfsg.orig/SConstruct	2010-04-03 21:47:43.000000000 -0300
-+++ csound-5.12.1~dfsg/SConstruct	2010-04-03 21:57:58.000000000 -0300
+--- a/SConstruct
++++ b/SConstruct
 @@ -769,6 +769,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 f58fae7..ff8315c 100644
--- a/debian/patches/1003-abi-plugin-dir.diff
+++ b/debian/patches/1003-abi-plugin-dir.diff
@@ -2,11 +2,9 @@ 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.12.1~dfsg/SConstruct
-===================================================================
---- csound-5.12.1~dfsg.orig/SConstruct	2010-03-28 23:09:34.000000000 -0300
-+++ csound-5.12.1~dfsg/SConstruct	2010-03-28 23:09:53.000000000 -0300
-@@ -918,6 +918,7 @@
+--- a/SConstruct
++++ b/SConstruct
+@@ -919,6 +919,7 @@
              tmp = '%s/lib64/csound/plugins' % commonEnvironment['prefix']
          if commonEnvironment['useDouble'] != '0':
              tmp += '64'
@@ -14,7 +12,7 @@ Index: csound-5.12.1~dfsg/SConstruct
          s = '-DCS_DEFAULT_PLUGINDIR=\\"%s\\"' % tmp
          csoundLibraryEnvironment.Append(CPPFLAGS = [s])
      elif buildOSXFramework != 0:
-@@ -2797,6 +2798,8 @@
+@@ -2801,6 +2802,8 @@
      PLUGIN_DIR = LIB_DIR + "/csound/plugins"
  else:
      PLUGIN_DIR = LIB_DIR + "/csound/plugins64"
diff --git a/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff b/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff
index d8f8f9e..c74d9be 100644
--- a/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff
+++ b/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff
@@ -4,11 +4,9 @@ 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.12.1~dfsg/SConstruct
-===================================================================
---- csound-5.12.1~dfsg.orig/SConstruct	2010-03-28 23:09:53.000000000 -0300
-+++ csound-5.12.1~dfsg/SConstruct	2010-03-28 23:09:53.000000000 -0300
-@@ -1614,8 +1614,6 @@
+--- a/SConstruct
++++ b/SConstruct
+@@ -1615,8 +1615,6 @@
  makePlugin(pluginEnvironment, 'pitch',
             ['Opcodes/pitch.c', 'Opcodes/pitch0.c', 'Opcodes/spectra.c'])
  if not buildOLPC:
diff --git a/debian/patches/2001-lua-link.diff b/debian/patches/2001-lua-link.diff
index a7c21d8..35aa863 100644
--- a/debian/patches/2001-lua-link.diff
+++ b/debian/patches/2001-lua-link.diff
@@ -3,11 +3,9 @@ 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.12.1~dfsg/SConstruct
-===================================================================
---- csound-5.12.1~dfsg.orig/SConstruct	2010-03-28 23:09:53.000000000 -0300
-+++ csound-5.12.1~dfsg/SConstruct	2010-03-28 23:09:53.000000000 -0300
-@@ -1446,7 +1446,7 @@
+--- a/SConstruct
++++ b/SConstruct
+@@ -1447,7 +1447,7 @@
          if getPlatform() == 'win32':
              luaWrapperEnvironment.Prepend(LIBS = ['csnd','lua51'])
          else:
@@ -16,7 +14,7 @@ Index: csound-5.12.1~dfsg/SConstruct
         	luaWrapper = makeLuaModule(luaWrapperEnvironment, 'luaCsnd', [csoundLuaInterface])
  	Depends(luaWrapper, csoundLuaInterface)
  
-@@ -2480,7 +2480,7 @@
+@@ -2484,7 +2484,7 @@
         	  luaCsoundACWrapperEnvironment.Prepend(LIBS = Split('luaCsnd lua51 CsoundAC csnd fltk_images'))
         else:
         	  luaCsoundACWrapperEnvironment.Prepend(LIBS = [luaWrapper])
diff --git a/debian/patches/2002-csoundac.diff b/debian/patches/2002-csoundac.diff
index 9b171e4..26376dc 100644
--- a/debian/patches/2002-csoundac.diff
+++ b/debian/patches/2002-csoundac.diff
@@ -1,10 +1,8 @@
 Description: Enable support for building CsoundAC as a shared library
 Author: Felipe Sateler <fsateler at gmail.com>
-Index: csound-5.12.1~dfsg/SConstruct
-===================================================================
---- csound-5.12.1~dfsg.orig/SConstruct	2010-03-28 23:09:53.000000000 -0300
-+++ csound-5.12.1~dfsg/SConstruct	2010-03-28 23:09:54.000000000 -0300
-@@ -2388,8 +2388,6 @@
+--- a/SConstruct
++++ b/SConstruct
+@@ -2392,8 +2392,6 @@
          acEnvironment.Append(LINKFLAGS = ['-Wl,-rpath-link,.'])
          acEnvironment.Append(LIBS = ['fltk_images'])
          guiProgramEnvironment.Prepend(LINKFLAGS = ['-Wl,-rpath-link,.'])
@@ -13,7 +11,7 @@ Index: csound-5.12.1~dfsg/SConstruct
      elif getPlatform() == 'darwin':
          acEnvironment.Append(LIBS = ['dl', 'm', 'fltk_images', 'fltk_png', 'fltk_jpeg'])
          acEnvironment.Append(SHLINKFLAGS = '--no-export-all-symbols')
-@@ -2442,7 +2440,17 @@
+@@ -2446,7 +2444,17 @@
      acWrapperEnvironment = csoundWrapperEnvironment.Clone()
      fixCFlagsForSwig(acWrapperEnvironment)
      if commonEnvironment['dynamicCsoundLibrary'] == '1':
diff --git a/debian/patches/2004-fix-gettext.diff b/debian/patches/2004-fix-gettext.diff
index a5c1b7e..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.12.1~dfsg/Top/getstring.c
-===================================================================
---- csound-5.12.1~dfsg.orig/Top/getstring.c	2010-03-28 23:09:11.000000000 -0300
-+++ csound-5.12.1~dfsg/Top/getstring.c	2010-03-28 23:09:54.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 004c306..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.12.1~dfsg/Doxyfile
-===================================================================
---- csound-5.12.1~dfsg.orig/Doxyfile	2010-03-28 23:09:11.000000000 -0300
-+++ csound-5.12.1~dfsg/Doxyfile	2010-03-28 23:09:54.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 840fa94..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.12.1~dfsg/Doxyfile
-===================================================================
---- csound-5.12.1~dfsg.orig/Doxyfile	2010-03-28 23:09:54.000000000 -0300
-+++ csound-5.12.1~dfsg/Doxyfile	2010-03-28 23:09:54.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 e7f3a1d..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.12.1~dfsg/refman_header.tex
-===================================================================
---- csound-5.12.1~dfsg.orig/refman_header.tex	2010-03-28 23:09:11.000000000 -0300
-+++ csound-5.12.1~dfsg/refman_header.tex	2010-03-28 23:09:55.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 46c3f83..ae394ce 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.12.1~dfsg/SConstruct
-===================================================================
---- csound-5.12.1~dfsg.orig/SConstruct	2010-03-28 23:09:54.000000000 -0300
-+++ csound-5.12.1~dfsg/SConstruct	2010-03-28 23:09:55.000000000 -0300
+--- a/SConstruct
++++ b/SConstruct
 @@ -738,7 +738,9 @@
  pthreadBarrierFound = configure.CheckLibWithHeader('pthread', 'pthread.h', 'C', 'pthread_barrier_init(0, 0, 0);')
  if pthreadBarrierFound:
diff --git a/debian/patches/2011-no-link-csoundac-python.diff b/debian/patches/2011-no-link-csoundac-python.diff
index 120caa0..19da806 100644
--- a/debian/patches/2011-no-link-csoundac-python.diff
+++ b/debian/patches/2011-no-link-csoundac-python.diff
@@ -1,10 +1,8 @@
 Description: Avoid linking with the python library, csoundac doesn't need it.
 Author: Felipe Sateler <fsateler at gmail.com>
-Index: csound-5.12.1~dfsg/SConstruct
-===================================================================
---- csound-5.12.1~dfsg.orig/SConstruct	2010-03-28 23:09:55.000000000 -0300
-+++ csound-5.12.1~dfsg/SConstruct	2010-03-28 23:09:55.000000000 -0300
-@@ -2363,7 +2363,8 @@
+--- a/SConstruct
++++ b/SConstruct
+@@ -2367,7 +2367,8 @@
      acEnvironment.Append(LINKFLAGS = pythonLinkFlags)
      acEnvironment.Append(LIBPATH = pythonLibraryPath)
      if getPlatform() != 'darwin':
diff --git a/debian/patches/2012-luaCsnd-soname.diff b/debian/patches/2012-luaCsnd-soname.diff
index 010e8e9..d448cbd 100644
--- a/debian/patches/2012-luaCsnd-soname.diff
+++ b/debian/patches/2012-luaCsnd-soname.diff
@@ -1,8 +1,6 @@
-Index: csound-5.12.1~dfsg/SConstruct
-===================================================================
---- csound-5.12.1~dfsg.orig/SConstruct	2010-03-28 23:09:55.000000000 -0300
-+++ csound-5.12.1~dfsg/SConstruct	2010-03-28 23:09:55.000000000 -0300
-@@ -1449,6 +1449,8 @@
+--- a/SConstruct
++++ b/SConstruct
+@@ -1450,6 +1450,8 @@
              luaWrapperEnvironment.Prepend(LIBS = ['csnd','lua51'])
          else:
              luaWrapperEnvironment.Prepend(LIBS = ['csnd'])

-- 
csound packaging

More information about the pkg-multimedia-commits mailing list