Bump version to v2.9.8

(cherry picked from commit bc6fd3aa72)

AUTHORS

@@ -74,6 +74,7 @@ Translations authors:
   copyright:
   - Arabic: SDERAWI (abz8868@msn.com) and sn51234 (nesseyan@gmail.com)
   - Armenian: Hrant Ohanyan (hrantohanyan@mail.am)
+  - Basque: Xabier Aramendi (azpidatziak@gmail.com)
   - Belarusian: Mihas Varantsou (meequz@gmail.com)
   - Brazilian: Nick Marinho (nickmarinho@gmail.com)
   - Bulgarian: Tsvetan & Boyko Bankoff (emerge_life@users.sourceforge.net)

Changelog

@@ -1,3 +1,30 @@
+* Sat May 5 2012 - Christophe Dumez <chris@qbittorrent.org> - v2.9.8
+    - BUGFIX: Various UI style fixes
+    - BUGFIX: Fix compilation with gcc 4.7
+    - BUGFIX: Fix possible compilation error with msvc (Windows)
+    - BUGFIX: Fix compilation on OS/2
+    - I18N: Update Italian translation
+
+* Sun Mar 18 2012 - Christophe Dumez <chris@qbittorrent.org> - v2.9.7
+    - BUGFIX: Fix important HTTP request parsing bug (Web UI)
+
+* Sat Mar 17 2012 - Christophe Dumez <chris@qbittorrent.org> - v2.9.6
+    - BUGFIX: Fix download first/last pieces state reporting
+    - BUGFIX: Fix name of progress column in torrent content panel
+    - BUGFIX: Disable system tray icon on Mac OS X
+    - BUGFIX: RSS downloader should not ignore "Do not start automatically" rule (closes #946910)
+    - BUGFIX: Fix DHT port setting in Web UI (Closes #952182)
+    - BUGFIX: Fix possible Web UI authentication problem when using SSL (closes #941343)
+    - BUGFIX: Fix possible issues with folder removal when removing a torrent
+    - I18N: Add Basque translation
+
+* Sat Feb 18 2012 - Christophe Dumez <chris@qbittorrent.org> - v2.9.5
+    - BUGFIX: Fix crash when disabling then reenabling RSS
+    - BUGFIX: Fix duplicate torrent detection when adding a magnet link
+    - BUGFIX: Fix import of new trackers when adding a torrent with same hash (Closes #747000)
+    - BUGFIX: Fix possible redownload of torrents marked as read (Closes #927495)
+    - BUGFIX: Properly remove RSS feed settings/history upon feed removal
+
 * Sat Feb 18 2012 - Christophe Dumez <chris@qbittorrent.org> - v2.9.4
     - BUGFIX: qBittorrent does not handle redirection to relative URLs correctly (Closes #919905)
     - BUGFIX: Cmd+M minimizes main window on Mac OS X (Closes #928216)

README.os2

@@ -27,7 +27,6 @@ First you need to create the conf.pri file in the same dir as this readme.os2 is
 the conf.pri file has the following content:
 
 ##### conf.pri content beginn #####
-PREFIX = .
 BINDIR = ./bin
 INCDIR = ./include
 LIBDIR = ./lib

configure

@@ -507,6 +507,7 @@ public:
 #if LIBTORRENT_VERSION_MAJOR == 0 && LIBTORRENT_VERSION_MINOR < 16
     required_libs << "filesystem" ;
 #endif
+    required_libs << "thread";
     QStringList libDirs;
     if (!s.isEmpty())
       libDirs << s;

install.os2

@@ -11,7 +11,7 @@ QBittorrent installation
 
 3. INSTALLATION
 
-4. CONTACT
+4. BUGREPORTS
 
 5. CREDITS
 
@@ -29,17 +29,70 @@ Welcome to QBittorrent port for OS/2 and eComStation.
 2. REQUIREMENTS
 ===============
 
-* klibc 0.6.3 or later
+The following requirements can be installed either by rpm or by zip files.
 
-    ftp://ftp.netlabs.org/pub/gcc/libc-0_6_3-csd3.wpi
+RPM Installation:
 
-* openssl 1.0
- 
-    ftp://ftp.netlabs.org/pub/unixos2/ssl10.zip
+klibc
+-----
 
-* Qt4 dll
+  1. yum install libc
 
-    see http://svn.netlabs.org/qt4 for more information whats needed and where to get the latest
+openssl 1.0
+-----------
+
+  1. yum install openssl
+
+pthread
+-------
+
+  1. yum install pthread
+
+GCC4Core
+--------
+
+  1. yum install libgcc
+  2. yum install gcc-stack-protector
+  3. yum install gcc-stdc++-shared-library
+  4. yum install gcc-supc++-shared-library
+
+Qt4 dll
+-------
+
+  1. yum install libqt4
+
+
+ZIP Installation:
+
+klibc
+-----
+
+  1. Download klibc 0.6.4 or better (see http://svn.netlabs.org/libc for more information)
+  2. Install the files to your libpath eg x:\ecs\dll
+
+openssl 1.0
+-----------
+
+  1. Download the zip file from http://rpm.netlabs.org/release/00/zip
+  2. Install the files to your libpath eg. x:\ecs\dll
+
+pthread
+-------
+
+  1. Download pthread 2012-03-13 or better from http://rpm.netlabs.org/release/00/zip
+  2. Install the files to your libpath eg. x:\ecs\dll
+
+GCC4Core
+--------
+
+  1. Download GCC4Core 1.2.1 or better from http://ftp.netlabs.org/pub/gcc
+  2. Install the files to your libpath eg. x:\ecs\dll
+
+Qt4 dll
+-------
+
+  1. Download Qt4 4.7.3 or better (see http://svn.netlabs.org/qt4 for more information)
+  2. Install the files according to the readme
 
 
 3. INSTALLATION
@@ -47,30 +100,6 @@ Welcome to QBittorrent port for OS/2 and eComStation.
           
 To install QBittorrent, do the following:
 
-klibc
------
-
-  1. Download klibc 0.6.3 csd3 or later.
-  2. Install the package by double-clicking on the WPI file.
-
-
-openssl 1.0
------------
-
-  1. Download the zip file
-  2. Install the files to your libpath eg. x:\ecs\dll
-
-Qt4 dll
--------
-
-  1. Download the package
-  2. Install the package by double-clicking on the wpi file.
-
-
-
-QBittorrent
------------
-
   1. Create a directory for QBittorrent.
   2. Extract the QBittorrent package to the new directory.
   3. Create a WPS object for QBittorrent.exe.
@@ -78,18 +107,13 @@ QBittorrent
   5. Happy torrenting
   
 
+4. BUGREPORTS
+=============
 
-4. CONTACT
-==========
-
-Please send bugreports to:
-
-  ecs@aroa.ch
-
+Please create bugreports at http://svn.netlabs.org/qtapps
 Only bug reports with a reproducable bug are accepted. :-)
 
 
-
 5. CREDITS
 ==========
 
@@ -122,6 +146,20 @@ development, you can do so in one of the following ways:
 7. HISTORY
 ==========
 
+2012-03-15
+
+  * updated to 2.9.5 code level of QBittorrent
+
+2011-09-26
+
+  * updated to 2.8.5 code level of QBittorrent
+  * updated to Qt 4.7.3
+
+2011-06-20
+
+  * updated to 2.7.3 code level of QBittorrent
+  * updated libtorrent to 0.15.6 level
+
 2010-12-23
 
   * updated to 2.5.2 code level of QBittorrent

qbittorrent.pro

@@ -11,6 +11,8 @@ dist.commands += rm -fR ../$${PROJECT_NAME}-$${PROJECT_VERSION}/.git &&
 dist.commands += rm -f ../$${PROJECT_NAME}-$${PROJECT_VERSION}/.gitignore &&
 dist.commands += cd .. &&
 dist.commands += tar czf $${PROJECT_NAME}-$${PROJECT_VERSION}.tar.gz $${PROJECT_NAME}-$${PROJECT_VERSION} &&
+dist.commands += tar cf $${PROJECT_NAME}-$${PROJECT_VERSION}.tar $${PROJECT_NAME}-$${PROJECT_VERSION} &&
+dist.commands += xz -f $${PROJECT_NAME}-$${PROJECT_VERSION}.tar &&
 dist.commands += rm -fR $${PROJECT_NAME}-$${PROJECT_VERSION}
 
 QMAKE_EXTRA_TARGETS += dist

qcm/libboost.qcm

@@ -71,6 +71,7 @@ public:
 #if LIBTORRENT_VERSION_MAJOR == 0 && LIBTORRENT_VERSION_MINOR < 16
     required_libs << "filesystem" ;
 #endif
+    required_libs << "thread";
     QStringList libDirs;
     if (!s.isEmpty())
       libDirs << s;

src/Info.plist

@@ -47,7 +47,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleGetInfoString</key>
-	<string>2.9.4</string>
+	<string>2.9.8</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleExecutable</key>

src/about_imp.h

@@ -64,6 +64,7 @@ class about : public QDialog, private Ui::AboutDlg{
       QString trans_txt = "<p>"+tr("I would like to thank the following people who volunteered to translate qBittorrent:")+"</p>";
       trans_txt += QString::fromUtf8("<ul><li><u>Arabic:</u> SDERAWI (abz8868@msn.com) and sn51234 (nesseyan@gmail.com)</li>\
           <li><u>Armenian:</u> Hrant Ohanyan (hrantohanyan@mail.am)</li>\
+          <li><u>Basque:</u> Xabier Aramendi (azpidatziak@gmail.com)</li>\
           <li><u>Belarusian:</u> Mihas Varantsou (meequz@gmail.com)</li>\
           <li><u>Brazilian:</u> Nick Marinho (nickmarinho@gmail.com)</li>\
           <li><u>Bulgarian:</u> Tsvetan & Boyko Bankoff (emerge_life@users.sourceforge.net)</li>\

src/downloadfromurldlg.ui

@@ -14,31 +14,14 @@
    <string>Download from urls</string>
   </property>
   <layout class="QVBoxLayout">
-   <property name="spacing">
-    <number>6</number>
-   </property>
-   <property name="margin">
-    <number>9</number>
-   </property>
    <item>
     <layout class="QHBoxLayout">
-     <property name="spacing">
-      <number>6</number>
-     </property>
-     <property name="margin">
-      <number>0</number>
-     </property>
      <item>
       <widget class="QLabel" name="downloadURL_lbl">
        <property name="font">
         <font>
-         <family>Sans Serif</family>
-         <pointsize>12</pointsize>
          <weight>75</weight>
-         <italic>false</italic>
          <bold>true</bold>
-         <underline>false</underline>
-         <strikeout>false</strikeout>
         </font>
        </property>
        <property name="text">
@@ -65,13 +48,7 @@
      </property>
      <property name="font">
       <font>
-       <family>Sans Serif</family>
-       <pointsize>9</pointsize>
-       <weight>50</weight>
        <italic>true</italic>
-       <bold>false</bold>
-       <underline>false</underline>
-       <strikeout>false</strikeout>
       </font>
      </property>
      <property name="text">
@@ -81,12 +58,6 @@
    </item>
    <item>
     <layout class="QHBoxLayout">
-     <property name="spacing">
-      <number>6</number>
-     </property>
-     <property name="margin">
-      <number>0</number>
-     </property>
      <item>
       <spacer>
        <property name="orientation">

src/lang.qrc

@@ -35,5 +35,6 @@
   <file>lang/qbittorrent_ro.qm</file>
   <file>lang/qbittorrent_ka.qm</file>
   <file>lang/qbittorrent_be.qm</file>
+  <file>lang/qbittorrent_eu.qm</file>
 </qresource>
 </RCC>