diff -Nru globus-gsi-sysconfig-5.3/debian/changelog globus-gsi-sysconfig-5.3/debian/changelog --- globus-gsi-sysconfig-5.3/debian/changelog 2013-05-26 11:09:08.000000000 +0000 +++ globus-gsi-sysconfig-5.3/debian/changelog 2013-11-10 07:44:04.000000000 +0000 @@ -1,3 +1,10 @@ +globus-gsi-sysconfig (5.3-3) unstable; urgency=low + + * Implement Multi-Arch support + * Rename dbg package + + -- Mattias Ellert Sun, 10 Nov 2013 08:43:12 +0100 + globus-gsi-sysconfig (5.3-2) unstable; urgency=low * Add arm64 to the list of 64 bit architectures diff -Nru globus-gsi-sysconfig-5.3/debian/control globus-gsi-sysconfig-5.3/debian/control --- globus-gsi-sysconfig-5.3/debian/control 2013-05-22 04:52:02.000000000 +0000 +++ globus-gsi-sysconfig-5.3/debian/control 2013-11-12 19:58:25.000000000 +0000 @@ -1,7 +1,7 @@ Source: globus-gsi-sysconfig Priority: optional Maintainer: Mattias Ellert -Build-Depends: debhelper (>= 5), autotools-dev, grid-packaging-tools (>= 3.4), globus-core (>= 8), libglobus-common-dev (>= 14), libglobus-openssl-module-dev (>= 3), libglobus-gsi-openssl-error-dev (>= 2), libssl-dev, doxygen-latex, texlive-fonts-recommended, graphviz, ghostscript +Build-Depends: debhelper (>= 5), autotools-dev, grid-packaging-tools (>= 3.4), globus-core (>= 8.16), libglobus-common-dev (>= 14.10), libglobus-openssl-module-dev (>= 3.3), libglobus-gsi-openssl-error-dev (>= 2.1-4~), libssl-dev, doxygen-latex, texlive-fonts-recommended, graphviz, ghostscript Standards-Version: 3.9.4 Section: net Vcs-Browser: http://svn.nordugrid.org/trac/packaging/browser/debian/globus-gsi-sysconfig @@ -11,6 +11,8 @@ Package: libglobus-gsi-sysconfig1 Section: libs Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: Globus Toolkit - Globus GSI System Config Library The Globus Toolkit is an open source software toolkit used for @@ -25,7 +27,8 @@ Package: libglobus-gsi-sysconfig-dev Section: libdevel Architecture: any -Depends: libglobus-gsi-sysconfig1 (= ${binary:Version}), ${misc:Depends}, libglobus-common-dev (>= 14), libglobus-openssl-module-dev (>= 3), libglobus-gsi-openssl-error-dev (>= 2), globus-core (>= 8), libssl-dev +Multi-Arch: same +Depends: libglobus-gsi-sysconfig1 (= ${binary:Version}), ${misc:Depends}, globus-core (>= 8), libglobus-common-dev (>= 14), libglobus-openssl-module-dev (>= 3), libglobus-gsi-openssl-error-dev (>= 2), libssl-dev Recommends: libglobus-gsi-sysconfig-doc (= ${source:Version}) Description: Globus Toolkit - Globus GSI System Config Library Development Files The Globus Toolkit is an open source software toolkit used for @@ -40,6 +43,7 @@ Package: libglobus-gsi-sysconfig-doc Section: doc Architecture: all +Multi-Arch: foreign Depends: libglobus-gsi-sysconfig-dev (>= ${source:Version}), ${misc:Depends}, ${js:Depends} Description: Globus Toolkit - Globus GSI System Config Library Documentation Files The Globus Toolkit is an open source software toolkit used for @@ -51,10 +55,14 @@ The libglobus-gsi-sysconfig-doc package contains: Globus GSI System Config Library Documentation Files -Package: globus-gsi-sysconfig-dbg +Package: libglobus-gsi-sysconfig-dbg Section: debug Priority: extra Architecture: any +Multi-Arch: same +Provides: globus-gsi-sysconfig-dbg +Replaces: globus-gsi-sysconfig-dbg (<< 5.3-3~) +Conflicts: globus-gsi-sysconfig-dbg (<< 5.3-3~) Depends: libglobus-gsi-sysconfig1 (= ${binary:Version}), ${misc:Depends} Description: Globus Toolkit - Globus GSI System Config Library Debug Symbols The Globus Toolkit is an open source software toolkit used for @@ -63,5 +71,5 @@ of projects and companies are using the Globus Toolkit to unlock the potential of grids for their cause. . - The globus-gsi-sysconfig-dbg package contains: + The libglobus-gsi-sysconfig-dbg package contains: Globus GSI System Config Library Debug Symbols diff -Nru globus-gsi-sysconfig-5.3/debian/copyright globus-gsi-sysconfig-5.3/debian/copyright --- globus-gsi-sysconfig-5.3/debian/copyright 2012-07-23 07:57:35.000000000 +0000 +++ globus-gsi-sysconfig-5.3/debian/copyright 2013-11-10 07:19:51.000000000 +0000 @@ -5,13 +5,13 @@ Files: * Copyright: - 1999-2012 University of Chicago + 1999-2013 University of Chicago License: Apache-2.0 Files: debian/* Copyright: - 2008-2012 Mattias Ellert - 2010-2012 Initiative for Globus in Europe (IGE), http://www.ige-project.eu/ + 2008-2013 Mattias Ellert + 2010-2013 Initiative for Globus in Europe (IGE), http://www.ige-project.eu/ License: Apache-2.0 License: Apache-2.0 diff -Nru globus-gsi-sysconfig-5.3/debian/rules globus-gsi-sysconfig-5.3/debian/rules --- globus-gsi-sysconfig-5.3/debian/rules 2013-05-22 04:45:44.000000000 +0000 +++ globus-gsi-sysconfig-5.3/debian/rules 2013-11-10 07:54:40.000000000 +0000 @@ -11,17 +11,18 @@ _prefix = /usr _bindir = $(_prefix)/bin _sbindir = $(_prefix)/sbin -_libdir = $(_prefix)/lib +_libdir = $(_prefix)/lib/$(DEB_HOST_MULTIARCH) _datadir = $(_prefix)/share _mandir = $(_datadir)/man _docdir = $(_datadir)/doc/lib$(name)-dev -DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_ARCH_BITS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -ifneq (,$(filter $(DEB_HOST_ARCH), alpha amd64 arm64 ia64 kfreebsd-amd64 ppc64 s390x sparc64)) -flavor = gcc64 +ifeq ($(DEB_HOST_ARCH_BITS), 64) +flavor = gcc64-$(DEB_HOST_MULTIARCH) else -flavor = gcc32 +flavor = gcc32-$(DEB_HOST_MULTIARCH) endif configure: configure-stamp @@ -29,10 +30,10 @@ configure-stamp: dh_testdir - /usr/share/globus/globus-bootstrap.sh - dh_autotools-dev_updateconfig + /usr/share/globus/globus-bootstrap.sh + ./configure \ --disable-static \ --with-flavor=$(flavor) \ @@ -68,10 +69,11 @@ # Remove autogenerated files rm -f aclocal.m4 + rm -f compile rm -f configure - rm -f config.guess - rm -f config.sub + rm -f install-sh rm -f ltmain.sh + rm -f missing rm -f mkinstalldirs rm -f doxygen/Doxyfile* @@ -143,13 +145,13 @@ dh_install -a --fail-missing dh_installman -a dh_link -a - dh_strip -a --dbg-package=$(name)-dbg + dh_strip -a --dbg-package=lib$(name)-dbg dh_compress -a dh_fixperms -a dh_perl -a dh_makeshlibs -a dh_installdeb -a - dh_shlibdeps -a -l debian/lib$(name)$(soname)/usr/lib + dh_shlibdeps -a dh_gencontrol -a dh_md5sums -a dh_builddeb -a