[Demudi-commits] r1615 - csound/trunk/debian/patches

[fsateler-guest at alioth.debian.org]

Author: fsateler-guest
Date: 2007-09-26 20:43:10 +0000 (Wed, 26 Sep 2007)
New Revision: 1615

Removed:
   csound/trunk/debian/patches/03lua-interface-build.dpatch
Modified:
   csound/trunk/debian/patches/00list
   csound/trunk/debian/patches/00lua-link.dpatch
Log:
Fix a stupid error which caused the lua interface to link to tcl.


Modified: csound/trunk/debian/patches/00list
===================================================================
--- csound/trunk/debian/patches/00list	2007-09-26 20:42:02 UTC (rev 1614)
+++ csound/trunk/debian/patches/00list	2007-09-26 20:43:10 UTC (rev 1615)
@@ -1,5 +1,4 @@
 00lua-link
 01no-java-recompile
 02instdir
-03lua-interface-build
 04cseditor-shared-link

Modified: csound/trunk/debian/patches/00lua-link.dpatch
===================================================================
--- csound/trunk/debian/patches/00lua-link.dpatch	2007-09-26 20:42:02 UTC (rev 1614)
+++ csound/trunk/debian/patches/00lua-link.dpatch	2007-09-26 20:43:10 UTC (rev 1615)
@@ -6,16 +6,9 @@
 
 @DPATCH@
 diff -urNad csound-5.06.0.dfsg~/SConstruct csound-5.06.0.dfsg/SConstruct
---- csound-5.06.0.dfsg~/SConstruct	2007-07-10 18:24:15.000000000 -0400
-+++ csound-5.06.0.dfsg/SConstruct	2007-07-10 18:37:13.000000000 -0400
-@@ -1059,13 +1059,13 @@
-         print 'CONFIGURATION DECISION: Building Csound Lua interface library.'
-         csoundLuaInterface = csoundWrapperEnvironment.SharedObject(
-             'interfaces/lua_interface.i',
--            SWIGFLAGS = [swigflags, '-lua', '-outdir', '.'])
-+            SWIGFLAGS = [swigflags, '-llua5.1', '-outdir', '.'])
-         if getPlatform() != 'darwin':
-             csoundInterfacesSources.insert(0, csoundLuaInterface)
+--- csound-5.06.0.dfsg~/SConstruct	2007-09-14 13:32:17.000000000 -0400
++++ csound-5.06.0.dfsg/SConstruct	2007-09-21 17:33:27.101684373 -0400
+@@ -1065,7 +1065,7 @@
              if getPlatform() == 'win32':
                  csoundInterfacesEnvironment.Prepend(LIBS = ['lua51'])
              else:

Deleted: csound/trunk/debian/patches/03lua-interface-build.dpatch
===================================================================
--- csound/trunk/debian/patches/03lua-interface-build.dpatch	2007-09-26 20:42:02 UTC (rev 1614)
+++ csound/trunk/debian/patches/03lua-interface-build.dpatch	2007-09-26 20:43:10 UTC (rev 1615)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04lua-interface-build.dpatch by  <fsateler at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Pass -lua to the SWIG flags when generating lua interfaces.
-## DP: Otherwise SWIG generates TCL output.
-
- at DPATCH@
-diff -urNad csound-5.06.0.dfsg~/SConstruct csound-5.06.0.dfsg/SConstruct
---- csound-5.06.0.dfsg~/SConstruct	2007-09-03 23:44:00.210813112 -0400
-+++ csound-5.06.0.dfsg/SConstruct	2007-09-03 23:44:47.713520074 -0400
-@@ -1065,7 +1065,7 @@
-         print 'CONFIGURATION DECISION: Building Csound Lua interface library.'
-         csoundLuaInterface = csoundWrapperEnvironment.SharedObject(
-             'interfaces/lua_interface.i',
--            SWIGFLAGS = [swigflags, '-llua5.1', '-outdir', '.'])
-+            SWIGFLAGS = [swigflags, '-lua', '-llua5.1', '-outdir', '.'])
-         if getPlatform() != 'darwin':
-             csoundInterfacesSources.insert(0, csoundLuaInterface)
-             if getPlatform() == 'win32':