[libdap] 14/48: First cut at multiarch
Alastair McKinstry
mckinstry at moszumanska.debian.org
Sun Jul 5 10:17:08 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to tag unstable/3.12.0-1
in repository libdap.
commit d78fa29934f8d94487ae2f1e0aa29717c38d752a
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Tue Sep 13 18:47:42 2011 +0100
First cut at multiarch
---
debian/changelog | 3 ++-
debian/compat | 2 +-
debian/control | 8 ++++++++
debian/libdap-dev.install | 6 +++---
debian/libdap-dev.links | 3 ---
debian/libdap11.install | 2 +-
debian/libdap11.links | 1 -
debian/libdapclient3.install | 2 +-
debian/libdapclient3.links | 1 -
debian/libdapserver7.install | 2 +-
debian/libdapserver7.links | 1 -
debian/rules | 17 +++++++++++++++--
12 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8234418..f532950 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ libdap (3.11.1-8) unstable; urgency=low
* Remove unnecessary ${shlibs:Depends} from -dev package.
* Add -Wl,--as-needed to remove unneeded dependencies
+ * Multi-Arch enabled.
- -- Alastair McKinstry <mckinstry at debian.org> Tue, 13 Sep 2011 16:39:26 +0100
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 13 Sep 2011 18:47:11 +0100
libdap (3.11.1-7) unstable; urgency=low
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 03b949e..9cdfb9d 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,8 @@ Replaces: libdap10
Conflicts: libdap10
Breaks: libdap10
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Open-source Project for a Network Data Access Protocol library
OPeNDAP provides software that allows you to access data over the internet,
@@ -36,6 +38,8 @@ Section: libs
Replaces: libdap10
Breaks: libdap10
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: libdap11 ( = ${binary:Version} ), ${misc:Depends}, ${shlibs:Depends}
Description: Client library for the Network Data Access Protocol
OPeNDAP provides software that allows you to access data over the internet,
@@ -51,6 +55,8 @@ Section: libs
Breaks: libdap10
Replaces: libdap10
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: libdap11 ( = ${binary:Version} ), ${misc:Depends}, ${shlibs:Depends}
Description: Server library for the Network Data Access Protocol
OPeNDAP provides software that allows you to access data over the internet,
@@ -64,6 +70,7 @@ Description: Server library for the Network Data Access Protocol
Package: libdap-bin
Architecture: any
+Multi-Arch: foreign
Depends: libdapclient3 ( = ${binary:Version} ), ${misc:Depends}, ${shlibs:Depends}
Description: Binaries for the libdap Data Access Protocol library
OPeNDAP provides software that allows you to access data over the internet,
@@ -78,6 +85,7 @@ Package: libdap-dev
Section: libdevel
Architecture: any
Conflicts: libdnet-dev
+Multi-Arch: same
Depends: libdap11 ( = ${binary:Version} ), libdapserver7 (=${binary:Version}), libdapclient3 (=${binary:Version}) , ${misc:Depends}, libxml2-dev, libcurl4-gnutls-dev, uuid-dev
Recommends: pkg-config
Description: Development files (headers and static libraries) for libdap
diff --git a/debian/libdap-dev.install b/debian/libdap-dev.install
index a4918fd..41c4344 100644
--- a/debian/libdap-dev.install
+++ b/debian/libdap-dev.install
@@ -1,6 +1,6 @@
-usr/lib/pkgconfig/*.pc
-usr/lib/*.so
-usr/lib/*.a
+usr/lib/*/pkgconfig/*.pc
+usr/lib/*/*.so
+usr/lib/*/*.a
usr/share/aclocal/libdap.m4
usr/include/libdap/*
usr/bin/dap-config
diff --git a/debian/libdap-dev.links b/debian/libdap-dev.links
deleted file mode 100644
index 190785f..0000000
--- a/debian/libdap-dev.links
+++ /dev/null
@@ -1,3 +0,0 @@
-/usr/lib/libdap.so.11.3.0 /usr/lib/libdap.so
-/usr/lib/libdapclient.so.3.1.0 /usr/lib/libdapclient.so
-/usr/lib/libdapserver.so.7.2.0 /usr/lib/libdapserver.so
diff --git a/debian/libdap11.install b/debian/libdap11.install
index bb17c30..3961030 100644
--- a/debian/libdap11.install
+++ b/debian/libdap11.install
@@ -1 +1 @@
-usr/lib/libdap.so.11.3.0
+usr/lib/*/libdap.so.11.3.0
diff --git a/debian/libdap11.links b/debian/libdap11.links
deleted file mode 100644
index 3ef9de5..0000000
--- a/debian/libdap11.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/libdap.so.11.3.0 /usr/lib/libdap.so.11
diff --git a/debian/libdapclient3.install b/debian/libdapclient3.install
index f5b8777..ee5e7fd 100644
--- a/debian/libdapclient3.install
+++ b/debian/libdapclient3.install
@@ -1 +1 @@
-usr/lib/libdapclient.so.3.1.0
+usr/lib/*/libdapclient.so.3.1.0
diff --git a/debian/libdapclient3.links b/debian/libdapclient3.links
deleted file mode 100644
index 5198f2d..0000000
--- a/debian/libdapclient3.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/libdapclient.so.3.1.0 /usr/lib/libdapclient.so.3
diff --git a/debian/libdapserver7.install b/debian/libdapserver7.install
index db703e0..684c9ae 100644
--- a/debian/libdapserver7.install
+++ b/debian/libdapserver7.install
@@ -1 +1 @@
-usr/lib/libdapserver.so.7.2.0
+usr/lib/*/libdapserver.so.7.2.0
diff --git a/debian/libdapserver7.links b/debian/libdapserver7.links
deleted file mode 100644
index a9b6327..0000000
--- a/debian/libdapserver7.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/libdapserver.so.7.2.0 /usr/lib/libdapserver.so.7
diff --git a/debian/rules b/debian/rules
index f3ddd19..2f44d04 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,14 @@
#!/usr/bin/make -f
-DEB_CONFIGURE_EXTRA_FLAGS := --with-gnu-ld
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+LIBDIR:=/usr/lib/$(DEB_HOST_MULTIARCH)
# The magic debhelper rule:
%:
dh $@
+
override_dh_auto_configure:
# remove out of date files
rm -f conf/config.guess conf/config.sub
@@ -13,12 +16,22 @@ override_dh_auto_configure:
libtoolize -c -f
autoreconf -fi
(cd conf && patch < ../debian/as-needed.patch)
- LDFLAGS=" -Wl,--as-needed" dh_auto_configure
+ LDFLAGS=" -Wl,--as-needed" dh_auto_configure -- with-gnu-ld
override_dh_auto_build:
dh_auto_build
$(MAKE) docs
+override_dh_auto_install:
+ dh_auto_install
+ # dh_links needed for multi-arch
+ dh_link -p libdap11 $(LIBDIR)/libdap.so.11.3.0 $(LIBDIR)/libdap.so.11
+ dh_link -p libdapclient3 $(LIBDIR)/libdapclient.so.3.1.0 $(LIBDIR)/libdapclient.so.3
+ dh_link -p libdapserver7 $(LIBDIR)/libdapserver.so.7.2.0 $(LIBDIR)/libdapserver.so.7
+ dh_link -p libdap-dev $(LIBDIR)/libdap.so.11.3.0 $(LIBDIR)/libdap.so
+ dh_link -p libdap-dev $(LIBDIR)/libdapclient.so.3.1.0 $(LIBDIR)/libdapclient.so
+ dh_link -p libdap-dev $(LIBDIR)/libdapserver.so.7.2.0 $(LIBDIR)/libdapserver.so
+
clean:
dh clean
rm -rf docs
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libdap.git
More information about the debian-science-commits
mailing list