From 3628c13eb6002144f69444defbc4cdadb6c391c1 Mon Sep 17 00:00:00 2001
From: Geoffrey Biggs <git@killbots.net>
Date: Thu, 22 Jun 2017 12:02:59 +0900
Subject: [PATCH] Release 4.2

---
 README.txt                   |  8 ++++++++
 README_ja.txt                |  8 ++++++++
 installer/rtshell.wxs        |  6 +++---
 installer/rtshell_module.wxs | 20 ++++++++++----------
 rtshell/__init__.py          |  2 +-
 setup.py                     |  2 +-
 6 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/README.txt b/README.txt
index f5f4f72..c7ebb23 100644
--- a/README.txt
+++ b/README.txt
@@ -163,6 +163,14 @@ To create a redistributable wheel package, run the following command:
 Changelog
 =========
 
+4.2
+---
+
+- Add "-d" option to rtcon to check for duplicate connections
+- Add support for FSM4RTC, with rtwatch and rtfsm commands (@yosuke)
+- Add doctests (@yosuke)
+- Fix direction of rtstodot graphs (@haudren)
+
 4.1
 ---
 
diff --git a/README_ja.txt b/README_ja.txt
index 065b5cd..7cf19f9 100644
--- a/README_ja.txt
+++ b/README_ja.txt
@@ -136,6 +136,14 @@ $ ./test/test_cmds.py ~/share/OpenRTM-aist/examples/rtcs/ rtactTests
 Changelog
 =========
 
+4.2
+---
+
+- Add "-d" option to rtcon to check for duplicate connections
+- Add support for FSM4RTC, with rtwatch and rtfsm commands (@yosuke)
+- Add doctests (@yosuke)
+- Fix direction of rtstodot graphs (@haudren)
+
 4.1
 ---
 
diff --git a/installer/rtshell.wxs b/installer/rtshell.wxs
index e235dd4..0b9b96d 100644
--- a/installer/rtshell.wxs
+++ b/installer/rtshell.wxs
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-  <Product Name="RTShell 4.1"
+  <Product Name="RTShell 4.2"
     Manufacturer="AIST"
     Id="A999A734-5509-11E5-89AA-D4BED9A6AE6D"
     UpgradeCode="BC9FBF12-5509-11E5-89AA-D4BED9A6AE6D"
     Language="1033"
     Codepage="1252"
-    Version="4.1.0">
+    Version="4.2.0">
     <!--Language="1041" Codepage="932" for Japanese-->
     <Package Id="*"
       Keywords="Installer"
-      Description="RTShell 4.1 installer"
+      Description="RTShell 4.2 installer"
       Comments="RTShell is a product of the National Institute for Advanced Industrial Science and Technology, Japan"
       Manufacturer="AIST"
       InstallerVersion="400"
diff --git a/installer/rtshell_module.wxs b/installer/rtshell_module.wxs
index bc572e7..6621315 100644
--- a/installer/rtshell_module.wxs
+++ b/installer/rtshell_module.wxs
@@ -4,11 +4,11 @@
   <Module Id="RTShell41"
     Language="1033"
     Codepage="1252"
-    Version="4.1.0">
+    Version="4.2.0">
     <!--Language="1041" Codepage="932" for Japanese-->
     <Package Id="33717363-5E00-48C0-9BD8-8B694262D7C0"
       Keywords="Installer"
-      Description="RTShell 4.1 installer"
+      Description="RTShell 4.2 installer"
       Comments="RTShell is a product of the National Institute for Advanced Industrial Science and Technology, Japan"
       Manufacturer="AIST"
       InstallerVersion="400"
@@ -30,7 +30,7 @@
                 </Directory>
               </Directory>
             </Directory>
-            <Directory Id="RTShellInfo" Name="rtshell-4.1.0.dist-info">
+            <Directory Id="RTShellInfo" Name="rtshell-4.2.0.dist-info">
             </Directory>
           </Directory>
         </Directory>
@@ -170,12 +170,12 @@
     </DirectoryRef>
     <DirectoryRef Id="RTShellInfo">
       <Component Id="RTShellInfo" Guid="375256E1-9272-47D6-8D86-3A2FE86B77C9">
-        <File Id="RTShellDESCRIPTION.rst" Source="C:\Python27\Lib\site-packages\rtshell-4.1.0.dist-info\DESCRIPTION.rst" KeyPath="yes"/>
-        <File Id="RTShellMETADATA" Source="C:\Python27\Lib\site-packages\rtshell-4.1.0.dist-info\METADATA"/>
-        <File Id="RTShellmetadata.json" Source="C:\Python27\Lib\site-packages\rtshell-4.1.0.dist-info\metadata.json"/>
-        <File Id="RTShellRECORD" Source="C:\Python27\Lib\site-packages\rtshell-4.1.0.dist-info\RECORD"/>
-        <File Id="RTShelltop_level.txt" Source="C:\Python27\Lib\site-packages\rtshell-4.1.0.dist-info\top_level.txt"/>
-        <File Id="RTShellWHEEL" Source="C:\Python27\Lib\site-packages\rtshell-4.1.0.dist-info\WHEEL"/>
+        <File Id="RTShellDESCRIPTION.rst" Source="C:\Python27\Lib\site-packages\rtshell-4.2.0.dist-info\DESCRIPTION.rst" KeyPath="yes"/>
+        <File Id="RTShellMETADATA" Source="C:\Python27\Lib\site-packages\rtshell-4.2.0.dist-info\METADATA"/>
+        <File Id="RTShellmetadata.json" Source="C:\Python27\Lib\site-packages\rtshell-4.2.0.dist-info\metadata.json"/>
+        <File Id="RTShellRECORD" Source="C:\Python27\Lib\site-packages\rtshell-4.2.0.dist-info\RECORD"/>
+        <File Id="RTShelltop_level.txt" Source="C:\Python27\Lib\site-packages\rtshell-4.2.0.dist-info\top_level.txt"/>
+        <File Id="RTShellWHEEL" Source="C:\Python27\Lib\site-packages\rtshell-4.2.0.dist-info\WHEEL"/>
       </Component>
     </DirectoryRef>
     <DirectoryRef Id="PythonScripts">
@@ -230,7 +230,7 @@
     </DirectoryRef>
 
     <!-- Dependencies -->
-    <Dependency RequiredId="RTCTree41.000485BE_A31F_4D6B_B3D1_337589CEA03D" RequiredLanguage="0" RequiredVersion="4.1.0"/>
+    <Dependency RequiredId="RTCTree41.000485BE_A31F_4D6B_B3D1_337589CEA03D" RequiredLanguage="0" RequiredVersion="4.2.0"/>
     <Dependency RequiredId="RTSProfile41.54F6C036_634B_4478_8EE6_D5C217C5E0F2" RequiredLanguage="0" RequiredVersion="4.1.0"/>
   </Module>
 </Wix>
diff --git a/rtshell/__init__.py b/rtshell/__init__.py
index f10ca9c..141a771 100644
--- a/rtshell/__init__.py
+++ b/rtshell/__init__.py
@@ -18,7 +18,7 @@
 '''
 
 
-RTSH_VERSION = '4.1.0'
+RTSH_VERSION = '4.2.0'
 
 
 # vim: tw=79
diff --git a/setup.py b/setup.py
index 43f5a7f..f910bd1 100644
--- a/setup.py
+++ b/setup.py
@@ -394,7 +394,7 @@ def run(self):
 
 
 setuptools.setup(name='rtshell',
-    version='4.1.0',
+    version='4.2.0',
     description='Shell commands for managing RT Components and RT Systems.',
     author='Geoffrey Biggs and contributors',
     author_email='geoffrey.biggs@aist.go.jp',