[SCM] Ann packaging branch, master, updated. fb5ed43a17a0effa9f84127435a7402476c67cdc

[Sylvestre Ledru]

The following commit has been merged in the master branch:
commit fb5ed43a17a0effa9f84127435a7402476c67cdc
Author: Sylvestre Ledru <sylvestre.ledru at scilab.org>
Date:   Tue Oct 11 01:13:24 2011 +0200

    update of the build + symbols

diff --git a/debian/libann-dev.docs b/debian/libann-dev.docs
index 285c801..e366f30 100644
--- a/debian/libann-dev.docs
+++ b/debian/libann-dev.docs
@@ -1,2 +1,2 @@
 doc/ANNmanual.pdf
-README.Debian
+debian/README.Debian
diff --git a/debian/libann0.symbols b/debian/libann0.symbols
index 89e265f..4f58ef4 100644
--- a/debian/libann0.symbols
+++ b/debian/libann0.symbols
@@ -47,14 +47,14 @@ libann.so.0 libann0 #MINVER#
  _Z14annMedianSplitPPdPiiiRdi at Base 1.1.1
  _Z14annResetCountsv at Base 1.1.1
  _Z14annUpdateStatsv at Base 1.1.1
- _Z14print_one_statPc11ANNsampStatd at Base 1.1.1
+ _Z14print_one_statPKc11ANNsampStatd at Base 1.1.2
  _Z14sl_midpt_splitPPdPiRK11ANNorthRectiiRiRdS5_ at Base 1.1.1
  _Z15annSplitBalancePPdPiiid at Base 1.1.1
  _Z15trySimpleShrinkPPdPiiiRK11ANNorthRectRS2_ at Base 1.1.1
  _Z17tryCentroidShrinkPPdPiiiRK11ANNorthRectPFvS0_S1_S4_iiRiRdS5_ERS2_ at Base 1.1.1
  _Z7annDistiPdS_ at Base 1.1.1
  _Z8annClosev at Base 1.1.1
- _Z8annErrorPc6ANNerr at Base 1.1.1
+ _Z8annErrorPKc6ANNerr at Base 1.1.2
  _Z8kd_splitPPdPiRK11ANNorthRectiiRiRdS5_ at Base 1.1.1
  _Z8rbd_treePPdPiiiiR11ANNorthRectPFvS0_S1_RKS2_iiRiRdS6_E13ANNshrinkRule at Base 1.1.1
  _Z8rkd_treePPdPiiiiR11ANNorthRectPFvS0_S1_RKS2_iiRiRdS6_E at Base 1.1.1
@@ -67,6 +67,7 @@ libann.so.0 libann0 #MINVER#
  _ZN10ANNbd_treeC2ERSi at Base 1.1.1
  _ZN10ANNbd_treeD0Ev at Base 1.1.1
  _ZN10ANNbd_treeD1Ev at Base 1.1.1
+ _ZN10ANNbd_treeD2Ev at Base 1.1.2
  _ZN10ANNkdStats5mergeERKS_ at Base 1.1.1
  _ZN10ANNkd_leaf10ann_searchEd at Base 1.1.1
  _ZN10ANNkd_leaf13ann_FR_searchEd at Base 1.1.1
@@ -76,8 +77,10 @@ libann.so.0 libann0 #MINVER#
  _ZN10ANNkd_leaf8getStatsEiR10ANNkdStatsR11ANNorthRect at Base 1.1.1
  _ZN10ANNkd_leafD0Ev at Base 1.1.1
  _ZN10ANNkd_leafD1Ev at Base 1.1.1
+ _ZN10ANNkd_leafD2Ev at Base 1.1.2
  _ZN10ANNkd_nodeD0Ev at Base 1.1.1
  _ZN10ANNkd_nodeD1Ev at Base 1.1.1
+ _ZN10ANNkd_nodeD2Ev at Base 1.1.2
  _ZN10ANNkd_tree10annkSearchEPdiPiS0_d at Base 1.1.1
  _ZN10ANNkd_tree12SkeletonTreeEiiiPPdPi at Base 1.1.1
  _ZN10ANNkd_tree12annkFRSearchEPddiPiS0_d at Base 1.1.1
@@ -105,10 +108,13 @@ libann.so.0 libann0 #MINVER#
  _ZN11ANNkd_split8getStatsEiR10ANNkdStatsR11ANNorthRect at Base 1.1.1
  _ZN11ANNkd_splitD0Ev at Base 1.1.1
  _ZN11ANNkd_splitD1Ev at Base 1.1.1
+ _ZN11ANNkd_splitD2Ev at Base 1.1.2
  _ZN11ANNorthRect6insideEiPd at Base 1.1.1
  (optional)_ZN11ANNorthRectD1Ev at Base 1.1.1
+ _ZN11ANNorthRectD2Ev at Base 1.1.2
  _ZN11ANNpointSetD0Ev at Base 1.1.1
  _ZN11ANNpointSetD1Ev at Base 1.1.1
+ _ZN11ANNpointSetD2Ev at Base 1.1.2
  _ZN12ANNbd_shrink10ann_searchEd at Base 1.1.1
  _ZN12ANNbd_shrink13ann_FR_searchEd at Base 1.1.1
  _ZN12ANNbd_shrink14ann_pri_searchEd at Base 1.1.1
@@ -117,7 +123,7 @@ libann.so.0 libann0 #MINVER#
  _ZN12ANNbd_shrink8getStatsEiR10ANNkdStatsR11ANNorthRect at Base 1.1.1
  _ZN12ANNbd_shrinkD0Ev at Base 1.1.1
  _ZN12ANNbd_shrinkD1Ev at Base 1.1.1
- _ZN13ANN_exceptionD1Ev at Base 1.1.1
+ _ZN12ANNbd_shrinkD2Ev at Base 1.1.2
  _ZN13ANNbruteForce10annkSearchEPdiPiS0_d at Base 1.1.1
  _ZN13ANNbruteForce12annkFRSearchEPddiPiS0_d at Base 1.1.1
  _ZN13ANNbruteForce6theDimEv at Base 1.1.1
@@ -135,7 +141,6 @@ libann.so.0 libann0 #MINVER#
  _ZTI11ANNkd_split at Base 1.1.1
  _ZTI11ANNpointSet at Base 1.1.1
  _ZTI12ANNbd_shrink at Base 1.1.1
- _ZTI13ANN_exception at Base 1.1.1
  _ZTI13ANNbruteForce at Base 1.1.1
  _ZTS10ANNbd_tree at Base 1.1.1
  _ZTS10ANNkd_leaf at Base 1.1.1
@@ -144,7 +149,6 @@ libann.so.0 libann0 #MINVER#
  _ZTS11ANNkd_split at Base 1.1.1
  _ZTS11ANNpointSet at Base 1.1.1
  _ZTS12ANNbd_shrink at Base 1.1.1
- _ZTS13ANN_exception at Base 1.1.1
  _ZTS13ANNbruteForce at Base 1.1.1
  _ZTV10ANNbd_tree at Base 1.1.1
  _ZTV10ANNkd_leaf at Base 1.1.1
diff --git a/debian/rules b/debian/rules
index decb496..40319c1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,20 +6,17 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-# DEB_AUTO_UPDATE_AUTOHEADER = 2.61
-# DEB_AUTO_UPDATE_AUTOCONF = 2.61
-# DEB_AUTO_UPDATE_ACLOCAL = 1.10
-# DEB_AUTO_UPDATE_AUTOMAKE = 1.10
+DEB_AUTO_UPDATE_AUTOHEADER = 2.61
+DEB_AUTO_UPDATE_AUTOCONF = 2.61
+DEB_AUTO_UPDATE_ACLOCAL = 1.9
+DEB_AUTO_UPDATE_AUTOMAKE = 1.9
 DEB_AUTOMAKE_ARGS = --foreign --add-missing
-#DEB_AUTO_UPDATE_LIBTOOL = pre
+DEB_AUTO_UPDATE_LIBTOOL = pre
 
 DEB_COMPRESS_EXCLUDE = .pdf
 
 SAVE_FILES = Makefile ann2fig/Makefile sample/Makefile test/Makefile
 
-debian/stamp-autotools-files:
-        autoreconf
-
 
 makebuilddir/libann0::
 	# Save upstream Makefiles
@@ -27,7 +24,7 @@ makebuilddir/libann0::
 		if [ ! -f $$f-orig ] ; then mv $$f $$f-orig ; fi	\
 	done
 	# Access several AC_CXX_* macros from the Autoconf archive
-	test -L m4 || ln -s /usr/share/autoconf-archive m4
+	test -L m4 || ln -s /usr/share/aclocal m4
 	# Create an empty aclocal.m4, otherwise CDBS will not create one
 	touch aclocal.m4
 	# Created autotools auxiliary directory cfg

-- 
Ann packaging