[med-svn] [Git][med-team/xmedcon][master] 2 commits: Use d-shlibs

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / xmedcon


Commits:
05f3d9d8 by Andreas Tille at 2018-06-16T15:13:06+02:00
Use d-shlibs

- - - - -
ad7ac1fc by Andreas Tille at 2018-06-16T15:26:59+02:00
Bump library name according to soversion bump, unversioned dev package

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/libmdc2-dev.install → debian/libmdc-dev.install
- − debian/libmdc2.install
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xmedcon (0.15.0-2) UNRELEASED; urgency=medium
+
+  * Use d-shlibs
+  * Bump library name according to soversion bump
+    Closes: #901634
+  * Unversioned dev package
+
+ -- Andreas Tille <tille at debian.org>  Sat, 16 Jun 2018 14:27:43 +0200
+
 xmedcon (0.15.0-1) unstable; urgency=medium
 
   * New upstream version


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Uploaders: Roland Marcus Rutschmann <rudi at debian.org>,
 Section: graphics
 Priority: optional
 Build-Depends: debhelper (>= 11~),
+               d-shlibs,
                libgtk2.0-dev,
                zlib1g-dev,
                libpng-dev,
@@ -14,7 +15,7 @@ Vcs-Browser: https://salsa.debian.org/med-team/xmedcon
 Vcs-Git: https://salsa.debian.org/med-team/xmedcon.git
 Homepage: http://xmedcon.sourceforge.net/
 
-Package: libmdc2
+Package: libmdc3
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -31,13 +32,14 @@ Description: Medical Image (DICOM, ECAT, ...) conversion tool (library)
  This is the central library needed by medcon, xmedcon and derived
  programs.
 
-Package: libmdc2-dev
+Package: libmdc-dev
 Architecture: any
 Section: libdevel
-Depends: libmdc2 (= ${binary:Version}),
+Depends: libmdc3 (= ${binary:Version}),
          ${misc:Depends}
-Conflicts: libmdc-dev
-Replaces: libmdc-dev
+Conflicts: libmdc2-dev
+Replaces: libmdc2-dev
+Provides: libmdc2-dev
 Description: Medical Image (DICOM, ECAT, ...) conversion tool (development)
  This project stands for Medical Image Conversion. Released under the
  (L)GPL, it comes with the full C-source code of the library, a


=====================================
debian/libmdc2-dev.install → debian/libmdc-dev.install
=====================================
--- a/debian/libmdc2-dev.install
+++ b/debian/libmdc-dev.install
@@ -1,6 +1,3 @@
-debian/tmp/usr/lib/*/*.a
-debian/tmp/usr/lib/*/*.so
-debian/tmp/usr/include
 debian/tmp/usr/share/man/man1/xmedcon-config.1
 debian/tmp/usr/share/man/man3
 debian/tmp/usr/share/man/man4


=====================================
debian/libmdc2.install deleted
=====================================
--- a/debian/libmdc2.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/*/libmdc.so.*


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -20,3 +20,14 @@ override_dh_auto_install:
 		$(CURDIR)/debian/xmedcon/usr/share/icons/hicolor/48x48/apps/
 	mkdir -p $(CURDIR)/debian/tmp/etc
 	cp -a etc/xmedconrc.linux $(CURDIR)/debian/tmp/etc/xmedconrc
+
+override_dh_install:
+	dh_install
+	d-shlibmove --commit \
+		    --multiarch \
+		    --devunversioned \
+		    --exclude-la \
+		    --override s/libniftiio2-dev/libnifti-dev/ \
+		    --override s/libznz2-dev/libnifti-dev/ \
+		    --movedev debian/tmp/usr/include usr \
+		    debian/tmp/usr/lib/*/*.so



View it on GitLab: https://salsa.debian.org/med-team/xmedcon/compare/ddd1d14276f24e560127220b3d93abb43569915f...ad7ac1fcc3b776d23bca7fad2552b2b8eae51705

-- 
View it on GitLab: https://salsa.debian.org/med-team/xmedcon/compare/ddd1d14276f24e560127220b3d93abb43569915f...ad7ac1fcc3b776d23bca7fad2552b2b8eae51705
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20180616/f18346b1/attachment-0001.html>