r45902 - in /packages/opencv/trunk/debian: changelog rules

[iwamatsu at users.alioth.debian.org]

Author: iwamatsu
Date: Fri May 17 01:22:34 2013
New Revision: 45902

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45902
Log:
cleanup build options

Modified:
    packages/opencv/trunk/debian/changelog
    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=45902&op=diff
==============================================================================
--- packages/opencv/trunk/debian/changelog (original)
+++ packages/opencv/trunk/debian/changelog Fri May 17 01:22:34 2013
@@ -1,6 +1,8 @@
 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/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/rules?rev=45902&op=diff
==============================================================================
--- packages/opencv/trunk/debian/rules (original)
+++ packages/opencv/trunk/debian/rules Fri May 17 01:22:34 2013
@@ -1,17 +1,7 @@
 #!/usr/bin/make -f
 
-CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
-CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
-CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
-LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
-
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie,+fortify
 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
-# duplicated in the command line.
-unexport CFLAGS
-unexport CXXFLAGS
-unexport LDFLAGS
 
 # SSE options
 ifeq ($(DEB_HOST_ARCH),amd64)