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

[Lifeng Sun]

The following commit has been merged in the master branch:
commit 5157e06527287122f018d263d0f83afd0a5301c6
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Thu Jun 14 19:41:10 2012 +0800

    Remove redudant files.

diff --git a/debian/root.conf b/debian/root.conf
deleted file mode 100644
index d19223c..0000000
--- a/debian/root.conf
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/root
diff --git a/debian/rules b/debian/rules
index 32557f1..15f58d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -600,10 +600,6 @@ install-arch: build-arch
 	#cp build/package/debian/application-x-root.png \
 	#	$(DTMP)$(ICONTHEME)/mimetypes/application-x-root.png
 
-	#library path patch
-	#mkdir -p $(DTMP)/etc/ld.so.conf.d
-	#cp debian/root.conf $(DTMP)/etc/ld.so.conf.d
-
 	# Make root-config output '/usr/lib/$(DEB_HOST_MULTIARCH)' instead of
 	# '/usr/lib/$(DEB_HOST_MULTIARCH)/root<version>'
 	sed 's,$(CINTDIR),$(PREFIX)/lib/$(DEB_HOST_MULTIARCH),' \

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