[libdap] 01/01: Fix links in debian/rules

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/experimental
in repository libdap.

commit 062a76daf485dc35585526e97b824989988cd0dc
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Jul 16 20:42:03 2015 +0100

    Fix links in debian/rules
---
 debian/changelog |  3 ++-
 debian/control   | 18 ++++++++----------
 debian/rules     |  6 +++---
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a444f11..f6adb91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ libdap (3.14.0-3~exp2) experimental; urgency=medium
   * Add XML2_LIBS to unit-tests/Makefile.am to build tests
   * Fix copyrights, move to DEP-5. Closes: #792536.
   * Add Breaks/Replaces for transition. Closes: #79568.
+  * Fix links in debian/rules
 
- -- Alastair McKinstry <mckinstry at debian.org>  Thu, 16 Jul 2015 05:36:31 +0100
+ -- Alastair McKinstry <mckinstry at debian.org>  Fri, 24 Jul 2015 07:42:46 +0100
 
 libdap (3.14.0-3~exp1) experimental; urgency=medium
 
diff --git a/debian/control b/debian/control
index fb884e0..1490bfd 100644
--- a/debian/control
+++ b/debian/control
@@ -18,8 +18,8 @@ Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libdap17v5
-Replaces: libdap17v5
+Breaks: libdap17
+Replaces: libdap17
 Description: Open-source Project for a Network Data Access Protocol library
  OPeNDAP provides software that allows you to access data over the internet,
  from programs that weren't originally designed for that purpose, as well 
@@ -41,9 +41,9 @@ Section: libs
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends:  libdap17 ( = ${binary:Version} ), ${misc:Depends}, ${shlibs:Depends}
-Breaks: libdapclient6v5
-Replaces: libdapclient6v5
+Depends:  libdap17v5 ( = ${binary:Version} ), ${misc:Depends}, ${shlibs:Depends}
+Breaks: libdapclient6
+Replaces: libdapclient6
 Description: Client library for the Network Data Access Protocol
  OPeNDAP provides software that allows you to access data over the internet,
  from programs that weren't originally designed for that purpose, as well
@@ -55,12 +55,10 @@ Description: Client library for the Network Data Access Protocol
 
 Package: libdapserver7v5
 Section: libs
-Breaks: libdap10
-Replaces: libdap10
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends:  libdap17 ( = ${binary:Version} ), ${misc:Depends}, ${shlibs:Depends}
+Depends:  libdap17v5 ( = ${binary:Version} ), ${misc:Depends}, ${shlibs:Depends}
 Breaks: libdapserver7
 Replaces: libdapserver7
 Description: Server library for the Network Data Access Protocol
@@ -76,7 +74,7 @@ Description: Server library for the Network Data Access Protocol
 Package: libdap-bin
 Architecture: any
 Multi-Arch: foreign
-Depends: libdapclient6 ( = ${binary:Version} ),  ${misc:Depends}, ${shlibs:Depends}
+Depends: libdapclient6v5 ( = ${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,
  from programs that weren't originally designed for that purpose, as well
@@ -90,7 +88,7 @@ Package: libdap-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libdap17 ( = ${binary:Version} ), libdapserver7 (=${binary:Version}), libdapclient6 (=${binary:Version}) , ${misc:Depends}, libxml2-dev, libcurl4-gnutls-dev | libcurl-dev, uuid-dev, pkg-config
+Depends: libdap17v5 ( = ${binary:Version} ), libdapserver7v5 (=${binary:Version}), libdapclient6v5 (=${binary:Version}) , ${misc:Depends}, libxml2-dev, libcurl4-gnutls-dev | libcurl-dev, uuid-dev, pkg-config
 Description: Development files (headers and static libraries) for libdap
  OPeNDAP provides software that allows you to access data over the internet,
  from programs that weren't originally designed for that purpose, as well
diff --git a/debian/rules b/debian/rules
index f9326ec..0b2238d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,9 +37,9 @@ override_dh_auto_build:
 override_dh_auto_install:
 	dh_auto_install
 	# dh_links needed for multi-arch
-	dh_link -p libdap17       $(LIBDIR)/libdap.so.17.1.0       $(LIBDIR)/libdap.so.17
-	dh_link -p libdapclient6  $(LIBDIR)/libdapclient.so.6.1.0  $(LIBDIR)/libdapclient.so.6
-	dh_link -p libdapserver7  $(LIBDIR)/libdapserver.so.7.6.0  $(LIBDIR)/libdapserver.so.7
+	dh_link -p libdap17v5       $(LIBDIR)/libdap.so.17.1.0       $(LIBDIR)/libdap.so.17
+	dh_link -p libdapclient6v5  $(LIBDIR)/libdapclient.so.6.1.0  $(LIBDIR)/libdapclient.so.6
+	dh_link -p libdapserver7v5  $(LIBDIR)/libdapserver.so.7.6.0  $(LIBDIR)/libdapserver.so.7
 	dh_link -p libdap-dev     $(LIBDIR)/libdap.so.17.1.0       $(LIBDIR)/libdap.so
 	dh_link -p libdap-dev     $(LIBDIR)/libdapclient.so.6.1.0  $(LIBDIR)/libdapclient.so
 	dh_link -p libdap-dev     $(LIBDIR)/libdapserver.so.7.6.0  $(LIBDIR)/libdapserver.so

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