From 9f654cb590c9f8cacb94dcf1fcc097f26476bbc8 Mon Sep 17 00:00:00 2001
From: shibakaneki <didier@sente.ch>
Date: Tue, 3 May 2011 15:24:05 +0200
Subject: [PATCH] Fixed some bugs

---
 Sankore_3.1.pro                                    |   3 ---
 release.macx.sh                                    |   4 ++--
 thirdparty/google-breakpad/r318/bin/macx/dump_syms | Bin
 thirdparty/refnum/dmgutil.pl                       |   0
 thirdparty/xpdf/xpdf-3.02/xpdf/Makefile            |   2 +-
 5 files changed, 3 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 thirdparty/google-breakpad/r318/bin/macx/dump_syms
 mode change 100644 => 100755 thirdparty/refnum/dmgutil.pl

diff --git a/Sankore_3.1.pro b/Sankore_3.1.pro
index 07b94165..bee0985f 100644
--- a/Sankore_3.1.pro
+++ b/Sankore_3.1.pro
@@ -12,9 +12,6 @@ VERSION_PATCH = 00
 VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}"
 VERSION = $$replace(VERSION, "\\.r", "")
 
-SVN_VERSION = $$system(svnversion)
-SVN_VERSION = $$replace(SVN_VERSION, "\\n", "")
-
 LONG_VERSION = "$${VERSION}.$${SVN_VERSION}"
 macx:OSX_VERSION = "$${VERSION} (r$${SVN_VERSION})"
 
diff --git a/release.macx.sh b/release.macx.sh
index a7615abf..92969380 100644
--- a/release.macx.sh
+++ b/release.macx.sh
@@ -69,14 +69,14 @@ QMAKE_CMD="$QMAKE -spec macx-g++42"
 $QMAKE_CMD
 
 VERSION=`cat "$BUILD_DIR/version"`
-if [ "$VERSION" = "" ]; then
+if [ ! -f "$BUILD_DIR/version" ]; then
     echo "version not found"
     exit 1
 else
     LAST_COMMITED_VERSION="`git describe $(git rev-list --tags --max-count=1)`"
     if [ "v$VERSION" != "$LAST_COMMITED_VERSION" ]; then
 	echo creating a tag with the version $VERSION
-	git tag -a "v$VERSION"
+	git tag -a "v$VERSION" -m "Generated setup for v$VERSION"
 	git push origin --tags
     else
 	if [ "$1" != "escape" ] ; then
diff --git a/thirdparty/google-breakpad/r318/bin/macx/dump_syms b/thirdparty/google-breakpad/r318/bin/macx/dump_syms
old mode 100644
new mode 100755
diff --git a/thirdparty/refnum/dmgutil.pl b/thirdparty/refnum/dmgutil.pl
old mode 100644
new mode 100755
diff --git a/thirdparty/xpdf/xpdf-3.02/xpdf/Makefile b/thirdparty/xpdf/xpdf-3.02/xpdf/Makefile
index 82263a55..054b0178 100644
--- a/thirdparty/xpdf/xpdf-3.02/xpdf/Makefile
+++ b/thirdparty/xpdf/xpdf-3.02/xpdf/Makefile
@@ -26,7 +26,7 @@ LDFLAGS =
 T1LIBS = 
 FTLIBS = 
 
-XLIBS =   -lXt -lXp -lXext -lXpm  -lSM -lICE  -lX11 
+XLIBS =         -lX11 
 
 SPLASHLIBS = -L$(SPLASHLIBDIR) -lsplash