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

[Lifeng Sun]

The following commit has been merged in the master branch:
commit 05349f999b55f57a0c68902045e72f14cff05ad2
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Tue Jun 19 09:50:18 2012 +0800

    Improve multiarch support.

diff --git a/debian/control b/debian/control
index 834a68f..778f822 100644
--- a/debian/control
+++ b/debian/control
@@ -410,8 +410,6 @@ Description: Clarens extension for ROOT - development files
 Package: libroot-roofit5.34
 Architecture: any
 Section: libs
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, libroot-math-minuit5.34 | root-fitter, ${misc:Depends}
 Homepage: http://roofit.sourceforge.net/
 Replaces: root-plugin-roofit  (<< 5.09.01-1)
@@ -668,6 +666,8 @@ Description: Geometry library  for ROOT - run-time library
 
 Package: libroot-geom-dev
 Architecture: any
+Multi-Arch: foreign
+Pre-Depends: ${misc:Pre-Depends}
 Section: libdevel
 Depends: libroot-geom5.34 (= ${binary:Version}), libroot-math-mathcore-dev, ${misc:Depends}
 Recommends: libroot-graf3d-gl-dev
@@ -1752,8 +1752,6 @@ Description: GUI to browse an interactive PROOF session
 
 Package: root-plugin-hist-hbook
 Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: root-plugin-hbook
 Replaces: root-plugin-hbook (<< 5.19.01-1)
@@ -1985,6 +1983,8 @@ Description: Static archive of ROOT libraries
 
 Package: root-system-common
 Architecture: all
+Multi-Arch: foreign
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ttf-freefont | root-ttf, ttf-opensymbol | root-ttf, ${misc:Depends}
 Description: Common files for ROOT
  The ROOT system provides a set of OO frameworks with all the
diff --git a/debian/skel/libroot-geom.control b/debian/skel/libroot-geom.control
index 935527d..e13edc2 100644
--- a/debian/skel/libroot-geom.control
+++ b/debian/skel/libroot-geom.control
@@ -14,6 +14,8 @@ Description: Geometry library  for ROOT - run-time library
 
 Package: libroot-geom-dev
 Architecture: any
+Multi-Arch: foreign
+Pre-Depends: ${misc:Pre-Depends}
 Section: libdevel
 Depends: libroot-geom at libvers@ (= ${binary:Version}), libroot-math-mathcore-dev, ${misc:Depends}
 Recommends: libroot-graf3d-gl-dev
diff --git a/debian/skel/libroot-roofit.control b/debian/skel/libroot-roofit.control
index cb9d412..e15ccf0 100644
--- a/debian/skel/libroot-roofit.control
+++ b/debian/skel/libroot-roofit.control
@@ -1,8 +1,6 @@
 Package: libroot-roofit at libvers@
 Architecture: any
 Section: libs
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, libroot-math-minuit at libvers@ | root-fitter, ${misc:Depends}
 Homepage: http://roofit.sourceforge.net/
 Replaces: root-plugin-roofit  (<< 5.09.01-1)
diff --git a/debian/skel/root-plugin-hist-hbook.control b/debian/skel/root-plugin-hist-hbook.control
index 873a7e0..326206e 100644
--- a/debian/skel/root-plugin-hist-hbook.control
+++ b/debian/skel/root-plugin-hist-hbook.control
@@ -1,7 +1,5 @@
 Package: root-plugin-hist-hbook
 Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: root-plugin-hbook
 Replaces: root-plugin-hbook (<< 5.19.01-1)
diff --git a/debian/skel/root-system-common.control b/debian/skel/root-system-common.control
index d4d4942..ccf5a85 100644
--- a/debian/skel/root-system-common.control
+++ b/debian/skel/root-system-common.control
@@ -1,5 +1,7 @@
 Package: root-system-common
 Architecture: all
+Multi-Arch: foreign
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ttf-freefont | root-ttf, ttf-opensymbol | root-ttf, ${misc:Depends}
 Description: Common files for ROOT
  The ROOT system provides a set of OO frameworks with all the

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