[med-svn] [mia] 03/08: move to new upstream version 2.2

Gert Wollny gert-guest at moszumanska.debian.org
Fri Sep 5 09:59:04 UTC 2014


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

gert-guest pushed a commit to branch master
in repository mia.

commit c3e75317885e4998568bce42f6c94ac4978aa0bf
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Wed Sep 3 13:53:06 2014 +0200

    move to new upstream version 2.2
---
 debian/changelog                                   | 11 ++++
 debian/control                                     | 61 ++++++++++++----------
 debian/libmia-2.0-8.install                        |  2 -
 debian/libmia-2.0-8.lintian-overrides              | 10 ----
 debian/libmia-2.0-doc.install                      |  2 -
 debian/libmia-2.2-0.install                        |  2 +
 debian/libmia-2.2-0.lintian-overrides              | 18 +++++++
 ...bmia-2.0-dev.install => libmia-2.2-dev.install} |  2 +-
 ...ia-2.0-doc.doc-base => libmia-2.2-doc.doc-base} |  4 +-
 debian/libmia-2.2-doc.install                      |  2 +
 debian/mia-tools-doc.doc-base                      |  4 +-
 debian/mia-tools-doc.install                       |  2 +-
 debian/rules                                       |  4 +-
 debian/run_strip                                   |  2 +-
 14 files changed, 75 insertions(+), 51 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c11d789..16d1a4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+mia (2.2.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+  * Change library and devel packages from 2.0 to 2.2 because of 
+    ABI and API changes
+  * Tighten dependency on BOOST packages
+  * Add dependency on libeigen3-dev, libhdf5-dev, and libnifti-dev
+  * Transition libvtk6-dev
+
+ -- Gert Wollny <gw.fossdev at gmail.com>  Tue, 02 Sep 2014 15:23:04 +0200
+
 mia (2.0.13-1) unstable; urgency=medium
 
   * New Upstream release 
diff --git a/debian/control b/debian/control
index 37f73d3..6373084 100644
--- a/debian/control
+++ b/debian/control
@@ -3,37 +3,44 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
 Uploaders: Gert Wollny <gw.fossdev at gmail.com>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 9.0.0),
-               cmake (>= 2.8.8),
-               libboost-all-dev (>= 1.46.1),
-               libxml++2.6-dev (>= 2.34.1),
+Build-Depends: cmake (>= 2.8.8),
+               debhelper (>= 9.0.0),
+               docbook-xsl,
+               doxygen,
+               libblas-dev,
+               libboost-filesystem-dev (>= 1.46.1),
+               libboost-regex-dev (>= 1.46.1),
+               libboost-serialization-dev (>= 1.46.1),
+               libboost-system-dev (>= 1.46.1),
+               libboost-test-dev (>= 1.46.1),
+               libdcmtk2-dev,
+               libfftw3-dev,
+               libgsl0-dev (>= 1.14),
+               libgts-dev,
+               libhdf5-dev, 
                libitpp-dev (>= 4.2),
-               libtbb-dev (>= 3.0),
+               libnifti-dev, 
+               libnlopt-dev (>= 2.3),
                libopenexr-dev (>= 1.6.1),
                libpng-dev,
-               libdcmtk2-dev (>= 3.6.0),
+               libtbb-dev (>= 3.0),
                libtiff-dev,
-               libnlopt-dev (>= 2.3),
-               libgsl0-dev (>= 1.14),
-               libblas-dev,
-               doxygen,
-               libfftw3-dev,
-               xsltproc,
-               docbook-xsl,
+               libvtk6-dev,
+               libvistaio-dev (>=1.2.12),
+               libxml++2.6-dev (>= 2.34.1),
                python-lxml,
-               libvtk5-dev,
-               libgts-dev,
-               libvistaio-dev (>=1.2.12)
+               xsltproc
 Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-med/mia.git
 Vcs-Git: git://anonscm.debian.org/debian-med/mia.git
 Homepage: http://mia.sourceforge.net
 
-Package: libmia-2.0-dev
+Package: libmia-2.2-dev
 Architecture: any
 Section: libdevel
-Depends: libmia-2.0-8 (= ${binary:Version}),
+Depends: libmia-2.2-0 (= ${binary:Version}),
          libxml++2.6-dev (>= 2.34.1),
+         libeigen3-dev, 
          libitpp-dev (>= 4.2),
          libtbb-dev,
          libgsl0-dev,
@@ -41,7 +48,7 @@ Depends: libmia-2.0-8 (= ${binary:Version}),
          libfftw3-dev,
          libblas-dev,
          ${misc:Depends}
-Recommends: libmia-2.0-doc
+Recommends: libmia-2.2-doc
 Description: library for 2D and 3D gray scale image processing, development files
  libmia comprises a set of libraries and plug-ins for general purpose 
  2D and 3D gray scale image processing and basic handling of triangular 
@@ -49,12 +56,12 @@ Description: library for 2D and 3D gray scale image processing, development file
  algorithms, that can be specialized by specifying the apropriate plug-ins. 
  This package provides the development files for the library.
 
-Package: libmia-2.0-doc
+Package: libmia-2.2-doc
 Architecture: all
 Section: doc
 Depends: ${misc:Depends},
          libjs-jquery
-Enhances: libmia-2.0-dev
+Enhances: libmia-2.2-dev
 Description: library for 2D and 3D gray scale image processing, documentation
  libmia comprises a set of libraries and plug-ins for general purpose 
  2D and 3D gray scale image processing and basic handling of triangular 
@@ -62,13 +69,11 @@ Description: library for 2D and 3D gray scale image processing, documentation
  algorithms, that can be specialized by specifying the apropriate plug-ins. 
  This package provides the Doxygen generated API reference. 
 
-Package: libmia-2.0-8
+Package: libmia-2.2-0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         libnlopt0 (>= 2.2.4),
-         libopenexr6 (>= 1.6.1)
+         ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
 Description: library for 2D and 3D gray scale image processing
  libmia comprises a set of libraries and plug-ins for general purpose 
@@ -76,11 +81,11 @@ Description: library for 2D and 3D gray scale image processing
  meshes. The libraries provide a basic infrastructure and  generic 
  algorithms, that can be specialized by specifying the apropriate plug-ins. 
 
-Package: libmia-2.0-8-dbg
+Package: libmia-2.2-0-dbg
 Architecture: any
 Section: debug
 Priority: extra
-Depends: libmia-2.0-8 (= ${binary:Version}),
+Depends: libmia-2.2-0 (= ${binary:Version}),
          ${misc:Depends}
 Description: Debug information for the MIA library 
  libmia comprises a set of libraries and plug.ins for general purpose 
@@ -92,7 +97,7 @@ Description: Debug information for the MIA library
 
 Package: mia-tools
 Architecture: any
-Depends: libmia-2.0-8 (= ${binary:Version}),
+Depends: libmia-2.2-0 (= ${binary:Version}),
          ${shlibs:Depends},
          ${misc:Depends}
 Recommends: mia-doc
diff --git a/debian/libmia-2.0-8.install b/debian/libmia-2.0-8.install
deleted file mode 100644
index d22e72d..0000000
--- a/debian/libmia-2.0-8.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/lib*.so.*
-usr/lib/*/mia-2.0/plugins/*
diff --git a/debian/libmia-2.0-8.lintian-overrides b/debian/libmia-2.0-8.lintian-overrides
deleted file mode 100644
index b43eb0e..0000000
--- a/debian/libmia-2.0-8.lintian-overrides
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-#The package provides multiple libraries, which means no unique soname can be given
-#
-libmia-2.0-8 binary: package-name-doesnt-match-sonames 
-
-#
-# The SOURCE_FORTIFY=2 flag is used, but in many cases the compiler is just good enough
-# to detect that fortification is not needed
-#
-libmia-2.0-8 binary: hardening-no-fortify-functions
diff --git a/debian/libmia-2.0-doc.install b/debian/libmia-2.0-doc.install
deleted file mode 100644
index 9e3bcdf..0000000
--- a/debian/libmia-2.0-doc.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/doc/mia-2.0/libdoc/*
-
diff --git a/debian/libmia-2.2-0.install b/debian/libmia-2.2-0.install
new file mode 100644
index 0000000..8f445d7
--- /dev/null
+++ b/debian/libmia-2.2-0.install
@@ -0,0 +1,2 @@
+usr/lib/*/lib*.so.*
+usr/lib/*/mia-2.2/plugins/*
diff --git a/debian/libmia-2.2-0.lintian-overrides b/debian/libmia-2.2-0.lintian-overrides
new file mode 100644
index 0000000..28b723b
--- /dev/null
+++ b/debian/libmia-2.2-0.lintian-overrides
@@ -0,0 +1,18 @@
+#
+#The package provides multiple libraries, which means no unique soname can be given
+#
+libmia-2.2-0 binary: package-name-doesnt-match-sonames 
+
+#
+# The SOURCE_FORTIFY=2 flag is used, but in many cases the compiler is just good enough
+# to detect that fortification is not needed
+#
+libmia-2.2-0 binary: hardening-no-fortify-functions
+
+#
+# Since the symbols will differ greatly between 32 bit and 64 bit builds a symbols file 
+# would have to be provided for each arch 
+#
+libmia-2.2-0 binary: no-symbols-control-file
+
+
diff --git a/debian/libmia-2.0-dev.install b/debian/libmia-2.2-dev.install
similarity index 65%
rename from debian/libmia-2.0-dev.install
rename to debian/libmia-2.2-dev.install
index 7aa69d1..6e416a6 100644
--- a/debian/libmia-2.0-dev.install
+++ b/debian/libmia-2.2-dev.install
@@ -1,4 +1,4 @@
 usr/include/*
 usr/lib/*/lib*.so
-usr/lib/*/mia-2.0/include/*
+usr/lib/*/mia-2.2/include/*
 usr/lib/*/pkgconfig/*
diff --git a/debian/libmia-2.0-doc.doc-base b/debian/libmia-2.2-doc.doc-base
similarity index 69%
rename from debian/libmia-2.0-doc.doc-base
rename to debian/libmia-2.2-doc.doc-base
index c782486..9a38d7a 100644
--- a/debian/libmia-2.0-doc.doc-base
+++ b/debian/libmia-2.2-doc.doc-base
@@ -5,5 +5,5 @@ Abstract: This is the Doxygen reference of the MIA libraries
 Section: Programming/libraries
 
 Format: HTML
-Index: /usr/share/doc/mia-2.0/libdoc/index.html
-Files: /usr/share/doc/mia-2.0/libdoc/*.html
+Index: /usr/share/doc/mia-2.2/libdoc/index.html
+Files: /usr/share/doc/mia-2.2/libdoc/*.html
diff --git a/debian/libmia-2.2-doc.install b/debian/libmia-2.2-doc.install
new file mode 100644
index 0000000..8814815
--- /dev/null
+++ b/debian/libmia-2.2-doc.install
@@ -0,0 +1,2 @@
+usr/share/doc/mia-2.2/libdoc/*
+
diff --git a/debian/mia-tools-doc.doc-base b/debian/mia-tools-doc.doc-base
index 8d91288..cd7f723 100644
--- a/debian/mia-tools-doc.doc-base
+++ b/debian/mia-tools-doc.doc-base
@@ -5,5 +5,5 @@ Abstract: This is the reference for the MIA command line tools and plug-ins
 Section: Science/Medicine
 
 Format: HTML
-Index: /usr/share/doc/mia-2.0/userref/index.html
-Files: /usr/share/doc/mia-2.0/userref/*.html
+Index: /usr/share/doc/mia-2.2/userref/index.html
+Files: /usr/share/doc/mia-2.2/userref/*.html
diff --git a/debian/mia-tools-doc.install b/debian/mia-tools-doc.install
index 341ebdf..01f80e3 100644
--- a/debian/mia-tools-doc.install
+++ b/debian/mia-tools-doc.install
@@ -1 +1 @@
-usr/share/doc/mia-2.0/userref/*
+usr/share/doc/mia-2.2/userref/*
diff --git a/debian/rules b/debian/rules
index 2f3d77c..7ca15db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -fvisibility=hidden
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -25,5 +25,5 @@ override_dh_strip:
 	 `pwd`/debian/run_strip
 
 override_dh_shlibdeps:
-	dh_shlibdeps -- $(shell find  debian/libmia-2.0-8/ -name "*.mia")
+	dh_shlibdeps -- $(shell find  debian/libmia-2.2-0/ -name "*.mia")
 
diff --git a/debian/run_strip b/debian/run_strip
index 23761ac..9a26b1b 100755
--- a/debian/run_strip
+++ b/debian/run_strip
@@ -1,5 +1,5 @@
 #!/bin/bash
 for f in $(find . -name "*.mia"); do chmod 755 $f; done
-/usr/bin/dh_strip -plibmia-2.0-8 --dbg-package=libmia-2.0-8-dbg
+/usr/bin/dh_strip -plibmia-2.2-0 --dbg-package=libmia-2.2-0-dbg
 /usr/bin/dh_strip -pmia-tools --dbg-package=mia-tools-dbg
 for f in $(find . -name "*.mia"); do chmod 644 $f; done

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/mia.git



More information about the debian-med-commit mailing list