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

js at users.alioth.debian.org js at users.alioth.debian.org
Wed Apr 14 11:42:32 UTC 2010


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

    Prepare release: Update changelog, control file and copyright hints.

diff --git a/debian/changelog b/debian/changelog
index fb47f67..6215bc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,17 @@ csound (1:5.12.1~dfsg-1) unstable; urgency=low
   * Bump Standards-Version to 3.8.4.
   * Wrap long descriptions at 72 characters.
   * Fix capitalization of PureData in a long description.
+  * Packaging moved to Debian Multimedia Maintainers: Update Maintainer
+    and Vcs-* stanzas in control file.
+  * Drop implementing DEB_MAINTAINER_MODE in rules file: handled in cdbs
+    now. Drop related lintian override as well.
+  * Drop package-relations.mk (last remaining local CDBS snippet):
+    included in cdbs itself now.
+  * Use CDBS class python-module.mk, and simplify local Python hacks in
+    rules file.
+  * Refresh patches, using shortening quilt options --no-timestamps
+    --no-index -pab.
+  * Update copyright file (new author, no new licenses).
 
   [ Felipe Sateler ]
   * New upstream release
@@ -24,7 +35,7 @@ csound (1:5.12.1~dfsg-1) unstable; urgency=low
   * Invoke the java archs resolution script in debian/rules
   * Update debian/control
 
- -- Felipe Sateler <fsateler at gmail.com>  Wed, 07 Apr 2010 19:42:34 -0400
+ -- Jonas Smedegaard <dr at jones.dk>  Wed, 14 Apr 2010 13:42:06 +0200
 
 csound (1:5.11.1~dfsg-4) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index a9618ea..754b0d3 100644
--- a/debian/control
+++ b/debian/control
@@ -1,11 +1,12 @@
 Source: csound
 Section: sound
 Priority: optional
-Maintainer: Felipe Sateler <fsateler at gmail.com>
-Uploaders: Jonas Smedegaard <dr at jones.dk>
+Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
+Uploaders: Felipe Sateler <fsateler at gmail.com>, Jonas Smedegaard <dr at jones.dk>
 Build-Depends: cdbs (>= 0.4.73~),
  scons,
  debhelper (>= 6),
+ python-central,
  devscripts (>= 2.10.7~),
  dh-buildinfo,
  libsndfile1-dev,
@@ -34,11 +35,10 @@ Build-Depends: cdbs (>= 0.4.73~),
  libgmm++-dev,
  doxygen,
  graphviz,
- ttf-dejavu,
- python-central (>= 0.5.6)
+ ttf-dejavu
 Standards-Version: 3.8.4
-Vcs-Git: git://git.debian.org/git/collab-maint/csound.git
-Vcs-Browser: http://git.debian.org/?p=collab-maint/csound.git;a=summary
+Vcs-Git: git://git.debian.org/git/pkg-multimedia/csound
+Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/csound.git;a=summary
 XS-Python-Version: current
 DM-Upload-Allowed: yes
 Homepage: http://www.csounds.com
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 5d5dd3d..8d3111f 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -5,7 +5,6 @@ Files: ./AUTHORS,
 	./Before_release,
 	./CsoundLib.framework/readme.txt,
 	./Doxyfile,
-	./Engine/csound_orcparse.output,
 	./H/OpcodeBase.hpp,
 	./H/cs_jack.h,
 	./H/csound_orc.h,
@@ -34,6 +33,7 @@ Files: ./AUTHORS,
 	./Opcodes/linear_algebra.cpp,
 	./Opcodes/mixer.cpp,
 	./Opcodes/oggplay.c,
+	./Opcodes/p5g_mac,
 	./Opcodes/py/README,
 	./Opcodes/py/examples/ftedit.orc,
 	./Opcodes/py/examples/ftedit.sco,
@@ -129,6 +129,7 @@ Files: ./AUTHORS,
 	./debian/compat,
 	./debian/control,
 	./debian/control.in,
+	./debian/control.in.in,
 	./debian/csladspa.install,
 	./debian/csound-gui.install,
 	./debian/csound-gui.lintian-overrides,
@@ -151,10 +152,8 @@ Files: ./AUTHORS,
 	./debian/libcsoundac-dev.install,
 	./debian/libcsoundac5.2.install,
 	./debian/liblua5.1-luacsnd5.2.install,
-	./debian/patches/0000-correct-csperfthread-path.diff,
-	./debian/patches/0001-swig-message-callback.diff,
-	./debian/patches/0002-install-csnd.diff,
-	./debian/patches/1000-fix-dependency-on-none.diff,
+	./debian/patches/0000-fix-continuation-segfaults.diff,
+	./debian/patches/1000-use-system-stk.diff,
 	./debian/patches/1003-abi-plugin-dir.diff,
 	./debian/patches/2000-avoid-nonfree-scansyn-plugin.diff,
 	./debian/patches/2001-lua-link.diff,
@@ -191,6 +190,7 @@ Files: ./AUTHORS,
 	./examples/cscore/more/test.orc,
 	./examples/cscore/more/test.sco,
 	./examples/csoundapi_tilde/csapi_demo.csd,
+	./examples/hommage.csd,
 	./examples/java/CSDPlayer.java,
 	./examples/java/CSDPlayer.mf,
 	./examples/java/CsoundEditor.java,
@@ -204,6 +204,8 @@ Files: ./AUTHORS,
 	./examples/opcode_demos/mp3f.csd,
 	./examples/opcode_demos/osc.csd,
 	./examples/opcode_demos/osclisten.csd,
+	./examples/opcode_demos/p5glove.csd,
+	./examples/opcode_demos/passign.csd,
 	./examples/opcode_demos/pfield.csd,
 	./examples/opcode_demos/sdft.csd,
 	./examples/opcode_demos/wii.csd,
@@ -383,6 +385,10 @@ Files: ./AUTHORS,
 	./tests/test30.csd,
 	./tests/test31.csd,
 	./tests/test32.csd,
+	./tests/test33.csd,
+	./tests/test34.csd,
+	./tests/test35.csd,
+	./tests/test36.csd,
 	./tests/test4.csd,
 	./tests/test5.csd,
 	./tests/test6.csd,
@@ -940,14 +946,16 @@ Copyright: Victor Lazzarini, 2005
 License: LGPL-2.1+
  FIXME
 
-Files: ./debian/cdbs/1/rules/buildinfo.mk,
-	./debian/cdbs/1/rules/package-relations.mk,
-	./debian/cdbs/1/rules/upstream-tarball.mk,
-	./debian/pkgarchs.sh
-Copyright: 2004-2007, Jonas Smedegaard <dr at jones.dk>
-	2007-2008, Jonas Smedegaard <dr at jones.dk>
-	2008, Jonas Smedegaard <dr at jones.dk>
-License: GPL
+Files: ./examples/CsoundAC.csd,
+	./examples/CsoundVST.csd,
+	./examples/python/CsoundPerformanceTest.py,
+	./examples/python/GeneralMidi.py,
+	./examples/python/drone.py
+Copyright: 2003, Michael Gogins
+	2005, Michael Gogins
+	2006, 2008 Michael Gogins
+	2006, Michael Gogins
+License: UNKNOWN
  FIXME
 
 Files: ./Opcodes/Loris/README,
@@ -991,17 +999,6 @@ Copyright:
 License: UNKNOWN
  FIXME
 
-Files: ./examples/CsoundAC.csd,
-	./examples/CsoundVST.csd,
-	./examples/python/GeneralMidi.py,
-	./examples/python/drone.py
-Copyright: 2003, Michael Gogins
-	2005, Michael Gogins
-	2006, 2008 Michael Gogins
-	2006, Michael Gogins
-License: UNKNOWN
- FIXME
-
 Files: ./examples/lua/Lindenmayer.lua,
 	./examples/python/Koch.py,
 	./examples/python/Lindenmayer.py,
@@ -1076,13 +1073,6 @@ Copyright: 1995, Robin Whittle
 License: LGPL-2.1+
  FIXME
 
-Files: ./po/german.po,
-	./po/italian.po,
-	./po/romanian.po
-Copyright: 2007, John ffitch and Csound community
-License: UNKNOWN
- FIXME
-
 Files: ./po/american.po,
 	./po/csound.po,
 	./po/russian.po
@@ -1098,18 +1088,6 @@ Copyright: 1997, - 2002, Makoto Matsumoto and Takuji Nishimura
 License: BSD (2 clause)
  FIXME
 
-Files: ./Engine/csound_orcparse.c,
-	./Engine/csound_orcparse.h
-Copyright: 1984, 1989-1990, 2000-2006
-License: GPL
- FIXME
-
-Files: ./debian/cdbs/1/class/scons-vars.mk,
-	./debian/cdbs/1/class/scons.mk
-Copyright: 2005, Matthew A. Nicholson <matt at matt-land.com>
-License: GPL
- FIXME
-
 Files: ./examples/cscore/pulse.c,
 	./examples/cscore/switch.c
 Copyright: 1991, Barry Vercoe
@@ -1203,6 +1181,12 @@ Copyright: 1995, Fabio P. Bertolotti
 License: LGPL-2.1+
  FIXME
 
+Files: ./Opcodes/crossfm.c,
+	./Opcodes/crossfm.h
+Copyright: 2005, Francois Pinot
+License: LGPL-2.1+
+ FIXME
+
 Files: ./H/convolve.h,
 	./Opcodes/ugens9.h
 Copyright: 1996, Greg Sullivan
@@ -1333,9 +1317,15 @@ Copyright: 1999, matt ingalls
 License: LGPL-2.1+
  FIXME
 
+Files: ./Opcodes/modmatrix.c,
+	./Opcodes/modmatrix.h
+Copyright: 2009, Øyvind Brandtsegg, Thom Johansen
+License: LGPL-2.1+
+ FIXME
+
 Files: ./Opcodes/partikkel.c,
 	./Opcodes/partikkel.h
-Copyright: 2006-2008, Øyvind Brandtsegg, Torgeir Strand Henriksen
+Copyright: 2006-2009, Øyvind Brandtsegg, Torgeir Strand Henriksen
 License: LGPL-2.1+
  FIXME
 
@@ -1360,17 +1350,18 @@ Copyright: 1991--2003, Barry Vercoe and John ffitch
 License: UNKNOWN
  FIXME
 
+Files: ./po/german.po,
+	./po/romanian.po
+Copyright: 2007, John ffitch and Csound community
+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/cdbs/1/rules/copyright-check.mk
-Copyright: 
-License: GPL
- FIXME
-
 Files: ./debian/rules
 Copyright: 2007-2009, Felipe Sateler <fsateler at gmail.com>
 	2008-2010, Jonas Smedegaard <dr at jones.dk>
@@ -1378,6 +1369,11 @@ Copyright: 2007-2009, Felipe Sateler <fsateler at gmail.com>
 License: GPL
  FIXME
 
+Files: ./debian/pkgarchs.sh
+Copyright: 2008, Jonas Smedegaard <dr at jones.dk>
+License: GPL
+ FIXME
+
 Files: ./H/pstream.h
 Copyright: 2001, Richard Dobson
 	Richard Dobson August 2001
@@ -1403,13 +1399,6 @@ Copyright: 1991, Free Software Foundation, Inc
 License: LGPL-2+
  FIXME
 
-Files: ./Engine/csound_orclex.c
-Copyright: ((unsigned int) (unsigned char) c)
-	2006,
-	yyunput( c, (yytext_ptr) )
-License: LGPL-2.1+
- FIXME
-
 Files: ./Engine/fgens.c
 Copyright: 1991, 1994-1995, 1998, 2000, 2004
 	Victor Lazzarini, 2004, */
@@ -1939,7 +1928,7 @@ Copyright: %6.1f, amp rel %6.1f\n"
 	avec une expression en "
 	compilÃe avec le support des "
 	correctement en mode MIDI, ne pas l'utiliser\n"
-	crÃe avec un taux d'Ãchantillonnage = %f, chorus %s, reverb %s, "
+	crÃe avec un taux d'Ãchantillonnage = %f, chorus %s, "
 	d'au moins 2 lettres"
 	d'avoir le même fsig en entrÃe et en sortie"
 	dans la ligne de commande"
@@ -1997,7 +1986,6 @@ Copyright: %6.1f, amp rel %6.1f\n"
 	spÃcifiÃe"
 	substituÃe à %d.\n"
 	sur Bison"
-	sur ce pÃriphÃrique ; utiliser plutôt %d\n"
 	sur ce terminal"
 	sur cette plateforme"
 	sur cette plateforme.\n"
@@ -2077,6 +2065,13 @@ Copyright: 2006, John ffitch
 License: UNKNOWN
  FIXME
 
+Files: ./po/italian.po
+Copyright: 2007, John ffitch and Csound community
+	supera il 100%% di tempo di cpu"
+	supera maxalloc dello strumento"
+License: UNKNOWN
+ FIXME
+
 Files: ./frontends/OSX/CsoundHelp/index.html
 Copyright: 1986, 1992 Massachusetts Institute of Technology</p>
 License: UNKNOWN

-- 
csound packaging



More information about the pkg-multimedia-commits mailing list