[SCM] mclibs: CERNLIB Monte Carlo libraries branch, debian, updated. upstream/2006.dfsg.2-25-g5e9b493

Lifeng Sun lifongsun at gmail.com
Thu Jul 5 15:44:00 UTC 2012 

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

    Support multiarch.

diff --git a/debian/changelog b/debian/changelog
index 8e8d127..dcd5705 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-mclibs (20061220+dfsg3-2) UNRELEASED; urgency=low
+mclibs (20061220+dfsg3-2) unstable; urgency=low
 
   * debian/control: remove obsolete dpatch package from build-dep.
   * Remove unused lintian-overrides.
   * Rename debian/debhelper to debian/dh to fix an issue similar to
     #640572.
   * Set source format to 3.0 (quilt).
+  * Support multiarch.
 
- -- Lifeng Sun <lifongsun at gmail.com>  Thu, 05 Jul 2012 12:03:54 +0800
+ -- Lifeng Sun <lifongsun at gmail.com>  Thu, 05 Jul 2012 23:11:04 +0800
 
 mclibs (20061220+dfsg3-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index d3526f2..83364e8 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: mclibs
 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/cernlib/mc.html
@@ -49,6 +49,8 @@ Description: [Physics] COJETS p-p and pbar-p interaction Monte Carlo
 Package: libcojets2-gfortran
 Architecture: any
 Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, montecarlo-base, ${misc:Depends}
 Recommends: montecarlo-data (>= 2006.dfsg.2)
 Description: [Physics] COJETS p-p and pbar-p interaction Monte Carlo library
@@ -79,6 +81,8 @@ Description: [Physics] Monte Carlo library for quark / heavy lepton decays
 Package: libeurodec1-gfortran
 Architecture: any
 Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, cernlib-base (>= 2006.dfsg.2-7), montecarlo-base, ${misc:Depends}
 Recommends: montecarlo-data (>= 2006.dfsg.2)
 Description: [Physics] Monte Carlo library for quark and heavy lepton decays
@@ -106,6 +110,8 @@ Description: [Physics] Monte Carlo event generator for hadrons (development)
 Package: libherwig59-2-gfortran
 Architecture: any
 Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, montecarlo-base, ${misc:Depends}
 Description: [Physics] Monte Carlo event generator simulating hadronic events
  HERWIG is a general-purpose event generator for high energy hadronic
@@ -135,6 +141,8 @@ Description: [Physics] Monte Carlo generator for proton/electron reactions
 Package: libisajet758-3-gfortran
 Architecture: any
 Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, montecarlo-base, ${misc:Depends}
 Recommends: montecarlo-data (>= 2006.dfsg.2)
 Description: [Physics] Monte Carlo generator for proton / electron reactions
@@ -166,6 +174,8 @@ Description: [Physics] Comprehensive library of parton density functions
 Package: libpdflib804-2-gfortran
 Architecture: any
 Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, montecarlo-base, ${misc:Depends}
 Description: [Physics] Comprehensive library of parton density functions
  The PDFLIB package gathers about 100 different sets of Parton Density
@@ -180,6 +190,8 @@ Description: [Physics] Comprehensive library of parton density functions
 Package: libphotos202-1-gfortran
 Architecture: any
 Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, cernlib-base (>= 2006.dfsg.2-7), montecarlo-base, ${misc:Depends}
 Description: [Physics] Monte Carlo simulation of photon radiation in decays
  The PHOTOS library simulates QED photon radiative corrections in
@@ -222,6 +234,8 @@ Description: [Physics] General purpose Monte Carlo routines (development files)
 Package: libphtools2-gfortran
 Architecture: any
 Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, montecarlo-base, ${misc:Depends}
 Description: [Physics] General purpose Monte Carlo routines
  This library contains three main routines.  FOWL allows calculation of phase
@@ -235,6 +249,8 @@ Description: [Physics] General purpose Monte Carlo routines
 
 Package: montecarlo-base
 Architecture: all
+Multi-Arch: foreign
+Pre-Depends: ${misc:Pre-Depends}
 Depends: cernlib-base (>= 2006.dfsg.2-7), ${misc:Depends}
 Description: [Physics] Common files for CERNLIB Monte Carlo libraries
  CERNLIB is a suite of data analysis tools and libraries created for
diff --git a/debian/control.d/0base.control b/debian/control.d/0base.control
index 1c98274..f8a117c 100644
--- a/debian/control.d/0base.control
+++ b/debian/control.d/0base.control
@@ -2,7 +2,7 @@ Source: mclibs
 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/cernlib/mc.html
diff --git a/debian/control.d/libcojets2-gfortran.control b/debian/control.d/libcojets2-gfortran.control
index 77a5d0a..fcd1556 100644
--- a/debian/control.d/libcojets2-gfortran.control
+++ b/debian/control.d/libcojets2-gfortran.control
@@ -1,6 +1,8 @@
 Package: libcojets2-gfortran
 Architecture: any
 Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, montecarlo-base, ${misc:Depends}
 Recommends: montecarlo-data (>= 2006.dfsg.2)
 Description: [Physics] COJETS p-p and pbar-p interaction Monte Carlo library
diff --git a/debian/control.d/libeurodec1-gfortran.control b/debian/control.d/libeurodec1-gfortran.control
index e322866..1a8204c 100644
--- a/debian/control.d/libeurodec1-gfortran.control
+++ b/debian/control.d/libeurodec1-gfortran.control
@@ -1,6 +1,8 @@
 Package: libeurodec1-gfortran
 Architecture: any
 Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, cernlib-base (>= 2006.dfsg.2-7), montecarlo-base, ${misc:Depends}
 Recommends: montecarlo-data (>= 2006.dfsg.2)
 Description: [Physics] Monte Carlo library for quark and heavy lepton decays
diff --git a/debian/control.d/libherwig59-2-gfortran.control b/debian/control.d/libherwig59-2-gfortran.control
index 36ac972..51e3eb5 100644
--- a/debian/control.d/libherwig59-2-gfortran.control
+++ b/debian/control.d/libherwig59-2-gfortran.control
@@ -1,6 +1,8 @@
 Package: libherwig59-2-gfortran
 Architecture: any
 Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, montecarlo-base, ${misc:Depends}
 Description: [Physics] Monte Carlo event generator simulating hadronic events
  HERWIG is a general-purpose event generator for high energy hadronic
diff --git a/debian/control.d/libisajet758-3-gfortran.control b/debian/control.d/libisajet758-3-gfortran.control
index afa7f74..7f2d21e 100644
--- a/debian/control.d/libisajet758-3-gfortran.control
+++ b/debian/control.d/libisajet758-3-gfortran.control
@@ -1,6 +1,8 @@
 Package: libisajet758-3-gfortran
 Architecture: any
 Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, montecarlo-base, ${misc:Depends}
 Recommends: montecarlo-data (>= 2006.dfsg.2)
 Description: [Physics] Monte Carlo generator for proton / electron reactions
diff --git a/debian/control.d/libpdflib804-2-gfortran.control b/debian/control.d/libpdflib804-2-gfortran.control
index 824d073..3fe40d6 100644
--- a/debian/control.d/libpdflib804-2-gfortran.control
+++ b/debian/control.d/libpdflib804-2-gfortran.control
@@ -1,6 +1,8 @@
 Package: libpdflib804-2-gfortran
 Architecture: any
 Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, montecarlo-base, ${misc:Depends}
 Description: [Physics] Comprehensive library of parton density functions
  The PDFLIB package gathers about 100 different sets of Parton Density
diff --git a/debian/control.d/libphotos202-1-gfortran.control b/debian/control.d/libphotos202-1-gfortran.control
index e17c2c9..5e38898 100644
--- a/debian/control.d/libphotos202-1-gfortran.control
+++ b/debian/control.d/libphotos202-1-gfortran.control
@@ -1,6 +1,8 @@
 Package: libphotos202-1-gfortran
 Architecture: any
 Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, cernlib-base (>= 2006.dfsg.2-7), montecarlo-base, ${misc:Depends}
 Description: [Physics] Monte Carlo simulation of photon radiation in decays
  The PHOTOS library simulates QED photon radiative corrections in
diff --git a/debian/control.d/libphtools2-gfortran.control b/debian/control.d/libphtools2-gfortran.control
index bbeaa4a..56c90be 100644
--- a/debian/control.d/libphtools2-gfortran.control
+++ b/debian/control.d/libphtools2-gfortran.control
@@ -1,6 +1,8 @@
 Package: libphtools2-gfortran
 Architecture: any
 Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, montecarlo-base, ${misc:Depends}
 Description: [Physics] General purpose Monte Carlo routines
  This library contains three main routines.  FOWL allows calculation of phase
diff --git a/debian/control.d/montecarlo-base.control b/debian/control.d/montecarlo-base.control
index 6f315f1..0df1ead 100644
--- a/debian/control.d/montecarlo-base.control
+++ b/debian/control.d/montecarlo-base.control
@@ -1,5 +1,7 @@
 Package: montecarlo-base
 Architecture: all
+Multi-Arch: foreign
+Pre-Depends: ${misc:Pre-Depends}
 Depends: cernlib-base (>= 2006.dfsg.2-7), ${misc:Depends}
 Description: [Physics] Common files for CERNLIB Monte Carlo libraries
  CERNLIB is a suite of data analysis tools and libraries created for
diff --git a/debian/dh/libcojets2-dev.dirs b/debian/dh/libcojets2-dev.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/dh/libcojets2-dev.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/dh/libcojets2-dev.install b/debian/dh/libcojets2-dev.install
index 6cd7f0c..dc84e96 100644
--- a/debian/dh/libcojets2-dev.install
+++ b/debian/dh/libcojets2-dev.install
@@ -1,3 +1,3 @@
-debian/tmp/usr/lib/libcojets.a
-debian/tmp/usr/lib/libcojets.so
+debian/tmp/usr/lib/*/libcojets.a
+debian/tmp/usr/lib/*/libcojets.so
 debian/tmp/usr/include/cojets/
diff --git a/debian/dh/libcojets2-gfortran.install b/debian/dh/libcojets2-gfortran.install
index f8113f2..9224db1 100644
--- a/debian/dh/libcojets2-gfortran.install
+++ b/debian/dh/libcojets2-gfortran.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/libcojets.so.2_gfortran.2006
-debian/tmp/usr/lib/libcojets.so.2_gfortran
+debian/tmp/usr/lib/*/libcojets.so.2_gfortran.2006
+debian/tmp/usr/lib/*/libcojets.so.2_gfortran
diff --git a/debian/dh/libeurodec1-dev.dirs b/debian/dh/libeurodec1-dev.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/dh/libeurodec1-dev.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/dh/libeurodec1-dev.install b/debian/dh/libeurodec1-dev.install
index a522709..3d02ca2 100644
--- a/debian/dh/libeurodec1-dev.install
+++ b/debian/dh/libeurodec1-dev.install
@@ -1,3 +1,3 @@
-debian/tmp/usr/lib/libeurodec.a
-debian/tmp/usr/lib/libeurodec.so
+debian/tmp/usr/lib/*/libeurodec.a
+debian/tmp/usr/lib/*/libeurodec.so
 debian/tmp/usr/include/eurodec/
diff --git a/debian/dh/libeurodec1-gfortran.install b/debian/dh/libeurodec1-gfortran.install
index 0841068..1f0fca8 100644
--- a/debian/dh/libeurodec1-gfortran.install
+++ b/debian/dh/libeurodec1-gfortran.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/libeurodec.so.1_gfortran.2006
-debian/tmp/usr/lib/libeurodec.so.1_gfortran
+debian/tmp/usr/lib/*/libeurodec.so.1_gfortran.2006
+debian/tmp/usr/lib/*/libeurodec.so.1_gfortran
diff --git a/debian/dh/libherwig59-2-dev.dirs b/debian/dh/libherwig59-2-dev.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/dh/libherwig59-2-dev.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/dh/libherwig59-2-dev.install b/debian/dh/libherwig59-2-dev.install
index 734206e..38b23fa 100644
--- a/debian/dh/libherwig59-2-dev.install
+++ b/debian/dh/libherwig59-2-dev.install
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/libherwig59.a
-debian/tmp/usr/lib/libherwig59.so
+debian/tmp/usr/lib/*/libherwig59.a
+debian/tmp/usr/lib/*/libherwig59.so
 debian/tmp/usr/include/herwig59/
 debian/tmp/usr/include/herwig
diff --git a/debian/dh/libherwig59-2-gfortran.install b/debian/dh/libherwig59-2-gfortran.install
index 20e899c..d5488e8 100644
--- a/debian/dh/libherwig59-2-gfortran.install
+++ b/debian/dh/libherwig59-2-gfortran.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/libherwig59.so.2_gfortran.2006
-debian/tmp/usr/lib/libherwig59.so.2_gfortran
+debian/tmp/usr/lib/*/libherwig59.so.2_gfortran.2006
+debian/tmp/usr/lib/*/libherwig59.so.2_gfortran
diff --git a/debian/dh/libisajet758-3-dev.dirs b/debian/dh/libisajet758-3-dev.dirs
deleted file mode 100644
index 4418816..0000000
--- a/debian/dh/libisajet758-3-dev.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib
-usr/include
diff --git a/debian/dh/libisajet758-3-dev.install b/debian/dh/libisajet758-3-dev.install
index 0db100b..eb11686 100644
--- a/debian/dh/libisajet758-3-dev.install
+++ b/debian/dh/libisajet758-3-dev.install
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/libisajet758.a
-debian/tmp/usr/lib/libisajet758.so
+debian/tmp/usr/lib/*/libisajet758.a
+debian/tmp/usr/lib/*/libisajet758.so
 debian/tmp/usr/include/isajet758/
 debian/tmp/usr/include/isajet
diff --git a/debian/dh/libisajet758-3-gfortran.install b/debian/dh/libisajet758-3-gfortran.install
index b9f3e20..58b13f4 100644
--- a/debian/dh/libisajet758-3-gfortran.install
+++ b/debian/dh/libisajet758-3-gfortran.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/libisajet758.so.3_gfortran.2006
-debian/tmp/usr/lib/libisajet758.so.3_gfortran
+debian/tmp/usr/lib/*/libisajet758.so.3_gfortran.2006
+debian/tmp/usr/lib/*/libisajet758.so.3_gfortran
diff --git a/debian/dh/libpdflib804-2-dev.dirs b/debian/dh/libpdflib804-2-dev.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/dh/libpdflib804-2-dev.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/dh/libpdflib804-2-dev.install b/debian/dh/libpdflib804-2-dev.install
index 8f02ebb..7aa3d99 100644
--- a/debian/dh/libpdflib804-2-dev.install
+++ b/debian/dh/libpdflib804-2-dev.install
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/libpdflib804.a
-debian/tmp/usr/lib/libpdflib804.so
+debian/tmp/usr/lib/*/libpdflib804.a
+debian/tmp/usr/lib/*/libpdflib804.so
 debian/tmp/usr/include/pdf804/
 debian/tmp/usr/include/pdf
diff --git a/debian/dh/libpdflib804-2-gfortran.install b/debian/dh/libpdflib804-2-gfortran.install
index 16b1a95..706e9f2 100644
--- a/debian/dh/libpdflib804-2-gfortran.install
+++ b/debian/dh/libpdflib804-2-gfortran.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/libpdflib804.so.2_gfortran.2006
-debian/tmp/usr/lib/libpdflib804.so.2_gfortran
+debian/tmp/usr/lib/*/libpdflib804.so.2_gfortran.2006
+debian/tmp/usr/lib/*/libpdflib804.so.2_gfortran
diff --git a/debian/dh/libphotos202-1-gfortran.install b/debian/dh/libphotos202-1-gfortran.install
index edae9db..bed10d5 100644
--- a/debian/dh/libphotos202-1-gfortran.install
+++ b/debian/dh/libphotos202-1-gfortran.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/libphotos202.so.1_gfortran.2006
-debian/tmp/usr/lib/libphotos202.so.1_gfortran
+debian/tmp/usr/lib/*/libphotos202.so.1_gfortran.2006
+debian/tmp/usr/lib/*/libphotos202.so.1_gfortran
diff --git a/debian/dh/libphotos202-dev.dirs b/debian/dh/libphotos202-dev.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/dh/libphotos202-dev.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/dh/libphotos202-dev.install b/debian/dh/libphotos202-dev.install
index 7d941c2..b5cf9f4 100644
--- a/debian/dh/libphotos202-dev.install
+++ b/debian/dh/libphotos202-dev.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/libphotos202.a
-debian/tmp/usr/lib/libphotos202.so
+debian/tmp/usr/lib/*/libphotos202.a
+debian/tmp/usr/lib/*/libphotos202.so
diff --git a/debian/dh/libphtools2-dev.dirs b/debian/dh/libphtools2-dev.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/dh/libphtools2-dev.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/dh/libphtools2-dev.install b/debian/dh/libphtools2-dev.install
index 2a9f344..9526ba2 100644
--- a/debian/dh/libphtools2-dev.install
+++ b/debian/dh/libphtools2-dev.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/libphtools.a
-debian/tmp/usr/lib/libphtools.so
+debian/tmp/usr/lib/*/libphtools.a
+debian/tmp/usr/lib/*/libphtools.so
diff --git a/debian/dh/libphtools2-gfortran.install b/debian/dh/libphtools2-gfortran.install
index b78287c..8653d27 100644
--- a/debian/dh/libphtools2-gfortran.install
+++ b/debian/dh/libphtools2-gfortran.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/libphtools.so.2_gfortran.2006
-debian/tmp/usr/lib/libphtools.so.2_gfortran
+debian/tmp/usr/lib/*/libphtools.so.2_gfortran.2006
+debian/tmp/usr/lib/*/libphtools.so.2_gfortran
diff --git a/debian/dh/montecarlo-base.dirs b/debian/dh/montecarlo-base.dirs
index 49c237f..6ce9db3 100644
--- a/debian/dh/montecarlo-base.dirs
+++ b/debian/dh/montecarlo-base.dirs
@@ -1,2 +1 @@
-usr/include
 usr/include/cfortran

-- 
mclibs: CERNLIB Monte Carlo libraries

More information about the debian-science-commits mailing list