[SCM] csound-manual packaging branch, master, updated. debian/5.10.dfsg-2-23-g6065edd

[fsateler-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit cea72fc99b4f005413fd0d123fc54861fcdd8aff
Author: Felipe Sateler <fsateler at gmail.com>
Date:   Thu Jun 10 16:11:54 2010 -0400

    Completely filter out the python opcodes

diff --git a/debian/copyright b/debian/copyright
index 55a51f1..32b1839 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,7 +7,7 @@ Source: http://csound.sourceforge.net/
 Excluded: ./examples/22Bassoon.sf2 ./examples/01hpschd.sf2
 Reason: Possibly non free soundfonts
 
-Excluded: ./opcodes/pyassign.xml ./opcodes/pyeval.xml ./opcodes/pyinit.xml
+Excluded: ./opcodes/py*.xml
 Reason: Licensing status is not clear upstream
 
 Copyright: 1986-2008, Andrés Cabrera and others
diff --git a/debian/rules b/debian/rules
index 998990e..40e9934 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,11 +28,14 @@ DEB_UPSTREAM_TARBALL_MD5 = 102a79d89e9a69c3c1abc070ce1a44e5
 
 DEB_UPSTREAM_TARBALL_SRCDIR = manual
 
+# Remove on next upstream release
+DEB_UPSTREAM_REPACKAGE_TAG = dfsg2
+
 # Possibly non free soundfonts
 DEB_UPSTREAM_REPACKAGE_EXCLUDES = ./examples/22Bassoon.sf2 ./examples/01hpschd.sf2
 
 # Licensing status is not clear upstream
-DEB_UPSTREAM_REPACKAGE_EXCLUDES += ./opcodes/pyassign.xml ./opcodes/pyeval.xml ./opcodes/pyinit.xml
+DEB_UPSTREAM_REPACKAGE_EXCLUDES += ./opcodes/py*.xml
 
 # DEB_INSTALL_DOCS_ALL += authors.txt
 

-- 
csound-manual packaging