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

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-04-29 07:40:46 +0000 (Fri, 29 Apr 2011)
New Revision: 6710

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

Modified: trunk/packages/vxl/trunk/debian/changelog
===================================================================
--- trunk/packages/vxl/trunk/debian/changelog	2011-04-29 07:39:34 UTC (rev 6709)
+++ trunk/packages/vxl/trunk/debian/changelog	2011-04-29 07:40:46 UTC (rev 6710)
@@ -1,3 +1,10 @@
+vxl (1.14.0-7) unstable; urgency=low
+
+  * Fix compilation on armel. Closes: #624512
+  * Explicitely B-D on libav-dev files
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Fri, 29 Apr 2011 09:38:20 +0200
+
 vxl (1.14.0-6) unstable; urgency=low
 
   * Fix compilation on armel. Closes: #624410

Modified: trunk/packages/vxl/trunk/debian/rules
===================================================================
--- trunk/packages/vxl/trunk/debian/rules	2011-04-29 07:39:34 UTC (rev 6709)
+++ trunk/packages/vxl/trunk/debian/rules	2011-04-29 07:40:46 UTC (rev 6710)
@@ -37,6 +37,8 @@
 common-configure-arch::
 	# remove duplicate from bprb_parameters+unsigned_int-.cxx
 	rm -f $(CURDIR)/contrib/brl/bpro/bprb/Templates/bprb_parameters+unsigned-.cxx
+	# remove duplicate from bvxm_voxel_grid+bsta_num_obs+bsta_mixture_fixed+bsta_num_obs+bsta_gauss_f1-.3---.cxx
+	rm -f $(CURDIR)/contrib/brl/bseg/bvxm/grid/Templates/bvxm_voxel_grid+bsta_num_obs+bsta_mixture_fixed+bsta_num_obs+bsta_gaussian_sphere+float.1--.3---.cxx
 	cd $(DEB_BUILDDIR) && cmake \
 	-DCMAKE_INSTALL_PREFIX:PATH=/usr \
 	-DCMAKE_SKIP_RPATH:BOOL=ON \