[med-svn] [Git][med-team/ncbi-vdb][master] Reflect SONAME bump in package names and start adapting the installation to...

Andreas Tille (@tille) gitlab at salsa.debian.org
Thu Feb 24 19:08:06 GMT 2022



Andreas Tille pushed to branch master at Debian Med / ncbi-vdb


Commits:
6ac3d1c4 by Andreas Tille at 2022-02-24T18:31:17+01:00
Reflect SONAME bump in package names and start adapting the installation to the new directory layout

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/libncbi-vdb-dev.install
- debian/libncbi-vdb2.install → debian/libncbi-vdb3.install
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -2,6 +2,7 @@ ncbi-vdb (3.0.0+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream version
   * Switch to cmake build system
+  * Reflect SONAME bump in package names
 
  -- Andreas Tille <tille at debian.org>  Sat, 19 Feb 2022 11:53:03 +0100
 


=====================================
debian/control
=====================================
@@ -28,7 +28,7 @@ Vcs-Git: https://salsa.debian.org/med-team/ncbi-vdb.git
 Homepage: https://github.com/ncbi/ncbi-vdb
 Rules-Requires-Root: no
 
-Package: libncbi-vdb2
+Package: libncbi-vdb3
 Architecture: amd64 arm64 i386 x32
 Section: libs
 Depends: ${shlibs:Depends},
@@ -52,7 +52,7 @@ Architecture: amd64 arm64 i386 x32
 Section: libdevel
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libncbi-vdb2 (= ${binary:Version}),
+         libncbi-vdb3 (= ${binary:Version}),
          libkdf5-dev (= ${binary:Version}),
          libncbi-wvdb-dev (= ${binary:Version}),
          libaec-dev,
@@ -78,7 +78,7 @@ Description: libraries for using data in the INSDC Sequence Read Archives (devel
  .
  This is the development package.
 
-Package: libkdf5-2
+Package: libkdf5-3
 Architecture: amd64 arm64 i386 x32
 Section: libs
 Depends: ${shlibs:Depends},
@@ -100,7 +100,7 @@ Architecture: amd64 arm64 i386 x32
 Section: libdevel
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libkdf5-2 (= ${binary:Version})
+         libkdf5-3 (= ${binary:Version})
 Description: hdf5 access to data in the INSDC Sequence Read Archives (devel)
  NGS is a new, domain-specific API for accessing reads, alignments and
  pileups produced from Next Generation Sequencing. The API itself is
@@ -114,7 +114,7 @@ Description: hdf5 access to data in the INSDC Sequence Read Archives (devel)
  .
  This is the development package.
 
-Package: libncbi-wvdb2
+Package: libncbi-wvdb3
 Architecture: amd64 arm64 i386 x32
 Section: libs
 Depends: ${shlibs:Depends},
@@ -134,7 +134,7 @@ Architecture: amd64 arm64 i386 x32
 Section: libdevel
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libncbi-wvdb2 (= ${binary:Version})
+         libncbi-wvdb3 (= ${binary:Version})
 Description: virtual layer update modul of ncbi-vdb library (devel)
  NGS is a new, domain-specific API for accessing reads, alignments and
  pileups produced from Next Generation Sequencing. The API itself is


=====================================
debian/libncbi-vdb-dev.install
=====================================
@@ -0,0 +1 @@
+usr/include/*	usr/include/ncbi-vdb


=====================================
debian/libncbi-vdb2.install → debian/libncbi-vdb3.install
=====================================


=====================================
debian/rules
=====================================
@@ -15,7 +15,7 @@ MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 SODIR := $(DEB_SOURCE)/$(DEB_SOURCE)/$(OS)/gcc
 # VDB_ARCH := $(word 1, $(subst -, ,$(DEB_HOST_MULTIARCH)))
 VDB_ARCH := *
-LIBINSTALLDIR := debian/tmp/usr/$(DEB_SOURCE)/$(OS)/gcc/$(VDB_ARCH)/dbg/lib
+LIBINSTALLDIR := debian/tmp/usr/lib64
 LIBPKG := libncbi-vdb2
 SCHEMADIR := debian/$(LIBPKG)/usr/lib/$(DEB_SOURCE)
 DSLMFLAGS := --commit --multiarch --devunversioned --exclude-la
@@ -65,35 +65,34 @@ override_dh_auto_install:
 	    mv $(LIBINSTALLDIR)/`readlink $$slib` $$slib ; \
 	    mv $(LIBINSTALLDIR)/`readlink $$slib` $$slib ; \
 	done
+#		    --movedev $(LIBINSTALLDIR)/libncbi-ngs-c++.a usr/lib/$(MULTIARCH) \
+
 	d-shlibmove $(DSLMFLAGS) \
-		    --movedev debian/tmp/usr/$(DEB_SOURCE)/$(OS)/gcc/*/dbg/lib/libncbi-ngs-c++.a usr/lib/$(MULTIARCH) \
-		    --movedev debian/tmp/usr/$(DEB_SOURCE)/$(OS)/gcc/*/dbg/ilib/libkapp.a usr/lib/$(MULTIARCH) \
-		    --movedev debian/tmp/usr/$(DEB_SOURCE)/$(OS)/gcc/*/dbg/ilib/libkapp-norsrc.a usr/lib/$(MULTIARCH) \
-		    --movedev debian/tmp/usr/$(DEB_SOURCE)/$(OS)/gcc/*/dbg/ilib/libkff.a usr/lib/$(MULTIARCH) \
-		    --movedev debian/tmp/usr/$(DEB_SOURCE)/$(OS)/gcc/*/dbg/ilib/libktst.a usr/lib/$(MULTIARCH) \
-		    --movedev debian/tmp/usr/$(DEB_SOURCE)/$(OS)/gcc/*/dbg/ilib/libkxfs.a usr/lib/$(MULTIARCH) \
-		    --movedev debian/tmp/usr/$(DEB_SOURCE)/$(OS)/gcc/*/dbg/ilib/libkxml.a usr/lib/$(MULTIARCH) \
-                    --movedev debian/tmp/usr/$(DEB_SOURCE)/$(OS)/gcc/*/dbg/ilib/libload.a usr/lib/$(MULTIARCH) \
-		    --movedev debian/tmp/usr/$(DEB_SOURCE)/$(OS)/gcc/*/dbg/ilib/libtui.a usr/lib/$(MULTIARCH) \
-                    --movedev debian/tmp/usr/$(DEB_SOURCE)/$(OS)/gcc/*/dbg/ilib/libtui_cpp.a usr/lib/$(MULTIARCH) \
-		    debian/tmp/usr/$(DEB_SOURCE)/$(OS)/gcc/*/dbg/lib/libncbi-vdb.so
-	install -d debian/libncbi-vdb-dev/usr/include
-	cp -a interfaces debian/libncbi-vdb-dev/usr/include/$(DEB_SOURCE)
+		    --movedev $(LIBINSTALLDIR)/libkapp.a	usr/lib/$(MULTIARCH) \
+		    --movedev $(LIBINSTALLDIR)/libkff.a		usr/lib/$(MULTIARCH) \
+		    --movedev $(LIBINSTALLDIR)/libktst.a	usr/lib/$(MULTIARCH) \
+		    --movedev $(LIBINSTALLDIR)/libkxfs.a	usr/lib/$(MULTIARCH) \
+		    --movedev $(LIBINSTALLDIR)/libkxml.a	usr/lib/$(MULTIARCH) \
+                    --movedev $(LIBINSTALLDIR)/libload.a	usr/lib/$(MULTIARCH) \
+		    --movedev $(LIBINSTALLDIR)/libtui.a		usr/lib/$(MULTIARCH) \
+                    --movedev $(LIBINSTALLDIR)/libtui_cpp.a	usr/lib/$(MULTIARCH) \
+                    --movedev obj-*/ilib/libkapp-norsrc.a	usr/lib/$(MULTIARCH) \
+		    $(LIBINSTALLDIR)/libncbi-vdb.so
+	dh_install -p libncbi-vdb-dev interfaces usr/include/$(DEB_SOURCE)
 	# json-response.h and services-priv.h are needed by sra-sdk, but
 	# the latter shouldn't replace interfaces/vfs/services-priv.h.
 	dh_install -plibncbi-vdb-dev libs/vfs/json-response.h usr/include/ncbi-vdb/vfs
 	cp libs/vfs/services-priv.h debian/libncbi-vdb-dev/usr/include/ncbi-vdb/vfs/services-priv-internal.h
 	d-shlibmove $(DSLMFLAGS) \
 		    --override s/libhdf5_serial[0-9]*-dev/libhdf5-dev/ \
-		    debian/tmp/usr/$(DEB_SOURCE)/$(OS)/gcc/*/dbg/lib/libkdf5.so
-	d-shlibmove $(DSLMFLAGS) \
-		    debian/tmp/usr/$(DEB_SOURCE)/$(OS)/gcc/*/dbg/lib/libncbi-wvdb.so
+		    $(LIBINSTALLDIR)/libkdf5.so
 	d-shlibmove $(DSLMFLAGS) \
-		    debian/tmp/usr/$(DEB_SOURCE)/$(OS)/gcc/*/dbg/lib/libvdb-sqlite.so
+		    $(LIBINSTALLDIR)/libncbi-wvdb.so
+#	d-shlibmove $(DSLMFLAGS) \
+#		    $(LIBINSTALLDIR)/libvdb-sqlite.so
 	find debian/lib* -name .gitignore -delete
 	# move schemata from development packages to library packages since these are used in executables
 	mkdir -p $(SCHEMADIR)
-	set -x ; \
 	for schema in `find debian/libncbi-vdb-dev/usr/include/$(DEB_SOURCE) -name "*.vschema"` ; do \
 	    schemafile=`basename $${schema}` ; \
 	    schemadir=`basename $$(dirname $${schema})` ; \
@@ -101,6 +100,3 @@ override_dh_auto_install:
 	    sed -i "s:^include ':&/usr/lib/ncbi-vdb/:" $${schema} ; \
 	    mv $${schema} $(SCHEMADIR)/$${schemadir} ; \
 	done
-
-override_dh_missing:
-	dh_missing --fail-missing



View it on GitLab: https://salsa.debian.org/med-team/ncbi-vdb/-/commit/6ac3d1c4ea81994fd32052128efd5959d5445a54

-- 
View it on GitLab: https://salsa.debian.org/med-team/ncbi-vdb/-/commit/6ac3d1c4ea81994fd32052128efd5959d5445a54
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/20220224/bd7df264/attachment-0001.htm>


More information about the debian-med-commit mailing list