[pkg-boost-commits] r15040 - in /boost/trunk/debian: changelog rules

[xnox at users.alioth.debian.org]

Author: xnox
Date: Fri Oct 20 13:26:39 2017
New Revision: 15040

URL: http://svn.debian.org/wsvn/pkg-boost/?sc=1&rev=15040
Log:
Fixup py3 suffixes and symlinks.

Modified:
    boost/trunk/debian/changelog
    boost/trunk/debian/rules

Modified: boost/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-boost/boost/trunk/debian/changelog?rev=15040&op=diff
==============================================================================
--- boost/trunk/debian/changelog	(original)
+++ boost/trunk/debian/changelog	Fri Oct 20 13:26:39 2017
@@ -1,8 +1,12 @@
 boost1.65.1 (1.65.1+dfsg-1) UNRELEASED; urgency=medium
 
+  [ Steve M. Robbins ]
   * New upstream.
   * Remove "Force use g++-6"
   * patches/chrono-duration.patch: Remove.  Obsoleted by upstream changes.
+
+  [ Dimitri John Ledkov ]
+  * Fixup py3 suffixes and symlinks.
 
  -- Steve M. Robbins <smr at debian.org>  Mon, 25 Sep 2017 21:44:44 -0500
 

Modified: boost/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-boost/boost/trunk/debian/rules?rev=15040&op=diff
==============================================================================
--- boost/trunk/debian/rules	(original)
+++ boost/trunk/debian/rules	Fri Oct 20 13:26:39 2017
@@ -16,11 +16,15 @@
 boost_lib_serialization := serialization wserialization
 boost_lib_test := prg_exec_monitor test_exec_monitor unit_test_framework
 
-pyversions = $(shell pyversions -rv) $(shell py3versions -rv)
+py2versions = $(shell pyversions -rv)
+py3versions = $(shell py3versions -rv)
+pyversions = $(py2versions) $(py3versions)
 
 # These are special cases for suffixes.  Generally come from --python-buildid, so begin with a dash.
-boost_suffixes_python := $(addprefix -py,$(subst .,,$(pyversions)))
+boost_suffixes_python := $(addprefix 3-py,$(subst .,,$(py3versions))) $(addprefix -py,$(subst .,,$(py2versions)))
 boost_suffixes_mpi-python := $(boost_suffixes_python)
+
+py3default = $(subst .,,$(shell py3versions -dv))
 
 # Files that are generated by filtering a template
 filtered_files = 
@@ -136,6 +140,20 @@
 	   usr/lib/$(DEB_HOST_MULTIARCH)/libboost_mpi_python-py27.so \
 	   usr/lib/$(DEB_HOST_MULTIARCH)/libboost_mpi_python.so
 
+	dh_link -plibboost-python$(PKGVERSION)-dev \
+	   usr/lib/$(DEB_HOST_MULTIARCH)/libboost_python3-py$(py3default).a \
+	   usr/lib/$(DEB_HOST_MULTIARCH)/libboost_python3.a
+	dh_link -plibboost-python$(PKGVERSION)-dev \
+	   usr/lib/$(DEB_HOST_MULTIARCH)/libboost_python3-py$(py3default).so \
+	   usr/lib/$(DEB_HOST_MULTIARCH)/libboost_python3.so
+
+	dh_link -plibboost-mpi-python$(PKGVERSION)-dev \
+	   usr/lib/$(DEB_HOST_MULTIARCH)/libboost_mpi_python3-py$(py3default).a \
+	   usr/lib/$(DEB_HOST_MULTIARCH)/libboost_mpi_python3.a
+	dh_link -plibboost-mpi-python$(PKGVERSION)-dev \
+	   usr/lib/$(DEB_HOST_MULTIARCH)/libboost_mpi_python3-py$(py3default).so \
+	   usr/lib/$(DEB_HOST_MULTIARCH)/libboost_mpi_python3.so
+
 	dh_installexamples -plibboost$(PKGVERSION)-doc debian/boost-build-examples
 	mkdir -p $(exampledir)
 	cat debian/example-files | xargs cp -a --parents --target-directory=$(exampledir)