[SCM] csound/master: Update changelog, control file and copyright hints.
js at users.alioth.debian.org
js at users.alioth.debian.org
Thu Jan 19 20:50:25 UTC 2012
The following commit has been merged in the master branch:
commit bd51af3f039d38ef1208b351e8a542841e59a9f5
Author: Jonas Smedegaard <dr at jones.dk>
Date: Thu Jan 19 21:49:37 2012 +0100
Update changelog, control file and copyright hints.
diff --git a/debian/changelog b/debian/changelog
index eb1e16a..a69ce16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,23 @@ csound (1:5.15.0~dfsg-1) UNRELEASED; urgency=low
* New upstream release
+ [ Felipe Sateler ]
+ * Remove patch applied upstream
+ * Remove stale option buildLoris
+ * Refresh patches
+ * Remove stale options for other frontends
+ * Recommend stk so that the stk rawwaves can be used
+
+ [ Jonas Smedegaard ]
+ * Unfuzz patches.
+ * Update copyright file:
+ + Extend copyright years for main Files section.
+ + Add a copyright holder.
+ * Drop dpkg-source local-options: Defaults since dpkg-source 1.16.1.
+ * Bump debhelper compat level to 7.
+ * Shorten Vcs-Browser field in control file.
+ * Avoid copyright-checking some known-good data files.
+
-- Felipe Sateler <fsateler at debian.org> Sat, 24 Dec 2011 17:04:46 -0300
csound (1:5.14.2~dfsg-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 4e17bcd..ed714a0 100644
--- a/debian/control
+++ b/debian/control
@@ -40,7 +40,7 @@ Build-Depends: scons,
ttf-dejavu
Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/git/pkg-multimedia/csound
-Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/csound.git;a=summary
+Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/csound.git
Homepage: http://www.csounds.com
Package: csound
@@ -88,7 +88,7 @@ Package: libcsound64-5.2
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, csound-data
-Recommends: csound
+Recommends: csound, stk
Breaks: csound (<< 1:5.07.0.dfsg-1)
Description: main library for Csound
This package contains the library which provides most of the Csound
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 48d132e..ab63290 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -17,10 +17,12 @@ Files: AUTHORS
H/cs_par_dispatch.h
H/cs_par_orc_semantics.h
H/csound_orc.h
+ H/resize.h
H/tok.h
How_to_Build_Csound_on_Windows.doc
INSTALL
InOut/CMakeLists.txt
+ InOut/libmpadec/mpadec_config.h
InOut/virtual_keyboard/keyboard.map
InOut/widglobals.h
Loadable_Opcodes.txt
@@ -45,7 +47,6 @@ Files: AUTHORS
Opcodes/mixer.cpp
Opcodes/oggplay.c
Opcodes/p5g_mac
- Opcodes/pvlock.c
Opcodes/pvslock.c
Opcodes/py/README
Opcodes/py/examples/ftedit.orc
@@ -90,6 +91,7 @@ Files: AUTHORS
Opcodes/py/pyx.auto.h
Opcodes/signalflowgraph.cpp
Opcodes/signalflowgraphtest.csd
+ Opcodes/stk/CMakeLists.txt
Opcodes/vst4cs/doc/Compatibilty.doc
Opcodes/vst4cs/doc/compatibilty.html
Opcodes/vst4cs/doc/index.html
@@ -167,7 +169,6 @@ Files: AUTHORS
debian/libcsoundac-dev.install
debian/libcsoundac5.2.install
debian/liblua5.1-luacsnd5.2.install
- debian/patches/0001-Add-the-beats-executable-to-the-executable-list.patch
debian/patches/1000-use-system-stk.diff
debian/patches/1003-abi-plugin-dir.diff
debian/patches/1004-fix-csoundac-csnd-linkage.diff
@@ -193,7 +194,6 @@ Files: AUTHORS
debian/python-csoundac.examples
debian/python-csoundac.install
debian/source/format
- debian/source/local-options
debian/tclcsound.examples
debian/tclcsound.install
debian/tclcsound.lintian-overrides
@@ -331,12 +331,29 @@ Files: AUTHORS
installer/linux/f32.sh
installer/linux/f64.sh
installer/linux/installer.fl
- installer/macosx/Makefile
- installer/macosx/Readme_temp.txt
- installer/macosx/csound.info
- installer/macosx/installer.fl
- installer/macosx/mkdmg
- installer/macosx/new_install.cxx
+ installer/macosx/Distribution.dist
+ installer/macosx/PkgResources/CsoundApps/Welcome.rtf
+ installer/macosx/PkgResources/CsoundApps/postinstall
+ installer/macosx/PkgResources/CsoundApps/postupgrade
+ installer/macosx/PkgResources/CsoundApps64/Welcome.rtf
+ installer/macosx/PkgResources/CsoundApps64/postinstall
+ installer/macosx/PkgResources/CsoundApps64/postupgrade
+ installer/macosx/PkgResources/CsoundLib/Welcome.rtf
+ installer/macosx/PkgResources/CsoundLib/postinstall
+ installer/macosx/PkgResources/CsoundLib/postupgrade
+ installer/macosx/PkgResources/CsoundLib/preinstall
+ installer/macosx/PkgResources/CsoundLib/preupgrade
+ installer/macosx/PkgResources/CsoundLib64/Welcome.rtf
+ installer/macosx/PkgResources/CsoundLib64/postinstall
+ installer/macosx/PkgResources/CsoundLib64/postupgrade
+ installer/macosx/PkgResources/CsoundLib64/preinstall
+ installer/macosx/PkgResources/CsoundLib64/preupgrade
+ installer/macosx/PkgResources/SupportLibs/ReadMe.rtf
+ installer/macosx/PkgResources/SupportLibs/Welcome.rtf
+ installer/macosx/PkgResources/en.lproj/Welcome.rtf
+ installer/macosx/PkgResources/en.lproj/background.tiff
+ installer/macosx/custom.10.7.py
+ installer/macosx/release-build-10.7.sh
installer/misc/csound.spec.in
installer/misc/csound.spec.in.old
installer/misc/loris_stk_src.sh
@@ -467,6 +484,8 @@ Files: InOut/libsnd_u.c
Opcodes/ampmidid.cpp
Opcodes/chua/ChuaOscillator.cpp
Opcodes/dssi4cs/src/seq_event.h
+ Opcodes/hrtfearly.c
+ Opcodes/hrtfreverb.c
Opcodes/pvoc.c
Opcodes/pvoc.h
Opcodes/pvs_ops.c
@@ -621,7 +640,10 @@ Copyright: 2001, Istvan Varga
License: LGPL-2.1+
FIXME
-Files: H/csdl.h
+Files: Engine/corfiles.c
+ H/corfile.h
+ H/csdl.h
+ H/interlocks.h
H/midioops.h
H/resource.h
H/text.h
@@ -688,7 +710,6 @@ License: LGPL-2.1+
Files: Engine/auxfd.c
Engine/entry1.c
Engine/musmon.c
- Engine/rdscor.c
Engine/scsort.c
Engine/swrite.c
Engine/twarp.c
@@ -726,8 +747,7 @@ Files: Engine/auxfd.c
frontends/cscore/cscoremain_MacOS9.c
util1/sortex/smain.c
util1/sortex/xmain.c
-Copyright: 1991, 1997 Barry Vercoe, John ffitch
- 1991, Barry Vercoe, John ffitch
+Copyright: 1991, Barry Vercoe, John ffitch
1991,2002, Barry Vercoe, John ffitch
1991-2002, Barry Vercoe, John ffitch
1991-2005, Barry Vercoe, John ffitch
@@ -817,6 +837,7 @@ License: LGPL-2.1+
Files: H/float-version-double.h
H/float-version.h
+ InOut/rtauhal.c
InOut/rtcoreaudio.c
InOut/rtpulse.c
Opcodes/eqfil.c
@@ -838,6 +859,7 @@ Copyright: 1991-2010, Victor Lazzarini
2006, Victor Lazzarini
2007, Victor Lazzarini
2008, Victor Lazzarini
+ 2011, Victor Lazzarini
License: LGPL-2.1+
FIXME
@@ -901,6 +923,20 @@ Copyright: 1991, 1994-1995, 1998, 2000, 2004
License: LGPL-2.1+
FIXME
+Files: H/mp3dec.h
+ H/mpadec.h
+ InOut/libmpadec/layer1.c
+ InOut/libmpadec/layer2.c
+ InOut/libmpadec/layer3.c
+ InOut/libmpadec/mp3dec.c
+ InOut/libmpadec/mp3dec_internal.h
+ InOut/libmpadec/mpadec_internal.h
+ InOut/libmpadec/synth.c
+ InOut/libmpadec/tables.c
+Copyright: 2002-2004, Dmitriy Startsev (dstartsev at rambler.ru)
+License: LGPL-2.1+
+ FIXME
+
Files: frontends/flcsound/canvas.cpp
frontends/flcsound/canvas.hpp
frontends/flcsound/curve.cpp
@@ -961,6 +997,26 @@ Copyright: 2004, Greg Ercolano
License: LGPL-2+
FIXME
+Files: installer/macosx/PkgResources/CsoundApps/License.rtf
+ installer/macosx/PkgResources/CsoundApps64/License.rtf
+ installer/macosx/PkgResources/CsoundLib/License.rtf
+ installer/macosx/PkgResources/CsoundLib64/License.rtf
+ installer/macosx/PkgResources/SupportLibs/License.rtf
+ installer/macosx/PkgResources/en.lproj/License.rtf
+Copyright: 1991, 1999 Free Software Foundation, Inc.\
+ <year> <name of author>\
+ HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY\
+ HOLDERS AND/OR\
+ disclaimer" for the library, if\
+ holder or\
+ holder who places the Library under this License may add\
+ interest in the\
+ law: that is to say, a work containing the Library or a\
+ notices, you must include the\
+ the\
+License: LGPL-2.1+
+ FIXME
+
Files: Opcodes/vbap.c
Opcodes/vbap.h
Opcodes/vbap_eight.c
@@ -1123,6 +1179,14 @@ Copyright: 2008, John ffitch and Csound developers
License: UNKNOWN
FIXME
+Files: installer/macosx/PkgResources/CsoundLib/ReadMe.rtf
+ installer/macosx/PkgResources/CsoundLib64/ReadMe.rtf
+ installer/macosx/PkgResources/en.lproj/ReadMe.rtf
+Copyright: 2005, The Csound Team, csound.sf.net\
+ 2009, The Csound Team, csound.sf.net\
+License: UNKNOWN
+ FIXME
+
Files: LICENCE.random
OOps/random.c
Copyright: 1997, - 2002, Makoto Matsumoto and Takuji Nishimura
@@ -1200,12 +1264,6 @@ Copyright: 2000, Davide Rocchesso, Nicola Bernardini
License: LGPL-2.1+
FIXME
-Files: H/mp3dec.h
- H/mpadec.h
-Copyright: 2002-2004, Dmitriy Startsev (dstartsev at rambler.ru)
-License: LGPL-2.1+
- FIXME
-
Files: Opcodes/hrtferX.c
Opcodes/hrtferx.h
Copyright: 1995, 2001 Eli Breder, David McIntyre, John ffitch
@@ -1264,6 +1322,12 @@ Copyright: 1998, 2001 matt ingalls, Richard Dobson, John ffitch
License: LGPL-2.1+
FIXME
+Files: Engine/rdscor.c
+ Engine/swritestr.c
+Copyright: 2011, John ffitch (after Barry Vercoe)
+License: LGPL-2.1+
+ FIXME
+
Files: Opcodes/mandolin.c
Opcodes/mandolin.h
Copyright: 1997, John ffitch, Perry Cook
@@ -1340,6 +1404,13 @@ Copyright: 2005, Samuel Groner
License: LGPL-2.1+
FIXME
+Files: InOut/cmidi.c
+ Opcodes/pvlock.c
+Copyright: 2009, V Lazzarini
+ 2011, V Lazzarini
+License: LGPL-2.1+
+ FIXME
+
Files: frontends/tclcsound/main_tclsh.c
frontends/tclcsound/main_wish.c
Copyright: 2005, Victor Lazzarini
@@ -1372,12 +1443,6 @@ Copyright: 2006-2009,
License: LGPL-2.1+
FIXME
-Files: frontends/flcsound/u2d.c
- samples/hrtf-96000-right.dat
-Copyright:
-License: UNKNOWN
- FIXME
-
Files: frontends/CsoundAC/KindsOfChords.py
frontends/CsoundVST/KindsOfChords.py
Copyright: != chord:
@@ -1405,25 +1470,31 @@ Copyright: 2007, John ffitch and Csound community
License: UNKNOWN
FIXME
+Files: installer/macosx/PkgResources/CsoundApps/ReadMe.rtf
+ installer/macosx/PkgResources/CsoundApps64/ReadMe.rtf
+Copyright: 2005, The Csound Team , csound.sf.net }
+License: UNKNOWN
+ FIXME
+
Files: examples/csoundapi_tilde/csoundapi-osx.pd
examples/csoundapi_tilde/csoundapi.pd
Copyright: V Lazzarini \, 2005-2007;
License: UNKNOWN
FIXME
-Files: debian/rules
-Copyright: 2007-2009, Felipe Sateler <fsateler at gmail.com>
- 2008-2010, Jonas Smedegaard <dr at jones.dk>
- but lack licensing info
-License: GPL
- FIXME
-
Files: H/pstream.h
Copyright: 2001, Richard Dobson
Richard Dobson August 2001
License: GPL LGPL-2.1+
FIXME
+Files: debian/rules
+Copyright: 2007-2009, Felipe Sateler <fsateler at gmail.com>
+ 2008-2010, Jonas Smedegaard <dr at jones.dk>
+ but lack licensing info
+License: GPL-2+
+ FIXME
+
Files: examples/cscore/test.c
Copyright: 19xx Barry Vercoe, John ffitch
License: GPL-2+
@@ -1496,6 +1567,13 @@ Copyright: 2007, Rory Walsh, Victor Lazzarini
License: LGPL-2.1+
FIXME
+Files: InOut/libmpadec/mpadec.c
+Copyright: 2002-2004, Dmitriy Startsev (dstartsev at rambler.ru)
+ = (uint8_t)((header >> 3) & 1);
+ = mpa->frame.;
+License: LGPL-2.1+
+ FIXME
+
Files: frontends/CsoundAC/Composition.cpp
Copyright: = value;
License: LGPL-2.1+
@@ -1635,7 +1713,7 @@ License: LGPL-2.1+
FIXME
Files: Opcodes/hrtfopcodes.c
-Copyright: Brian Carty, 2008
+Copyright: Brian Carty, 2010
License: LGPL-2.1+
FIXME
@@ -1772,6 +1850,11 @@ Copyright: 2005, Istvan Varga, Michael Gogins
License: LGPL-2.1+
FIXME
+Files: H/cs_par_structs.h
+Copyright: 2011, John ffitch and Chris Wilson
+License: LGPL-2.1+
+ FIXME
+
Files: Engine/sort.c
Copyright: 2010, John ffitch with some code from Barry Vercoe
License: LGPL-2.1+
@@ -1904,6 +1987,12 @@ Copyright: 2006, Stefan Bilbao and John ffitch
License: LGPL-2.1+
FIXME
+Files: Opcodes/serial.c
+Copyright: 2006, Tod E. Kurt, tod at todbot.com
+ 2011, matt ingalls
+License: LGPL-2.1+
+ FIXME
+
Files: util/hetro.c
Copyright: 1992, Tom Sullivan, Richard Dobson, John ffitch
License: LGPL-2.1+
@@ -1958,15 +2047,8 @@ Copyright: 1999-2000, Ross Bencina and Phil Burk
License: MIT/X11 (BSD like)
FIXME
-Files: samples/hrtf-48000-right.dat
-Copyright: ë½ : ~ø:EÜ=l6:N§>7¡:ª
-License: UNKNOWN
- FIXME
-
-Files: samples/hrtf-48000-left.dat
-Copyright: >³f>À$l%>ä@8G6>¿é?ND>Zg8½Ha>7¿ä2>ÐÅÀKµ>¾¥)@æÇÎ>jè?ÿØ®>³¾½ÿ¡>[cÍ¿ó>
ÄBÀ5>Coý?Ôé>Éó[?ÿ >f¿
É=ÚÊÀý¾=®»@«$>ÚèV>B>±l§¿/1>Ð?6ÀÕ.Æ>§½è?Dz·>°=¥2T>$ø¿d^>i1Àþ^>ï@¿ùÁ=âɽêêa=½'ÀÓV>£ @Ï>h¸Û>o¡>xw¿>xÀSo>ÿã6 at 6ã>xÏ?x Ì>¬¨>²Ä>Ý<¿åÜ>µ«ì¿F?ß@DÀ*?@ã?i²??./?1w¿×M?Ô¶ ÀÿÒ??SÊ&@xý9?fI~?ß"?ÐÓ;¿'ó
- %¾X»:f&á½ ¼: ÑW»:Eá=":f>Uàµ:
¹>+Ø:¾=z
;sr¥>EÚ;c¿
è<eLÀÒ
- @8ó¿)¿ú?ÀWäÈ? @4L?3p?õ?c?ô'¿7N?5 ÀÝ|C?W}@W??vX§?T=?ûd>C#?Ã6¿Z½
?ó±¿|é$? ãÀÀ%?!qG@× ?'@ËÛ¯>p?*7> @?¸7>Cÿ;?*>yô>}ý>ð¾´?
V¿Q?Àìx?»ÞFÀ£`?¹@ý? Ï?
ï?³î=tÚ?×Q¿ÿÅ?ãÀ½?pìB@ï>¬?fä?»Ï´? #>dp?¥ø£¿¼>/?¦æÀ8.p?NnFÀz? îã?Ó?Í.> ª>ÛI@»}?^´¾ëà?¸nö¿c%`?WË;@¿:.?«ó?p[?¢p?¢?ÒT¿-Q? æ
+Files: frontends/flcsound/u2d.c
+Copyright:
License: UNKNOWN
FIXME
@@ -2071,11 +2153,13 @@ Copyright: %6.1f, amp rel %6.1f\n"
trouvÃe"
trouvÃs... dÃsolÃ\n"
un compte de %d octets au lieu de %d"
+ utilisà avant d'être dÃfini (pour opcode %s) "
vers le p-champ N comme amplitude"
vers le p-champ N comme valeur MIDI [0-127
Ãcrit sur le disque\n"
Ãcrites\n"
à %d avec %d canaux audio\n"
+ Ã : %s pour Ãcriture"
à dÃmarrer\n"
à la dernière trame"
à la dernière trame\n"
@@ -2123,23 +2207,6 @@ Copyright: 1999. The Regents of the University of California (Regents)
License: UNKNOWN
FIXME
-Files: samples/hrtf-44100-right.dat
-Copyright: ?5_H at q¶6?C)@xE?Éò?´?ºl?ÒB >ß#>bãg>òK@»Ü??ºØ×?}?)`?eÐØ?Õ >{!@_7¿#Ñ@=ý»¿
- @û4?z¿à?%?d
?%
$?Î>±9?o¡¦¾,B?ÏÕ¿ nB?Þ\ü¿.FO?z 8Àu0?WÍ#@X³/?ÀYç?a+?åôk?¶?&5Ö=¼é>óü¿êÌ>Í,¿¹à¸>Ù-ð¿É¹>²ÁÀNDº>6EÀÅâÑ>ÉÞ@6³Ø>o}á?²Zç>}e{?O³ç>»P=aÌ>Îíh¿>ò¨ò¿
|>·ý0ÀS£=ñÏBÀá¾
=ëA@¸NF=,F@¡¶à<»? À< ¶à<Õ¿NF=.FÀâ¾
=ïAÀ[£=ôÏB@|>µý0@>ò¨ò?aÌ>Ìíh?O³ç>ÍP½²Zç>e{¿6³Ø>r}á¿ÅâÑ>ÊÞÀPDº>5E@
ɹ>±Á@ºà¸>Ø-ð?êÌ>È,?½é>ðü?´?
-License: UNKNOWN
- FIXME
-
-Files: samples/hrtf-44100-left.dat
-Copyright: @¯C;ãáK½v¿
:÷mq=E(;)¼Ï= ; ½E(;͵ϽÀ
:q½¯C;ÒëK=Ãy:Ǩ ÀôôË;Û?ü+Z<¡í¾ k<ý¢À¼<ì%ç?+¨<`+#>sÞ;j3¤¿5kª<Ôùø¿[Õ±<C@ó<À\?qY=>N¿F/ =ÍF$ÀQÂ!=L!Û?DlÏ<0>¸H=ÉÄ¿ÉÚX=w
ÀS«=âOù?$=Ð0x>R=¬Ì¿âH=,-@£=Â':?½
=«Ù«¿)l=iO.@Èòb=¸ä>ºµZ=×Gò¿Í½\=}¬@í!P=l>VJ=·YÞ¿(9¼; 8ÀÒf=®4@áä=ô£?:¦= ¿`Ë=å À"ê=âô @gÜ=W?¨
ê=à)¿k¿÷=óF@[*=?Í<´îú¿q=|o>´%â=ÝÅ¿ÛW>ç%@Äç>p ?º´Ç=±ä¦¿1¨X=@fV=·¿úK>Y)@jJ>ÞÜ?£>ÈÃÀ¿ð>¼4@O·>ºv?M¿¿>I¿¿óª>ZB@:'>Ñg?2>¶¿§£> /ÀX8Ô>
-License: UNKNOWN
- FIXME
-
-Files: samples/hrtf-96000-left.dat
-Copyright: 9-@ñÚ°:j'@ÑòÉ:ë&4@êrÆ:í±)@sÕ¾:Ö1@®ç±:|*@1§:K,@¥äÉ:YM3 at kåÐ:Ó*2@ÀEº:H(@/q¿:Ø4@ðÆ:0Z6 at A²:=à3 at V_·:5@¦!´:{:@\¦ª:À6@ÝÚ¤:jÇ<@Rÿ¿:Yö2@½:d4@ï£:M=@ѧÀ:u»D@
- õ¬@!ð:Mj@nÙÂ:`\@ pÜ:Ð-@¹½:¶$
@ÃÅÄ:¸ß@À:Kl@è·:Ý/@¹ý:n@nê:
@$°:í@ºµ´:@R¤:ø@A&:)@R·:@_:
-License: UNKNOWN
- FIXME
-
Files: readme-csound5-complete.txt
Copyright: 1991, Barry Vercoe, John ffitch
2001, Michael Gogins
@@ -2180,11 +2247,6 @@ Copyright: 1999-2000, The University of Chicago
License: UNKNOWN
FIXME
-Files: Opcodes/serial.c
-Copyright: 2006, Tod E. Kurt, tod at todbot.com
-License: UNKNOWN
- FIXME
-
Files: frontends/OSX/English.lproj/main.nib/objects.xib
Copyright: 2005, V Lazzarini</string>
License: UNKNOWN
--
csound packaging
More information about the pkg-multimedia-commits
mailing list