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

[tgg at alioth.debian.org]

Author: tgg
Date: 2007-12-22 17:04:08 +0000 (Sat, 22 Dec 2007)
New Revision: 548

Modified:
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/rules
Log:
package 5.6.2


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-12-15 20:56:10 UTC (rev 547)
+++ trunk/debian/changelog	2007-12-22 17:04:08 UTC (rev 548)
@@ -7,12 +7,11 @@
   * Fix DEB_BUILD_OPTIONS=noopt.
   * Add zlib1g-dev and libzzip-dev build dependencies.
   * Enable symbol visibility.
-  * Patches taken from SVN:
-    o 07-use-short-names-for-ace-doxygen.dpatch to reduce generated filenames
   * Manually add missing some autoconf tests to reduce differences against
     regular ACE build method.
+  * Do not generate doxygen; it fails.
 
- -- Thomas Girard <thomas.g.girard at free.fr>  Thu, 15 Nov 2007 21:43:08 +0000
+ -- Thomas Girard <thomas.g.girard at free.fr>  Sat, 22 Dec 2007 17:56:23 +0100
 
 ace (5.5.9-1) experimental; urgency=low
 

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2007-12-15 20:56:10 UTC (rev 547)
+++ trunk/debian/control	2007-12-22 17:04:08 UTC (rev 548)
@@ -4,7 +4,6 @@
 Maintainer: Debian ACE+TAO maintainers <pkg-ace-devel at lists.alioth.debian.org>
 Uploaders: Konstantinos Margaritis <markos at debian.org>, Brian Nelson <pyro at debian.org>, Thomas Girard <thomas.g.girard at free.fr>
 Build-Depends: debhelper (>= 5), libssl-dev (>= 0.9.7d), dpatch (>= 2.0.10), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev, tk8.4-dev (>= 8.4.7), zlib1g-dev, libzzip-dev, docbook-to-man, bzip2, autoconf, automake, libtool, autotools-dev
-Build-Depends-Indep: doxygen, graphviz
 Build-Conflicts: autoconf2.13, automake1.4
 Standards-Version: 3.7.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ace/trunk

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2007-12-15 20:56:10 UTC (rev 547)
+++ trunk/debian/rules	2007-12-22 17:04:08 UTC (rev 548)
@@ -117,15 +117,6 @@
 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
 
@@ -197,9 +188,9 @@
 #       We don't install .la files
 	find $(DT) -name '*.la' -print0 | xargs -0 rm
 	rm -f $(DT)/usr/bin/TAO_Service
-	dh_install --sourcedir=$(DT) --list-missing
+	dh_install --sourcedir=$(DT) --fail-missing
 
-binary-indep: build install doxygen-stamp
+binary-indep: build install
 	dh_testdir -i
 	dh_testroot -i
 	dh_installdocs -i