[openrtm-commit:01522] r605 - in trunk/OpenRTM-aist-Python: installer/install_scripts packages/deb/debian

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2015-02-27 17:38:20 +0900 (Fri, 27 Feb 2015)
New Revision: 605

Modified:
   trunk/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_debian.sh
   trunk/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_fedora.sh
   trunk/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_ubuntu.sh
   trunk/OpenRTM-aist-Python/packages/deb/debian/control
Log:
[compat, installer] 'omniorb-nameserver' has been added as a dependent set of deb package. Package list of install script has been corrected.

Modified: trunk/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_debian.sh
===================================================================
--- trunk/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_debian.sh	2015-02-10 07:36:11 UTC (rev 604)
+++ trunk/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_debian.sh	2015-02-27 08:38:20 UTC (rev 605)
@@ -14,15 +14,10 @@
 #---------------------------------------
 set_package_list()
 {
-	if [ "$code_name" = "sarge" ] || [ "$code_name" = "etch" ] || [ "$code_name" = "lenny" ]; then
-		omnipy="python python-omniorb2-omg python-omniorb2 omniidl4-python omniorb4-nameserver"
-	elif [ "$code_name" = "squeeze" ]; then	# 6.0
-		omnipy="python python-omniorb-omg python-omniorb omniidl-python omniorb4-nameserver"
-	else
-		omnipy="python python-omniorb-omg python-omniorb omniidl-python omniorb-nameserver"
-	fi
+	omnipy="python-omniorb-omg python-omniorb omniidl-python"
+	devel="python"
 	openrtm="openrtm-aist-python openrtm-aist-python-example"
-	packages="$omnipy $openrtm"
+	packages="$devel $omnipy $openrtm"
 	u_packages="$omnipy $openrtm "
 }
 
@@ -92,7 +87,7 @@
 # リポジトリサーバ
 #---------------------------------------
 create_srclist () {
-    openrtm_repo="deb http://www.openrtm.org/pub/Linux/debian/ $code_name main"
+    openrtm_repo="deb http://openrtm.org/pub/Linux/debian/ $code_name main"
 }
 
 #---------------------------------------

Modified: trunk/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_fedora.sh
===================================================================
--- trunk/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_fedora.sh	2015-02-10 07:36:11 UTC (rev 604)
+++ trunk/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_fedora.sh	2015-02-27 08:38:20 UTC (rev 605)
@@ -17,16 +17,12 @@
 # パッケージリスト
 #---------------------------------------
 version_num=`cat /etc/fedora-release | awk '/Fedora/{print $3}' -`
-if [ $version_num -ge 16 ] && [ $version_num -le 18 ]; then
-	# バージョンが16,17,18の場合
-	omnipy="python python-devel openssl-devel doxygen omniORB-servers omniORBpy omniORBpy-devel omniORBpy-standard"
-else
-	omnipy="python omniORB-servers omniORBpy omniORBpy-devel omniORBpy-standard"
-fi
+omnipy="omniORB-servers omniORBpy omniORBpy-devel omniORBpy-standard"
+devel="python"
 openrtm="OpenRTM-aist-Python OpenRTM-aist-Python-example"
-packages="$omnipy $openrtm"
+packages="$devel $omnipy $openrtm"
+u_packages="$omnipy $openrtm "
 
-
 #----------------------------------------
 # root かどうかをチェック
 #----------------------------------------
@@ -59,7 +55,7 @@
 [openrtm]
 name=Fedora \$releasever - \$basearch
 failovermethod=priority
-baseurl=http://www.openrtm.org/pub/Linux/Fedora/releases/\$releasever/Fedora/\$basearch/os/Packages
+baseurl=http://openrtm.org/pub/Linux/Fedora/releases/\$releasever/Fedora/\$basearch/os/Packages
 enabled=1
 gpgcheck=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY
@@ -145,7 +141,7 @@
 #---------------------------------------
 check_root
 if test "x$1" = "x-u" ; then
-    uninstall_packages `reverse $packages`
+    uninstall_packages `reverse $u_packages`
 else
     create_repo
     install_packages $packages

Modified: trunk/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_ubuntu.sh
===================================================================
--- trunk/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_ubuntu.sh	2015-02-10 07:36:11 UTC (rev 604)
+++ trunk/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_ubuntu.sh	2015-02-27 08:38:20 UTC (rev 605)
@@ -26,14 +26,10 @@
 #---------------------------------------
 set_package_list()
 {
-	if [ "$code_name" = "hardy" ] || [ $code_name = "lucid" ]; then
-		omnipy="python python-omniorb2-omg omniidl4-python omniorb4-nameserver"
-	else
-		# oneiric, precise, quantal
-		omnipy="python python-pyorbit-omg omniidl-python omniorb-nameserver"
-	fi
+	omnipy="python-pyorbit-omg omniidl-python"
+	devel="python"
 	openrtm="openrtm-aist-python$rtm_ver openrtm-aist-python-example$rtm_ver"
-	packages="$omnipy $openrtm"
+	packages="$devel $omnipy $openrtm"
 	u_packages="$omnipy $openrtm "
 }
 
@@ -104,7 +100,7 @@
 # リポジトリサーバ
 #---------------------------------------
 create_srclist () {
-    openrtm_repo="deb http://www.openrtm.org/pub/Linux/ubuntu/ $code_name main"
+    openrtm_repo="deb http://openrtm.org/pub/Linux/ubuntu/ $code_name main"
 }
 
 #---------------------------------------

Modified: trunk/OpenRTM-aist-Python/packages/deb/debian/control
===================================================================
--- trunk/OpenRTM-aist-Python/packages/deb/debian/control	2015-02-10 07:36:11 UTC (rev 604)
+++ trunk/OpenRTM-aist-Python/packages/deb/debian/control	2015-02-27 08:38:20 UTC (rev 605)
@@ -8,7 +8,7 @@
 
 Package: openrtm-aist-python
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, omniorb-nameserver
 Description: OpenRTM-aist is a reference implementation of RT-Middleware
  and RT-Component framework. RT-Component (RTC) is a component model
  standardized in OMG (Object Management Group) as Robotic Technology