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

[js at users.alioth.debian.org]

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

    Tighten repackaging to match current (slightly cleaner) upstream release, in rules and copyright files.

diff --git a/debian/copyright b/debian/copyright
index 5c9f87b..83052ad 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,19 +3,15 @@ Name: CSound
 Maintainer: csound-devel at lists.sourceforge.net
 Source: http://csound.sourceforge.net/
 
-X-Stripped: Opcodes/scansyn.[ch] Opcodes/scansynx.c
+X-Stripped: ./Opcodes/scansyn*
 X-Stripped-Reason: non-commercially licensed only
 
-X-Stripped: csound5_osx_installer_files.tar.gz
+X-Stripped: ./csound5_osx_installer_files.tar.gz
 X-Stripped-Reason: contains possibly source-less python binary
 
-X-Stripped: samples/VintageDreamsWaves*
-	examples/GeneralMidi.py
+X-Stripped: ./samples/VintageDreamsWaves-v2.sf2
 X-Stripped-Reason: Contains explicit copyright but lack licensing
 
-X-Stripped: debian
-X-Stripped-Reason: simplify packaging (when repackaging anyway)
-
 Copyright: 1986-1992,1994,1997, the Massachussetts Institute of Technology
 	1991-2008, Barry Vercoe
 	1991-2009, John ffitch
diff --git a/debian/rules b/debian/rules
index 38f6849..6735bde 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,13 +37,11 @@ DEB_UPSTREAM_TARBALL_BASENAME_MANGLE = s/\-//g
 DEB_UPSTREAM_TARBALL_MD5 = 70b0c4a159c4960a09719674657949c9
 
 # Non-DFSG license: limited to educational and research purposes
-DEB_UPSTREAM_REPACKAGE_EXCLUDES = ./Opcodes/scansyn.c ./Opcodes/scansyn.h ./Opcodes/scansynx.c
+DEB_UPSTREAM_REPACKAGE_EXCLUDES = ./Opcodes/scansyn*
 # Embedded tarball contains possibly source-less python binary
 DEB_UPSTREAM_REPACKAGE_EXCLUDES += ./csound5_osx_installer_files.tar.gz
 # Contains explicit copyright but lack licensing info
-DEB_UPSTREAM_REPACKAGE_EXCLUDES += ./samples/VintageDreamsWaves* ./examples/GeneralMidi.py
-# When repackaging anyway, simplify packaging by avoiding upstream hints
-DEB_UPSTREAM_REPACKAGE_EXCLUDES += ./debian/
+DEB_UPSTREAM_REPACKAGE_EXCLUDES += ./samples/VintageDreamsWaves-v2.sf2
 
 # Common docs for all packages
 DEB_INSTALL_DOCS_ALL = readme-csound5.txt AUTHORS

-- 
csound packaging