[openrtm-commit:01917] r2716 - in tags/RELEASE_1_1_2/OpenRTM-aist: . build

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2016-04-26 11:16:22 +0900 (Tue, 26 Apr 2016)
New Revision: 2716

Modified:
   tags/RELEASE_1_1_2/OpenRTM-aist/
   tags/RELEASE_1_1_2/OpenRTM-aist/build/pkg_install_debian.sh
Log:
[merge] r2715 has been merged from trunk.




Property changes on: tags/RELEASE_1_1_2/OpenRTM-aist
___________________________________________________________________
Modified: svn:mergeinfo
   - /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-2574,2592,2605,2610,2623,2626,2644,2648,2652-2653,2670,2677-2678,2681-2682,2684-2687,2689-2692,2696-2697,2700,2703,2706,2711-2712
   + /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-2574,2592,2605,2610,2623,2626,2644,2648,2652-2653,2670,2677-2678,2681-2682,2684-2687,2689-2692,2696-2697,2700,2703,2706,2711-2712,2715

Modified: tags/RELEASE_1_1_2/OpenRTM-aist/build/pkg_install_debian.sh
===================================================================
--- tags/RELEASE_1_1_2/OpenRTM-aist/build/pkg_install_debian.sh	2016-04-25 04:27:17 UTC (rev 2715)
+++ tags/RELEASE_1_1_2/OpenRTM-aist/build/pkg_install_debian.sh	2016-04-26 02:16:22 UTC (rev 2716)
@@ -70,7 +70,7 @@
 # コードネーム取得
 #---------------------------------------
 check_codename () {
-    cnames="sarge etch lenny squeeze wheezy"
+    cnames="sarge etch lenny squeeze wheezy jessie"
     for c in $cnames; do
 	if test -f "/etc/apt/sources.list"; then
 	    res=`grep $c /etc/apt/sources.list`