[SCM] herwig++: Multi-purpose event generator for high energy physics branch, master, updated. upstream/2.6.0-4-g41fd05a

[Lifeng Sun]

The following commit has been merged in the master branch:
commit 24a16314fac2fc8216aed20f4304611c8a1b4299
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Sun Jun 17 09:05:34 2012 +0800

    Simplify lintian-overrides handling.

diff --git a/debian/herwig++.install b/debian/herwig++.install
index 0ce0549..cf662ee 100644
--- a/debian/herwig++.install
+++ b/debian/herwig++.install
@@ -1,3 +1,2 @@
 usr/bin/Herwig++
 usr/lib/*/Herwig++/*.so*
-usr/share/lintian/overrides
diff --git a/debian/lintian-overrides/herwig++ b/debian/herwig++.lintian-overrides
similarity index 100%
rename from debian/lintian-overrides/herwig++
rename to debian/herwig++.lintian-overrides
diff --git a/debian/rules b/debian/rules
index 1d1a903..3ffa717 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,9 +64,6 @@ install: build-arch
 	dh_prep
 	dh_auto_install
 	chrpath -d debian/tmp/$(LIBPATH)/Herwig++/HwMPI.so
-	mkdir -p debian/tmp/usr/share/lintian/overrides
-	cp -a debian/lintian-overrides/herwig++ \
-		debian/tmp/usr/share/lintian/overrides
 	rm -rf debian/tmp/usr/share/Herwig++/Doc
 	sed -i -e 's,/.*debian/tmp,,' \
 	    debian/tmp/usr/share/Herwig++/HerwigDefaults.rpo \

-- 
herwig++: Multi-purpose event generator for high energy physics