[SCM] visp branch, master, updated. debian/2.6.2-1-49-g6994be4

[Thomas Moulard]

The following commit has been merged in the master branch:
commit 6994be42b1aa3e5d700187fd432a09abb4e542e4
Author: Thomas Moulard <thomas.moulard at gmail.com>
Date:   Mon Jun 17 13:51:37 2013 +0900

    Enhance debian/rules.
    
    Doxygen documentation is now generated in build-indep.
    
    Test suite is disabled via the nocheck option and not through
    overriding the override_dh_autotest target.

diff --git a/debian/rules b/debian/rules
index f91b1d5..34b04b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,9 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+# Test suite fails for this release.
+export DEB_BUILD_OPTIONS=nocheck
+
 # Hardening flags.
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
 
@@ -56,9 +59,8 @@ endif
 
 
 .PHONY: override_dh_auto_configure	\
-	override_dh_auto_build		\
-	override_dh_strip		\
-	override_dh_auto_test
+	override_dh_auto_build-indep	\
+	override_dh_strip
 
 %:
 	dh  $@ --parallel --with pkgkde-symbolshelper
@@ -71,11 +73,8 @@ override_dh_auto_clean:
 override_dh_auto_configure:
 	dh_auto_configure -- $(CONFIGURE_ARGS)
 
-override_dh_auto_build:
-	dh_auto_build -- # Compile the software.
+override_dh_auto_build-indep:
 	dh_auto_build -- html-doc # Generate Doxygen HTML documentation.
 
 override_dh_strip:
 	dh_strip -a --dbg-package=libvisp2-dbg
-
-override_dh_auto_test:

-- 
visp