[med-svn] r6695 - trunk/packages/vxl/trunk/debian

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-04-28 08:47:16 +0000 (Thu, 28 Apr 2011)
New Revision: 6695

Modified:
   trunk/packages/vxl/trunk/debian/changelog
   trunk/packages/vxl/trunk/debian/rules
Log:
prepare for next upload

Modified: trunk/packages/vxl/trunk/debian/changelog
===================================================================
--- trunk/packages/vxl/trunk/debian/changelog	2011-04-28 08:38:20 UTC (rev 6694)
+++ trunk/packages/vxl/trunk/debian/changelog	2011-04-28 08:47:16 UTC (rev 6695)
@@ -1,3 +1,9 @@
+vxl (1.14.0-6) unstable; urgency=low
+
+  * Fix compilation on armel. Closes: #624410
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Thu, 28 Apr 2011 10:46:46 +0200
+
 vxl (1.14.0-5) unstable; urgency=low
 
   * Rename libs to prevent conflicts. Closes: #623511, #624174

Modified: trunk/packages/vxl/trunk/debian/rules
===================================================================
--- trunk/packages/vxl/trunk/debian/rules	2011-04-28 08:38:20 UTC (rev 6694)
+++ trunk/packages/vxl/trunk/debian/rules	2011-04-28 08:47:16 UTC (rev 6695)
@@ -35,6 +35,8 @@
 	rm -rf $(DEB_BUILDDIR)
 
 common-configure-arch::
+	# remove duplicate from bprb_parameters+unsigned_int-.cxx
+	rm -f $(CURDIR)/contrib/brl/bpro/bprb/Templates/bprb_parameters+unsigned-.cxx
 	cd $(DEB_BUILDDIR) && cmake \
 	-DCMAKE_INSTALL_PREFIX:PATH=/usr \
 	-DCMAKE_SKIP_RPATH:BOOL=ON \
@@ -84,7 +86,5 @@
 
 get-orig-source: $(UPSTREAM_SRC).zip
 	unzip -q $(UPSTREAM_SRC).zip
-	# remove duplicate from bprb_parameters+unsigned_int-.cxx
-	rm $(DEBIAN_SRC_DIR)/contrib/brl/bpro/bprb/Templates/bprb_parameters+unsigned-.cxx
 	GZIP="--best --no-name" tar czf $(DEBIAN_SRC_TAR) $(DEBIAN_SRC_DIR)
 	rm -rf $(DEBIAN_SRC_DIR)