[SCM] root-system: CERN's ROOT Data Analysis Framework branch, master, updated. upstream/5.34.00_rc1-43-gab65ef3

[Lifeng Sun]

The following commit has been merged in the master branch:
commit e71ff9b2729bacfd8c0472897de084f4a612538e
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Wed Jun 27 12:44:44 2012 +0800

    Simplify lintian-overrides handling.

diff --git a/debian/root-system-common.lintian-overrides b/debian/root-system-common.lintian-overrides
new file mode 100644
index 0000000..3a51139
--- /dev/null
+++ b/debian/root-system-common.lintian-overrides
@@ -0,0 +1 @@
+root-system-common: font-in-non-font-package usr/share/root/fonts/symbol.ttf
diff --git a/debian/rules b/debian/rules
index 598e00a..eb8f7bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -558,17 +558,7 @@ install-indep: install-arch
 	cp -a debian/ttf-root-installer.sha256sums \
 		debian/ttf-root-installer/var/lib/ttf-root-installer/sha256sums
 
-	mkdir -p debian/root-system-common/usr/share/lintian/overrides/
-	echo "font-in-non-font-package usr/share/root/fonts/symbol.ttf" \
-		>> debian/root-system-common/usr/share/lintian/overrides/root-system-common
-	mkdir -p debian/ttf-root-installer/usr/share/lintian/overrides/
-	echo "package-contains-empty-directory usr/share/root/fonts/" \
-		>> debian/ttf-root-installer/usr/share/lintian/overrides/ttf-root-installer
-
-	# New Ld.so.conf file 
-	# cp debian/root-system-common.conf \
-	#   debian/root-system-common/$(SYSCONFDIR)/ld.so.conf.d
-
+	dh_lintian -i
 
 install-arch: build-arch
 	dh_testroot
@@ -749,14 +739,9 @@ install-arch: build-arch
 #		   $(wildcard $(DTMP)/$(PREFIX)/lib/root/lib*.so.$(SOVERS)), \
 #		    -X$(i:$(DTMP)/%=%) )
 
-	for i in debian/*.overrides ; do	\
-	  if test ! -f $$i ; then continue; fi;	\
-	  b=`basename $$i .overrides` ; \
-	  echo "Installing Lintian override $$i in debian/$$b/usr/share/lintian/overrides/$$b" ; \
-	  mkdir -p debian/$$b/usr/share/lintian/overrides/ ; \
-	  cp  $$i debian/$$b/usr/share/lintian/overrides/$$b ; \
-	done 
+	dh_lintian -s
 
+	# ship spool as empty dir, see #677053
 	mkdir -p debian/root-system-rootd/var/spool/rootd/tmp
 	mkdir -p debian/root-system-rootd/var/spool/rootd/pub
 

-- 
root-system: CERN's ROOT Data Analysis Framework