r45907 - /packages/opencv/trunk/debian/
iwamatsu at users.alioth.debian.org
iwamatsu at users.alioth.debian.org
Fri May 17 01:29:23 UTC 2013
Author: iwamatsu
Date: Fri May 17 01:29:22 2013
New Revision: 45907
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45907
Log:
Change to multiarch support
Modified:
packages/opencv/trunk/debian/changelog
packages/opencv/trunk/debian/control
packages/opencv/trunk/debian/libopencv-calib3d-dev.install
packages/opencv/trunk/debian/libopencv-calib3d2.4.install
packages/opencv/trunk/debian/libopencv-contrib-dev.install
packages/opencv/trunk/debian/libopencv-contrib2.4.install
packages/opencv/trunk/debian/libopencv-core-dev.install
packages/opencv/trunk/debian/libopencv-core2.4.install
packages/opencv/trunk/debian/libopencv-dev.install
packages/opencv/trunk/debian/libopencv-features2d-dev.install
packages/opencv/trunk/debian/libopencv-features2d2.4.install
packages/opencv/trunk/debian/libopencv-flann-dev.install
packages/opencv/trunk/debian/libopencv-flann2.4.install
packages/opencv/trunk/debian/libopencv-gpu-dev.install
packages/opencv/trunk/debian/libopencv-gpu2.4.install
packages/opencv/trunk/debian/libopencv-highgui-dev.install
packages/opencv/trunk/debian/libopencv-highgui2.4.install
packages/opencv/trunk/debian/libopencv-imgproc-dev.install
packages/opencv/trunk/debian/libopencv-imgproc2.4.install
packages/opencv/trunk/debian/libopencv-legacy-dev.install
packages/opencv/trunk/debian/libopencv-legacy2.4.install
packages/opencv/trunk/debian/libopencv-ml-dev.install
packages/opencv/trunk/debian/libopencv-ml2.4.install
packages/opencv/trunk/debian/libopencv-objdetect-dev.install
packages/opencv/trunk/debian/libopencv-objdetect2.4.install
packages/opencv/trunk/debian/libopencv-photo-dev.install
packages/opencv/trunk/debian/libopencv-photo2.4.install
packages/opencv/trunk/debian/libopencv-stitching-dev.install
packages/opencv/trunk/debian/libopencv-stitching2.4.install
packages/opencv/trunk/debian/libopencv-superres-dev.install
packages/opencv/trunk/debian/libopencv-superres2.4.install
packages/opencv/trunk/debian/libopencv-ts-dev.install
packages/opencv/trunk/debian/libopencv-ts2.4.install
packages/opencv/trunk/debian/libopencv-video-dev.install
packages/opencv/trunk/debian/libopencv-video2.4.install
packages/opencv/trunk/debian/libopencv-videostab-dev.install
packages/opencv/trunk/debian/libopencv-videostab2.4.install
packages/opencv/trunk/debian/opencv-doc.install
packages/opencv/trunk/debian/rules
Modified: packages/opencv/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/changelog?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/changelog (original)
+++ packages/opencv/trunk/debian/changelog Fri May 17 01:29:22 2013
@@ -1,8 +1,6 @@
opencv (2.4.5+dfsg-1) experimental; urgency=low
* New upstream release.
- * Update opencv_traincascade.1.
- Fix typo.
-- Nobuhiro Iwamatsu <iwamatsu at debian.org> Wed, 08 May 2013 08:55:28 +0900
Modified: packages/opencv/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/control?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/control (original)
+++ packages/opencv/trunk/debian/control Fri May 17 01:29:22 2013
@@ -52,6 +52,8 @@
Package: libcv-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends},
pkg-config,
libopencv-core-dev,
@@ -109,6 +111,8 @@
Package: libhighgui-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends},
pkg-config,
libopencv-highgui-dev
@@ -149,6 +153,8 @@
Package: libcvaux-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends},
pkg-config,
libopencv-core-dev,
@@ -225,7 +231,7 @@
Replaces: libopencv-core-dev (<= 2.3.1-8)
Breaks: libopencv-core-dev (<= 2.3.1-8)
Description: development files for opencv
- This is a meta package providing development package necessary for
+ This is a metapackage providing development package necessary for
development of OpenCV (Open Computer Vision).
.
The Open Computer Vision Library is a collection of algorithms and sample
@@ -241,6 +247,8 @@
Package: libopencv-core-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}, libopencv-core2.4 (= ${binary:Version}),
zlib1g-dev
Description: development files for libopencv-core
@@ -260,6 +268,8 @@
Package: libopencv-core2.4
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: computer vision core library
This package contains the OpenCV (Open Computer Vision) core runtime libraries.
@@ -277,6 +287,8 @@
Package: libopencv-ml-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends},
libopencv-core-dev (= ${binary:Version}),
libopencv-ml2.4 (= ${binary:Version})
@@ -297,6 +309,8 @@
Package: libopencv-ml2.4
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends},
libopencv-core2.4 (= ${binary:Version})
Description: computer vision Machine Learning library
@@ -316,6 +330,8 @@
Package: libopencv-imgproc-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends},
libopencv-core-dev (= ${binary:Version}),
libopencv-imgproc2.4 (= ${binary:Version})
@@ -336,6 +352,8 @@
Package: libopencv-imgproc2.4
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends},
libopencv-core2.4 (= ${binary:Version})
Description: computer vision Image Processing library
@@ -355,6 +373,8 @@
Package: libopencv-video-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends},
libopencv-imgproc-dev (= ${binary:Version}),
libopencv-video2.4 (= ${binary:Version})
@@ -375,6 +395,8 @@
Package: libopencv-video2.4
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends},
libopencv-imgproc2.4 (= ${binary:Version})
Description: computer vision Video analysis library
@@ -394,6 +416,8 @@
Package: libopencv-objdetect-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends},
libopencv-highgui-dev (= ${binary:Version}),
libopencv-objdetect2.4 (= ${binary:Version})
@@ -414,6 +438,8 @@
Package: libopencv-objdetect2.4
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends},
libopencv-highgui2.4 (= ${binary:Version})
Description: computer vision Object Detection library
@@ -433,6 +459,8 @@
Package: libopencv-highgui-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
${shlibs:Depends},
libopencv-imgproc-dev (= ${binary:Version}),
@@ -466,6 +494,8 @@
Package: libopencv-highgui2.4
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
${shlibs:Depends},
libopencv-imgproc2.4 (= ${binary:Version})
@@ -486,6 +516,8 @@
Package: libopencv-calib3d-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends},
libopencv-features2d-dev (= ${binary:Version}),
libopencv-calib3d2.4 (= ${binary:Version})
@@ -506,6 +538,8 @@
Package: libopencv-calib3d2.4
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends},
libopencv-features2d2.4 (= ${binary:Version}),
Description: computer vision Camera Calibration library
@@ -525,6 +559,8 @@
Package: libopencv-flann-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends},
libopencv-core-dev (= ${binary:Version}),
libopencv-flann2.4 (= ${binary:Version})
@@ -546,6 +582,8 @@
Package: libopencv-flann2.4
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends},
libopencv-core2.4 (= ${binary:Version}),
Description: computer vision Clustering and Search in Multi-Dimensional spaces library
@@ -565,6 +603,8 @@
Package: libopencv-features2d-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends},
libopencv-flann-dev (= ${binary:Version}),
libopencv-imgproc-dev (= ${binary:Version}),
@@ -587,6 +627,8 @@
Package: libopencv-features2d2.4
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends},
libopencv-flann2.4 (= ${binary:Version}),
libopencv-imgproc2.4 (= ${binary:Version}),
@@ -607,6 +649,8 @@
Package: libopencv-legacy-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends},
libopencv-video-dev (= ${binary:Version}),
libopencv-calib3d-dev (= ${binary:Version}),
@@ -630,6 +674,8 @@
Package: libopencv-legacy2.4
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends},
libopencv-video2.4 (= ${binary:Version}),
libopencv-calib3d2.4 (= ${binary:Version}),
@@ -652,6 +698,8 @@
Package: libopencv-contrib-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends},
libopencv-calib3d-dev (= ${binary:Version}),
libopencv-highgui-dev (= ${binary:Version}),
@@ -676,6 +724,8 @@
Package: libopencv-contrib2.4
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends},
libopencv-calib3d2.4 (= ${binary:Version}),
libopencv-highgui2.4 (= ${binary:Version}),
@@ -699,6 +749,8 @@
Package: libopencv-ts-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends},
libopencv-core-dev (= ${binary:Version}),
libopencv-ts2.4 (= ${binary:Version})
@@ -719,6 +771,8 @@
Package: libopencv-ts2.4
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends},
libopencv-core2.4 (= ${binary:Version})
Description: computer vision ts library
@@ -737,6 +791,8 @@
Package: libopencv-photo-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends},
libopencv-imgproc-dev (= ${binary:Version}),
libopencv-photo2.4 (= ${binary:Version})
@@ -758,6 +814,8 @@
Package: libopencv-photo2.4
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends},
libopencv-imgproc2.4 (= ${binary:Version})
Description: computer vision computational photography library
@@ -777,6 +835,8 @@
Package: libopencv-videostab-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends},
libopencv-features2d-dev (= ${binary:Version}),
libopencv-video-dev (= ${binary:Version}),
@@ -802,6 +862,8 @@
Package: libopencv-videostab2.4
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends},
libopencv-features2d2.4 (= ${binary:Version}),
libopencv-video2.4 (= ${binary:Version}),
@@ -825,6 +887,8 @@
Package: libopencv-stitching-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends},
libopencv-calib3d-dev (= ${binary:Version}),
libopencv-flann-dev (= ${binary:Version}),
@@ -846,6 +910,8 @@
Package: libopencv-stitching2.4
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends},
libopencv-calib3d2.4 (= ${binary:Version}),
libopencv-flann2.4 (= ${binary:Version})
@@ -866,6 +932,8 @@
Package: libopencv-gpu-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends},
libopencv-core-dev (= ${binary:Version})
Description: development files for libopencv-gpu2.4
@@ -885,6 +953,8 @@
Package: libopencv-gpu2.4
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends},
libopencv-core2.4 (= ${binary:Version})
Description: computer vision GPU library
@@ -904,6 +974,8 @@
Package: libopencv-superres-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends},
libopencv-highgui-dev (= ${binary:Version}),
libopencv-video-dev (= ${binary:Version}),
@@ -925,6 +997,8 @@
Package: libopencv-superres2.4
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends},
libopencv-highgui2.4 (= ${binary:Version}),
libopencv-video2.4 (= ${binary:Version}),
Modified: packages/opencv/trunk/debian/libopencv-calib3d-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/libopencv-calib3d-dev.install?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/libopencv-calib3d-dev.install (original)
+++ packages/opencv/trunk/debian/libopencv-calib3d-dev.install Fri May 17 01:29:22 2013
@@ -1,3 +1,3 @@
usr/include/opencv2/calib3d/*
-usr/lib/libopencv_calib3d.a
-usr/lib/libopencv_calib3d.so
+usr/lib/*/libopencv_calib3d.a
+usr/lib/*/libopencv_calib3d.so
Modified: packages/opencv/trunk/debian/libopencv-calib3d2.4.install
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/libopencv-calib3d2.4.install?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/libopencv-calib3d2.4.install (original)
+++ packages/opencv/trunk/debian/libopencv-calib3d2.4.install Fri May 17 01:29:22 2013
@@ -1,1 +1,1 @@
-usr/lib/libopencv_calib3d.so.*
+usr/lib/*/libopencv_calib3d.so.*
Modified: packages/opencv/trunk/debian/libopencv-contrib-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/libopencv-contrib-dev.install?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/libopencv-contrib-dev.install (original)
+++ packages/opencv/trunk/debian/libopencv-contrib-dev.install Fri May 17 01:29:22 2013
@@ -1,3 +1,3 @@
usr/include/opencv2/contrib/*
-usr/lib/libopencv_contrib.a
-usr/lib/libopencv_contrib.so
+usr/lib/*/libopencv_contrib.a
+usr/lib/*/libopencv_contrib.so
Modified: packages/opencv/trunk/debian/libopencv-contrib2.4.install
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/libopencv-contrib2.4.install?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/libopencv-contrib2.4.install (original)
+++ packages/opencv/trunk/debian/libopencv-contrib2.4.install Fri May 17 01:29:22 2013
@@ -1,1 +1,1 @@
-usr/lib/libopencv_contrib.so.*
+usr/lib/*/libopencv_contrib.so.*
Modified: packages/opencv/trunk/debian/libopencv-core-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/libopencv-core-dev.install?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/libopencv-core-dev.install (original)
+++ packages/opencv/trunk/debian/libopencv-core-dev.install Fri May 17 01:29:22 2013
@@ -3,5 +3,5 @@
usr/include/opencv2/opencv.hpp
usr/include/opencv2/opencv_modules.hpp
# libraries
-usr/lib/libopencv_core.a
-usr/lib/libopencv_core.so
+usr/lib/*/libopencv_core.a
+usr/lib/*/libopencv_core.so
Modified: packages/opencv/trunk/debian/libopencv-core2.4.install
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/libopencv-core2.4.install?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/libopencv-core2.4.install (original)
+++ packages/opencv/trunk/debian/libopencv-core2.4.install Fri May 17 01:29:22 2013
@@ -1,1 +1,1 @@
-usr/lib/libopencv_core.so.*
+usr/lib/*/libopencv_core.so.*
Modified: packages/opencv/trunk/debian/libopencv-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/libopencv-dev.install?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/libopencv-dev.install (original)
+++ packages/opencv/trunk/debian/libopencv-dev.install Fri May 17 01:29:22 2013
@@ -1,4 +1,4 @@
-usr/lib/pkgconfig
+usr/lib/*/pkgconfig
usr/share/OpenCV/OpenCVConfig.cmake
usr/share/OpenCV/OpenCVConfig-version.cmake
# samples
Modified: packages/opencv/trunk/debian/libopencv-features2d-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/libopencv-features2d-dev.install?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/libopencv-features2d-dev.install (original)
+++ packages/opencv/trunk/debian/libopencv-features2d-dev.install Fri May 17 01:29:22 2013
@@ -1,3 +1,3 @@
usr/include/opencv2/features2d/*
-usr/lib/libopencv_features2d.a
-usr/lib/libopencv_features2d.so
+usr/lib/*/libopencv_features2d.a
+usr/lib/*/libopencv_features2d.so
Modified: packages/opencv/trunk/debian/libopencv-features2d2.4.install
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/libopencv-features2d2.4.install?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/libopencv-features2d2.4.install (original)
+++ packages/opencv/trunk/debian/libopencv-features2d2.4.install Fri May 17 01:29:22 2013
@@ -1,1 +1,1 @@
-usr/lib/libopencv_features2d.so.*
+usr/lib/*/libopencv_features2d.so.*
Modified: packages/opencv/trunk/debian/libopencv-flann-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/libopencv-flann-dev.install?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/libopencv-flann-dev.install (original)
+++ packages/opencv/trunk/debian/libopencv-flann-dev.install Fri May 17 01:29:22 2013
@@ -1,3 +1,3 @@
usr/include/opencv2/flann/*
-usr/lib/libopencv_flann.a
-usr/lib/libopencv_flann.so
+usr/lib/*/libopencv_flann.a
+usr/lib/*/libopencv_flann.so
Modified: packages/opencv/trunk/debian/libopencv-flann2.4.install
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/libopencv-flann2.4.install?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/libopencv-flann2.4.install (original)
+++ packages/opencv/trunk/debian/libopencv-flann2.4.install Fri May 17 01:29:22 2013
@@ -1,1 +1,1 @@
-usr/lib/libopencv_flann.so.*
+usr/lib/*/libopencv_flann.so.*
Modified: packages/opencv/trunk/debian/libopencv-gpu-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/libopencv-gpu-dev.install?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/libopencv-gpu-dev.install (original)
+++ packages/opencv/trunk/debian/libopencv-gpu-dev.install Fri May 17 01:29:22 2013
@@ -1,3 +1,3 @@
usr/include/opencv2/gpu/*
-usr/lib/libopencv_gpu.a
-usr/lib/libopencv_gpu.so
+usr/lib/*/libopencv_gpu.a
+usr/lib/*/libopencv_gpu.so
Modified: packages/opencv/trunk/debian/libopencv-gpu2.4.install
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/libopencv-gpu2.4.install?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/libopencv-gpu2.4.install (original)
+++ packages/opencv/trunk/debian/libopencv-gpu2.4.install Fri May 17 01:29:22 2013
@@ -1,1 +1,1 @@
-usr/lib/libopencv_gpu.so.*
+usr/lib/*/libopencv_gpu.so.*
Modified: packages/opencv/trunk/debian/libopencv-highgui-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/libopencv-highgui-dev.install?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/libopencv-highgui-dev.install (original)
+++ packages/opencv/trunk/debian/libopencv-highgui-dev.install Fri May 17 01:29:22 2013
@@ -1,3 +1,3 @@
usr/include/opencv2/highgui/*
-usr/lib/libopencv_highgui.a
-usr/lib/libopencv_highgui.so
+usr/lib/*/libopencv_highgui.a
+usr/lib/*/libopencv_highgui.so
Modified: packages/opencv/trunk/debian/libopencv-highgui2.4.install
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/libopencv-highgui2.4.install?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/libopencv-highgui2.4.install (original)
+++ packages/opencv/trunk/debian/libopencv-highgui2.4.install Fri May 17 01:29:22 2013
@@ -1,1 +1,1 @@
-usr/lib/libopencv_highgui.so.*
+usr/lib/*/libopencv_highgui.so.*
Modified: packages/opencv/trunk/debian/libopencv-imgproc-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/libopencv-imgproc-dev.install?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/libopencv-imgproc-dev.install (original)
+++ packages/opencv/trunk/debian/libopencv-imgproc-dev.install Fri May 17 01:29:22 2013
@@ -1,3 +1,3 @@
usr/include/opencv2/imgproc/*
-usr/lib/libopencv_imgproc.a
-usr/lib/libopencv_imgproc.so
+usr/lib/*/libopencv_imgproc.a
+usr/lib/*/libopencv_imgproc.so
Modified: packages/opencv/trunk/debian/libopencv-imgproc2.4.install
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/libopencv-imgproc2.4.install?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/libopencv-imgproc2.4.install (original)
+++ packages/opencv/trunk/debian/libopencv-imgproc2.4.install Fri May 17 01:29:22 2013
@@ -1,1 +1,1 @@
-usr/lib/libopencv_imgproc.so.*
+usr/lib/*/libopencv_imgproc.so.*
Modified: packages/opencv/trunk/debian/libopencv-legacy-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/libopencv-legacy-dev.install?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/libopencv-legacy-dev.install (original)
+++ packages/opencv/trunk/debian/libopencv-legacy-dev.install Fri May 17 01:29:22 2013
@@ -1,3 +1,3 @@
usr/include/opencv2/legacy/*
-usr/lib/libopencv_legacy.a
-usr/lib/libopencv_legacy.so
+usr/lib/*/libopencv_legacy.a
+usr/lib/*/libopencv_legacy.so
Modified: packages/opencv/trunk/debian/libopencv-legacy2.4.install
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/libopencv-legacy2.4.install?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/libopencv-legacy2.4.install (original)
+++ packages/opencv/trunk/debian/libopencv-legacy2.4.install Fri May 17 01:29:22 2013
@@ -1,1 +1,1 @@
-usr/lib/libopencv_legacy.so.*
+usr/lib/*/libopencv_legacy.so.*
Modified: packages/opencv/trunk/debian/libopencv-ml-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/libopencv-ml-dev.install?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/libopencv-ml-dev.install (original)
+++ packages/opencv/trunk/debian/libopencv-ml-dev.install Fri May 17 01:29:22 2013
@@ -1,3 +1,3 @@
usr/include/opencv2/ml/*
-usr/lib/libopencv_ml.a
-usr/lib/libopencv_ml.so
+usr/lib/*/libopencv_ml.a
+usr/lib/*/libopencv_ml.so
Modified: packages/opencv/trunk/debian/libopencv-ml2.4.install
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/libopencv-ml2.4.install?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/libopencv-ml2.4.install (original)
+++ packages/opencv/trunk/debian/libopencv-ml2.4.install Fri May 17 01:29:22 2013
@@ -1,1 +1,1 @@
-usr/lib/libopencv_ml.so.*
+usr/lib/*/libopencv_ml.so.*
Modified: packages/opencv/trunk/debian/libopencv-objdetect-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/libopencv-objdetect-dev.install?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/libopencv-objdetect-dev.install (original)
+++ packages/opencv/trunk/debian/libopencv-objdetect-dev.install Fri May 17 01:29:22 2013
@@ -1,3 +1,3 @@
usr/include/opencv2/objdetect/*
-usr/lib/libopencv_objdetect.a
-usr/lib/libopencv_objdetect.so
+usr/lib/*/libopencv_objdetect.a
+usr/lib/*/libopencv_objdetect.so
Modified: packages/opencv/trunk/debian/libopencv-objdetect2.4.install
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/libopencv-objdetect2.4.install?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/libopencv-objdetect2.4.install (original)
+++ packages/opencv/trunk/debian/libopencv-objdetect2.4.install Fri May 17 01:29:22 2013
@@ -1,1 +1,1 @@
-usr/lib/libopencv_objdetect.so.*
+usr/lib/*/libopencv_objdetect.so.*
Modified: packages/opencv/trunk/debian/libopencv-photo-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/libopencv-photo-dev.install?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/libopencv-photo-dev.install (original)
+++ packages/opencv/trunk/debian/libopencv-photo-dev.install Fri May 17 01:29:22 2013
@@ -1,3 +1,3 @@
usr/include/opencv2/photo/*
-usr/lib/libopencv_photo.a
-usr/lib/libopencv_photo.so
+usr/lib/*/libopencv_photo.a
+usr/lib/*/libopencv_photo.so
Modified: packages/opencv/trunk/debian/libopencv-photo2.4.install
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/libopencv-photo2.4.install?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/libopencv-photo2.4.install (original)
+++ packages/opencv/trunk/debian/libopencv-photo2.4.install Fri May 17 01:29:22 2013
@@ -1,1 +1,1 @@
-usr/lib/libopencv_photo.so.*
+usr/lib/*/libopencv_photo.so.*
Modified: packages/opencv/trunk/debian/libopencv-stitching-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/libopencv-stitching-dev.install?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/libopencv-stitching-dev.install (original)
+++ packages/opencv/trunk/debian/libopencv-stitching-dev.install Fri May 17 01:29:22 2013
@@ -1,3 +1,3 @@
usr/include/opencv2/stitching/*
-usr/lib/libopencv_stitching.a
-usr/lib/libopencv_stitching.so
+usr/lib/*/libopencv_stitching.a
+usr/lib/*/libopencv_stitching.so
Modified: packages/opencv/trunk/debian/libopencv-stitching2.4.install
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/libopencv-stitching2.4.install?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/libopencv-stitching2.4.install (original)
+++ packages/opencv/trunk/debian/libopencv-stitching2.4.install Fri May 17 01:29:22 2013
@@ -1,1 +1,1 @@
-usr/lib/libopencv_stitching.so.*
+usr/lib/*/libopencv_stitching.so.*
Modified: packages/opencv/trunk/debian/libopencv-superres-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/libopencv-superres-dev.install?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/libopencv-superres-dev.install (original)
+++ packages/opencv/trunk/debian/libopencv-superres-dev.install Fri May 17 01:29:22 2013
@@ -1,3 +1,3 @@
usr/include/opencv2/superres/*
-usr/lib/libopencv_superres.a
-usr/lib/libopencv_superres.so
+usr/lib/*/libopencv_superres.a
+usr/lib/*/libopencv_superres.so
Modified: packages/opencv/trunk/debian/libopencv-superres2.4.install
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/libopencv-superres2.4.install?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/libopencv-superres2.4.install (original)
+++ packages/opencv/trunk/debian/libopencv-superres2.4.install Fri May 17 01:29:22 2013
@@ -1,1 +1,1 @@
-usr/lib/libopencv_superres.so.*
+usr/lib/*/libopencv_superres.so.*
Modified: packages/opencv/trunk/debian/libopencv-ts-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/libopencv-ts-dev.install?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/libopencv-ts-dev.install (original)
+++ packages/opencv/trunk/debian/libopencv-ts-dev.install Fri May 17 01:29:22 2013
@@ -1,3 +1,3 @@
usr/include/opencv2/ts/*
-usr/lib/libopencv_ts.a
-usr/lib/libopencv_ts.so
+usr/lib/*/libopencv_ts.a
+usr/lib/*/libopencv_ts.so
Modified: packages/opencv/trunk/debian/libopencv-ts2.4.install
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/libopencv-ts2.4.install?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/libopencv-ts2.4.install (original)
+++ packages/opencv/trunk/debian/libopencv-ts2.4.install Fri May 17 01:29:22 2013
@@ -1,1 +1,1 @@
-usr/lib/libopencv_ts.so.*
+usr/lib/*/libopencv_ts.so.*
Modified: packages/opencv/trunk/debian/libopencv-video-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/libopencv-video-dev.install?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/libopencv-video-dev.install (original)
+++ packages/opencv/trunk/debian/libopencv-video-dev.install Fri May 17 01:29:22 2013
@@ -1,3 +1,3 @@
usr/include/opencv2/video/*
-usr/lib/libopencv_video.a
-usr/lib/libopencv_video.so
+usr/lib/*/libopencv_video.a
+usr/lib/*/libopencv_video.so
Modified: packages/opencv/trunk/debian/libopencv-video2.4.install
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/libopencv-video2.4.install?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/libopencv-video2.4.install (original)
+++ packages/opencv/trunk/debian/libopencv-video2.4.install Fri May 17 01:29:22 2013
@@ -1,1 +1,1 @@
-usr/lib/libopencv_video.so.*
+usr/lib/*/libopencv_video.so.*
Modified: packages/opencv/trunk/debian/libopencv-videostab-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/libopencv-videostab-dev.install?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/libopencv-videostab-dev.install (original)
+++ packages/opencv/trunk/debian/libopencv-videostab-dev.install Fri May 17 01:29:22 2013
@@ -1,3 +1,3 @@
usr/include/opencv2/videostab/*
-usr/lib/libopencv_videostab.a
-usr/lib/libopencv_videostab.so
+usr/lib/*/libopencv_videostab.a
+usr/lib/*/libopencv_videostab.so
Modified: packages/opencv/trunk/debian/libopencv-videostab2.4.install
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/libopencv-videostab2.4.install?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/libopencv-videostab2.4.install (original)
+++ packages/opencv/trunk/debian/libopencv-videostab2.4.install Fri May 17 01:29:22 2013
@@ -1,1 +1,1 @@
-usr/lib/libopencv_videostab.so.*
+usr/lib/*/libopencv_videostab.so.*
Modified: packages/opencv/trunk/debian/opencv-doc.install
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/opencv-doc.install?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/opencv-doc.install (original)
+++ packages/opencv/trunk/debian/opencv-doc.install Fri May 17 01:29:22 2013
@@ -1,5 +1,5 @@
usr/share/OpenCV/doc/* usr/share/doc/opencv-doc/
-usr/share/OpenCV/samples/* usr/share/doc/opencv-doc/examples/
+#usr/share/OpenCV/samples/* usr/share/doc/opencv-doc/examples/
samples/python usr/share/doc/opencv-doc/examples/
samples/python2 usr/share/doc/opencv-doc/examples/
debian/samples/c/Makefile.debian usr/share/doc/opencv-doc/examples/c/
Modified: packages/opencv/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/rules?rev=45907&op=diff
==============================================================================
--- packages/opencv/trunk/debian/rules (original)
+++ packages/opencv/trunk/debian/rules Fri May 17 01:29:22 2013
@@ -2,6 +2,7 @@
export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie,+fortify
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
# SSE options
ifeq ($(DEB_HOST_ARCH),amd64)
@@ -19,13 +20,13 @@
CMAKE_FLAGS = \
-DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR="lib/$(DEB_HOST_MULTIARCH)" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_C_FLAGS_RELEASE="$(CFLAGS)" \
-DCMAKE_CXX_FLAGS_RELEASE="$(CXXFLAGS)" \
-DCMAKE_SHARED_LINKER_FLAGS_RELEASE="$(LDFLAGS)" \
-DCMAKE_EXE_LINKER_FLAGS_RELEASE="$(LDFLAGS)" \
-DCMAKE_BUILD_TYPE=Release \
- $(CMAKE_ARCH_FLAGS) \
-DBUILD_EXAMPLES=ON \
-DINSTALL_C_EXAMPLES=ON \
-DINSTALL_PYTHON_EXAMPLES=ON \
@@ -46,7 +47,8 @@
-DWITH_XINE=OFF \
-DBUILD_TESTS=OFF \
-DCMAKE_SKIP_RPATH=ON \
- -DWITH_CUDA=OFF
+ -DWITH_CUDA=OFF \
+ $(CMAKE_ARCH_FLAGS)
%:
dh $@ --buildsystem=cmake
@@ -65,8 +67,9 @@
-rm --verbose -rf debian/tmp/usr/share/opencv/samples/octave
-rm --verbose -rf debian/tmp/usr/share/opencv/samples/c/cvsample.dsp
-rm --verbose -rf debian/tmp/usr/share/OpenCV/doc/license.txt
+
for f in $$(ls obj-*/lib/libopencv_*_s.a); do \
- cp --verbose --preserve=mode $$f debian/tmp/usr/lib/$$(basename $$f _s.a).a; done
+ cp --verbose --preserve=mode $$f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/$$(basename $$f _s.a).a; done
dh_install -O--buildsystem=cmake --list-missing
override_dh_fixperms:
More information about the debian-science-commits
mailing list