[Forensics-changes] [SCM] debian-forensics/libphash branch, debian, updated. debian/0.9.4-1-11-gc45603c

[Julien Valroff]

The following commit has been merged in the debian branch:
commit 8832471776ad2fb07c0a30138f557936502b0656
Author: Julien Valroff <julien at kirya.net>
Date:   Thu Aug 18 19:20:42 2011 +0200

    Don't use dh override to fix CXXFLAGS

diff --git a/debian/changelog b/debian/changelog
index 9bb315c..2961b3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,9 @@ libphash (0.9.4-2) unstable; urgency=low
   * Update copyright file to latest DEP5 specification 
   * Drop ${shlibs:Depends} substvar from -dev package 
   * Bump standards version to 3.9.2 (no changes needed) 
+  * Don't use dh override to fix CXXFLAGS 
 
- -- Julien Valroff <julien at debian.org>  Thu, 18 Aug 2011 18:46:58 +0200
+ -- Julien Valroff <julien at debian.org>  Thu, 18 Aug 2011 19:20:25 +0200
 
 libphash (0.9.4-1.1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 2f26e91..9512379 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 
-%:
-	dh ${@}
+CXXFLAGS += -D__STDC_CONSTANT_MACROS
 
-override_dh_auto_configure:
-	dh_auto_configure -- CXXFLAGS="$(CXXFLAGS) -D__STDC_CONSTANT_MACROS"
+%:
+	dh $@

-- 
debian-forensics/libphash