[openrtm-commit:01520] r2603 - in branches/RELENG_1_1/OpenRTM-aist: build packages/deb/debian

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2015-02-27 14:32:56 +0900 (Fri, 27 Feb 2015)
New Revision: 2603

Modified:
   branches/RELENG_1_1/OpenRTM-aist/build/pkg_install_debian.sh
   branches/RELENG_1_1/OpenRTM-aist/build/pkg_install_fedora.sh
   branches/RELENG_1_1/OpenRTM-aist/build/pkg_install_ubuntu.sh
   branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control
   branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.not-multiarch
Log:
[compat, ->RELEASE_1_1_1] 'omniorb-nameserver' has been added as a dependent set of deb package. Package list of install script has been corrected.

Modified: branches/RELENG_1_1/OpenRTM-aist/build/pkg_install_debian.sh
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/build/pkg_install_debian.sh	2014-12-03 07:13:27 UTC (rev 2602)
+++ branches/RELENG_1_1/OpenRTM-aist/build/pkg_install_debian.sh	2015-02-27 05:32:56 UTC (rev 2603)
@@ -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: branches/RELENG_1_1/OpenRTM-aist/build/pkg_install_fedora.sh
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/build/pkg_install_fedora.sh	2014-12-03 07:13:27 UTC (rev 2602)
+++ branches/RELENG_1_1/OpenRTM-aist/build/pkg_install_fedora.sh	2015-02-27 05:32:56 UTC (rev 2603)
@@ -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: branches/RELENG_1_1/OpenRTM-aist/build/pkg_install_ubuntu.sh
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/build/pkg_install_ubuntu.sh	2014-12-03 07:13:27 UTC (rev 2602)
+++ branches/RELENG_1_1/OpenRTM-aist/build/pkg_install_ubuntu.sh	2015-02-27 05:32:56 UTC (rev 2603)
@@ -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: branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control	2014-12-03 07:13:27 UTC (rev 2602)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control	2015-02-27 05:32:56 UTC (rev 2603)
@@ -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: branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.not-multiarch
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.not-multiarch	2014-12-03 07:13:27 UTC (rev 2602)
+++ branches/RELENG_1_1/OpenRTM-aist/packages/deb/debian/control.not-multiarch	2015-02-27 05:32:56 UTC (rev 2603)
@@ -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