r45334 - in /packages/opencv/tags/2.3.1-11/debian: changelog control rules

[iwamatsu at users.alioth.debian.org]

Author: iwamatsu
Date: Mon Aug 27 11:32:07 2012
New Revision: 45334

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45334
Log:
Update 2.3.1-11

Modified:
    packages/opencv/tags/2.3.1-11/debian/changelog
    packages/opencv/tags/2.3.1-11/debian/control
    packages/opencv/tags/2.3.1-11/debian/rules

Modified: packages/opencv/tags/2.3.1-11/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/tags/2.3.1-11/debian/changelog?rev=45334&op=diff
==============================================================================
--- packages/opencv/tags/2.3.1-11/debian/changelog (original)
+++ packages/opencv/tags/2.3.1-11/debian/changelog Mon Aug 27 11:32:07 2012
@@ -1,3 +1,16 @@
+opencv (2.3.1-11) unstable; urgency=high
+  
+  * Update debian/control.
+    - Bumped Standards-Version to 3.9.3. No changes needed.
+    - Update Homepage field.
+    - Add python-numpy-abi9 and python-numpy (>= 1:1.6.1) to python-opencv.
+      Fix lintian error for missing-dependency-on-numpy-abi. (Closes: #676633)
+  * Update debian/rules.
+    - Remove unnecessary option of build config.
+  * Add lintian-overrides files for hardening-no-fortify-functions.
+
+ -- Nobuhiro Iwamatsu <iwamatsu at debian.org>  Thu, 28 Jun 2012 04:04:04 +0900
+
 opencv (2.3.1-10) unstable; urgency=high
 
   * Update debian/control.

Modified: packages/opencv/tags/2.3.1-11/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/tags/2.3.1-11/debian/control?rev=45334&op=diff
==============================================================================
--- packages/opencv/tags/2.3.1-11/debian/control (original)
+++ packages/opencv/tags/2.3.1-11/debian/control Mon Aug 27 11:32:07 2012
@@ -4,7 +4,6 @@
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Nobuhiro Iwamatsu <iwamatsu at debian.org>
 Build-Depends: debhelper (>= 8),
- quilt (>= 0.46-7~),
  cmake,
  libavcodec-dev, libavformat-dev, libswscale-dev, libgtk2.0-dev,
  libjasper-dev (>= 1.900.1),
@@ -24,10 +23,10 @@
  python-sphinx,
  texlive-fonts-extra, texlive-latex-extra, texlive-latex-recommended,
  latex-xcolor, texlive-fonts-recommended
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/opencv/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/opencv/trunk/
-Homepage: http://opencvlibrary.sourceforge.net/
+Homepage: http://opencv.willowgarage.com
 
 Package: opencv-doc
 Section: doc
@@ -728,7 +727,8 @@
 Package: python-opencv
 Section: python
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-numpy-abi9,
+	python-numpy (>= 1:1.6.1)
 Provides: ${python:Provides}
 Replaces: python2.3-opencv (<= 0.9.7-3)
 Conflicts: python2.3-opencv (<= 0.9.7-3)

Modified: packages/opencv/tags/2.3.1-11/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/tags/2.3.1-11/debian/rules?rev=45334&op=diff
==============================================================================
--- packages/opencv/tags/2.3.1-11/debian/rules (original)
+++ packages/opencv/tags/2.3.1-11/debian/rules Mon Aug 27 11:32:07 2012
@@ -4,7 +4,6 @@
 CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
 LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 
-DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_HOST_CPU)
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 # These don't need to be exported and if they are we'll get the flags
@@ -14,7 +13,7 @@
 unexport LDFLAGS
 
 # SSE options
-ifeq ($(DEB_HOST_ARCH_CPU),amd64)
+ifeq ($(DEB_HOST_ARCH),amd64)
 CMAKE_ARCH_FLAGS = -DENABLE_SSE=ON -DENABLE_SSE2=ON -DENABLE_SSSE3=OFF 
 else
 CMAKE_ARCH_FLAGS = -DENABLE_SSE=OFF -DENABLE_SSE2=OFF -DENABLE_SSSE3=OFF 
@@ -58,7 +57,7 @@
 	-DCMAKE_SKIP_RPATH=ON
 
 %:
-	dh $@ --with quilt --buildsystem=cmake
+	dh $@ --buildsystem=cmake
 
 override_dh_clean:
 	rm -rf modules/python/src2/hdr_parser.pyc