[pkg-boost-commits] r14771 - in boost/branches: . experimental/debian
Dmitrijs Ledkovs
xnox at alioth.debian.org
Mon Jun 3 22:41:40 UTC 2013
Author: xnox
Date: 2013-06-03 22:41:40 +0000 (Mon, 03 Jun 2013)
New Revision: 14771
Added:
boost/branches/experimental/
Modified:
boost/branches/experimental/debian/changelog
boost/branches/experimental/debian/control
boost/branches/experimental/debian/rules
Log:
* Convert to Multi-Arch. Closes: #710413.
+ Add ${misc:Pre-Depends} to shared libraries.
+ Switch to multi-arch paths.
+ Mark shared libraries as Multi-Arch:same except for python related ones.
* Upload to experimental.
Modified: boost/branches/experimental/debian/changelog
===================================================================
--- boost/trunk/debian/changelog 2013-05-28 08:37:59 UTC (rev 14770)
+++ boost/branches/experimental/debian/changelog 2013-06-03 22:41:40 UTC (rev 14771)
@@ -1,3 +1,16 @@
+boost1.53 (1.53.0-5+exp1) experimental; urgency=low
+
+ [ Helmut Grohne ]
+ * Convert to Multi-Arch. Closes: #710413.
+ + Add ${misc:Pre-Depends} to shared libraries.
+ + Switch to multi-arch paths.
+ + Mark shared libraries as Multi-Arch:same except for python related ones.
+
+ [ Dmitrijs Ledkovs ]
+ * Upload to experimental.
+
+ -- Dmitrijs Ledkovs <dmitrij.ledkov at ubuntu.com> Mon, 03 Jun 2013 23:03:01 +0100
+
boost1.53 (1.53.0-5) unstable; urgency=low
* control: Boost.Thread depends on some non header-only libraries:
Modified: boost/branches/experimental/debian/control
===================================================================
--- boost/trunk/debian/control 2013-05-28 08:37:59 UTC (rev 14770)
+++ boost/branches/experimental/debian/control 2013-06-03 22:41:40 UTC (rev 14771)
@@ -146,6 +146,8 @@
Architecture: any
Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: atomic data types, operations, and memory ordering constraints
This package forms part of the Boost C++ Libraries collection.
.
@@ -193,6 +195,8 @@
Architecture: any
Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: C++ representation of time duration, time point, and clocks
This package forms part of the Boost C++ Libraries collection.
.
@@ -281,6 +285,8 @@
Architecture: any
Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: provides a sort of cooperative multitasking on a single thread
This package forms part of the Boost C++ Libraries collection.
.
@@ -318,6 +324,8 @@
Architecture: any
Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: set of date-time libraries based on generic programming concepts
This package forms part of the Boost C++ Libraries collection.
.
@@ -358,6 +366,8 @@
Architecture: any
Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: filesystem operations (portable paths, iteration over directories, etc) in C++
This package forms part of the Boost C++ Libraries collection.
.
@@ -386,6 +396,8 @@
Architecture: any
Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Suggests: graphviz
Description: generic graph components and algorithms in C++
This package forms part of the Boost C++ Libraries collection.
@@ -420,6 +432,8 @@
Architecture: any
Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Suggests: graphviz
Description: generic graph components and algorithms in C++
This package forms part of the Boost C++ Libraries collection.
@@ -457,6 +471,8 @@
Section: libs
Priority: important
Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: Boost.Iostreams Library
This package forms part of the Boost C++ Libraries collection.
.
@@ -485,6 +501,8 @@
Architecture: any
Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: C++ facilities for localization
This package forms part of the Boost C++ Libraries collection.
.
@@ -544,6 +562,8 @@
Architecture: any
Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: Boost.Math Library
This package forms part of the Boost C++ Libraries collection.
.
@@ -585,6 +605,8 @@
Architecture: any
Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: C++ interface to the Message Passing Interface (MPI)
This package forms part of the Boost C++ Libraries collection.
.
@@ -619,6 +641,7 @@
Architecture: any
Section: python
Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}, mpi-default-bin
+Pre-Depends: ${misc:Pre-Depends}
Suggests: python, python3
Breaks: ${python:Breaks}
Conflicts: libboost-mpi-python1.40.0,
@@ -662,6 +685,8 @@
Architecture: any
Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: program options library for C++
This package forms part of the Boost C++ Libraries collection.
.
@@ -689,6 +714,7 @@
Architecture: any
Section: python
Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}
+Pre-Depends: ${misc:Pre-Depends}
Suggests: python, python3
Breaks: ${python:Breaks}
Description: Boost.Python Library
@@ -748,6 +774,8 @@
Architecture: any
Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: Boost Random Number Library
This package forms part of the Boost C++ Libraries collection.
.
@@ -775,6 +803,8 @@
Architecture: any
Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: regular expression library for C++
This package forms part of the Boost C++ Libraries collection.
.
@@ -817,6 +847,8 @@
Architecture: any
Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: serialization library for C++
This package forms part of the Boost C++ Libraries collection,
containing the following functionalities:
@@ -860,6 +892,8 @@
Architecture: any
Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: managed signals and slots library for C++
This package forms part of the Boost C++ Libraries collection.
.
@@ -891,6 +925,8 @@
Architecture: any
Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: Operating system (e.g. diagnostics support) library
This package forms part of the Boost C++ Libraries collection.
.
@@ -926,6 +962,8 @@
Architecture: any
Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: components for writing and executing test suites
This package forms part of the Boost C++ Libraries collection. The
library contains several components.
@@ -955,6 +993,8 @@
Architecture: any
Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: portable C++ multi-threading
This package forms part of the Boost C++ Libraries collection.
.
@@ -987,6 +1027,8 @@
Architecture: any
Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: C++ wall clock and CPU process timers
This package forms part of the Boost C++ Libraries collection.
.
@@ -1024,6 +1066,8 @@
Architecture: any
Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: C99/C++ preprocessor library
This package forms part of the Boost C++ Libraries collection.
.
Modified: boost/branches/experimental/debian/rules
===================================================================
--- boost/trunk/debian/rules 2013-05-28 08:37:59 UTC (rev 14770)
+++ boost/branches/experimental/debian/rules 2013-06-03 22:41:40 UTC (rev 14771)
@@ -27,6 +27,7 @@
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
+include /usr/share/dpkg/architecture.mk
%:
dh $@ --with python2 --with python3
@@ -68,14 +69,18 @@
dh_compress -Xlibboost$(PKGVERSION)-doc/HTML
override_dh_install:
- $(JAM) --prefix=$(CURDIR)/debian/tmp/usr $(JAM_WITHOUT) --without-python install
+ $(JAM) --prefix=$(CURDIR)/debian/tmp/usr $(JAM_WITHOUT) \
+ --libdir=$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) \
+ --without-python install
for pyver in $(pyversions); do \
pyid=`echo $$pyver | tr -d .`; \
- $(JAM) --prefix=$(CURDIR)/debian/tmp/usr install --with-python --with-mpi --python-buildid=py$$pyid python=$$pyver; \
+ $(JAM) --prefix=$(CURDIR)/debian/tmp/usr \
+ --libdir=$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) \
+ install --with-python --with-mpi --python-buildid=py$$pyid python=$$pyver; \
done
# Install Boost.Build v2 & jam
- cd $(bbv2dir) && ./bjam install --prefix=$(CURDIR)/debian/tmp/usr
+ cd $(bbv2dir) && ./bjam install --prefix=$(CURDIR)/debian/tmp/usr --libdir=$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
mv debian/tmp/usr/share/boost-build/example debian/boost-build-examples
install --mode=755 -D debian/rtupdate debian/tmp/usr/share/python/runtime.d/libboost-python$(PKGVERSION)-dev.rtupdate
@@ -178,7 +183,7 @@
# Helpers to make basic and decorated library names
# Input: library, variant, suffix
# Return: base library filename for short or full name
-mk_base_name = usr/lib/libboost_$(subst -,_,$(1))$(2)$(3)
+mk_base_name = usr/lib/$(DEB_HOST_MULTIARCH)/libboost_$(subst -,_,$(1))$(2)$(3)
# Input: component, variant
# Return: package name for shared library or development
@@ -320,6 +325,7 @@
$(bjam):
./bootstrap.sh --with-icu --prefix=$(CURDIR)/debian/tmp/usr \
+ --libdir=$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) \
|| cat bootstrap.log
debian/bjam.1: $(bjam)
More information about the pkg-boost-commits
mailing list