[SCM] PAW: Physics Analysis Workstation branch, debian, updated. debian/1%2.14.04.dfsg.2-8-6-g743fa56

[Lifeng Sun]

The following commit has been merged in the debian branch:
commit 743fa5648ed98ed4c6745897ed15e9f362e02d66
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Thu Jul 5 22:54:08 2012 +0800

    Support multiarch.

diff --git a/debian/changelog b/debian/changelog
index 2016e85..166aafd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-paw (1:2.14.04.dfsg.2-9) UNRELEASED; urgency=low
+paw (1:2.14.04.dfsg.2-9) unstable; urgency=low
 
   * debian/control: remove obsolete dpatch from build-dep.
   * Remove unused lintian-overrides.
+  * Support multiarch.
 
- -- Lifeng Sun <lifongsun at gmail.com>  Thu, 05 Jul 2012 11:00:51 +0800
+ -- Lifeng Sun <lifongsun at gmail.com>  Thu, 05 Jul 2012 22:51:39 +0800
 
 paw (1:2.14.04.dfsg.2-8) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 7c2526b..87acb60 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: paw
 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://paw.web.cern.ch/paw/
@@ -31,6 +31,8 @@ Description: CERNLIB PAW library (Lesstif-dependent part - development files)
 Package: libpawlib-lesstif3-gfortran
 Architecture: any
 Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: CERNLIB PAW library (Lesstif-dependent part)
  CERNLIB is a suite of data analysis tools and libraries created for
@@ -70,6 +72,8 @@ Description: CERNLIB PAW library - portion without Lesstif (development files)
 Package: libpawlib2-gfortran
 Architecture: any
 Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends:  ${shlibs:Depends}, gfortran, netbase (>= 4.08), ${misc:Depends}
 Recommends: libc6-dev | libc-dev
 Description: CERNLIB PAW library - portion without Lesstif dependencies
diff --git a/debian/control.d/0base.control b/debian/control.d/0base.control
index 23e6dd7..0972e8d 100644
--- a/debian/control.d/0base.control
+++ b/debian/control.d/0base.control
@@ -2,7 +2,7 @@ Source: paw
 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://paw.web.cern.ch/paw/
diff --git a/debian/control.d/libpawlib-lesstif3-gfortran.control b/debian/control.d/libpawlib-lesstif3-gfortran.control
index 5ad1d92..ac13a2e 100644
--- a/debian/control.d/libpawlib-lesstif3-gfortran.control
+++ b/debian/control.d/libpawlib-lesstif3-gfortran.control
@@ -1,6 +1,8 @@
 Package: libpawlib-lesstif3-gfortran
 Architecture: any
 Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: CERNLIB PAW library (Lesstif-dependent part)
  CERNLIB is a suite of data analysis tools and libraries created for
diff --git a/debian/control.d/libpawlib2-gfortran.control b/debian/control.d/libpawlib2-gfortran.control
index fdd7212..703a2ba 100644
--- a/debian/control.d/libpawlib2-gfortran.control
+++ b/debian/control.d/libpawlib2-gfortran.control
@@ -1,6 +1,8 @@
 Package: libpawlib2-gfortran
 Architecture: any
 Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends:  ${shlibs:Depends}, gfortran, netbase (>= 4.08), ${misc:Depends}
 Recommends: libc6-dev | libc-dev
 Description: CERNLIB PAW library - portion without Lesstif dependencies
diff --git a/debian/dh/libpawlib-lesstif3-dev.dirs b/debian/dh/libpawlib-lesstif3-dev.dirs
index 25c3e64..1e9024b 100644
--- a/debian/dh/libpawlib-lesstif3-dev.dirs
+++ b/debian/dh/libpawlib-lesstif3-dev.dirs
@@ -1,2 +1 @@
-usr/lib
 usr/include/paw
diff --git a/debian/dh/libpawlib-lesstif3-dev.install b/debian/dh/libpawlib-lesstif3-dev.install
index 89053fb..83cec03 100644
--- a/debian/dh/libpawlib-lesstif3-dev.install
+++ b/debian/dh/libpawlib-lesstif3-dev.install
@@ -1,3 +1,3 @@
-debian/tmp/usr/lib/libpawlib-lesstif.a
-debian/tmp/usr/lib/libpawlib-lesstif.so
+debian/tmp/usr/lib/*/libpawlib-lesstif.a
+debian/tmp/usr/lib/*/libpawlib-lesstif.so
 debian/add-ons/paw/*			usr/include/paw
diff --git a/debian/dh/libpawlib-lesstif3-gfortran.install b/debian/dh/libpawlib-lesstif3-gfortran.install
index 1f6b11c..fed2b1e 100644
--- a/debian/dh/libpawlib-lesstif3-gfortran.install
+++ b/debian/dh/libpawlib-lesstif3-gfortran.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/libpawlib-lesstif.so.3_gfortran.2006
-debian/tmp/usr/lib/libpawlib-lesstif.so.3_gfortran
+debian/tmp/usr/lib/*/libpawlib-lesstif.so.3_gfortran.2006
+debian/tmp/usr/lib/*/libpawlib-lesstif.so.3_gfortran
diff --git a/debian/dh/libpawlib2-dev.README.debian b/debian/dh/libpawlib2-dev.README.debian
index d2d9da5..358b4e3 100644
--- a/debian/dh/libpawlib2-dev.README.debian
+++ b/debian/dh/libpawlib2-dev.README.debian
@@ -30,7 +30,7 @@ is statically linked to pawlib.
 If you have doubts, run ldd on your executable; a statically linked program
 should NOT have the output of ldd include a line similar to this:
 
-	libpawlib.so.2 => /usr/lib/libpawlib.so.2 (0x0f7eb000)
+	libpawlib.so.2 => /usr/lib/*/libpawlib.so.2 (0x0f7eb000)
 
 Executive summary
 -----------------
diff --git a/debian/dh/libpawlib2-dev.dirs b/debian/dh/libpawlib2-dev.dirs
index 7a1ba37..6ce9db3 100644
--- a/debian/dh/libpawlib2-dev.dirs
+++ b/debian/dh/libpawlib2-dev.dirs
@@ -1,3 +1 @@
-usr/lib
-usr/include
 usr/include/cfortran
diff --git a/debian/dh/libpawlib2-dev.install b/debian/dh/libpawlib2-dev.install
index 08e587a..60d89d6 100644
--- a/debian/dh/libpawlib2-dev.install
+++ b/debian/dh/libpawlib2-dev.install
@@ -1,5 +1,5 @@
-debian/tmp/usr/lib/libpawlib.a
-debian/tmp/usr/lib/libpawlib.so
+debian/tmp/usr/lib/*/libpawlib.a
+debian/tmp/usr/lib/*/libpawlib.so
 debian/tmp/usr/include/comis.h
 debian/tmp/usr/include/paw.h
 debian/tmp/usr/include/paw.car
diff --git a/debian/dh/libpawlib2-gfortran.install b/debian/dh/libpawlib2-gfortran.install
index 98a0a0f..46e01e1 100644
--- a/debian/dh/libpawlib2-gfortran.install
+++ b/debian/dh/libpawlib2-gfortran.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/libpawlib.so.2_gfortran.2006
-debian/tmp/usr/lib/libpawlib.so.2_gfortran
+debian/tmp/usr/lib/*/libpawlib.so.2_gfortran.2006
+debian/tmp/usr/lib/*/libpawlib.so.2_gfortran

-- 
PAW: Physics Analysis Workstation