From f5ea96fec2d898e2f1ac250cd9b91f59d33fa84a Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Thu, 6 Jan 2011 15:24:14 +0000
Subject: [PATCH] Tagged v2.5.5 release

---
 Changelog                                   | 2 +-
 src/Icons/qBittorrent.desktop               | 2 +-
 src/Info.plist                              | 2 +-
 src/torrentcreator/torrentcreatorthread.cpp | 2 +-
 unixconf.pri                                | 2 +-
 version.pri                                 | 6 +++---
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Changelog b/Changelog
index 48431a1a4..8688ca5f4 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,4 @@
-* Thu Jan 6 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.5.4
+* Thu Jan 6 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.5.5
     - BUGFIX: Added --enable-debug parameter to the configure script
     - BUGFIX: Prioritize first and last pieces when sequential download is enabled
     - BUGFIX: Some encoding fixes (Windows)
diff --git a/src/Icons/qBittorrent.desktop b/src/Icons/qBittorrent.desktop
index a61401d03..0d6bcac4a 100644
--- a/src/Icons/qBittorrent.desktop
+++ b/src/Icons/qBittorrent.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Categories=Qt;Network;P2P;
-Comment=V2.5.4
+Comment=V2.5.5
 Exec=qbittorrent %f
 GenericName=Bittorrent client
 GenericName[ar]=العميل Bittorrent
diff --git a/src/Info.plist b/src/Info.plist
index f8175a542..59719487e 100644
--- a/src/Info.plist
+++ b/src/Info.plist
@@ -47,7 +47,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleGetInfoString</key>
-	<string>2.5.4</string>
+	<string>2.5.5</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleExecutable</key>
diff --git a/src/torrentcreator/torrentcreatorthread.cpp b/src/torrentcreator/torrentcreatorthread.cpp
index 8ab323853..81382655c 100644
--- a/src/torrentcreator/torrentcreatorthread.cpp
+++ b/src/torrentcreator/torrentcreatorthread.cpp
@@ -135,7 +135,7 @@ void TorrentCreatorThread::run() {
       emit updateProgress(100);
       emit creationSuccess(save_path, parent_path);
     } else {
-      throw std::exception(tr("Cannot write the output file").toLocal8Bit().constData());
+      throw std::exception();
     }
   } catch (std::exception& e){
     emit creationFailure(QString::fromLocal8Bit(e.what()));
diff --git a/unixconf.pri b/unixconf.pri
index abc5e1f49..ecf03fe6b 100644
--- a/unixconf.pri
+++ b/unixconf.pri
@@ -1,5 +1,5 @@
 # Generated by the configure file
-include(../conf.pri)
+include(conf.pri)
 
 # COMPILATION SPECIFIC
 QT += dbus
diff --git a/version.pri b/version.pri
index dc0e6b243..88d559874 100644
--- a/version.pri
+++ b/version.pri
@@ -1,11 +1,11 @@
 os2 {
-    DEFINES += VERSION=\'\"v2.5.4\"\'
+    DEFINES += VERSION=\'\"v2.5.5\"\'
 } else {
-    DEFINES += VERSION=\\\"v2.5.4\\\"
+    DEFINES += VERSION=\\\"v2.5.5\\\"
 }
 DEFINES += VERSION_MAJOR=2
 DEFINES += VERSION_MINOR=5
-DEFINES += VERSION_BUGFIX=4
+DEFINES += VERSION_BUGFIX=5
 
 # NORMAL,ALPHA,BETA,RELEASE_CANDIDATE,DEVEL
 DEFINES += VERSION_TYPE=NORMAL