[Pkg-ace-devel] r475 - in /trunk/debian: mpc-ace.docs mpc-ace.install rules tao-idl.install tao-ifr.install

tgg-guest at users.alioth.debian.org tgg-guest at users.alioth.debian.org
Sun Feb 11 16:59:15 CET 2007 

Author: tgg-guest
Date: Sun Feb 11 16:59:15 2007
New Revision: 475

URL: http://svn.debian.org/wsvn/pkg-ace/?sc=1&rev=475
Log:
Continue repairing things.

Modified:
    trunk/debian/mpc-ace.docs
    trunk/debian/mpc-ace.install
    trunk/debian/rules
    trunk/debian/tao-idl.install
    trunk/debian/tao-ifr.install

Modified: trunk/debian/mpc-ace.docs
URL: http://svn.debian.org/wsvn/pkg-ace/trunk/debian/mpc-ace.docs?rev=475&op=diff
==============================================================================
--- trunk/debian/mpc-ace.docs (original)
+++ trunk/debian/mpc-ace.docs Sun Feb 11 16:59:15 2007
@@ -1,3 +1,3 @@
-#ACE_wrappers/MPC/ChangeLog
-#ACE_wrappers/MPC/README
-#ACE_wrappers/MPC/USAGE
+ACE_wrappers/MPC/ChangeLog
+ACE_wrappers/MPC/README
+ACE_wrappers/MPC/USAGE

Modified: trunk/debian/mpc-ace.install
URL: http://svn.debian.org/wsvn/pkg-ace/trunk/debian/mpc-ace.install?rev=475&op=diff
==============================================================================
--- trunk/debian/mpc-ace.install (original)
+++ trunk/debian/mpc-ace.install Sun Feb 11 16:59:15 2007
@@ -1,8 +1,6 @@
-#bin/mpc-ace                    usr/bin
-#bin/mwc-ace                    usr/bin
-#bin/depgen.pl                  usr/share/ace/bin
-#bin/DependencyGenerator        usr/share/ace/bin
-#bin/MakeProjectCreator         usr/share/ace/bin
-#MPC/{config,modules,templates} usr/share/ace/MPC
-#MPC/*.pl                       usr/share/ace/MPC
-#MPC/ChangeLog                  usr/share/ace/MPC
+usr/bin/mpc-ace
+usr/bin/mwc-ace
+usr/share/ace/bin/depgen.pl
+usr/share/ace/bin/DependencyGenerator
+usr/share/ace/bin/MakeProjectCreator
+usr/share/ace/MPC

Modified: trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ace/trunk/debian/rules?rev=475&op=diff
==============================================================================
--- trunk/debian/rules (original)
+++ trunk/debian/rules Sun Feb 11 16:59:15 2007
@@ -6,7 +6,8 @@
 # Copyright (C) 2004  Raphael Bossek <bossekr at debian.org>
 # Modified 2005, 2006, 2007 by Thomas Girard <thomas.g.girard at free.fr>
 
-INSTALL := install
+INSTALL := install -o root -g root
+INSTALL_755 := $(INSTALL) -m 755
 export AV := 5.5.6
 export TV := 1.5.6
 export CV := 0.5.6
@@ -51,6 +52,9 @@
 POSTPATCH_MARK := 04-bootstrap.dpatch
 UNTIL := $(PREPATCH_MARK)
 
+# Where we install every file before calling dh_install
+DT := debian/tmp
+
 # This is the debhelper compatibility version to use.
 export DH_COMPAT=5
 
@@ -73,12 +77,15 @@
 	touch $@
 
 ifneq (mpc-archive-missing,$(MPC_ARCHIVE))
-patch: $(ACE_ROOT) $(MPC_ROOT)
+patch-stamp: $(ACE_ROOT) $(MPC_ROOT)
 else
-patch: $(ACE_ROOT)
+patch-stamp: $(ACE_ROOT)
 endif
 	dpatch apply-all
-	touch $@
+	chmod +x $(ACE_ROOT)/configure $(ACE_ROOT)/TAO/configure
+	touch $@
+
+patch: patch-stamp
 
 unpatch: clean $(ACE_ROOT)
 
@@ -93,28 +100,28 @@
 	dpatch apply-until $(UNTIL)
 	rm -rf debian/patched
 
-bootstrap: prepatch $(ACE_ROOT)/configure
-
-$(ACE_ROOT)/configure: $(ACE_ROOT)/configure.ac
+bootstrap: prepatch
 	cd $(ACE_ROOT) && bin/bootstrap
 
 autotools: debian/patches/$(POSTPATCH_MARK)
 
 debian/patches/$(POSTPATCH_MARK):
 	$(MAKE) -f debian/rules clean prepatch
-	mv $(ACE_ROOT) $(ACE_ROOT).orig
+	mv $(ACE_SUBDIR) $(ACE_SUBDIR).orig
 	$(MAKE) -f debian/rules bootstrap
 	diff -Nru $(ACE_SUBDIR).orig $(ACE_SUBDIR) | dpatch patch-template -p $(POSTPATCH_MARK) "autools boostrapping" > $@
+	rm -Rf $(ACE_SUBDIR).orig
+	$(MAKE) -f debian/rules clean
 
 build: build-stamp build-manpages
 
 build-manpages: $(MAN1) $(MAN5)
 	touch $@
 
-build-stamp: patch configure-stamp
+build-stamp: configure-stamp
 	dh_testdir
 
-	# Hack to remove once the bug is fixed
+	# Hack to remove when this bug is fixed
 	mkdir -p objdir/ace/QtReactor
 	$(MAKE) -C objdir
 
@@ -122,8 +129,7 @@
 
 clean:
 	dh_testdir
-	rm -rf $(ACE_SUBDIR) $(ACE_SUBDIR).orig $(MPC_SUBDIR) objdir debian/patched $(MAN1) $(MAN5) patch-pl patch debian/mpc-ace.sgml build-manpages build-stamp
-
+	rm -rf $(ACE_SUBDIR) $(ACE_SUBDIR).orig $(MPC_SUBDIR) objdir debian/patched $(MAN1) $(MAN5) patch-pl patch-stamp debian/mpc-ace.sgml build-manpages build-stamp
 	dh_clean
 
 install: build
@@ -132,47 +138,53 @@
 	dh_clean -k
 	dh_installdirs
 
-	$(MAKE) -C objdir install DESTDIR=$(CURDIR)/debian/tmp
-
-	mv debian/tmp/usr/bin/gperf debian/tmp/usr/bin/gperf-ace
+	$(MAKE) -C objdir install DESTDIR=$(CURDIR)/$(DT)
+
+#       Rename gperf to gperf-ace
+	mv $(DT)/usr/bin/gperf $(DT)/usr/bin/gperf-ace
 
 	sed -e 's/gperf/gperf-ace/g' \
             -e 's/GPERF/GPERF-ACE/g' \
-           debian/tmp/usr/share/man/man1/gperf.1 > \
-	   debian/tmp/usr/share/man/man1/gperf-ace.1
-	rm -f debian/tmp/usr/share/man/man1/gperf.1
+           $(DT)/usr/share/man/man1/gperf.1 > \
+	   $(DT)/usr/share/man/man1/gperf-ace.1
+	rm -f $(DT)/usr/share/man/man1/gperf.1
 	sed -e 's/gperf\.info/gperf-ace\.info/g' \
             -e 's/(gperf)\.    /(gperf-ace)\./g' \
            $(ACE_ROOT)/apps/gperf/gperf.info > \
            $(ACE_ROOT)/apps/gperf/gperf-ace.info
 
 #	Rename the catior utility, it already exists in another package
-	mv debian/tmp/usr/bin/catior debian/tmp/usr/bin/tao-catior
+	mv $(DT)/usr/bin/catior $(DT)/usr/bin/tao-catior
 
 #       Multiple README
 	cp $(TAO_ROOT)/utils/catior/README $(TAO_ROOT)/utils/catior/README.catior
 	cp $(TAO_ROOT)/utils/nslist/README $(TAO_ROOT)/utils/nslist/README.nslist
 
-#	Rename tao_idl to have a script automatically define ACE_ROOT and
-#	TAO_ROOT
-	mv debian/tmp/usr/bin/tao_idl debian/tmp/usr/bin/tao_idl.real
-	$(INSTALL) -m 755 -o root -g root -D debian/tao_idl debian/tao-idl/usr/bin/tao_idl
-	mv  debian/tmp/usr/bin/tao_ifr  debian/tmp/usr/bin/tao_ifr.real
-	$(INSTALL) -m 755 -o root -g root -D debian/tao_ifr debian/tao-ifr/usr/bin/tao_ifr
-
-#       Rename mpc.pl and mwc.pl so that they do not include language extension.
-	cp $(ACE_ROOT)/bin/mpc.pl $(ACE_ROOT)/bin/mpc-ace
-	cp $(ACE_ROOT)/bin/mwc.pl $(ACE_ROOT)/bin/mwc-ace
+#	We provide scripts replacement for tao_idl and tao_ifr ; they
+#	automatically define ACE_ROOT and TAO_ROOT
+	mv $(DT)/usr/bin/tao_idl $(DT)/usr/bin/tao_idl.real
+	$(INSTALL_755) -D debian/tao_idl $(DT)/usr/bin/tao_idl
+	mv  $(DT)/usr/bin/tao_ifr  $(DT)/usr/bin/tao_ifr.real
+	$(INSTALL_755) -D debian/tao_ifr $(DT)/usr/bin/tao_ifr
+
+#       Copy MPC files.
+	$(INSTALL_755) -D $(ACE_ROOT)/bin/mpc.pl $(DT)/usr/bin/mpc-ace
+	$(INSTALL_755) -D $(ACE_ROOT)/bin/mwc.pl $(DT)/usr/bin/mwc-ace
+	$(INSTALL_755) -D $(ACE_ROOT)/bin/depgen.pl $(DT)/usr/share/ace/bin/depgen.pl
+	cp -a $(ACE_SUBDIR)/bin/DependencyGenerator $(DT)/usr/share/ace/bin
+	cp -a $(ACE_SUBDIR)/bin/MakeProjectCreator $(DT)/usr/share/ace/bin
+	cp -a $(ACE_SUBDIR)/MPC/config $(DT)/usr/share/ace/MPC
+	cp -a $(ACE_SUBDIR)/MPC/modules $(DT)/usr/share/ace/MPC
+	cp -a $(ACE_SUBDIR)/MPC/templates $(DT)/usr/share/ace/MPC
+	cp -a $(ACE_SUBDIR)/MPC/*.pl $(DT)/usr/share/ace/MPC
+	cp -a $(ACE_SUBDIR)/MPC/ChangeLog $(DT)/usr/share/ace/MPC
 
 #	Be lintian clean, fix permissions on examples
 	-chmod -x `find $(TAO_ROOT)/examples/ -perm 755 ! -type d -a ! \( -name "*.pl" -o -name "*.sh" \)`
-	-chmod -x `find $(TAO_ROOT)/CIAO/examples/ -perm 755 ! -type d -a ! \( -name "*.pl" -o -name "*.sh" \)`
-#	And on some header files
-	-chmod -x `find $(TAO_ROOT)/orbsvcs -perm 755 ! -type d -a \( -name "*.h" -o -name "*.inl" -o -name "*.i" \)`
 
 #       We don't install .la files
-	find debian/tmp -name '*.la' -print0 | xargs -0 rm
-	dh_install --sourcedir=debian/tmp --list-missing
+	find $(DT) -name '*.la' -print0 | xargs -0 rm
+	dh_install --sourcedir=$(DT) --fail-missing
 
 binary-indep: build install
 	dh_testdir -i
@@ -214,10 +226,11 @@
 
 binary: binary-indep binary-arch
 
-configure-stamp: $(ACE_ROOT)/configure
+configure: configure-stamp
+
+configure-stamp: patch-stamp
 	mkdir -p objdir
-	chmod +x $<
 	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 $@
 
-.PHONY: build clean binary-indep binary-arch binary install unpatch prepatch prepatchtwo update-makefile update-makefile-complete source diff dpatch bootstrap
+.PHONY: build clean binary-indep binary-arch binary install patch unpatch prepatch source diff bootstrap configure

Modified: trunk/debian/tao-idl.install
URL: http://svn.debian.org/wsvn/pkg-ace/trunk/debian/tao-idl.install?rev=475&op=diff
==============================================================================
--- trunk/debian/tao-idl.install (original)
+++ trunk/debian/tao-idl.install Sun Feb 11 16:59:15 2007
@@ -1,1 +1,2 @@
 usr/bin/tao_idl.real
+usr/bin/tao_idl

Modified: trunk/debian/tao-ifr.install
URL: http://svn.debian.org/wsvn/pkg-ace/trunk/debian/tao-ifr.install?rev=475&op=diff
==============================================================================
--- trunk/debian/tao-ifr.install (original)
+++ trunk/debian/tao-ifr.install Sun Feb 11 16:59:15 2007
@@ -1,2 +1,3 @@
 usr/bin/IFR_Service
 usr/bin/tao_ifr.real
+usr/bin/tao_ifr

More information about the Pkg-ace-devel mailing list