[Pkg-ace-devel] r482 - in /trunk/debian: changelog libtao-orbsvcs-1.5.6.manpages rules

[tgg-guest at users.alioth.debian.org]

Author: tgg-guest
Date: Tue Feb 13 20:08:42 2007
New Revision: 482

URL: http://svn.debian.org/wsvn/pkg-ace/?sc=1&rev=482
Log:
Remove TAO_ORB_Options.1 from libtao-orbsvcs and fix debian/rules.

Having TAO_ORB_Options.1 in a lib package prevents having both packages
installed, silly me.

Also fix debian/rules so that it does not try to run configure again.

Removed:
    trunk/debian/libtao-orbsvcs-1.5.6.manpages
Modified:
    trunk/debian/changelog
    trunk/debian/rules

Modified: trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ace/trunk/debian/changelog?rev=482&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Tue Feb 13 20:08:42 2007
@@ -4,8 +4,9 @@
   * Switch to the autotools method.  Since CIAO cannot yet be compiled this
     way, CIAO packages are dropped for now.
   * Drop obsolete patches and scripts.
-
- -- Thomas Girard <thomas.g.girard at free.fr>  Sat, 10 Feb 2007 16:24:02 +0000
+  * We no longer ship TAO_ORB_Options.1 in libtao-orbsvcs.
+
+ -- Thomas Girard <thomas.g.girard at free.fr>  Tue, 13 Feb 2007 19:09:57 +0000
 
 ace (5.4.7-11) unstable; urgency=low
 

Modified: trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ace/trunk/debian/rules?rev=482&op=diff
==============================================================================
--- trunk/debian/rules (original)
+++ trunk/debian/rules Tue Feb 13 20:08:42 2007
@@ -190,7 +190,7 @@
 #       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) --fail-missing
+	dh_install --sourcedir=$(DT) --list-missing
 
 binary-indep: build install
 	dh_testdir -i
@@ -234,7 +234,7 @@
 
 configure: configure-stamp
 
-configure-stamp: patch
+configure-stamp: patch-stamp pl-stamp
 	mkdir -p objdir
 	cd objdir && ../ACE_wrappers/configure $(confflags) --prefix=/usr --disable-tao-examples --disable-tao-tests --disable-ace-examples --disable-ace-tests --enable-fl-reactor --enable-qt-reactor --enable-tk-reactor  --enable-xt-reactor --enable-symbol-visibility --with-tclconfig=$(TCL_HOME) --with-tkconfig=$(TK_HOME) --enable-ipv6 --enable-inline --enable-probe
 	touch $@