# HG changeset patch
# User Chris Cannam
# Date 1300972843 0
# Node ID 1c72812883036d955e60d05e5a65ca1f39abf965
# Parent  b6d36a17899d64425672cfc354ce84f207f94edd# Parent  2d3f1e5d8638f4b37fc44495bce3ebeff055e42c
Merge

diff -r b6d36a17899d -r 1c7281288303 common_osx.mm
--- a/common_osx.mm	Thu Mar 24 13:20:33 2011 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-
-#include "common.h"
-
-#include <QString>
-
-#ifdef Q_OS_MAC
-
-#include <Foundation/Foundation.h>
-
-QString getUserRealName()
-{
-    NSString *s = NSFullUserName();
-    return QString::fromLocal8Bit([s UTF8String]);
-}
-
-#endif
diff -r b6d36a17899d -r 1c7281288303 deploy/osx/deploy.sh
--- a/deploy/osx/deploy.sh	Thu Mar 24 13:20:33 2011 +0000
+++ b/deploy/osx/deploy.sh	Thu Mar 24 13:20:43 2011 +0000
@@ -13,7 +13,7 @@
 fi
 app=EasyMercurial
 
-version=`perl -p -e 's/^[^"]*"([^"]*)".*$/$1/' version.h`
+version=`perl -p -e 's/^[^"]*"([^"]*)".*$/$1/' src/version.h`
 case "$version" in
     [0-9].[0-9]) bundleVersion="$version".0 ;;
     [0-9].[0-9].[0-9]) bundleVersion="$version" ;;
diff -r b6d36a17899d -r 1c7281288303 deploy/osx/paths.sh
--- a/deploy/osx/paths.sh	Thu Mar 24 13:20:33 2011 +0000
+++ b/deploy/osx/paths.sh	Thu Mar 24 13:20:43 2011 +0000
@@ -21,7 +21,7 @@
 
 for fwk in QtCore QtGui QtNetwork; do
         find "$app.app" -type f -print | while read x; do
-                current=$(otool -L "$x" | grep "$fwk.framework/" | awk '{ print $1; }')
+                current=$(otool -L "$x" | grep "$fwk" | grep ramework | awk '{ print $1; }')
                 [ -z "$current" ] && continue
                 echo "$x has $current"
                 relative=$(echo "$x" | sed -e "s,$app.app/Contents/,," \
diff -r b6d36a17899d -r 1c7281288303 easyhg.py
--- a/easyhg.py	Thu Mar 24 13:20:33 2011 +0000
+++ b/easyhg.py	Thu Mar 24 13:20:43 2011 +0000
@@ -26,8 +26,8 @@
 if not easyhg_import_path.startswith('NO_'):
     # We have an installation path: append it twice, once with
     # the Python version suffixed
-    version_suffix = "Py" + sys.version_info[0] + "." + sys.version_info[1];
-    sys.path.append(easyhg_import_path + version_suffix)
+    version_suffix = "Py" + str(sys.version_info[0]) + "." + str(sys.version_info[1]);
+    sys.path.append(easyhg_import_path + "/" + version_suffix)
     sys.path.append(easyhg_import_path)
 
 # Try to load the PyQt4 module that we need.  If this fails, we should
diff -r b6d36a17899d -r 1c7281288303 src/common_osx.mm
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/common_osx.mm	Thu Mar 24 13:20:43 2011 +0000
@@ -0,0 +1,16 @@
+
+#include "common.h"
+
+#include <QString>
+
+#ifdef Q_OS_MAC
+
+#include <Foundation/Foundation.h>
+
+QString getUserRealName()
+{
+    NSString *s = NSFullUserName();
+    return QString::fromLocal8Bit([s UTF8String]);
+}
+
+#endif
diff -r b6d36a17899d -r 1c7281288303 src/version.h
--- a/src/version.h	Thu Mar 24 13:20:33 2011 +0000
+++ b/src/version.h	Thu Mar 24 13:20:43 2011 +0000
@@ -1,1 +1,1 @@
-#define EASYHG_VERSION "0.9.5"
+#define EASYHG_VERSION "0.9.6"