[Demudi-commits] r1523 - in csound/trunk: . debian debian/patches
fsateler-guest at alioth.debian.org
fsateler-guest at alioth.debian.org
Thu Aug 2 22:44:24 UTC 2007
Author: fsateler-guest
Date: 2007-08-02 22:44:23 +0000 (Thu, 02 Aug 2007)
New Revision: 1523
Added:
csound/trunk/debian/
csound/trunk/debian/NEWS.Debian
csound/trunk/debian/README.Debian
csound/trunk/debian/README.Debian-source
csound/trunk/debian/changelog
csound/trunk/debian/compat
csound/trunk/debian/control
csound/trunk/debian/copyright
csound/trunk/debian/csound-doc.docs
csound/trunk/debian/csound-doc.install
csound/trunk/debian/csound.install
csound/trunk/debian/custom.py
csound/trunk/debian/dfsg-repack
csound/trunk/debian/dirs
csound/trunk/debian/docs
csound/trunk/debian/libcsound64-5.install
csound/trunk/debian/libcsound64-dev.install
csound/trunk/debian/patches/
csound/trunk/debian/patches/00list
csound/trunk/debian/patches/00lua-link.dpatch
csound/trunk/debian/patches/01no-java-recompile.dpatch
csound/trunk/debian/patches/02instdir.dpatch
csound/trunk/debian/pycompat
csound/trunk/debian/rules
csound/trunk/debian/watch
Log:
[svn-inject] Applying Debian modifications to trunk
Property changes on: csound/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Added: csound/trunk/debian/NEWS.Debian
===================================================================
--- csound/trunk/debian/NEWS.Debian (rev 0)
+++ csound/trunk/debian/NEWS.Debian 2007-08-02 22:44:23 UTC (rev 1523)
@@ -0,0 +1,19 @@
+csound (4.23f13-2) unstable; urgency=low
+
+ * The grain4 opcode has been removed temporarily due to licensing issues.
+ It should be available again on a future release.
+
+ -- Felipe Sateler <fsateler at gmail.com> Tue, 10 Jul 2007 16:55:09 -0400
+
+csound (4.23f13-1) unstable; urgency=low
+
+ * OSC-Kit is no longer in the upstream sources (GNU Build System tarball),
+ however OSC-Kit recently changed license which would allow it to be
+ included in Debian. Patches to bring the new OSC-Kit plugin with the new
+ license are welcome. See bug #297018.
+
+ * extract is now csound_extract instead of csound-extract due to a limitation
+ of automake.
+
+ -- Hans Fugal <hans at fugal.net> Tue, 19 Jul 2005 12:26:50 -0600
+
Added: csound/trunk/debian/README.Debian
===================================================================
--- csound/trunk/debian/README.Debian (rev 0)
+++ csound/trunk/debian/README.Debian 2007-08-02 22:44:23 UTC (rev 1523)
@@ -0,0 +1,11 @@
+Csound for Debian
+-----------------
+
+The scansyn and scansynx opcodes have a license incompatible with the Debian
+Free Software Guidelines. They have therefore been omitted from this build of
+Csound.
+
+The extract utility has been renamed csound-extract to avoid conflicting with
+the extract package.
+
+ -- Hans Fugal <hans at fugal.net>, Tue, 8 Jul 2003 07:14:43 -0600
Added: csound/trunk/debian/README.Debian-source
===================================================================
--- csound/trunk/debian/README.Debian-source (rev 0)
+++ csound/trunk/debian/README.Debian-source 2007-08-02 22:44:23 UTC (rev 1523)
@@ -0,0 +1,9 @@
+This source package has been repackaged from the upstream sources due
+to non-DFSG compliant license terms for the scansyn and grain4 opcodes.
+In practice, this means that the following files have been deleted:
+ Opcodes/scansyn.{c,h}
+ Opcodes/scansynx.c
+ Opcodes/grain4.{c,h}
+
+In addition, lines 1170, 1171 and 1181 from SConstruct have been commented
+to prevent the build from failing due to the missing files.
Added: csound/trunk/debian/changelog
===================================================================
--- csound/trunk/debian/changelog (rev 0)
+++ csound/trunk/debian/changelog 2007-08-02 22:44:23 UTC (rev 1523)
@@ -0,0 +1,83 @@
+csound (1:5.06.0.dfsg-1) unstable; urgency=low
+
+ * New maintainer for csound. Revamped the packaging (ie, start from
+ scratch).
+ * New upstream version.
+ (Closes: #415655, #365840)
+ * Repackaged source because on non-free code.
+
+ -- Felipe Sateler <fsateler at gmail.com> Tue, 10 Jul 2007 16:46:17 -0400
+
+csound (1:4.23f13-1.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * High-urgency upload for RC bugfix.
+ * Drop alpha, ia64, and amd64 from the package architecture list, because
+ this version of csound makes many 32-bit assumptions that render the
+ package unusable. Closes: #414660.
+ * Also fix the clean target to use make distclean, not just make
+ clean, and remove csound/csound.xmg by hand since nothing seems to
+ take care of this on clean.
+
+ -- Steve Langasek <vorlon at debian.org> Tue, 20 Mar 2007 15:55:27 -0700
+
+csound (1:4.23f13-1) unstable; urgency=low
+
+ [ Hans Fugal ]
+ * New upstream release
+ * Renamed csound-extract to csound_extract due to automake limitations
+ * Added NEWS.Debian
+ * Install more upstream documentation (in /usr/share/doc/csound)
+ * Removed -P128 from defaults list in manpage. (closes: #300622)
+ * Built with g++ 4.0. (closes: #318915)
+ * Upstream removed OSC-Kit. (closes: #297018)
+
+ [ Guenter Geiger (Debian/GNU) ]
+ * Added texinfo build depends
+
+ -- Guenter Geiger (Debian/GNU) <geiger at debian.org> Thu, 15 Sep 2005 11:06:56 +0200
+
+csound (4.23f12-2) unstable; urgency=low
+
+ * Updated to policy 3.6.1 (no changes)
+
+ -- Hans Fugal <hans at fugal.net> Tue, 03 Aug 2004 09:29:32 -0600
+
+csound (4.23f12-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Hans Fugal <hans at fugal.net> Wed, 28 Jul 2004 07:54:35 -0600
+
+csound (4.23f08-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Hans Fugal <hans at fugal.net> Fri, 02 Jan 2004 10:29:36 -0700
+
+csound (4.23f07-1) unstable; urgency=low
+
+ * New upstream release
+ * Renamed extract to csound-extract. (closes: #205918)
+ * No longer build plugin .so's, which weren't being installed anyway.
+ (closes: #207574)
+
+ -- Hans Fugal <hans at fugal.net> Fri, 12 Sep 2003 08:33:46 -0600
+
+csound (4.23f06-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Hans Fugal <hans at fugal.net> Sun, 17 Aug 2003 15:40:15 -0600
+
+csound (4.23f04-1) unstable; urgency=low
+
+ * Initial Release. (closes: #200355)
+ * Omitted scansyn and scansynx opcodes because of license
+ * Omitted some OSC-Kit files because of license
+ * Various Makefile adjustments
+ * widget.cpp/gcc compile errors fixed
+ * Wrote manpages for all binaries (closes: #130373 indirectly)
+
+ -- Hans Fugal <hans at fugal.net> Tue, 12 Aug 2003 08:09:20 -0600
+
Added: csound/trunk/debian/compat
===================================================================
--- csound/trunk/debian/compat (rev 0)
+++ csound/trunk/debian/compat 2007-08-02 22:44:23 UTC (rev 1523)
@@ -0,0 +1 @@
+5
Added: csound/trunk/debian/control
===================================================================
--- csound/trunk/debian/control (rev 0)
+++ csound/trunk/debian/control 2007-08-02 22:44:23 UTC (rev 1523)
@@ -0,0 +1,50 @@
+Source: csound
+Section: sound
+Priority: extra
+Maintainer: Felipe Sateler <fsateler at gmail.com>
+Build-Depends: debhelper (>= 5), libfltk1.1-dev, libasound2-dev, libjack0.100.0-dev, portaudio19-dev, libfluidsynth-dev, liblo0-dev, puredata, tk8.4-dev, tcl8.4-dev, libportmidi-dev, python-dev, scons, libsndfile1-dev, fluid, liblua5.1-0-dev, swig, ladspa-sdk, java-gcj-compat-dev | java2-compiler, dpatch
+Standards-Version: 3.7.2
+
+Package: csound
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: csound-plugins
+Suggests: csound-doc
+Description: powerful and versatile sound synthesis software
+ Csound is a sound and music synthesis system. Drawing from over 450 signal
+ processing modules, it can be used to model virtually any synthesizer or
+ multi-effect processor. It can work either in real-time or as a compiler.
+ .
+ Csound is to sound synthesis as C is to programming.
+ Homepage: http://www.csounds.com
+
+Package: csound-doc
+Architecture: all
+Description: Documentation for csound
+ <insert long description, indented with spaces>
+
+Package: libcsound64-5
+Architecture:any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: main library for csound
+ This package contains the library which provides most of the
+ csound functionality. This library was built using 64-bit precision for
+ the calculations (this doesn't mean you need a 64-bit processor).
+ .
+ For more information on csound, see the csound package.
+
+Package: libcsnd-java
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, java-gcj-compat | java-virtual-machine, java-gcj-compat | java2-runtime
+Recommends: csound
+Description: Java bindings for csound
+ These are the java bindings for csound. For more information on csound,
+ see the csound package
+
+Package: libcsound64-dev
+Architecture: any
+Depends: libcsound64-5
+Description: development files for libcsound
+ This package contains the development files needed to build programs
+ linking to the csound library.
+ For more information on csound, see the csound package.
Added: csound/trunk/debian/copyright
===================================================================
--- csound/trunk/debian/copyright (rev 0)
+++ csound/trunk/debian/copyright 2007-08-02 22:44:23 UTC (rev 1523)
@@ -0,0 +1,73 @@
+This package was debianized by Felipe Sateler <fsateler at gmail.com> on
+Mon, 09 Jul 2007 22:21:08 -0400.
+
+It was downloaded from http://csound.sourceforge.net/
+
+Upstream Author(s):
+
+ See the AUTHORS file included.
+
+Copyright:
+
+ Csound is copyright (c) 1991 Barry Vercoe, John ffitch.
+ CsoundVST is copyright (c) 2001 by Michael Gogins.
+
+License:
+
+ This package is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL'.
+
+The Debian packaging is (C) 2007, Felipe Sateler <fsateler at gmail.com> and
+is licensed under the GPL version 2, see `/usr/share/common-licenses/GPL-2'.
+
+Some of the files in the package have a different license. Here they are
+listed by license type:
+
+BSD (found in /usr/share/common-licenses/BSD, with an appropriate copyright
+ holder)
+
+ OOps/random.c: (c) 1997-2002, Makoto Matsumoto, Takuji Nishimura
+
+GPL version 2 or (at your option) later.
+
+ Opcodes/Loris/*: (c) 1999-2004, Kelly Fitz, Lippold Haken
+ util/:
+ envext.c (C) 1994 John ffitch
+ het_export.c (C) 1995 John ffitch
+ heti_main.c (C) 1995 John ffitch
+ het_import.c (C) 1995 John ffitch
+ lpc_export.c (C) 1995 John ffitch
+ lpci_main.c (C) 1995 John ffitch
+ lpc_import.c (C) 1995 John ffitch
+ lpcx_main.c (C) 1995 John ffitch
+ mixer.c (C) 1995 John ffitch
+ pv_export.c (C) 1995-2006 John ffitch
+ pv_import.c (C) 1995-2006 John ffitch
+ scale.c (C) 1994-2005 John ffitch
+ srconv.c (C) 1989, 2000 Mark Dolson, John ffitch
+ xtrct.c (C) 1995 John ffitch
+ util1/:
+ MOD.c (C) 1991 Barry Vercoe
+ smain.c (C) 1991 Barry Vercoe, John ffitch
+ xmain.c (C) 1991 Barry Vercoe, John ffitch
+ Opcodes/nlfilt.h (C) 1996 John ffitch, Richard Dobson
+ Opcodes/py/pycall-gen.p (C) 2002 Maurizio Umberto Puxeddu
+ examples/cscore:
+ pulse.c (C) 1991 Barry Vercoe
+ switch.c (C) 1991 Barry Vercoe
+ test.c (C) 19xx Barry Vercoe, John ffitch
+
Added: csound/trunk/debian/csound-doc.docs
===================================================================
--- csound/trunk/debian/csound-doc.docs (rev 0)
+++ csound/trunk/debian/csound-doc.docs 2007-08-02 22:44:23 UTC (rev 1523)
@@ -0,0 +1,2 @@
+#DOCS#
+
Added: csound/trunk/debian/csound-doc.install
===================================================================
--- csound/trunk/debian/csound-doc.install (rev 0)
+++ csound/trunk/debian/csound-doc.install 2007-08-02 22:44:23 UTC (rev 1523)
@@ -0,0 +1,2 @@
+#DOCS#
+
Added: csound/trunk/debian/csound.install
===================================================================
--- csound/trunk/debian/csound.install (rev 0)
+++ csound/trunk/debian/csound.install 2007-08-02 22:44:23 UTC (rev 1523)
@@ -0,0 +1,2 @@
+usr/bin/*
+usr/lib/csound/plugins64/*
Added: csound/trunk/debian/custom.py
===================================================================
--- csound/trunk/debian/custom.py (rev 0)
+++ csound/trunk/debian/custom.py 2007-08-02 22:44:23 UTC (rev 1523)
@@ -0,0 +1,133 @@
+'''
+Modify this file, by platform, to handle nonstandard options for third-party
+dependencies. If you do modify this file, you should make it read-only
+(or otherwise protect it) so that CVS will not overwrite it.
+
+Order is important: place local paths ahead of system paths.
+'''
+import sys
+
+customCPPPATH = []
+customCCFLAGS = []
+customCXXFLAGS = []
+customLIBS = []
+customLIBPATH = []
+customSHLINKFLAGS = []
+customSWIGFLAGS = []
+
+if sys.platform[:5] == 'linux':
+ platform = 'linux'
+ customCPPPATH.append('/usr/include/lua5.1')
+ customCPPPATH.append('/usr/include/tcl8.4')
+elif sys.platform == 'darwin':
+ platform = 'darwin'
+ customCPPPATH.append('/usr/include/malloc')
+ customCPPPATH.append('/opt/local/include/boost-1_32/')
+ customCPPPATH.append('/usr/include/python2.3')
+ customCXXFLAGS.append('-fabi-version=0')
+elif sys.platform[:3] == 'win':
+ # For the basic build you need MinGW, MSys, and libsndfile.
+ # Add them here:
+ customCPPPATH.append('D:/utah/msys/1.0/mingw/include')
+ customLIBPATH.append('D:/utah/msys/1.0/mingw/lib')
+ # If libsndfile is not in a standard location add it here:
+ customCPPPATH.append(r'D:\utah\opt\libsndfile-1.0.18pre10\src')
+ customLIBPATH.append(r'D:\utah\opt\libsndfile-1.0.18pre10\src\.libs')
+ ################################################################
+ # If you want real-time audio you need PortAudio.
+ # If it is not in a standard location add it here
+ # (of course you must build it first):
+ customCPPPATH.append('D:/utah/opt/portaudio_varga/include')
+ customLIBPATH.append('D:/utah/opt/lazzarini')
+ ################################################################
+ # If you want PortMidi for real-time midi,
+ # if it is not in a standard location add it here
+ # (of course you must build it first):
+ customCPPPATH.append('D:/utah/opt/portmidi/pm_common')
+ customCPPPATH.append('D:/utah/opt/portmidi/pm_win')
+ customCPPPATH.append('D:/utah/opt/portmidi/porttime')
+ customLIBPATH.append('D:/utah/opt/portmidi/pm_win')
+ customLIBPATH.append('D:/utah/opt/portmidi/porttime')
+ customLIBPATH.append('D:/utah/opt/portmidi')
+ ################################################################
+ # If you want FLTK widgets or if you want to build CsoundVST,
+ # you need FLTK. If it is not in a standard location,
+ # add it here (of course you must build it first):
+ customCPPPATH.append('D:/utah/opt/fltk-1.1.7')
+ customLIBPATH.append('D:/utah/opt/csound5/bin')
+ #customLIBPATH.append('D:/utah/opt/fltk-1.1.7/lib')
+ ################################################################
+ # If you want to build CsoundVST you need Python and
+ # a MinGW import library for Python. Add them here:
+ customLIBPATH.append('D:/utah/msys/1.0/local/lib')
+ customCPPPATH.append('D:/utah/opt/Python25/include')
+ customLIBPATH.append('D:/utah/opt/Python25/Libs')
+ ################################################################
+ # If you want to build vst4cs you need the include
+ # path to the VST SDK header files. Add them there:
+ customCPPPATH.append('d:/utah/home/mkg/projects/csoundd/frontends/CsoundVST')
+ ################################################################
+ # If you want to build scoregen you need the include
+ # path you need the VST MIDI plugin SDK header files. Copy
+ # the whole VST MIDI plugin SDK into the CsoundVST directory:
+ customCPPPATH.append('d:/utah/home/mkg/projects/csoundd/frontends/CsoundVST/VSTModuleArchitectureSDK/pluginterfaces/base')
+ ################################################################
+ # If you want to build Lua interfaces you need Lua.
+ # Add it here:
+ customCPPPATH.append('D:/utah/opt/lua-5.1.1/src')
+ customLIBPATH.append('D:/utah/opt/lua-5.1.1/src')
+ ################################################################
+ # If you want to build Tcl/Tk interfaces
+ # and Tclcsound you need Tcl/Tk.
+ # Add it here:
+ customCPPPATH.append('D:/utah/opt/Tcl/include')
+ customLIBPATH.append('D:/utah/opt/Tcl/bin')
+ ################################################################
+ # If you want to build CsoundVST you need boost.
+ # If it is not in a standard lcoation add it here
+ # (you do NOT need to build it first):
+ customCPPPATH.append('D:/utah/opt/boost/')
+ ################################################################
+ # If you want to build the FluidSynth opcodes
+ # you need FluidSynth. If it is not a standard location,
+ # add it here (you do NOT need to build it first):
+ #customLIBPATH.append('D:/utah/opt/fluidsynth-1.0.3-win32')
+ #customCPPPATH.append('D:/utah/opt/fluidsynth-1.0.3-win32/include')
+ customLIBPATH.append('D:/utah/home/mkg/projects/fluid/fluidsynth/src')
+ customCPPPATH.append('D:/utah/home/mkg/projects/fluid/fluidsynth/include')
+ ################################################################
+ # If you want to build the Java wrapper for CsoundVST
+ # you need Java. If it is not in a standard location,
+ # add it here (you do NOT need to build it first):
+ customCPPPATH.append('D:/utah/opt/jdk1.5.0/include')
+ customCPPPATH.append('D:/utah/opt/jdk1.5.0/include/win32')
+ ################################################################
+ # If you want to build the PD external csoundapi~
+ # you need PD. If it is not in a standard location,
+ # add it here (you do NOT need to build it first):
+ customCPPPATH.append('D:/utah/opt/pd-0.38-4-devel-2/src')
+ customLIBPATH.append('D:/utah/opt/pd-0.38-4-devel-2/bin')
+ ################################################################
+ # If you want to build the Loris opcodes,
+ # then copy Loris to csound5/Opcodes/Loris. Loris also
+ # requires FFTW, if it is not in a standard location,
+ # add it here (you do need to build it first):
+ customCPPPATH.append('D:/utah/opt/fftw-3.0.1/api')
+ customLIBPATH.append('D:/utah/opt/fftw-3.0.1/.libs')
+ ################################################################
+ # If you want to build the OSC opcodes,
+ # if it is not in a standard location,
+ # add it here (you do need to build it first):
+ customCPPPATH.append(r'D:\utah\home\mkg\projects\liblo\lo')
+ customCPPPATH.append(r'D:\utah\home\mkg\projects\liblo')
+ customLIBPATH.append('D:/utah/home/mkg/projects/liblo/src/.libs')
+ # For OSC on Windows you will also need a Windows pthread library,
+ # if it is not in a standard location,
+ # add it here (you do need to build it first):
+ customCPPPATH.append('D:/utah/opt/pthreads/Pre-built.2/include')
+ customLIBPATH.append('D:/utah/opt/pthreads/Pre-build.2/lib')
+ ################################################################
+ # print "Adding custom path"
+else:
+ platform = 'unsupported platform'
+
Added: csound/trunk/debian/dfsg-repack
===================================================================
--- csound/trunk/debian/dfsg-repack (rev 0)
+++ csound/trunk/debian/dfsg-repack 2007-08-02 22:44:23 UTC (rev 1523)
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# delete non-free opcodes
+
+rm Opcodes/grain4.{c,h}
+
+rm Opcodes/{scansyn.c,scansyn.h,scansynx.c}
+
+# don't build the deleted opcodes
+
+sed -i -e '/grain4/d' SConstruct
+sed -i -e '/scansyn/d' SConstruct
Added: csound/trunk/debian/dirs
===================================================================
--- csound/trunk/debian/dirs (rev 0)
+++ csound/trunk/debian/dirs 2007-08-02 22:44:23 UTC (rev 1523)
@@ -0,0 +1,2 @@
+usr/bin
+usr/sbin
Added: csound/trunk/debian/docs
===================================================================
--- csound/trunk/debian/docs (rev 0)
+++ csound/trunk/debian/docs 2007-08-02 22:44:23 UTC (rev 1523)
@@ -0,0 +1,4 @@
+Loadable_Opcodes.txt
+NEWS
+readme-csound5.txt
+AUTHORS
Added: csound/trunk/debian/libcsound64-5.install
===================================================================
--- csound/trunk/debian/libcsound64-5.install (rev 0)
+++ csound/trunk/debian/libcsound64-5.install 2007-08-02 22:44:23 UTC (rev 1523)
@@ -0,0 +1 @@
+usr/lib/libcsound64.so.5*
Added: csound/trunk/debian/libcsound64-dev.install
===================================================================
--- csound/trunk/debian/libcsound64-dev.install (rev 0)
+++ csound/trunk/debian/libcsound64-dev.install 2007-08-02 22:44:23 UTC (rev 1523)
@@ -0,0 +1,2 @@
+usr/include/*
+usr/lib/libcsound64.so
Added: csound/trunk/debian/patches/00list
===================================================================
--- csound/trunk/debian/patches/00list (rev 0)
+++ csound/trunk/debian/patches/00list 2007-08-02 22:44:23 UTC (rev 1523)
@@ -0,0 +1,3 @@
+00lua-link
+01no-java-recompile
+02instdir
Added: csound/trunk/debian/patches/00lua-link.dpatch
===================================================================
--- csound/trunk/debian/patches/00lua-link.dpatch (rev 0)
+++ csound/trunk/debian/patches/00lua-link.dpatch 2007-08-02 22:44:23 UTC (rev 1523)
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00lua-link.dpatch by <fsateler at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at 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)
+ if getPlatform() == 'win32':
+ csoundInterfacesEnvironment.Prepend(LIBS = ['lua51'])
+ else:
+- csoundInterfacesEnvironment.Prepend(LIBS = ['lua'])
++ csoundInterfacesEnvironment.Prepend(LIBS = ['lua5.1'])
+ if getPlatform() == 'linux':
+ os.spawnvp(os.P_WAIT, 'rm', ['rm', '-f', '_csnd.so'])
+ # os.symlink('lib_csnd.so', '_csnd.so')
Property changes on: csound/trunk/debian/patches/00lua-link.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: csound/trunk/debian/patches/01no-java-recompile.dpatch
===================================================================
--- csound/trunk/debian/patches/01no-java-recompile.dpatch (rev 0)
+++ csound/trunk/debian/patches/01no-java-recompile.dpatch 2007-08-02 22:44:23 UTC (rev 1523)
@@ -0,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01no-java-recompile.dpatch by <fsateler at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad csound-5.06.0.dfsg~/SConstruct csound-5.06.0.dfsg/SConstruct
+--- csound-5.06.0.dfsg~/SConstruct 2007-07-10 23:34:11.000000000 -0400
++++ csound-5.06.0.dfsg/SConstruct 2007-07-10 23:34:38.000000000 -0400
+@@ -1010,15 +1010,18 @@
+ csoundWrapperEnvironment.Append(CPPPATH =
+ ['/System/Library/Frameworks/JavaVM.Framework/Headers'])
+ if getPlatform() == 'linux':
+- # ugly hack to work around bug that requires running scons twice
+- tmp = [csoundWrapperEnvironment['SWIG']]
+- for i in swigflags:
+- tmp += [i]
+- tmp += ['-java', '-package', 'csnd']
+- tmp += ['-o', 'interfaces/java_interface_wrap.cc']
+- tmp += ['interfaces/java_interface.i']
+- if os.spawnvp(os.P_WAIT, tmp[0], tmp) != 0:
+- Exit(-1)
++ # hack to avoid running swig multiple times
++ # this works only because I never touch this file
++ if not os.path.exists("interfaces/java_interface_wrap.cc"):
++ # ugly hack to work around bug that requires running scons twice
++ tmp = [csoundWrapperEnvironment['SWIG']]
++ for i in swigflags:
++ tmp += [i]
++ tmp += ['-java', '-package', 'csnd']
++ tmp += ['-o', 'interfaces/java_interface_wrap.cc']
++ tmp += ['interfaces/java_interface.i']
++ if os.spawnvp(os.P_WAIT, tmp[0], tmp) != 0:
++ Exit(-1)
+ csoundJavaWrapperSources = [csoundWrapperEnvironment.SharedObject(
+ 'interfaces/java_interface_wrap.cc')]
+ else:
Property changes on: csound/trunk/debian/patches/01no-java-recompile.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: csound/trunk/debian/patches/02instdir.dpatch
===================================================================
--- csound/trunk/debian/patches/02instdir.dpatch (rev 0)
+++ csound/trunk/debian/patches/02instdir.dpatch 2007-08-02 22:44:23 UTC (rev 1523)
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02instdir.dpatch by <fsateler at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad csound-5.06.0.dfsg~/SConstruct csound-5.06.0.dfsg/SConstruct
+--- csound-5.06.0.dfsg~/SConstruct 2007-07-10 23:39:50.000000000 -0400
++++ csound-5.06.0.dfsg/SConstruct 2007-07-10 23:43:02.000000000 -0400
+@@ -215,6 +215,9 @@
+ commandOptions.Add('buildvst4cs',
+ 'Set to 1 to build vst4cs plugins (requires Steinberg VST headers)',
+ '0')
++commandOptions.Add('instdir',
++ 'For the install target: puts instdir before the prefix',
++ '')
+
+ # Define the common part of the build environment.
+ # This section also sets up customized options for third-party libraries, which
+@@ -2087,7 +2090,8 @@
+
+ # INSTALL OPTIONS
+
+-PREFIX = commonEnvironment['prefix']
++INSTDIR = commonEnvironment['instdir']
++PREFIX = INSTDIR + commonEnvironment['prefix']
+
+ BIN_DIR = PREFIX + "/bin"
+ INCLUDE_DIR = PREFIX + "/include/csound"
Property changes on: csound/trunk/debian/patches/02instdir.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: csound/trunk/debian/pycompat
===================================================================
--- csound/trunk/debian/pycompat (rev 0)
+++ csound/trunk/debian/pycompat 2007-08-02 22:44:23 UTC (rev 1523)
@@ -0,0 +1 @@
+2
Added: csound/trunk/debian/rules
===================================================================
--- csound/trunk/debian/rules (rev 0)
+++ csound/trunk/debian/rules 2007-08-02 22:44:23 UTC (rev 1523)
@@ -0,0 +1,149 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+#
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+#
+# Modified to make a template file for a multi-binary package with separated
+# build-arch and build-indep targets by Bill Allombert 2001
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+BUILDFLAGS=useDouble=1 usePortAudio=1 usePortMIDI=1 useALSA=1 \
+ useJack=1 useFLTK=1 buildCsound5GUI=1 buildWinsound=1 \
+ generatePdf=0 useOSC=1 buildPythonOpcodes=1 \
+ dynamicCsoundLibrary=1 buildPDClass=1 \
+ buildDSSI=1 buildUtilities=1 buildTclcsound=1 \
+ buildVirtual=1 buildInterfaces=1 buildJavaWrapper=1 \
+ buildCSEditor=1 buildNewParser=0 prefix=/usr
+
+CSVERSION=5.06.0
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
+#Architecture
+build: build-arch build-indep
+
+build-arch: build-arch-stamp
+build-arch-stamp: patch-stamp
+ cp debian/custom.py custom.py
+ scons $(BUILDFLAGS) CFLAGS="$(CFLAGS)"
+ touch $@
+
+build-indep: build-indep-stamp
+build-indep-stamp: patch-stamp
+ touch $@
+
+clean: unpatch
+ dh_testdir
+ dh_testroot
+ rm -f build-arch-stamp build-indep-stamp
+# Scons needs the build flags or else it will not clean up most stuff
+ifneq "$(wildcard ./custom.py)" "" # We actually built something
+ scons $(BUILDFLAGS) -c
+ rm custom.py
+# and there still is stuff that doesn't get deleted.
+ rm -f interfaces/*.java
+ rm -f interfaces/*_interface_wrap.*
+ rm -f frontends/CsoundVST/CsoundVST_wrap.h
+ rm -f frontends/fltk_gui/*_FLTK.hpp
+ rm -f lib_CsoundVST.so CsoundVST.py
+ rm -f config.log .sconsign.dblite
+ rm -rf .sconf_temp/
+ rm -f libcsound64.so
+ rm -f frontends/winsound/winsound.h
+ rm -f libcsound64.so.5
+endif
+ dh_clean
+
+install: install-indep install-arch
+install-indep: build-indep
+ dh_testdir
+ dh_testroot
+ dh_clean -k -i
+ dh_installdirs -i
+
+ # Add here commands to install the indep part of the package into
+ # debian/<package>-doc.
+ #INSTALLDOC#
+
+ dh_install -i
+
+install-arch: build-arch
+ dh_testdir
+ dh_testroot
+ dh_clean -k -s
+ dh_installdirs -s
+
+ scons $(BUILDFLAGS) install=1 instdir=$(CURDIR)/debian/tmp
+# Rename extract to csound-extract to avoid conflict with extract
+ mv $(CURDIR)/debian/tmp/usr/bin/extract \
+ $(CURDIR)/debian/tmp/usr/bin/csound_extract
+# Move the pd class where it belongs
+ mkdir -p $(CURDIR)/debian/tmp/usr/lib/pd/extra
+ mv $(CURDIR)/debian/tmp/usr/lib/csoundapi~.pd_linux \
+ $(CURDIR)/debian/tmp/usr/lib/pd/extra
+# Now the java classes and libs
+ mkdir -p $(CURDIR)/debian/tmp/usr/share/java
+ mv $(CURDIR)/debian/tmp/usr/lib/csnd.jar \
+ $(CURDIR)/debian/tmp/usr/share/java/csnd-$(CSVERSION).jar
+ mkdir -p $(CURDIR)/debian/tmp/usr/lib/jni
+ mv $(CURDIR)/debian/tmp/usr/lib/libcsnd.so \
+ $(CURDIR)/debian/tmp/usr/lib/jni
+# Scons sucks
+ mv libcsound64.so $(CURDIR)/debian/tmp/usr/lib/
+ ln -s $(CURDIR)/debian/tmp/usr/lib/libcsound64.so.5.1 \
+ $(CURDIR)/debian/tmp/usr/lib/libcsound64.so.5
+
+ dh_install -s --sourcedir=$(CURDIR)/debian/tmp/
+
+# Must not depend on anything. This is to be called by
+# binary-arch/binary-indep
+# in another 'make' thread.
+binary-common:
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs ChangeLog
+ dh_installdocs
+ dh_installexamples
+# dh_installmenu
+# dh_installmime
+ dh_python
+ dh_installman
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_perl
+ dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+# Build architecture independant packages using the common target.
+binary-indep: build-indep install-indep
+ $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependant packages using the common target.
+binary-arch: build-arch install-arch
+ $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
+
+binary: binary-arch binary-indep
+.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch
+
+
+include /usr/share/dpatch/dpatch.make
Property changes on: csound/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: csound/trunk/debian/watch
===================================================================
--- csound/trunk/debian/watch (rev 0)
+++ csound/trunk/debian/watch 2007-08-02 22:44:23 UTC (rev 1523)
@@ -0,0 +1,11 @@
+# Example watch control file for uscan
+# Rename this file to "watch" and then you can run the "uscan" command
+# to check for upstream updates and more.
+# See uscan(1) for format
+
+# Compulsory line, this is a version 3 file
+version=3
+
+http://sf.net/csound/Csound([0-9.]*)\.tar\.gz
+
+
More information about the Demudi-commits
mailing list