[SCM] pd-jmmmp/master: keep original license file, since it has both BSD and GPL

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

The following commit has been merged in the master branch:
commit 8e232593a18f9dd4b27299271e32d2ff81d1ed5a
Author: Hans-Christoph Steiner <hans at eds.org>
Date:   Fri Dec 31 12:54:31 2010 -0500

    keep original license file, since it has both BSD and GPL

diff --git a/debian/links b/debian/links
index 5e0a1e1..7297b9b 100644
--- a/debian/links
+++ b/debian/links
@@ -1,2 +1 @@
 usr/lib/pd/extra/jmmmp/README.txt        usr/share/doc/pd-jmmmp/README
-usr/share/common-licenses/BSD            usr/lib/pd/extra/jmmmp/LICENSE.txt
diff --git a/debian/pd-jmmmp.lintian-overrides b/debian/pd-jmmmp.lintian-overrides
index a8850d9..bd9c248 100644
--- a/debian/pd-jmmmp.lintian-overrides
+++ b/debian/pd-jmmmp.lintian-overrides
@@ -1,3 +1,6 @@
+# the upstream library format includes the license file in it, this library
+# has mostly BSD license covering it, with some files covered by the GPL.
+extra-license-file usr/lib/pd/extra/jmmmp/LICENSE.txt
 # the upstream library format includes an 'examples' directory where example
 # scripts are kept.  This directory needs to be part of the library itself so
 # that the documentation browser, aka the "Help Browser" can find and display
diff --git a/debian/rules b/debian/rules
index 0026b2a..cc54346 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,8 +9,6 @@ pkglibdir = /usr/lib/pd/extra
 
 override_dh_auto_install:
 	dh_auto_install -- prefix=/usr pkglibdir=$(pkglibdir)
-# replace license file with link to the Debian license file
-	rm -f -- $(CURDIR)/debian/$(PACKAGE)/$(pkglibdir)/$(LIBRARY_NAME)/LICENSE.txt
 
 override_dh_shlibdeps:
 	dpkg-shlibdeps $(CURDIR)/debian/$(PACKAGE)$(pkglibdir)/$(LIBRARY_NAME)/*.pd_linux \

-- 
pd-jmmmp packaging