[Pkg-ace-commits] [pkg-ace] r553 - trunk/debian

[tgg at alioth.debian.org]

Author: tgg
Date: 2008-02-17 09:00:47 +0000 (Sun, 17 Feb 2008)
New Revision: 553

Modified:
   trunk/debian/changelog
   trunk/debian/rules
Log:
restore doxygen; document bugzilla numbers and prepare changelog


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-01-06 22:21:36 UTC (rev 552)
+++ trunk/debian/changelog	2008-02-17 09:00:47 UTC (rev 553)
@@ -1,3 +1,10 @@
+ace (5.6.2-2) unstable; urgency=low
+
+  * Upload to unstable.
+  * Build doxygen again.
+
+ -- Thomas Girard <thomas.g.girard at free.fr>  Sat, 16 Feb 2008 21:38:25 +0100
+
 ace (5.6.2-1) experimental; urgency=low
 
   * New upstream release.

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2008-01-06 22:21:36 UTC (rev 552)
+++ trunk/debian/rules	2008-02-17 09:00:47 UTC (rev 553)
@@ -117,6 +117,15 @@
 manpages-stamp: $(MAN1) $(MAN5)
 	touch $@
 
+doxygen-stamp: extract-stamp
+	cd $(ACE_ROOT) && bin/generate_doxygen.pl -is_release
+	find $(ACE_ROOT)/html/ace -name '*.tag' -o -name '*.md5' -o -name '*.dot' -o -name '*.idx' | xargs -r rm -f
+	find $(ACE_ROOT)/html/tao -name '*.tag' -o -name '*.md5' -o -name '*.dot' -o -name '*.idx' | xargs -r rm -f
+	touch $@
+
+.PHONY: doxygen
+doxygen: doxygen-stamp
+
 build-stamp: configure-stamp
 	dh_testdir
 
@@ -190,7 +199,7 @@
 	rm -f $(DT)/usr/bin/TAO_Service
 	dh_install --sourcedir=$(DT) --fail-missing
 
-binary-indep: build install
+binary-indep: build install doxygen-stamp
 	dh_testdir -i
 	dh_testroot -i
 	dh_installdocs -i
@@ -244,18 +253,21 @@
 	echo '#define ACE_GPERF "gperf-ace"' >> $(CONFIG)
 	echo '#define TAO_IDL_INCLUDE_DIR "/usr/include/tao"' >> $(CONFIG)
 
-#	To remove once the autoconf macros exist
+#	To remove once the autoconf macros are fixed, see bz#3134
 	for i in 16 32 64 ; do \
 		echo "#define ACE_HAS_BSWAP_$$i" >> $(CONFIG) ; \
 	done
+
+	# bz#3138
 	echo "#define ACE_HAS_RECURSIVE_MUTEXES" >> $(CONFIG)
 
-	# Not sure about this one, but it can do no harm
+	# Not sure about this one, but it can do no harm (bz#3141)
 	echo "#define ACE_HAS_DLSYM_SEGFAULT_ON_INVALID_HANDLE" >> $(CONFIG)
 
 	echo "#define ACE_HAS_SCANDIR" >> $(CONFIG)
 	echo "#define ACE_SCANDIR_CMP_USES_CONST_VOIDPTR" >> $(CONFIG)
 
+	# bz#3144
 	echo "#define ACE_HAS_SENDFILE" >> $(CONFIG)
 
 	echo "#define ACE_LACKS_WCSICMP" >> $(CONFIG)