[SCM] root-system: CERN's ROOT Data Analysis Framework branch, master, updated. upstream/5.34.03-68-g662b6df

[Lifeng Sun]

The following commit has been merged in the master branch:
commit 662b6df9601486d0cc24e1b38cd98fb96fdcdf1a
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Tue Mar 5 21:51:27 2013 +0800

    libroot-geom-dev: remove multi-arch support.

diff --git a/debian/changelog b/debian/changelog
index efb262b..7cf286f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ root-system (5.34.05-1~exp1) experimental; urgency=low
   * libroot-graf2d-gpad{5.34,-dev}: remove duplicated paragraphs in
     package description. Thanks to Davide Prina. (Closes: #698529)
   * Add Dutch translation. Thanks to Vincent Zweije. (Closes: #692586)
+  * libroot-geom-dev: remove multi-arch support. (Closes: #693597)
 
  -- Lifeng Sun <lifongsun at gmail.com>  Tue, 05 Mar 2013 18:41:25 +0800
 
diff --git a/debian/control b/debian/control
index 6ef5327..785bca2 100644
--- a/debian/control
+++ b/debian/control
@@ -434,7 +434,7 @@ Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Breaks: libroot-dev (<< 5.19.01-1)
 Replaces: libroot-dev
-Depends: ${shlibs:Depends}, python-support, ${python:Depends}, libroot-geom-dev, ${misc:Depends}
+Depends: ${shlibs:Depends}, python-support, ${python:Depends}, ${misc:Depends}
 Description: GDML import/export module for ROOT geometries
  The ROOT system provides a set of OO frameworks with all the
  functionality needed to handle and analyze large amounts of data
@@ -602,8 +602,6 @@ 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
diff --git a/debian/skel/libroot-geom.control b/debian/skel/libroot-geom.control
index e13edc2..935527d 100644
--- a/debian/skel/libroot-geom.control
+++ b/debian/skel/libroot-geom.control
@@ -14,8 +14,6 @@ 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/root-plugin-geom-gdml.control b/debian/skel/root-plugin-geom-gdml.control
index 633629f..09afb41 100644
--- a/debian/skel/root-plugin-geom-gdml.control
+++ b/debian/skel/root-plugin-geom-gdml.control
@@ -4,7 +4,7 @@ Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Breaks: libroot-dev (<< 5.19.01-1)
 Replaces: libroot-dev
-Depends: ${shlibs:Depends}, python-support, ${python:Depends}, libroot-geom-dev, ${misc:Depends}
+Depends: ${shlibs:Depends}, python-support, ${python:Depends}, ${misc:Depends}
 Description: GDML import/export module for ROOT geometries
  The ROOT system provides a set of OO frameworks with all the
  functionality needed to handle and analyze large amounts of data

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