Author: malat Date: 2013-05-28 14:42:23 +0000 (Tue, 28 May 2013) New Revision: 13732
Modified: trunk/packages/vxl/trunk/debian/changelog trunk/packages/vxl/trunk/debian/control trunk/packages/vxl/trunk/debian/rules Log: MAke multiarch Modified: trunk/packages/vxl/trunk/debian/changelog =================================================================== --- trunk/packages/vxl/trunk/debian/changelog 2013-05-28 13:16:24 UTC (rev 13731) +++ trunk/packages/vxl/trunk/debian/changelog 2013-05-28 14:42:23 UTC (rev 13732) @@ -4,8 +4,9 @@ * Re-activate testing. Closes: #671601 * Build OpenCL modules. Closes: #697784 * Run two cmake configure steps. Closes: #708131 + * make package multiarch - -- Mathieu Malaterre <[email protected]> Mon, 27 May 2013 14:11:24 +0200 + -- Mathieu Malaterre <[email protected]> Tue, 28 May 2013 15:08:55 +0200 vxl (1.17.0-3) unstable; urgency=low Modified: trunk/packages/vxl/trunk/debian/control =================================================================== --- trunk/packages/vxl/trunk/debian/control 2013-05-28 13:16:24 UTC (rev 13731) +++ trunk/packages/vxl/trunk/debian/control 2013-05-28 14:42:23 UTC (rev 13732) @@ -19,6 +19,7 @@ Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +Pre-Depends: ${misc:Pre-Depends} Description: C++ Libraries for Computer Vision Research VXL (the Vision-something-Libraries) is a collection of C++ libraries designed for computer vision research and implementation. It was created Modified: trunk/packages/vxl/trunk/debian/rules =================================================================== --- trunk/packages/vxl/trunk/debian/rules 2013-05-28 13:16:24 UTC (rev 13731) +++ trunk/packages/vxl/trunk/debian/rules 2013-05-28 14:42:23 UTC (rev 13732) @@ -7,6 +7,8 @@ SOVERSION = $(shell echo $(VER_FULL) | cut -f1-2 -d.) VER_MAJOR = $(shell echo $(VER_FULL) | cut -f1 -d.) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + UPSTREAM_SRC = vxl-$(VER_FULL) DEBIAN_SRC_DIR = vxl-$(VER_FULL) DEBIAN_SRC_TAR = vxl_$(VER_FULL).orig.tar.gz @@ -70,8 +72,8 @@ dh_lintian override_dh_install: - dh_install -p$(pkg_lib) debian/tmp/usr/lib/lib*.so.* usr/lib - dh_install -p$(pkg_dev) debian/tmp/usr/lib/lib*.so usr/lib + dh_install -p$(pkg_lib) debian/tmp/usr/lib/lib*.so.* usr/lib/$(DEB_HOST_MULTIARCH) + dh_install -p$(pkg_dev) debian/tmp/usr/lib/lib*.so usr/lib/$(DEB_HOST_MULTIARCH) dh_install -p$(pkg_dev) --autodest debian/tmp/usr/include dh_install -p$(pkg_dev) --autodest debian/tmp/usr/share/vxl/cmake/*.cmake _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
