[SCM] geant321: Particle detector description and simulation tool branch, debian, updated. 8114702da0f3117efa4adff39aafa7a7371dcb01

[Lifeng Sun]

The following commit has been merged in the debian branch:
commit 8114702da0f3117efa4adff39aafa7a7371dcb01
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Thu Jul 5 23:26:56 2012 +0800

    Support multiarch.

diff --git a/debian/changelog b/debian/changelog
index 5cda5b7..b3d7405 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-geant321 (1:3.21.14.dfsg-10) UNRELEASED; urgency=low
+geant321 (1:3.21.14.dfsg-10) unstable; urgency=low
 
   * debian/control: remove obsolete dpatch package from build-dep.
   * Set source format to 3.0 (quilt).
   * Rename debian/debhelper to debian/dh to fix an issue similar to
     #640572.
+  * Support multiarch.
 
- -- Lifeng Sun <lifongsun at gmail.com>  Thu, 05 Jul 2012 12:19:52 +0800
+ -- Lifeng Sun <lifongsun at gmail.com>  Thu, 05 Jul 2012 23:24:08 +0800
 
 geant321 (1:3.21.14.dfsg-9) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index dd78b9c..ddb8e37 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: geant321
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Lifeng Sun <lifongsun at gmail.com>
 DM-Upload-Allowed: yes
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
 Priority: optional
 Section: science
 Homepage: http://wwwasd.web.cern.ch/wwwasd/geant/index.html
@@ -12,6 +12,8 @@ Vcs-Browser: http://git.debian.org/?p=debian-science/packages/geant321.git
 
 Package: geant321-data
 Architecture: all
+Multi-Arch: foreign
+Pre-Depends: ${misc:Pre-Depends}
 Depends: cernlib-base, ${misc:Depends}
 Description: [Physics] Data for GEANT 3.21 detector simulator
  GEANT is a framework for simulating the passage of subatomic particles
@@ -65,6 +67,8 @@ Description: [Physics] Library for GEANT 3.21 (development files)
 Package: libgeant321-2-gfortran
 Architecture: any
 Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, geant321-data, ${misc:Depends}
 Recommends: kxterm
 Description: [Physics] Library for GEANT 3.21
diff --git a/debian/control.d/0base.control b/debian/control.d/0base.control
index 7f03646..92935fc 100644
--- a/debian/control.d/0base.control
+++ b/debian/control.d/0base.control
@@ -2,7 +2,7 @@ Source: geant321
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Lifeng Sun <lifongsun at gmail.com>
 DM-Upload-Allowed: yes
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
 Priority: optional
 Section: science
 Homepage: http://wwwasd.web.cern.ch/wwwasd/geant/index.html
diff --git a/debian/control.d/geant321-data.control b/debian/control.d/geant321-data.control
index 4591808..4f42b62 100644
--- a/debian/control.d/geant321-data.control
+++ b/debian/control.d/geant321-data.control
@@ -1,5 +1,7 @@
 Package: geant321-data
 Architecture: all
+Multi-Arch: foreign
+Pre-Depends: ${misc:Pre-Depends}
 Depends: cernlib-base, ${misc:Depends}
 Description: [Physics] Data for GEANT 3.21 detector simulator
  GEANT is a framework for simulating the passage of subatomic particles
diff --git a/debian/control.d/libgeant321-2-gfortran.control b/debian/control.d/libgeant321-2-gfortran.control
index d290cca..9ce6ed2 100644
--- a/debian/control.d/libgeant321-2-gfortran.control
+++ b/debian/control.d/libgeant321-2-gfortran.control
@@ -1,6 +1,8 @@
 Package: libgeant321-2-gfortran
 Architecture: any
 Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, geant321-data, ${misc:Depends}
 Recommends: kxterm
 Description: [Physics] Library for GEANT 3.21
diff --git a/debian/dh/libgeant321-2-dev.dirs b/debian/dh/libgeant321-2-dev.dirs
index 7a1ba37..6ce9db3 100644
--- a/debian/dh/libgeant321-2-dev.dirs
+++ b/debian/dh/libgeant321-2-dev.dirs
@@ -1,3 +1 @@
-usr/lib
-usr/include
 usr/include/cfortran
diff --git a/debian/dh/libgeant321-2-dev.install b/debian/dh/libgeant321-2-dev.install
index ac960a2..0de432e 100644
--- a/debian/dh/libgeant321-2-dev.install
+++ b/debian/dh/libgeant321-2-dev.install
@@ -1,5 +1,5 @@
-debian/tmp/usr/lib/libgeant321.a
-debian/tmp/usr/lib/libgeant321.so
+debian/tmp/usr/lib/*/libgeant321.a
+debian/tmp/usr/lib/*/libgeant321.so
 debian/tmp/usr/include/geant321.h
 debian/tmp/usr/include/geanh.car
 debian/tmp/usr/include/geanh321.car
diff --git a/debian/dh/libgeant321-2-gfortran.install b/debian/dh/libgeant321-2-gfortran.install
index d9bc845..4abc2af 100644
--- a/debian/dh/libgeant321-2-gfortran.install
+++ b/debian/dh/libgeant321-2-gfortran.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/libgeant321.so.2_gfortran.2005
-debian/tmp/usr/lib/libgeant321.so.2_gfortran
+debian/tmp/usr/lib/*/libgeant321.so.2_gfortran.2005
+debian/tmp/usr/lib/*/libgeant321.so.2_gfortran

-- 
geant321: Particle detector description and simulation tool