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

Sat May 1 12:17:23 UTC 2010

Author: tgg
Date: 2010-05-01 12:17:17 +0000 (Sat, 01 May 2010)
New Revision: 660

Modified:
   trunk/debian/rules
Log:
Various fixes:
 - Fix *-stamp that was not working
 - Remove no longer needed passes
 - Workaround Lzo compressor missing .so symlink


Modified: trunk/debian/rules
===================================================================

--- trunk/debian/rules	2010-05-01 12:15:10 UTC (rev 659)
+++ trunk/debian/rules	2010-05-01 12:17:17 UTC (rev 660)
@@ -1,17 +1,17 @@
 #!/usr/bin/make -f
 
-# debian/rules file for the ACE Debian GNU/Linux package
+# debian/rules file for ACE+TAO Debian GNU/Linux packages
 # written February 2002 by Ossama Othman <ossama at debian.org>
 # Modified August 2003 by Brian Nelson <pyro at debian.org>
 # Copyright (C) 2004  Raphael Bossek <bossekr at debian.org>
-# Copyright © 2005-2008 Thomas Girard <thomas.g.girard at free.fr>
+# Copyright © 2005-20010 Thomas Girard <thomas.g.girard at free.fr>
 
 INSTALL := install -o root -g root
 INSTALL_755 := $(INSTALL) -m 755
 ACE_SUBDIR := ACE_wrappers
 ACE_ARCHIVE := $(shell ls -1 ACE+TAO+CIAO-src-*.tar.bz2 2>/dev/null || echo ace-archive-missing)
-MWCFLAGS := -type gnuace -features "ssl=1,zlib=1,zzip=1,xt=1,tk=1,fl=1,fox=1,qt4=1,exceptions=1,ace_qt4reactor=1" -noreldefs -genins
-ACE_MAKE_FLAGS := ssl=1 zlib=1 zzip=1 xt=1 tk=1 fl=1 fox=1 qt4=1 debug=0 inline=1 optimize=1 exceptions=1 ace_qt4reactor=1
+MWCFLAGS := -type gnuace -features "ssl=1,zlib=1,zzip=1,xt=1,tk=1,fl=1,fox=1,qt4=1,exceptions=1,ace_qt4reactor=1,bzip2=1,lzo1=1" -noreldefs -genins
+ACE_MAKE_FLAGS := ssl=1 zlib=1 zzip=1 xt=1 tk=1 fl=1 fox=1 qt4=1 debug=0 inline=1 optimize=1 exceptions=1 ace_qt4reactor=1 bzip2=1 lzo1=1
 PRJ_INSTALL_FLAGS := -k -s man_files,lib_output,header_files,inline_files,exe_output,idl_files,pidl_files,template_files  -b lib_output=usr/lib -b exe_output=usr/bin -b idl_files=usr/include -b pidl_files=usr/include -b template_files=usr/include -b header_files=usr/include -b inline_files=usr/include -b idl_files=usr/include -b man_files=usr/share/man
 MAN1 := debian/Basic_Logging_Service.1 \
 	debian/Event_Logging_Service.1 \
@@ -59,7 +59,7 @@
 	docbook-to-man $< > $@
 
 # Prepare a ACE_wrappers directory where most of the patches are applied.
-prepatch-stamp: extract
+prepatch-stamp: extract-stamp
 	dpatch apply-until $(UNTIL)
 
 	cp debian/ACE-DPKG.mwc $(ACE_ROOT)
@@ -70,11 +70,11 @@
 
 prepatch: prepatch-stamp
 
-pl-stamp: prepatch
+pl-stamp: prepatch-stamp
 	for fn in `find "$(ACE_ROOT)" -name "*.pl"`; do (echo '#!/usr/bin/perl'; cat "$$fn") > "$${fn}T"; mv "$${fn}T" "$$fn"; chmod a+x "$$fn"; done
 	touch $@
 
-patch-stamp: prepatch build
+patch-stamp: prepatch-stamp build
 	dpatch apply-all
 	touch $@
 
@@ -97,7 +97,7 @@
 
 doxygen: doxygen-stamp
 
-build-stamp: pl-stamp prepatch
+build-stamp: pl-stamp prepatch-stamp
 	dh_testdir
 	cd $(ACE_ROOT) && $(MAKE) $(ACE_MAKE_FLAGS)
 	cd $(TAO_ROOT) && $(MAKE) $(ACE_MAKE_FLAGS)
@@ -119,9 +119,9 @@
 	dh_installdirs
 #	Install ACE files in $(CURDIR)/$(DT)
 	echo Installing..
-	cd $(ACE_ROOT) && MPC/prj_install.pl $(PRJ_INSTALL_FLAGS) $(CURDIR)/$(DT) ace 
-	cd $(ACE_ROOT) && MPC/prj_install.pl $(PRJ_INSTALL_FLAGS) $(CURDIR)/$(DT) apps 
-	cd $(ACE_ROOT) && MPC/prj_install.pl $(PRJ_INSTALL_FLAGS) $(CURDIR)/$(DT) ACEXML  
+	cd $(ACE_ROOT) && MPC/prj_install.pl $(PRJ_INSTALL_FLAGS) $(CURDIR)/$(DT) ace
+	cd $(ACE_ROOT) && MPC/prj_install.pl $(PRJ_INSTALL_FLAGS) $(CURDIR)/$(DT) apps
+	cd $(ACE_ROOT) && MPC/prj_install.pl $(PRJ_INSTALL_FLAGS) $(CURDIR)/$(DT) ACEXML
 	cd $(ACE_ROOT) && MPC/prj_install.pl $(PRJ_INSTALL_FLAGS) $(CURDIR)/$(DT) Kokyu
 	cd $(ACE_ROOT)/protocols && ../MPC/prj_install.pl $(PRJ_INSTALL_FLAGS) $(CURDIR)/$(DT) ace
 
@@ -136,13 +136,15 @@
 	cd $(ACE_ROOT) && ./MPC/prj_install.pl -k -s man_files,exe_output,lib_output -b exe_output=usr/bin -b man_files=usr/share/man -b lib_output=usr/lib $(CURDIR)/$(DT) netsvcs
 	cd $(ACE_ROOT)/netsvcs/lib && ../../MPC/prj_install.pl -k -s header_files,inline_files,template_files  -b template_files=usr/include/netsvcs -b header_files=usr/include/netsvcs -b inline_files=usr/include/netsvcs $(CURDIR)/$(DT) .
 	cd $(ACE_ROOT)/netsvcs/servers && ../../MPC/prj_install.pl -k -s svc_conf_files -b svc_conf_files=usr/share/ace-netsvcs $(CURDIR)/$(DT) .
-	
+
 #	Move libraries and excutable to lib and bin, then remove subdirectories
 	cd $(CURDIR)/$(DT)/usr/bin &&  find . -executable -a -type f -exec mv {} . ';' && find . -type d -delete
 	cd $(CURDIR)/$(DT)/usr/lib &&  find . -type f -exec mv {} . ';' && find . -type d -delete
 
 #	Create .so links instead of copies
 	cd $(CURDIR)/$(DT)/usr/lib && find . -iname '*.so' -exec echo ln -sf {}.* {} ';' | sh
+#	Fixup a missing symlink
+	cd $(CURDIR)/$(DT)/usr/lib && ln -sf libTAO_LzoCompressor.so.* libTAO_LzoCompressor.so
 
 #	Change man1 files location
 	mkdir -p $(CURDIR)/$(DT)/usr/share/man/man1
@@ -158,10 +160,6 @@
 	mv  $(DT)/usr/bin/tao_ifr  $(DT)/usr/bin/tao_ifr.real
 	$(INSTALL_755) -D debian/tao_ifr $(DT)/usr/bin/tao_ifr
 
-#	Be lintian clean, fix permissions on examples
-#       But find returns nothing..
-#	-chmod -x `find $(TAO_ROOT)/examples/ -perm 755 ! -type d -a ! \( -name "*.pl" -o -name "*.sh" \)`
-
 	rm -f $(DT)/usr/bin/TAO_Service
 	dh_install --sourcedir=$(DT) --fail-missing
 
@@ -204,4 +202,3 @@
 	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
 
 binary: binary-indep binary-arch
-


