diff -Nru zorba-3.0.0/CMakeCompiler.txt zorba-3.0.0/CMakeCompiler.txt
--- zorba-3.0.0/CMakeCompiler.txt	2013-10-31 22:00:16.000000000 +0000
+++ zorba-3.0.0/CMakeCompiler.txt	2013-11-05 23:33:21.000000000 +0000
@@ -245,12 +245,6 @@
 IF (APPLE)
   # Needed for CFUUID*() functions in util/uuid.c.
   SET(CMAKE_SHARED_LINKER_FLAGS "-framework CoreFoundation ${CMAKE_SHARED_LINKER_FLAGS}")
-  # Due to the Zorba debugger (wrongly) relying on the C++11-only class of
-  # std::tuple, this is necessary.  Oddly, this fix seems to be necesssary only
-  # on Mac OS X Mavericks.
-  IF (CMAKE_COMPILER_IS_GNUCXX OR CLANG)
-    SET(CMAKE_CXX_FLAGS "-std=c++11 -stdlib=libc++ ${CMAKE_CXX_FLAGS}")
-  ENDIF (CMAKE_COMPILER_IS_GNUCXX OR CLANG)
 ELSEIF (WIN32)
   # Needed for UuidCreateSequential() function in util/uuid.c.
   SET(requiredlibs ${requiredlibs} "Rpcrt4")
diff -Nru zorba-3.0.0/CMakeLists.txt zorba-3.0.0/CMakeLists.txt
--- zorba-3.0.0/CMakeLists.txt	2013-10-31 22:00:16.000000000 +0000
+++ zorba-3.0.0/CMakeLists.txt	2013-11-05 23:33:21.000000000 +0000
@@ -536,6 +536,21 @@
 
 ################################################################################
 
+# C++11 TR1 header location & namespace
+CHECK_CXX_SOURCE_COMPILES("
+  #include <tr1/type_traits>
+  int main() { }" ZORBA_TR1_IN_TR1_SUBDIRECTORY)
+CHECK_CXX_SOURCE_COMPILES("
+  #include <type_traits>
+  int main() { std::tr1::is_convertible<int,int> x; }" ZORBA_TR1_1)
+CHECK_CXX_SOURCE_COMPILES("
+  #include <tr1/type_traits>
+  int main() { std::tr1::is_convertible<int,int> x; }" ZORBA_TR1_2)
+
+IF (ZORBA_TR1_1 OR ZORBA_TR1_2)
+  SET (ZORBA_TR1_NS_IS_STD_TR1 1)
+ENDIF (ZORBA_TR1_1 OR ZORBA_TR1_2)
+
 # C++11 langauge features
 CHECK_CXX_SOURCE_COMPILES("
   #include <cstddef>
@@ -632,3 +647,5 @@
 # and not within zorba-modules, which is for general use in other
 # non-zorba modules.
 ADD_DEPENDENCIES(check_core_uris gen_diag_modules)
+
+# vim:set et sw=2 ts=2:
diff -Nru zorba-3.0.0/bin/debugger/command_arg.h zorba-3.0.0/bin/debugger/command_arg.h
--- zorba-3.0.0/bin/debugger/command_arg.h	2013-10-31 22:00:16.000000000 +0000
+++ zorba-3.0.0/bin/debugger/command_arg.h	2013-11-05 23:33:21.000000000 +0000
@@ -22,7 +22,7 @@
 #include <set>
 #include <sstream>
 
-#if ZORBA_TR1_IN_TR1_SUBDIRECTORY
+#ifdef ZORBA_TR1_IN_TR1_SUBDIRECTORY
 # include <tr1/tuple>
 #else
 # include <tuple>
diff -Nru zorba-3.0.0/bin/debugger/command_line_handler.h zorba-3.0.0/bin/debugger/command_line_handler.h
--- zorba-3.0.0/bin/debugger/command_line_handler.h	2013-10-31 22:00:16.000000000 +0000
+++ zorba-3.0.0/bin/debugger/command_line_handler.h	2013-11-05 23:33:21.000000000 +0000
@@ -21,7 +21,7 @@
 
 #include <set>
 #include <cassert>
-#if ZORBA_TR1_IN_TR1_SUBDIRECTORY
+#ifdef ZORBA_TR1_IN_TR1_SUBDIRECTORY
 # include <tr1/tuple>
 #else
 # include <tuple>
diff -Nru zorba-3.0.0/debian/bzr-builder.manifest zorba-3.0.0/debian/bzr-builder.manifest
--- zorba-3.0.0/debian/bzr-builder.manifest	2013-10-31 22:00:33.000000000 +0000
+++ zorba-3.0.0/debian/bzr-builder.manifest	2013-11-05 23:33:37.000000000 +0000
@@ -1,3 +1,3 @@
-# bzr-builder format 0.3 deb-version 3.0.0-0
-lp:zorba revid:jenkins@lambda.nu-20131030221355-wa6ld4nar5i6j51l
+# bzr-builder format 0.3 deb-version 3.0.0-1
+lp:zorba revid:jenkins@lambda.nu-20131105004425-6a7jpr09azkhju49
 nest-part debian_rules lp:~zorba-coders/zorba/debian_control_files debian_files/zorba_debian_rules/debian debian revid:juan457@gmail.com-20131031190552-9p76o0q432489tw2
diff -Nru zorba-3.0.0/debian/changelog zorba-3.0.0/debian/changelog
--- zorba-3.0.0/debian/changelog	2013-10-31 22:00:33.000000000 +0000
+++ zorba-3.0.0/debian/changelog	2013-11-05 23:33:37.000000000 +0000
@@ -1,6 +1,6 @@
-zorba (3.0.0-0~ubuntu13.04.1) raring; urgency=low
+zorba (3.0.0-1~ubuntu13.04.1) raring; urgency=low
 
   * Auto build.
 
- -- Juan Zacarias <juan457@gmail.com>  Thu, 31 Oct 2013 22:00:33 +0000
+ -- Juan Zacarias <juan457@gmail.com>  Tue, 05 Nov 2013 23:33:37 +0000
 
diff -Nru zorba-3.0.0/include/zorba/config.h.cmake zorba-3.0.0/include/zorba/config.h.cmake
--- zorba-3.0.0/include/zorba/config.h.cmake	2013-10-31 22:00:16.000000000 +0000
+++ zorba-3.0.0/include/zorba/config.h.cmake	2013-11-05 23:33:21.000000000 +0000
@@ -127,30 +127,14 @@
 
 // C++11 types
 #cmakedefine ZORBA_HAVE_ENABLE_IF
+#cmakedefine ZORBA_HAVE_UNIQUE_PTR
 #cmakedefine ZORBA_HAVE_UNORDERED_MAP
 #cmakedefine ZORBA_HAVE_UNORDERED_SET
-#cmakedefine ZORBA_HAVE_UNIQUE_PTR
 
 ////////// C++ tr1 include directory & namespace //////////////////////////////
 
-#if defined( __GNUC__ ) && (__GNUC__ * 100 + __GNUC_MINOR__ < 430)
-# define ZORBA_GCC_OLDER_THAN_430 1
-#endif
-#if defined( __APPLE_CC__ ) && (__APPLE_CC__ >= 5621)
-# undef ZORBA_GCC_OLDER_THAN_430
-#endif
-
-#if defined( _MSC_VER ) && (_MSC_VER < 1600 /* 2010 */)
-# define ZORBA_MSC_OLDER_THAN_2010 1
-#endif
-
-#if defined( ZORBA_GCC_OLDER_THAN_430 )
-# define ZORBA_TR1_IN_TR1_SUBDIRECTORY 1
-#endif
-
-#if defined( ZORBA_GCC_OLDER_THAN_430 ) || defined( ZORBA_MSC_OLDER_THAN_2010 )
-# define ZORBA_TR1_NS_IS_STD_TR1 1
-#endif
+#cmakedefine ZORBA_TR1_IN_TR1_SUBDIRECTORY
+#cmakedefine ZORBA_TR1_NS_IS_STD_TR1
 
 #ifdef ZORBA_TR1_NS_IS_STD_TR1
 # define ZORBA_TR1_NS std::tr1
diff -Nru zorba-3.0.0/swig/java/CMakeLists.txt zorba-3.0.0/swig/java/CMakeLists.txt
--- zorba-3.0.0/swig/java/CMakeLists.txt	2013-10-31 22:00:16.000000000 +0000
+++ zorba-3.0.0/swig/java/CMakeLists.txt	2013-11-05 23:33:21.000000000 +0000
@@ -78,8 +78,8 @@
   SET(ZORBA_JAVA_JAR ${CMAKE_CURRENT_BINARY_DIR}/zorba_api.jar PARENT_SCOPE )
 
   IF ( APPLE )
-    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${ZORBA_SWIG_LIB_PREFIX}zorba_api.jnilib DESTINATION ${JAVA_SITEARCH_DIR})
-    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zorba_api.jar DESTINATION ${JAVA_SITEARCH_DIR})
+    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${ZORBA_SWIG_LIB_PREFIX}zorba_api_java.jnilib DESTINATION ${JAVA_SITEARCH_DIR})
+	INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zorba_api.jar DESTINATION ${JAVA_SITEARCH_DIR})
   ELSE ( APPLE )
     IF(NOT WIN32)
       INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libzorba_api_java.so DESTINATION ${JAVA_SITEARCH_DIR})
diff -Nru zorba-3.0.0/swig/php/CMakeLists.txt zorba-3.0.0/swig/php/CMakeLists.txt
--- zorba-3.0.0/swig/php/CMakeLists.txt	2013-10-31 22:00:16.000000000 +0000
+++ zorba-3.0.0/swig/php/CMakeLists.txt	2013-11-05 23:33:21.000000000 +0000
@@ -59,8 +59,12 @@
   #set project folder location for IDEs
   SET_TARGET_PROPERTIES(zorba_api_php PROPERTIES PROJECT_LABEL "PHP" FOLDER "APIs")
 
-  SET_TARGET_PROPERTIES(zorba_api_php PROPERTIES OUTPUT_NAME "zorba_api")
-
+  IF ( APPLE )
+    SET_TARGET_PROPERTIES(zorba_api_php PROPERTIES OUTPUT_NAME "zorba_api_php")
+  ELSE ( APPLE )
+    SET_TARGET_PROPERTIES(zorba_api_php PROPERTIES OUTPUT_NAME "zorba_api")
+  ENDIF ( APPLE )
+  
   IF (NOT WIN32 OR CYGWIN)
     STRING (REPLACE ${CMAKE_INSTALL_PREFIX} "" PHP5_INSTALL_PATH ${PHP5_EXTENSION_DIR})
     SET (PHP5_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/share/php5")
diff -Nru zorba-3.0.0/swig/python/CMakeLists.txt zorba-3.0.0/swig/python/CMakeLists.txt
--- zorba-3.0.0/swig/python/CMakeLists.txt	2013-10-31 22:00:16.000000000 +0000
+++ zorba-3.0.0/swig/python/CMakeLists.txt	2013-11-05 23:33:21.000000000 +0000
@@ -19,7 +19,12 @@
   INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH})
   SWIG_ADD_MODULE (zorba_api_python python zorba_api.i)
   SWIG_LINK_LIBRARIES (zorba_api_python zorba_simplestore ${PYTHON_LIBRARIES})
-  SET_TARGET_PROPERTIES (_zorba_api_python PROPERTIES OUTPUT_NAME "_zorba_api")
+
+  IF ( APPLE )
+    SET_TARGET_PROPERTIES (_zorba_api_python PROPERTIES OUTPUT_NAME "_zorba_api_python")
+  ELSE ( APPLE)
+    SET_TARGET_PROPERTIES (_zorba_api_python PROPERTIES OUTPUT_NAME "_zorba_api")
+  ENDIF (APPLE )
   
   IF (MSVC_IDE)
     SET_PROPERTY( TARGET _zorba_api_python PROPERTY PROJECT_LABEL "Python")
diff -Nru zorba-3.0.0/swig/ruby/CMakeLists.txt zorba-3.0.0/swig/ruby/CMakeLists.txt
--- zorba-3.0.0/swig/ruby/CMakeLists.txt	2013-10-31 22:00:16.000000000 +0000
+++ zorba-3.0.0/swig/ruby/CMakeLists.txt	2013-11-05 23:33:21.000000000 +0000
@@ -37,7 +37,7 @@
       SET_TARGET_PROPERTIES(zorba_api PROPERTIES
         INSTALL_RPATH "${CMAKE_INSTALL_RPATH}:${_rpath}"
         BUILD_WITH_INSTALL_RPATH ON
-        OUTPUT_NAME "zorba_api")
+        OUTPUT_NAME "zorba_api_ruby")
     ELSE (APPLE)
       SET_TARGET_PROPERTIES(zorba_api PROPERTIES
         INSTALL_RPATH "${CMAKE_INSTALL_RPATH}:${_rpath}"