[openrtm-commit:01876] r700 - in trunk/OpenRTM-aist-Python: . packages/deb/debian packages/rpm

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2016-04-01 16:38:36 +0900 (Fri, 01 Apr 2016)
New Revision: 700

Modified:
   trunk/OpenRTM-aist-Python/
   trunk/OpenRTM-aist-Python/packages/deb/debian/changelog
   trunk/OpenRTM-aist-Python/packages/rpm/openrtm-aist.spec.in
   trunk/OpenRTM-aist-Python/setup.py
Log:
[merge] r654 has been merged from branches/RELENG_1_1.


Property changes on: trunk/OpenRTM-aist-Python
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/RELENG_1_0/OpenRTM-aist-Python:345-404
/branches/RELENG_1_1/OpenRTM-aist-Python:396-478,488-497
/branches/work/OpenRTM-aist-Python:504-542
   + /branches/RELENG_1_0/OpenRTM-aist-Python:345-404
/branches/RELENG_1_1/OpenRTM-aist-Python:396-478,488-497,654
/branches/work/OpenRTM-aist-Python:504-542

Modified: trunk/OpenRTM-aist-Python/packages/deb/debian/changelog
===================================================================
--- trunk/OpenRTM-aist-Python/packages/deb/debian/changelog	2016-03-16 07:45:45 UTC (rev 699)
+++ trunk/OpenRTM-aist-Python/packages/deb/debian/changelog	2016-04-01 07:38:36 UTC (rev 700)
@@ -1,3 +1,9 @@
+openrtm-aist-python (1.1.2-0) experimental; urgency=low
+
+  * 1.1.2-0 (1.1.2-RELEASE). OpenRTM-aist-1.1.2-RELEASE
+
+ -- Noriaki Ando <n-ando at aist.go.jp>  Tue, 23 Feb 2016 15:35:39 +0900
+
 openrtm-aist-python (1.1.1-0) precise; urgency=low
 
   * 1.1.1-0 (1.1.1-RELEASE). OpenRTM-aist-1.1.1-RELEASE

Modified: trunk/OpenRTM-aist-Python/packages/rpm/openrtm-aist.spec.in
===================================================================
--- trunk/OpenRTM-aist-Python/packages/rpm/openrtm-aist.spec.in	2016-03-16 07:45:45 UTC (rev 699)
+++ trunk/OpenRTM-aist-Python/packages/rpm/openrtm-aist.spec.in	2016-04-01 07:38:36 UTC (rev 700)
@@ -109,6 +109,9 @@
 #------------------------------------------------------------
 # changelog section
 %changelog
+* Tue Feb 23 2016  <n-ando at aist.go.jp> 1.1.2
+- 1.1.2-RELEASE
+
 * Wed Oct 21 2015  <n-ando at aist.go.jp> 1.1.1
 - 1.1.1-RELEASE
 

Modified: trunk/OpenRTM-aist-Python/setup.py
===================================================================
--- trunk/OpenRTM-aist-Python/setup.py	2016-03-16 07:45:45 UTC (rev 699)
+++ trunk/OpenRTM-aist-Python/setup.py	2016-04-01 07:38:36 UTC (rev 700)
@@ -80,7 +80,7 @@
 #==============================
 pkg_major_version = "1"
 pkg_minor_version = "1"
-pkg_revision_num  = "1"
+pkg_revision_num  = "2"
 
 #============================================================
 # MODIFICATION IS ALLOWED IF IT IS NEED TO MODIFY.


Property changes on: trunk/OpenRTM-aist-Python/setup.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/RELENG_1_0/OpenRTM-aist-Python/setup.py:345-395
/branches/RELENG_1_1/OpenRTM-aist-Python/setup.py:396-478,488-497
/branches/work/OpenRTM-aist-Python/setup.py:505-509
   + /branches/RELENG_1_0/OpenRTM-aist-Python/setup.py:345-395
/branches/RELENG_1_1/OpenRTM-aist-Python/setup.py:396-478,488-497,654
/branches/work/OpenRTM-aist-Python/setup.py:505-509