[Pkg-ace-commits] [pkg-ace] r690 - trunk/debian
Thomas Girard
tgg at alioth.debian.org
Sun May 23 18:09:26 UTC 2010
Author: tgg
Date: 2010-05-23 18:09:17 +0000 (Sun, 23 May 2010)
New Revision: 690
Removed:
trunk/debian/tao-idl.links
Modified:
trunk/debian/README.Debian
trunk/debian/TODO
trunk/debian/changelog
trunk/debian/libace-dev.install
trunk/debian/libace-dev.links
trunk/debian/libacexml-dev.links
trunk/debian/libkokyu-dev.links
trunk/debian/libtao-dev.dirs
trunk/debian/libtao-dev.install
trunk/debian/libtao-dev.links
trunk/debian/libtao-orbsvcs-dev.links
trunk/debian/mpc-ace.install
trunk/debian/mpc-ace.links
trunk/debian/rules
trunk/debian/tao-idl.install
trunk/debian/tao-ifr.install
trunk/debian/tao_idl
trunk/debian/tao_ifr
Log:
Move $ACE_ROOT from /usr/share/ace to /usr/lib/ace
Also fixup execution rights from some files, as pointed
out by lintian.
Modified: trunk/debian/README.Debian
===================================================================
--- trunk/debian/README.Debian 2010-05-22 15:51:48 UTC (rev 689)
+++ trunk/debian/README.Debian 2010-05-23 18:09:17 UTC (rev 690)
@@ -5,10 +5,10 @@
== Environment variables ==
If the software you are compiling requires $ACE_ROOT to be set (for
-example, the tutorials), you may set it to /usr/share/ace. For bash,
+example, the tutorials), you may set it to /usr/lib/ace. For bash,
the command to do this is
- export ACE_ROOT=/usr/share/ace
+ export ACE_ROOT=/usr/lib/ace
Likewise, for TAO:
@@ -33,3 +33,5 @@
mwc-ace -recurse -value_project install=. -value_project libout=.
5. now you can compile your example.
+
+ -- Thomas Girard <thomas.g.girard at free.fr>, Sun, 23 May 2010 11:04:27 +0200
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2010-05-22 15:51:48 UTC (rev 689)
+++ trunk/debian/TODO 2010-05-23 18:09:17 UTC (rev 690)
@@ -6,10 +6,13 @@
o package websvcs library?
o create man pages for ace/tao binaries
* rewrite the patch to load TAO libraries by SONAME and RFC it
- * move ACE_ROOT from /usr/share/ace to /usr/lib/ace?
- * hide .real programs in /usr/lib/ace?
* make all TAO programs start with tao_, and put distribution compatible
program in /usr/lib/tao
+ * add cpp dependency to tao_idl
+ * install .mpc files?
+ * rename mpc-ace to ace-mpc to be consistent?
+ * What about REACTOR_NOTIFICATION_QUEUE?
+ * Move .idl files to usr/share/idl/tao?
= MWC and MPC =
* they should define $ACE_ROOT and $TAO_ROOT if they're not
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2010-05-22 15:51:48 UTC (rev 689)
+++ trunk/debian/changelog 2010-05-23 18:09:17 UTC (rev 690)
@@ -8,6 +8,7 @@
* New patch: 20-versioned_libs.dpatch, to generate libraries with names
following libACE-5.7.7.so pattern instead of libACE.so.5.7.7.
* Rename binaries and packages to follow what is used in RPMs.
+ * Move $ACE_ROOT to /usr/lib/ace.
[ Marek Brudka ]
* New upstream release:
@@ -27,8 +28,6 @@
* Created patch to reduce the size of doxygen doc. Closes: #562164
* Created patch to fix cross references in doxygen tags
* Created libnetsvcs packages. Closes: #466137. Addresses: LP#185285
- * Removed permission fixes for example in debian/rules as there is nothing to
- fix
[ Pau Garcia i Quiles ]
* New upstream release
@@ -65,7 +64,7 @@
debian/compat
* Fix fox-config location, detection method has changed since 5.6.3
- -- Thomas Girard <thomas.g.girard at free.fr> Sat, 24 Apr 2010 09:04:30 +0200
+ -- Thomas Girard <thomas.g.girard at free.fr> Sun, 23 May 2010 16:58:42 +0200
ace (5.6.3-6) unstable; urgency=low
Modified: trunk/debian/libace-dev.install
===================================================================
--- trunk/debian/libace-dev.install 2010-05-22 15:51:48 UTC (rev 689)
+++ trunk/debian/libace-dev.install 2010-05-23 18:09:17 UTC (rev 690)
@@ -1,11 +1,11 @@
-../../ACE_wrappers/bin/generate_export_file.pl usr/share/ace/bin
-../../ACE_wrappers/bin/split-cpp.pl usr/share/ace/bin
-../../ACE_wrappers/bin/g++dep usr/share/ace/bin
-../../ACE_wrappers/bin/add_rel_link.sh usr/share/ace/bin
-../../ACE_wrappers/bin/depgen.pl usr/share/ace/bin
-../../ACE_wrappers/bin/DependencyGenerator usr/share/ace/bin
-../../ACE_wrappers/include usr/share/ace
-../../ACE_wrappers/include/makeinclude/platform_macros.GNU usr/share/ace/include/makeinclude
+../../ACE_wrappers/bin/generate_export_file.pl usr/lib/ace/bin
+../../ACE_wrappers/bin/split-cpp.pl usr/lib/ace/bin
+../../ACE_wrappers/bin/g++dep usr/lib/ace/bin
+../../ACE_wrappers/bin/add_rel_link.sh usr/lib/ace/bin
+../../ACE_wrappers/bin/depgen.pl usr/lib/ace/bin
+../../ACE_wrappers/bin/DependencyGenerator usr/lib/ace/bin
+../../ACE_wrappers/include usr/lib/ace
+../../ACE_wrappers/include/makeinclude/platform_macros.GNU usr/lib/ace/include/makeinclude
usr/include/ace/*.{h,inl,cpp}
usr/include/ace/os_include
usr/lib/libACE.so
Modified: trunk/debian/libace-dev.links
===================================================================
--- trunk/debian/libace-dev.links 2010-05-22 15:51:48 UTC (rev 689)
+++ trunk/debian/libace-dev.links 2010-05-23 18:09:17 UTC (rev 690)
@@ -1,2 +1,2 @@
-usr/include/ace usr/share/ace/ace
-usr/lib usr/share/ace/lib
+usr/include/ace usr/lib/ace/ace
+usr/lib usr/lib/ace/lib
Modified: trunk/debian/libacexml-dev.links
===================================================================
--- trunk/debian/libacexml-dev.links 2010-05-22 15:51:48 UTC (rev 689)
+++ trunk/debian/libacexml-dev.links 2010-05-23 18:09:17 UTC (rev 690)
@@ -1 +1 @@
-usr/include/ACEXML usr/share/ace/ACEXML
+usr/include/ACEXML usr/lib/ace/ACEXML
Modified: trunk/debian/libkokyu-dev.links
===================================================================
--- trunk/debian/libkokyu-dev.links 2010-05-22 15:51:48 UTC (rev 689)
+++ trunk/debian/libkokyu-dev.links 2010-05-23 18:09:17 UTC (rev 690)
@@ -1 +1 @@
-usr/include/Kokyu usr/share/ace/Kokyu
+usr/include/Kokyu usr/lib/ace/Kokyu
Modified: trunk/debian/libtao-dev.dirs
===================================================================
--- trunk/debian/libtao-dev.dirs 2010-05-22 15:51:48 UTC (rev 689)
+++ trunk/debian/libtao-dev.dirs 2010-05-23 18:09:17 UTC (rev 690)
@@ -1 +1 @@
-usr/share/ace/TAO/MPC
+usr/lib/ace/TAO/MPC
Modified: trunk/debian/libtao-dev.install
===================================================================
--- trunk/debian/libtao-dev.install 2010-05-22 15:51:48 UTC (rev 689)
+++ trunk/debian/libtao-dev.install 2010-05-23 18:09:17 UTC (rev 690)
@@ -70,8 +70,8 @@
usr/lib/libTAO_ETCL.so
usr/include/tao/Monitor
usr/lib/libTAO_Monitor.so
-../../ACE_wrappers/TAO/MPC/config usr/share/ace/TAO/MPC
-../../ACE_wrappers/TAO/rules.tao.GNU usr/share/ace/TAO
+../../ACE_wrappers/TAO/MPC/config usr/lib/ace/TAO/MPC
+../../ACE_wrappers/TAO/rules.tao.GNU usr/lib/ace/TAO
usr/lib/libTAO_IFR_BE.so
usr/lib/libTAO_IDL_FE.so
usr/lib/libTAO_IDL_BE.so
Modified: trunk/debian/libtao-dev.links
===================================================================
--- trunk/debian/libtao-dev.links 2010-05-22 15:51:48 UTC (rev 689)
+++ trunk/debian/libtao-dev.links 2010-05-23 18:09:17 UTC (rev 690)
@@ -1 +1 @@
-usr/include/tao usr/share/ace/TAO/tao
+usr/include/tao usr/lib/ace/TAO/tao
Modified: trunk/debian/libtao-orbsvcs-dev.links
===================================================================
--- trunk/debian/libtao-orbsvcs-dev.links 2010-05-22 15:51:48 UTC (rev 689)
+++ trunk/debian/libtao-orbsvcs-dev.links 2010-05-23 18:09:17 UTC (rev 690)
@@ -1 +1 @@
-usr/include/orbsvcs usr/share/ace/TAO/orbsvcs
+usr/include/orbsvcs usr/lib/ace/TAO/orbsvcs
Modified: trunk/debian/mpc-ace.install
===================================================================
--- trunk/debian/mpc-ace.install 2010-05-22 15:51:48 UTC (rev 689)
+++ trunk/debian/mpc-ace.install 2010-05-23 18:09:17 UTC (rev 690)
@@ -1,8 +1,8 @@
-../../ACE_wrappers/bin/m[p,w]c.pl usr/share/ace/bin
-../../ACE_wrappers/bin/MakeProjectCreator usr/share/ace/bin
-../../ACE_wrappers/MPC/config usr/share/ace/MPC
-../../ACE_wrappers/MPC/modules usr/share/ace/MPC
-../../ACE_wrappers/MPC/templates usr/share/ace/MPC
-../../ACE_wrappers/MPC/*.pl usr/share/ace/MPC
-../../ACE_wrappers/MPC/ChangeLog usr/share/ace/MPC
-usr/share/ace/bin/PerlACE
+../../ACE_wrappers/bin/m[p,w]c.pl usr/lib/ace/bin
+../../ACE_wrappers/bin/MakeProjectCreator usr/lib/ace/bin
+../../ACE_wrappers/MPC/config usr/lib/ace/MPC
+../../ACE_wrappers/MPC/modules usr/lib/ace/MPC
+../../ACE_wrappers/MPC/templates usr/lib/ace/MPC
+../../ACE_wrappers/MPC/*.pl usr/lib/ace/MPC
+../../ACE_wrappers/MPC/ChangeLog usr/lib/ace/MPC
+usr/lib/ace/bin/PerlACE
Modified: trunk/debian/mpc-ace.links
===================================================================
--- trunk/debian/mpc-ace.links 2010-05-22 15:51:48 UTC (rev 689)
+++ trunk/debian/mpc-ace.links 2010-05-23 18:09:17 UTC (rev 690)
@@ -1,3 +1,3 @@
-usr/share/ace/bin/mpc.pl usr/bin/mpc-ace
-usr/share/ace/bin/mwc.pl usr/bin/mwc-ace
+usr/lib/ace/bin/mpc.pl usr/bin/mpc-ace
+usr/lib/ace/bin/mwc.pl usr/bin/mwc-ace
usr/share/man/man1/mpc-ace.1.gz usr/share/man/man1/mwc-ace.1.gz
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2010-05-22 15:51:48 UTC (rev 689)
+++ trunk/debian/rules 2010-05-23 18:09:17 UTC (rev 690)
@@ -67,8 +67,12 @@
dpatch apply-until $(UNTIL)
touch $@
+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 $@
+
configure: configure-stamp
-configure-stamp: prepatch-stamp
+configure-stamp: prepatch-stamp pl-stamp
cp debian/ACE-DPKG.mwc $(ACE_ROOT)
cd $(ACE_ROOT) && ./bin/mwc.pl $(MWCFLAGS) ACE-DPKG.mwc
cp debian/TAO-DPKG.mwc $(TAO_ROOT)
@@ -122,7 +126,7 @@
rm -Rf $(CURDIR)/$(DT)/usr/include/apps/gperf
cd $(ACE_ROOT)/protocols && ../MPC/prj_install.pl $(PRJ_INSTALL_ALL) $(CURDIR)/$(DT) ace
- cd $(ACE_ROOT)/bin/PerlACE && ../../MPC/prj_install.pl -s script_files -b script_files=usr/share/ace/bin/PerlACE $(CURDIR)/$(DT) PerlACE.ins
+ cd $(ACE_ROOT)/bin/PerlACE && ../../MPC/prj_install.pl -s script_files -b script_files=usr/lib/ace/bin/PerlACE $(CURDIR)/$(DT) PerlACE.ins
# Install TAO files in $(CURDIR)/$(DT)
for p in tao orbsvcs; do \
@@ -145,14 +149,18 @@
# 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
+ mkdir -p $(DT)/usr/lib/ace/TAO
+ mv $(DT)/usr/bin/tao_idl $(DT)/usr/bin/tao_ifr $(DT)/usr/lib/ace/TAO
$(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
rm -f $(DT)/usr/bin/TAO_Service
dh_install --sourcedir=$(DT) --fail-missing
+ chmod -x debian/libtao-doc/usr/share/doc/libtao-doc/examples/RTCORBA/Activity/svc.conf.server
+ chmod -x debian/libtao-doc/usr/share/doc/libtao-doc/examples/Simulator/DOVEBrowser/make.bat
+ chmod -x debian/libtao-doc/usr/share/doc/libtao-doc/examples/RTCORBA/Activity/svc.conf.client
+
binary-indep: build install doxygen-stamp
dh_testdir -i
dh_testroot -i
Modified: trunk/debian/tao-idl.install
===================================================================
--- trunk/debian/tao-idl.install 2010-05-22 15:51:48 UTC (rev 689)
+++ trunk/debian/tao-idl.install 2010-05-23 18:09:17 UTC (rev 690)
@@ -1,2 +1,2 @@
-usr/bin/tao_idl.real
usr/bin/tao_idl
+usr/lib/ace/TAO/tao_idl
Deleted: trunk/debian/tao-idl.links
===================================================================
--- trunk/debian/tao-idl.links 2010-05-22 15:51:48 UTC (rev 689)
+++ trunk/debian/tao-idl.links 2010-05-23 18:09:17 UTC (rev 690)
@@ -1,2 +0,0 @@
-usr/bin/tao_idl usr/share/ace/bin/tao_idl
-usr/share/man/man1/tao_idl.1.gz usr/share/man/man1/tao_idl.real.1.gz
Modified: trunk/debian/tao-ifr.install
===================================================================
--- trunk/debian/tao-ifr.install 2010-05-22 15:51:48 UTC (rev 689)
+++ trunk/debian/tao-ifr.install 2010-05-23 18:09:17 UTC (rev 690)
@@ -1,4 +1,3 @@
usr/bin/IFR_Service
-usr/bin/tao_ifr.real
usr/bin/tao_ifr
-
+usr/lib/ace/TAO/tao_ifr
Modified: trunk/debian/tao_idl
===================================================================
--- trunk/debian/tao_idl 2010-05-22 15:51:48 UTC (rev 689)
+++ trunk/debian/tao_idl 2010-05-23 18:09:17 UTC (rev 690)
@@ -1,6 +1,6 @@
#!/bin/sh
-ACE_ROOT=/usr/share/ace; export ACE_ROOT;
+ACE_ROOT=/usr/lib/ace; export ACE_ROOT;
TAO_ROOT=$ACE_ROOT/TAO; export TAO_ROOT;
-exec tao_idl.real "$@"
+exec $TAO_ROOT/tao_idl "$@"
Modified: trunk/debian/tao_ifr
===================================================================
--- trunk/debian/tao_ifr 2010-05-22 15:51:48 UTC (rev 689)
+++ trunk/debian/tao_ifr 2010-05-23 18:09:17 UTC (rev 690)
@@ -1,6 +1,6 @@
#!/bin/sh
-ACE_ROOT=/usr/share/ace; export ACE_ROOT;
+ACE_ROOT=/usr/lib/ace; export ACE_ROOT;
TAO_ROOT=$ACE_ROOT/TAO; export TAO_ROOT;
-exec tao_ifr.real "$@"
+exec $TAO_ROOT/tao_ifr "$@"
More information about the Pkg-ace-commits
mailing list