[magics] 18/31: Add libmagics++-metview-dev

[Alastair McKinstry]

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

mckinstry pushed a commit to branch master
in repository magics.

commit 405cea13a05749c33cf588923bcfcd033826dc83
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Dec 13 03:23:14 2013 +0000

    Add libmagics++-metview-dev
---
 debian/changelog                       |  1 +
 debian/control                         | 18 +++++++++++++-----
 debian/libmagics++-metview-dev.install |  1 +
 debian/libmagplus3.install             |  1 +
 debian/rules                           |  2 ++
 5 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ae34620..5a0aaaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ magics++ (2.18.15-4) unstable; urgency=medium
 
   * Fix hardening rules: disable PIE as it breaks python shlibs.
   * Add --enable-metview to support MetView.
+  * Add libmagics++-metview-dev to provide libs needed by MetView only.
 
  -- Alastair McKinstry <mckinstry at debian.org>  Thu, 12 Dec 2013 11:57:36 +0000
 
diff --git a/debian/control b/debian/control
index bb11f06..bc62199 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,6 @@ Package: libmagplus3
 Section: libs
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
 Depends: libmagics++-data,${misc:Depends}, ${shlibs:Depends}, ttf-dejavu-core, ttf-dejavu-extra, ghostscript
 Description: ECMWF meteorological plotting software library
  Magics++ is the latest generation of the ECMWF's Meteorological plotting
@@ -69,8 +68,6 @@ Description: python support for Magics++
  Magics++ is the latest generation of the ECMWF's Meteorological plotting
  software MAGICS. Although completely redesigned in C++, it is intended to be
  as backwards-compatible as possible with the Fortran interface.
- Besides its programming interfaces (Fortran and C), Magics++ offers MagML,
- a plot description language based on XML aimed at automatic web production.
  .
  This package provides python support for the magics++ library.
 
@@ -82,7 +79,18 @@ Description: Data files needed for magics++ library
  Magics++ is the latest generation of the ECMWF's Meteorological plotting
  software MAGICS. Although completely redesigned in C++, it is intended to be
  as backwards-compatible as possible with the Fortran interface.
- Besides its programming interfaces (Fortran and C), Magics++ offers MagML,
- a plot description language based on XML aimed at automatic web production.
  .
  This package contains data expected by the magics++ library.
+
+
+Package: libmagics++-metview-dev
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends}, libmagplus3 ( = ${binary:Version} )
+Description: Libraries needed for building MetView
+ Magics++ is the latest generation of the ECMWF's Meteorological plotting
+ software MAGICS. Although completely redesigned in C++, it is intended to be
+ as backwards-compatible as possible with the Fortran interface.
+ .
+ This package includes the header files and static libraries needed to build
+ metview against magics++.
diff --git a/debian/libmagics++-metview-dev.install b/debian/libmagics++-metview-dev.install
new file mode 100644
index 0000000..6ccec91
--- /dev/null
+++ b/debian/libmagics++-metview-dev.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/*/libMagWrapper.a
diff --git a/debian/libmagplus3.install b/debian/libmagplus3.install
index a9811bf..61ef498 100644
--- a/debian/libmagplus3.install
+++ b/debian/libmagplus3.install
@@ -1 +1,2 @@
 debian/tmp/usr/lib/*/libMagPlus.so.3.0.0 
+debian/tmp/usr/lib/*/libMagPlusQt.so.3.0.0
diff --git a/debian/rules b/debian/rules
index 23d973c..dcd86d2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -88,7 +88,9 @@ override_dh_auto_install:
 	rm -rf debian/libmagics++-data/usr/share/magics/ttf
 	find debian -name '*.so' -exec chrpath -d {} \;
 	# Deal with links for Multi-Arch:
+	dh_link -p libmagics++-metview-dev /usr/lib/$(DEB_HOST_MULTIARCH)/libMagPlusQt.so.3.0.0    /usr/lib/$(DEB_HOST_MULTIARCH)/libMagPlusQt.so
 	dh_link -p libmagics++-dev /usr/lib/$(DEB_HOST_MULTIARCH)/libMagPlus.so.3.0.0    /usr/lib/$(DEB_HOST_MULTIARCH)/libMagPlus.so
+	dh_link -p libmagplus3     /usr/lib/$(DEB_HOST_MULTIARCH)/libMagPlusQt.so.3.0.0    /usr/lib/$(DEB_HOST_MULTIARCH)/libMagPlusQt.so.3
 	dh_link -p libmagplus3     /usr/lib/$(DEB_HOST_MULTIARCH)/libMagPlus.so.3.0.0    /usr/lib/$(DEB_HOST_MULTIARCH)/libMagPlus.so.3
 	mkdir -p debian/libmagics++-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
 	find debian -name '*.la' -delete 

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