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

Lifeng Sun lifongsun at gmail.com
Sat Jul 14 15:00:27 UTC 2012


The following commit has been merged in the master branch:
commit 8c03a1a63c0641aac3d7920566aa25c1ce7a1e54
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Sat Jul 14 20:45:34 2012 +0800

    Move libRoot.a to /usr/lib/$multiarch/.

diff --git a/debian/rules b/debian/rules
index cc73d0f..ec1425b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -706,6 +706,9 @@ install-arch: build-arch
 	        debian/libroot-bindings-python-dev.install;; \
 	esac
 
+	mv $(DTMP)$(CINTDIR)/libRoot.a \
+		$(DTMP)$(PREFIX)/lib/$(DEB_HOST_MULTIARCH)
+
 	dh_install -s							\
 		--list-missing						\
 		--sourcedir=$(DTMP)					\
diff --git a/debian/skel/libroot-static.install.in b/debian/skel/libroot-static.install.in
index 251e338..de36ef2 100644
--- a/debian/skel/libroot-static.install.in
+++ b/debian/skel/libroot-static.install.in
@@ -1,4 +1,4 @@
- at prefix@/lib/*/root at version@/libRoot.a
+ at prefix@/lib/*/libRoot.a
 @prefix@/bin/roota
 @prefix@/bin/proofserva
 @prefix@/share/man/man1/roota.1*

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



More information about the debian-science-commits mailing list