[cernlib] 01/01: cernlib-base-dev: depends on dpkg-dev to fix Multiarch support.

[Lifeng Sun]

This is an automated email from the git hooks/post-receive script.

lifengsun-guest pushed a commit to branch master
in repository cernlib.

commit 9d92f73176691481811d5ee2b512b3fa13aeea8c
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Sat Aug 24 17:16:07 2013 +0800

    cernlib-base-dev: depends on dpkg-dev to fix Multiarch support.
---
 debian/add-ons/bin/cernlib.in             |    2 +-
 debian/changelog                          |    6 ++++++
 debian/control                            |    2 +-
 debian/control.d/cernlib-base-dev.control |    2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/add-ons/bin/cernlib.in b/debian/add-ons/bin/cernlib.in
index c682659..76c4720 100755
--- a/debian/add-ons/bin/cernlib.in
+++ b/debian/add-ons/bin/cernlib.in
@@ -257,7 +257,7 @@ find_library() {
 	# This behavior is currently commented out since it causes breakage
 	# when compiling Debianized out-of-tree CERNLIB modules. :-(
 
-	local dirlist="/lib /usr/lib /usr/X11R6/lib /lib64 /usr/lib64 /usr/X11R6/lib64 @LIBPREFIX@"
+	local dirlist="/lib /usr/lib /usr/X11R6/lib /lib64 /usr/lib64 /usr/X11R6/lib64 /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`"
 	if [ ! "$CERN" = "@PREFIX@" ] ; then
 		#if [ "$2" = cern ] ; then
 		#	dirlist="$CERN_ROOT/shlib $CERN_ROOT/lib"
diff --git a/debian/changelog b/debian/changelog
index e9f7b5c..6811b18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cernlib (20061220+dfsg3-4) unstable; urgency=low
+
+  * cernlib-base-dev: depends on dpkg-dev to fix Multiarch support.
+
+ -- Lifeng Sun <lifongsun at gmail.com>  Sat, 24 Aug 2013 17:11:08 +0800
+
 cernlib (20061220+dfsg3-3) unstable; urgency=low
 
   * Support multiarch.
diff --git a/debian/control b/debian/control
index 35402cc..38cee80 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/cernlib
 Package: cernlib-base-dev
 Architecture: all
 Section: devel
-Depends: cernlib-base (= ${source:Version}), ${misc:Depends}
+Depends: dpkg-dev, cernlib-base (= ${source:Version}), ${misc:Depends}
 Replaces: cernlib-base (<< 2005.dfsg-6), libcojets1-dev (<= 2004.11.04.dfsg-0sarge1), libgeant1-dev (<= 2004.11.04.dfsg-0sarge1), libherwig59-dev (<= 2004.11.04.dfsg-0sarge1), libisajet758-dev (<= 2004.11.04.dfsg-0sarge1), libkuipx11-1-dev (<= 2004.11.04.dfsg-0sarge1), libmathlib1-dev (<= 2004.11.04.dfsg-0sarge1), libpaw1-dev (<= 2004.11.04.dfsg-0sarge1), libpdflib804-dev (<= 2004.11.04.dfsg-0sarge1), libphtools1-dev (<= 2004.11.04.dfsg-0sarge1)
 Breaks: libcojets1-dev (<= 2004.11.04.dfsg-0sarge1), libgeant1-dev (<= 2004.11.04.dfsg-0sarge1), libherwig59-dev (<= 2004.11.04.dfsg-0sarge1), libisajet758-dev (<= 2004.11.04.dfsg-0sarge1), libkuipx11-1-dev (<= 2004.11.04.dfsg-0sarge1), libmathlib1-dev (<= 2004.11.04.dfsg-0sarge1), libpaw1-dev (<= 2004.11.04.dfsg-0sarge1), libpdflib804-dev (<= 2004.11.04.dfsg-0sarge1), libphtools1-dev (<= 2004.11.04.dfsg-0sarge1)
 Conflicts: blas2-dev, lapack2-dev
diff --git a/debian/control.d/cernlib-base-dev.control b/debian/control.d/cernlib-base-dev.control
index da78242..1002707 100644
--- a/debian/control.d/cernlib-base-dev.control
+++ b/debian/control.d/cernlib-base-dev.control
@@ -1,7 +1,7 @@
 Package: cernlib-base-dev
 Architecture: all
 Section: devel
-Depends: cernlib-base (= ${source:Version}), ${misc:Depends}
+Depends: dpkg-dev, cernlib-base (= ${source:Version}), ${misc:Depends}
 Replaces: cernlib-base (<< 2005.dfsg-6), libcojets1-dev (<= 2004.11.04.dfsg-0sarge1), libgeant1-dev (<= 2004.11.04.dfsg-0sarge1), libherwig59-dev (<= 2004.11.04.dfsg-0sarge1), libisajet758-dev (<= 2004.11.04.dfsg-0sarge1), libkuipx11-1-dev (<= 2004.11.04.dfsg-0sarge1), libmathlib1-dev (<= 2004.11.04.dfsg-0sarge1), libpaw1-dev (<= 2004.11.04.dfsg-0sarge1), libpdflib804-dev (<= 2004.11.04.dfsg-0sarge1), libphtools1-dev (<= 2004.11.04.dfsg-0sarge1)
 Breaks: libcojets1-dev (<= 2004.11.04.dfsg-0sarge1), libgeant1-dev (<= 2004.11.04.dfsg-0sarge1), libherwig59-dev (<= 2004.11.04.dfsg-0sarge1), libisajet758-dev (<= 2004.11.04.dfsg-0sarge1), libkuipx11-1-dev (<= 2004.11.04.dfsg-0sarge1), libmathlib1-dev (<= 2004.11.04.dfsg-0sarge1), libpaw1-dev (<= 2004.11.04.dfsg-0sarge1), libpdflib804-dev (<= 2004.11.04.dfsg-0sarge1), libphtools1-dev (<= 2004.11.04.dfsg-0sarge1)
 Conflicts: blas2-dev, lapack2-dev

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cernlib.git