[SCM] choreonoid branch, master, updated. upstream/1.1.0+dfsg-72-g16d0a32

[Thomas Moulard]

The following commit has been merged in the master branch:
commit d8d85d7c4be1efea7f03df26313cf71e3f6440a9
Author: Thomas Moulard <thomas.moulard at gmail.com>
Date:   Thu Jun 13 14:19:28 2013 +0900

    Fix Boost.Filesystem v3 patch.

diff --git a/debian/changelog b/debian/changelog
index ec26b9e..73a55c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 choreonoid (1.1.0+dfsg-5) unstable; urgency=low
 
   * Fix patch fixing opcode portability issue (Closes: #711003).
+  * Fix patch porting to Boost.Filesystem v3.
 
  -- Thomas Moulard <thomas.moulard at gmail.com>  Thu, 13 Jun 2013 13:46:59 +0900
 
diff --git a/debian/patches/0006-Port-to-Boost-Filesystem-v3.patch b/debian/patches/0006-Port-to-Boost-Filesystem-v3.patch
index 4bca260..35a9430 100644
--- a/debian/patches/0006-Port-to-Boost-Filesystem-v3.patch
+++ b/debian/patches/0006-Port-to-Boost-Filesystem-v3.patch
@@ -135,7 +135,7 @@ index 529e3fa..4d03202 100644
      shared->directoryVariableMap = AppConfig::archive()->openMapping("PathVariables");
  
 -    shared->projectDirPath = filesystem::complete(filesystem::path(projectFile)).branch_path();
-+    shared->projectDirPath = filesystem3::absolute(filesystem::path(projectFile)).branch_path();
++    shared->projectDirPath = filesystem::absolute(filesystem::path(projectFile)).branch_path();
      shared->topDirPath = App::topDirectory();
      shared->shareDirPath = App::shareDirectory();
  

-- 
choreonoid