[openrtm-commit:01521] r2604 - in tags/RELEASE_1_1_1/OpenRTM-aist: . build packages/deb/debian

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2015-02-27 14:43:51 +0900 (Fri, 27 Feb 2015)
New Revision: 2604

Modified:
   tags/RELEASE_1_1_1/OpenRTM-aist/
   tags/RELEASE_1_1_1/OpenRTM-aist/build/pkg_install_debian.sh
   tags/RELEASE_1_1_1/OpenRTM-aist/build/pkg_install_fedora.sh
   tags/RELEASE_1_1_1/OpenRTM-aist/build/pkg_install_ubuntu.sh
   tags/RELEASE_1_1_1/OpenRTM-aist/packages/deb/debian/control
   tags/RELEASE_1_1_1/OpenRTM-aist/packages/deb/debian/control.not-multiarch
Log:
[merge] r2603 has been merged from branches/RELENG_1_1.


Property changes on: tags/RELEASE_1_1_1/OpenRTM-aist
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/RELENG_1_1/OpenRTM-aist:2601
/tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2566,2568,2573-2574,2592
   + /branches/RELENG_1_1/OpenRTM-aist:2601,2603
/tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2566,2568,2573-2574,2592

Modified: tags/RELEASE_1_1_1/OpenRTM-aist/build/pkg_install_debian.sh
===================================================================
--- tags/RELEASE_1_1_1/OpenRTM-aist/build/pkg_install_debian.sh	2015-02-27 05:32:56 UTC (rev 2603)
+++ tags/RELEASE_1_1_1/OpenRTM-aist/build/pkg_install_debian.sh	2015-02-27 05:43:51 UTC (rev 2604)
@@ -14,11 +14,7 @@
 #---------------------------------------
 set_package_list()
 {
-if [ "$code_name" = "wheezy" ]; then
-	omni="libomniorb4-1 libomniorb4-dev omniidl omniorb-nameserver"
-else
-	omni="libomniorb4 libomniorb4-dev omniidl4 omniorb4-nameserver"
-fi
+omni="libomniorb4-dev omniidl"
 ace="libace libace-dev"
 openrtm="openrtm-aist openrtm-aist-doc openrtm-aist-dev openrtm-aist-example"
 openrtm04="openrtm-aist=0.4.2-1 openrtm-aist-doc=0.4.2-1 openrtm-aist-dev=0.4.2-1 openrtm-aist-example=0.4.2-1"
@@ -187,7 +183,7 @@
 uninstall_packages () {
     for p in $*; do
         echo $msg11 $p
-        apt-get remove $p
+        aptitude remove $p
         if test "$?" != 0; then
             apt-get purge $p
         fi

Modified: tags/RELEASE_1_1_1/OpenRTM-aist/build/pkg_install_fedora.sh
===================================================================
--- tags/RELEASE_1_1_1/OpenRTM-aist/build/pkg_install_fedora.sh	2015-02-27 05:32:56 UTC (rev 2603)
+++ tags/RELEASE_1_1_1/OpenRTM-aist/build/pkg_install_fedora.sh	2015-02-27 05:43:51 UTC (rev 2604)
@@ -16,13 +16,7 @@
 # パッケージリスト
 #---------------------------------------
 version_num=`cat /etc/fedora-release | awk '/Fedora/{print $3}' -`
-if [ $version_num -ge 16 ]; then
-	# バージョンが16以降の場合
-	omni="omniORB omniORB-devel omniORB-doc omniORB-servers omniORB-utils"
-else
-	omni="omniORB omniORB-devel omniORB-doc omniORB-servers omniORB-utils omniORB-bootscripts"
-fi
-
+omni="omniORB omniORB-devel omniORB-doc omniORB-servers omniORB-utils"
 ace="ace ace-devel"
 openrtm="OpenRTM-aist OpenRTM-aist-devel OpenRTM-aist-doc OpenRTM-aist-example PyYAML"
 openrtm04="OpenRTM-aist-0.4.2 OpenRTM-aist-devel-0.4.2 OpenRTM-aist-doc-0.4.2 OpenRTM-aist-example-0.4.2 PyYAML"

Modified: tags/RELEASE_1_1_1/OpenRTM-aist/build/pkg_install_ubuntu.sh
===================================================================
--- tags/RELEASE_1_1_1/OpenRTM-aist/build/pkg_install_ubuntu.sh	2015-02-27 05:32:56 UTC (rev 2603)
+++ tags/RELEASE_1_1_1/OpenRTM-aist/build/pkg_install_ubuntu.sh	2015-02-27 05:43:51 UTC (rev 2604)
@@ -11,7 +11,7 @@
 #---------------------------------------
 # パッケージリスト
 #---------------------------------------
-omni="libomniorb4 libomniorb4-dev omniidl4 omniorb4-nameserver omniidl omniorb-nameserver"
+omni="libomniorb4-dev omniidl"
 ace="libace libace-dev"
 openrtm="openrtm-aist openrtm-aist-doc openrtm-aist-dev openrtm-aist-example python-yaml"
 openrtm04="openrtm-aist=0.4.2-1 openrtm-aist-doc=0.4.2-1 openrtm-aist-dev=0.4.2-1 openrtm-aist-example=0.4.2-1 python-yaml"
@@ -173,7 +173,7 @@
 uninstall_packages () {
     for p in $*; do
 	echo $msg11 $p
-	apt-get remove $p
+	aptitude remove $p
     if test "$?" != 0; then
         apt-get purge $p
     fi

Modified: tags/RELEASE_1_1_1/OpenRTM-aist/packages/deb/debian/control
===================================================================
--- tags/RELEASE_1_1_1/OpenRTM-aist/packages/deb/debian/control	2015-02-27 05:32:56 UTC (rev 2603)
+++ tags/RELEASE_1_1_1/OpenRTM-aist/packages/deb/debian/control	2015-02-27 05:43:51 UTC (rev 2604)
@@ -10,7 +10,7 @@
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, omniorb-nameserver
 Description: OpenRTM-aist, RT-Middleware distributed by AIST
  OpenRTM-aist is a reference implementation of RTC (Robotic Technology
  Component) specification which is OMG standard. OpenRTM-aist includes

Modified: tags/RELEASE_1_1_1/OpenRTM-aist/packages/deb/debian/control.not-multiarch
===================================================================
--- tags/RELEASE_1_1_1/OpenRTM-aist/packages/deb/debian/control.not-multiarch	2015-02-27 05:32:56 UTC (rev 2603)
+++ tags/RELEASE_1_1_1/OpenRTM-aist/packages/deb/debian/control.not-multiarch	2015-02-27 05:43:51 UTC (rev 2604)
@@ -8,7 +8,7 @@
 
 Package: openrtm-aist
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, omniorb-nameserver
 Description: OpenRTM-aist, RT-Middleware distributed by AIST
  OpenRTM-aist is a reference implementation of RTC (Robotic Technology
  Component) specification which is OMG standard. OpenRTM-aist includes