Bump version to v3.0.5

Fix Changelog
Properly recover from HTTP parsing errors (Web UI)
2025-10-07 09:52:18 +02:00 · 2012-09-30 10:58:35 +03:00 · 2012-09-29 16:22:44 +03:00 · 2012-09-29 16:18:51 +03:00 · 2012-09-29 16:18:40 +03:00 · 2012-09-29 14:00:58 +03:00
932 changed files with 280813 additions and 52738 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,14 @@
+src/geoip/GeoIP.dat
+src/qbittorrent
+qbittorrent.pro.user
+conf.pri
+Makefile
+*.pyc
+*.log
+# Compiled object files
+*.o
+# Generated MOC, resource and UI files
+moc_*.cpp
+qrc_*.cpp
+ui_*.h
+*.moc
--- a/113
+++ b/113
@@ -1 +1,112 @@
-Christophe Dumez <chris@qbittorrent.org>
+Author:
+* Christophe Dumez <chris@qbittorrent.org>
+
+Contributors:
+* Vladimir Golovnev <glassez@yandex.ru>
+* Stefanos Antaris <santaris@csd.auth.gr>
+* Mohammad Dib <mdib@qbittorrent.org>
+* Mirco Chinelli <infinity89@fastwebmail.it>
+* Ishan Arora <ishan@qbittorrent.org>
+* Arnaud Demaizière <arnaud@qbittorrent.org>
+* Grigis Gaëtan <cipher16@gmail.com>
+* Christian Kandeler <zambesi@users.sourceforge.net>
+* Silvan Scherrer <silvan.scherrer@aroa.ch>
+
+Code from other projects:
+* files src/qtsingleapp/* src/lineedit/*
+  copyright: Nokia Corporation
+  license: LGPL
+
+* files src/ico.cpp src/ico.h
+  copyright: Malte Starostik <malte@kde.org>
+  license: LGPL
+
+* files src/search_engine/socks.py
+  copyright: Dan Haim <negativeiq@users.sourceforge.net>
+  license: BSD
+
+Images Authors:
+* files: src/Icons/*.png
+  copyright: Gnome Icon Theme
+  license: GPLv2
+  url: http://ftp.acc.umu.se/pub/GNOME/sources/gnome-icon-theme
+
+* files: src/oxygen/*.png
+  copyright: Oxygen Icon Theme (KDE)
+  license: LGPL
+  url: http://www.oxygen-icons.org
+
+* files: src/Icons/flags/*.png
+  copyright: Mark James <mjames@gmail.com>
+  license: Public Domain
+  url: http://www.famfamfam.com
+
+* files: src/Icons/skin/*.png
+  files: src/menuicons/YYxYY/*.png
+  copyright: Mateusz Tobola <tobejodok@qbittorrent.org>
+  license: GPLv2
+
+* file: src/Icons/skin/tabs.gif
+  copyright: Greg Houston <gregory.houston@gmail.com>
+  license: MIT
+
+* file: src/Icons/skin/qbittorrent_mono*
+  copyright: Daniel Eguren <deguren@gmail.com>
+  license: LGPL
+
+* file: src/search_engine/engines/btjunkie.png
+  copyright: Downloaded from btjunkie.org
+
+* file: src/search_engine/engines/isohunt.png
+  copyright: Downloaded from isohunt.com
+
+* file: src/search_engine/engines/mininova.png
+  copyright: Downloaded from mininova.org
+
+* file: src/search_engine/engines/piratebay.png
+  copyright: Downloaded from thepiratebay.org
+
+* file: src/search_engine/engines/torrentreactor.png
+  copyright: Downloaded from torrentreactor.net
+
+Translations authors:
+* files: src/lang/*.ts
+  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)
+  - Catalan: Francisco Luque Contreras (frannoe@ya.com)
+  - Chinese (Simplified): Guo Yue (yue.guo0418@gmail.com)
+  - Chinese (Traditional): Yi-Shun Wang (dnextstep@gmail.com)
+  - Croatian: Oliver Mucafir (oliver.untwist@gmail.com)
+  - Czech: Jirka Vilim (web@tets.cz)
+  - Danish: Mathias Nielsen (comoneo@gmail.com)
+  - Dutch: Pieter Heyvaert (pieter_heyvaert@hotmail.com)
+  - English: Christophe Dumez (chris@qbittorrent.org)
+  - Finnish: Niklas Laxström (nikerabbit@users.sourceforge.net)
+  - French: Christophe Dumez (chris@qbittorrent.org)
+  - Galician: Marcos Lans (marcoslansgarza@gmail.com)
+  - Georgian: Beqa Arabuli (arabulibeqa@yahoo.com)
+  - German: Niels Hoffmann (zentralmaschine@users.sourceforge.net)
+  - Greek: Tsvetan Bankov (emerge_life@users.sourceforge.net) and Stephanos Antaris (santaris@csd.auth.gr)
+  - Hebrew: David Deutsch (d.deffo@gmail.com)
+  - Hungarian: Majoros Péter (majoros.j.p@t-online.hu)
+  - Italian: bovirus (bovirus@live.it) and Matteo Sechi (bu17714@gmail.com)
+  - Japanese: Masato Hashimoto (cabezon.hashimoto@gmail.com)
+  - Korean: Jin Woo Sin (jin828sin@users.sourceforge.net)
+  - Lithuanian: Naglis Jonaitis (njonaitis@gmail.com)
+  - Norwegian: Tomaso
+  - Polish: Mariusz Fik (fisiu@opensuse.org)
+  - Portuguese: Nick Marinho (nickmarinho@gmail.com)
+  - Romanian: Obada Denis (obadadenis@users.sourceforge.net)
+  - Russian: Nick Khazov (m2k3d0n at users.sourceforge.net)
+  - Serbian: Anaximandar Milet (anaximandar at operamail.com)
+  - Slovak:  helix84
+  - Spanish: Francisco Luque Contreras (frannoe@ya.com)
+  - Swedish: Daniel Nylander (po@danielnylander.se)
+  - Turkish: Hasan Yilmaz (iletisim@hedefturkce.com)
+  - Ukrainian: Oleh Prypin (blaxpirit@gmail.com)
+  license: GPLv2
--- a/14
+++ b/14
@@ -1,3 +1,17 @@
+qBittorrent is licensed under the GNU General Public License version 2 with the
+addition of the following special exception:
+
+In addition, as a special exception, the copyright holders give permission to
+link this program with the OpenSSL project's "OpenSSL" library (or with
+modified versions of it that use the same license as the "OpenSSL" library),
+and distribute the linked executables. You must obey the GNU General Public
+License in all respects for all of the code used other than "OpenSSL".  If you
+modify file(s), you may extend this exception to your version of the file(s),
+but you are not obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+
+----------
+
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991

--- a/697
+++ b/697
--- a/66
+++ b/66
@@ -1,36 +1,58 @@
-qBittorrent - A BitTorrent client in C++ / Qt4.2
+qBittorrent - A BitTorrent client in C++ / Qt4
 ------------------------------------------

-*** Necessary if qt3 is default on your system ***
-export QTDIR=/usr/include/qt4
-export PATH=$QTDIR/bin:$PATH
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$QTDIR/lib
-*** End ***
+1) Compile and install qBittorrent with Qt4 Graphical Interface

-./configure
-make && make install
-qbittorrent
+  $ ./configure
+  $ make && make install
+  $ qbittorrent

-will install and execute qBittorrent hopefully without any problems.
+  will install and execute qBittorrent hopefully without any problems.

-Dependencies:
- Qt >= 4.2 (libqt-devel, libqtgui, libqtcore, libqtnetwork)
+  Dependencies:
+    - Qt >= 4.6.0 (libqtgui, libqtcore, libqtnetwork, libqtxml, libqtdbus/optional)

- libtorrent by Arvid Norberg (>= v0.12 REQUIRED)
-    -> http://libtorrent.sf.net
-    Be carefull: another library (the one used by rtorrent) use the same name.
-    These are TWO different libraries and qBittorrent will only work with the one provided
-    on sourceforge (created by Arvid Norberg). The two libraries conflicts with each other.
+    - pkg-config executable

- libboost: libboost-filesystem, libboost-date-time, libboost-thread, libboost-serialization
+    - libtorrent-rasterbar by Arvid Norberg (>= 0.15.0)
+        -> http://www.libtorrent.net
+        Be careful: another library (the one used by rTorrent) uses a similar name.

- libcurl
+    - libboost 1.34.x (libboost-filesystem°) + libasio
+      or
+    - libboost >= 1.35.x (libboost-system, libboost-filesystem°)
+      
+    °libboost-filesystem is not needed if libtorrent-rasterbar >= v0.16.x is used

- python >= 2.3 (previous might work - not tested): needed by search engine.
+    - python >= 2.3 (needed by search engine)
+        * Run time only dependency

-NOTE FOR GNOME USERS:
- qt4-qtconfig package is advised or qBittorrent interface will be ugly
+    - geoip-database (optional)
+        * If qBittorrent cannot find this database, it will try to resolve countries using the Internet but it will be a lot slower.
+        * Run time only dependency

+2) Compile and install qBittorrent without Qt4 Graphical interface
+
+  $ ./configure --disable-gui
+  $ make && make install
+  $ qbittorrent
+
+  will install and execute qBittorrent hopefully without any problems.
+
+  Dependencies:
+    - Qt >= 4.4.0 (libqt-devel, libqtcore, libqtnetwork)
+
+    - pkg-config executable
+
+    - libtorrent-rasterbar by Arvid Norberg (>= v0.15.0)
+        -> http://www.libtorrent.net
+        Be careful: another library (the one used by rTorrent) uses a similar name.
+
+    - libboost: libboost-filesystem, libboost-date-time, libboost-thread, libboost-serialization
+
+
+DOCUMENTATION:
+Please note that there is a documentation with a "compiling howto" at http://wiki.qbittorrent.org.

 ------------------------------------------
 Christophe Dumez <chris@qbittorrent.org>
--- a/22
+++ b/22
@@ -1,32 +1,38 @@
-qBittorrent - A BitTorrent client in Qt4.2
+qBittorrent - A BitTorrent client in Qt4
 ------------------------------------------

 Description:
 ********************************
-qBittorrent is a bittorrent client programmed in C++ / Qt4.2 that use
-libtorrent (sometimes called rb_libtorrent) by Arvid Norberg.
+qBittorrent is a bittorrent client programmed in C++ / Qt4 that uses
+libtorrent (sometimes called rblibtorrent) by Arvid Norberg.

 It aims to be a good alternative to all other bittorrent clients
 out there. qBittorrent is fast, stable and provides unicode
-support.
+support as well as many features.
+
+This product includes GeoLite data created by MaxMind, available from
+http://maxmind.com/

 Installation:
 ********************************
-For installation follow the instructions from INSTALL file, but simple
+For installation, follow the instructions from INSTALL file, but simple:

 ./configure
 make && make install
 qbittorrent

-will install and execute qBittorrent hopefully without any problems.
+will install and execute qBittorrent hopefully without any problem.

 For more information please visit:
 http://www.qbittorrent.org

-Please report any bug (or feature requests) to:
+or our wiki here:
+http://wiki.qbittorrent.org
+
+Please report any bug (or feature request) to:
 http://bugs.qbittorrent.org

-You can also meet me on IRC:
+You can also meet me (chris-qBT) on IRC:
 #qbittorrent on irc.freenode.net

 ------------------------------------------
--- a/README.os2
+++ b/README.os2
@@ -0,0 +1,74 @@
+qBittorrent - A BitTorrent client in Qt4
+------------------------------------------
+
+This is the eComStation (OS/2) qBittorrent part of the readme. See also README for more general information.
+
+
+Building qBittorrent
+********************
+
+
+Requirements
+============
+
+- gcc based build env (recommended gcc v4.4.2 or greater)
+  
+- Qt4 for eCS (OS/2) dev package (see http://svn.netlabs.org/qt4 for more information)
+
+- libtorrent-rasterbar for eCS (OS/2) port (see http://svn.netlabs.org/ports for more information)
+
+- boost for eCS (OS/2) port (see http://svn.netlabs.org/ports for more information)
+
+
+How to build
+============
+
+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 #####
+BINDIR = ./bin
+INCDIR = ./include
+LIBDIR = ./lib
+DATADIR = ./share
+
+CONFIG += staticlib
+INCLUDEPATH += x:/trees/libtorrent/trunk/include
+LIBS += -Lx:/trees/libtorrent/trunk/src/.libs \
+        -Lx:/trees/boost/trunk/stage/lib \
+        -Lx:/trees/openssl \
+	-Lx:/extras/lib
+##### conf.pri content end #####
+
+Of course all the above path references have to be adjusted to your build env.
+
+Now you can either do a normal build or a shadow build. A shadow build has the
+advantage that no created files are in the same dir as the sources are.
+
+For a normal build do the following:
+
+Simply type:
+$ qmake
+
+Followed by:
+$ make
+
+For a shadow build do the following:
+given your sources are in x:\trees\qbittorrent\trunk create a 
+x:\trees\qbittorrent\build directory
+
+Now switch to the created directory and type:
+$ qmake ..\trunk
+
+Followed by:
+$ make
+
+If all works fine you should get a working qbittorrent executable.
+
+If you have any question regarding the eCS (OS/2) port of qBittorrent you can meet me (_diver) on IRC:
+#netlabs on irc.freenode.net
+
+------------------------------------------
+Silvan Scherrer <silvan.scherrer@aroa.ch>
+
+
--- a/42
+++ b/42
@@ -1,42 +1,2 @@
-// Easy
- Write documentation
- Translations into as many languages as possible
- Improve man page
- Add more keyboard shortcuts
+See https://blueprints.launchpad.net/qbittorrent/

-// Intermediate
- Port on MacOS, Windows (and create an installer for Windows) - Progressing
- Add some transparency (menus,...)
- Add upnp port forwarding support
-
-// Harder
- Allow user to organize the downloads into categories/folders
- Display new searches in new tabs
- Display a progress bar that really displays the pieces we have (like in eMule)
-
-// Waiting for libtorrent
- Encryption support (v0.13?)
- File selection in a torrent in compact mode
- Allow to prioritize files within a torrent
- Allow to prioritize torrents
-
-// Unsure
- Azureus spoofing to prevent ban from trackers?
- Web interface?
- Use downloader class to download search plugin updates
- Allow to set upload limit for each torrent
- Option to shutdown computer when downloads are finished
- Add a torrent scheduler
-
-// in v1.0.0 (partial)
- Download from RSS feeds (WIP by gtsoul)
- Move finished torrent to another tab and keep on seeding them even after restart
- Allow to edit the trackers for a torrent
- Improve torrent creation dialog (look & features)
- Add IPv6 support (at least start working on it)
- UPnP support?
-
-// In v0.9.0
- Update translations (FR, SV, NB, PL, RU, DE done)
- Bug squashing
- Wait for libtorrent v0.12 official release
--- a/586
+++ b/586
--- a/doc/qbittorrent-nox.1
+++ b/doc/qbittorrent-nox.1
@@ -0,0 +1,44 @@
+.\" This manpage has been automatically generated by docbook2man
+.\" from a DocBook document.  This tool can be found at:
+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/>.
+.TH "QBITTORRENT\-NOX" "1" "January 16th 2010" "Command line Bittorrent client written in C++ / Qt4" ""
+
+.SH "NAME"
+qBittorrent\-nox \- a command line Bittorrent client written in C++ / Qt4
+
+.SH "SYNOPSIS"
+
+\fBqbittorrent\-nox\fR [\-\-webui-port=x] [TORRENT_FILE | URL]...
+
+\fBqbittorrent\-nox\fR \-\-help
+
+\fBqbittorrent\-nox\fR \-\-version
+
+.PP
+.SH "DESCRIPTION"
+
+\fBqBittorrent-nox\fR is an advanced command-line Bittorrent client written in C++ / Qt4,
+using the \fBlibtorrent-rasterbar\fR library by Arvid Norberg. qBittorrent\-nox aims
+to be a good alternative to other command line bittorrent clients and provides features similar to popular graphical clients.
+
+qBittorrent\-nox is fast, stable, light and it supports unicode. 
+It also comes with UPnP port forwarding / NAT-PMP, encryption (Vuze compatible), 
+FAST extension (mainline) and PeX support (utorrent compatible).
+
+qBittorrent\-nox is meant to be controlled via its feature-rich Web UI which is accessible as a default on http://localhost:8080. The Web UI access is secured and the default account user name is "admin" with "adminadmin" as a password.
+
+.SH "OPTIONS"
+
+\fB--help\fR Prints the command line options.
+
+\fB--version\fR Prints qbittorrent program version number.
+
+\fB--webui-port=x\fR Changes Web UI port to x (default: 8080).
+
+.SH "BUGS"
+
+If you find a bug, please report it at http://bugs.qbittorrent.org
+
+.SH "AUTHOR"
+
+Christophe Dumez <chris@qbittorrent.org>
--- a/doc/qbittorrent.1
+++ b/doc/qbittorrent.1
@@ -0,0 +1,42 @@
+.\" This manpage has been automatically generated by docbook2man
+.\" from a DocBook document.  This tool can be found at:
+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/>.
+.TH "QBITTORRENT" "1" "January 16th 2010" "Bittorrent client written in C++ / Qt4" ""
+
+.SH "NAME"
+qBittorrent \- a Bittorrent client written in C++ / Qt4
+
+.SH "SYNOPSIS"
+
+\fBqbittorrent\fR [\-\-no-splash] [\-\-webui-port=x] [TORRENT_FILE | URL]...
+
+\fBqbittorrent\fR \-\-help
+
+\fBqbittorrent\fR \-\-version
+
+.PP
+.SH "DESCRIPTION"
+
+\fBqBittorrent\fR is an advanced Bittorrent client written in C++ / Qt4,
+using the \fBlibtorrent-rasterbar\fR library by Arvid Norberg. qBittorrent is similar to uTorrent. qBittorrent
+is fast, stable, light, it supports unicode and it provides a good integrated search engine.
+It also comes with UPnP port forwarding / NAT-PMP, encryption (Vuze compatible), 
+FAST extension (mainline) and PeX support (utorrent compatible).
+
+.SH "OPTIONS"
+
+\fB--help\fR Prints the command line options.
+
+\fB--version\fR Prints qbittorrent program version number.
+
+\fB--no-splash\fR Disables splash screen on startup.
+
+\fB--webui-port=x\fR Changes Web UI port to x (default: 8080).
+
+.SH "BUGS"
+
+If you find a bug, please report it at http://bugs.qbittorrent.org
+
+.SH "AUTHOR"
+
+Christophe Dumez <chris@qbittorrent.org>
--- a/doc/qbittorrent.1.gz
+++ b/doc/qbittorrent.1.gz
--- a/install.os2
+++ b/install.os2
@@ -0,0 +1,187 @@
+QBittorrent installation
+
+
+
+0. CONTENTS OF THIS FILE
+========================
+
+1. INTRODUCTION
+
+2. REQUIREMENTS
+
+3. INSTALLATION
+
+4. BUGREPORTS
+
+5. CREDITS
+
+6. SUPPORT AND DONATIONS
+
+7. HISTORY
+
+
+1. INTRODUCTION
+===============
+
+Welcome to QBittorrent port for OS/2 and eComStation.
+
+
+2. REQUIREMENTS
+===============
+
+The following requirements can be installed either by rpm or by zip files.
+
+RPM Installation:
+
+klibc
+-----
+
+  1. yum install libc
+
+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.5 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
+===============
+          
+To install QBittorrent, do the following:
+
+  1. Create a directory for QBittorrent.
+  2. Extract the QBittorrent package to the new directory.
+  3. Create a WPS object for QBittorrent.exe.
+  4. Start QBittorrent
+  5. Happy torrenting
+  
+
+4. BUGREPORTS
+=============
+
+Please create bugreports at http://svn.netlabs.org/qtapps
+Only bug reports with a reproducable bug are accepted. :-)
+
+
+5. CREDITS
+==========
+
+The port was done by:
+
+Silvan Scherrer aka _diver
+
+Thanks go to:
+
+  * Dmitry A. Kuminov
+
+They either helped me when I had some nasty questions or did some testing for
+me.
+
+
+6. SUPPORT AND DONATIONS
+========================
+
+QBittorrent port is based on volunteer work. If you would like to support further
+development, you can do so in one of the following ways:
+
+
+  * Donate to the Qt4 project: see qt.netlabs.org for more information
+
+  * Contribute to the project: Besides actual development, this also includes
+    maintaining the documentation and the project web site as well as help
+    for users.
+
+
+7. HISTORY
+==========
+
+2012-09-19
+
+  * updated to 3.0.4 code level of QBittorrent
+  * updated libtorrent to 0.16.3 level
+
+2012-09-06
+
+  * updated to 3.0.2 code level of QBittorrent
+
+2012-05-14
+
+  * updated to 2.9.8 code level of QBittorrent
+
+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
+
+2010-11-22
+
+  * updated to 2.4.11 code level of QBittorrent
+
+2010-xx-xx
+
+  * initial port
+
--- a/macxconf.pri
+++ b/macxconf.pri
@@ -0,0 +1,65 @@
+PREFIX = /usr/local
+BINDIR = /usr/local/bin
+DATADIR = /usr/local/share
+
+# Use pkg-config to get all necessary libtorrent DEFINES
+CONFIG += link_pkgconfig
+PKGCONFIG += libtorrent-rasterbar
+DEFINES += BOOST_ASIO_DYN_LINK
+
+# Special include/libs paths (macports)
+INCLUDEPATH += /usr/include/openssl /usr/include /opt/local/include/boost /opt/local/include
+LIBS += -L/opt/local/lib
+
+# OpenSSL lib
+LIBS += -lssl -lcrypto
+# Boost system lib
+LIBS += -lboost_system-mt
+# Boost filesystem lib (Not needed for libtorrent >= 0.16.0)
+#LIBS += -lboost_filesystem-mt
+# Carbon
+LIBS += -framework Carbon -framework IOKit
+
+document_icon.path = Contents/Resources
+document_icon.files = mac/qBitTorrentDocument.icns
+QMAKE_BUNDLE_DATA += document_icon
+
+qt_conf.path = Contents/Resources
+qt_conf.files = mac/qt.conf
+QMAKE_BUNDLE_DATA += qt_conf
+
+qt_translations.path = Contents/MacOS/translations
+qt_translations.files = qt-translations/qt_ar.qm \
+                        qt-translations/qt_bg.qm \
+                        qt-translations/qt_ca.qm \
+                        qt-translations/qt_cs.qm \
+                        qt-translations/qt_da.qm \
+                        qt-translations/qt_de.qm \
+                        qt-translations/qt_es.qm \
+                        qt-translations/qt_fi.qm \
+                        qt-translations/qt_fr.qm \
+                        qt-translations/qt_gl.qm \
+                        qt-translations/qt_he.qm \
+                        qt-translations/qt_hu.qm \
+                        qt-translations/qt_it.qm \
+                        qt-translations/qt_ja.qm \
+                        qt-translations/qt_ko.qm \
+                        qt-translations/qt_lt.qm \
+                        qt-translations/qt_nl.qm \
+                        qt-translations/qt_pl.qm \
+                        qt-translations/qt_pt.qm \
+                        qt-translations/qt_pt_BR.qm \
+                        qt-translations/qt_ru.qm \
+                        qt-translations/qt_sk.qm \
+                        qt-translations/qt_sv.qm \
+                        qt-translations/qt_tr.qm \
+                        qt-translations/qt_uk.qm \
+                        qt-translations/qt_zh_CN.qm \
+                        qt-translations/qt_zh_TW.qm
+QMAKE_BUNDLE_DATA += qt_translations
+
+ICON = mac/qbittorrent_mac.icns
+QMAKE_INFO_PLIST = mac/Info.plist
+
+DEFINES += WITH_GEOIP_EMBEDDED
+message("On Mac OS X, GeoIP database must be embedded.")
--- a/os2conf.pri
+++ b/os2conf.pri
@@ -0,0 +1,19 @@
+exists(conf.pri) {
+    # to the conf.pri goes all system dependent stuff
+    include(conf.pri)
+}
+
+LIBS += -ltorrent-rasterbar \
+        -lboost_thread \
+        -lboost_system \
+        -lboost_filesystem \
+        -lssl -lcrypto -lidn -lpthread
+
+RC_FILE = qbittorrent_os2.rc
+
+# LIBTORRENT DEFINES
+DEFINES += WITH_SHIPPED_GEOIP_H
+DEFINES += BOOST_ASIO_DYN_LINK
+
+DEFINES += WITH_GEOIP_EMBEDDED
+message("On eCS(OS/2), GeoIP database must be embedded.")
--- a/packaging/debian-unstable/debian/changelog
+++ b/packaging/debian-unstable/debian/changelog
@@ -1,134 +0,0 @@
-qbittorrent (0.6.1-1) unstable; urgency=low
-
-  * Disabled debug mode
-
- -- Christophe Dumez <chris@qbittorrent.org>  Mon, 28 Aug 2006 21:22:48 +0200
-
-qbittorrent (0.6.1-0) unstable; urgency=low
-  * BUGFIX: Fixed possible segfaults when using context menus
-  * BUGFIX: Cleanup up context menus code
-  * BUGFIX: Used best gzip compressing for manpage
-
- -- Christophe Dumez <chris@qbittorrent.org>  Thu,  24 Aug 2006 19:53:32 +0200
-
-qbittorrent (0.6.0) unstable; urgency=low
-  * FEATURE: Rewritten the download list from scratch (more flexible)
-  * FEATURE: Rewritten the search results list from scratch (more flexible)
-  * FEATURE: Rewritten the torrent properties list from scratch (more flexible)
-  * FEATURE: Improved and cleaned up search engine code
-  * FEATURE: Search results are now displayed in real time (not sequentially)
-  * FEATURE: Added two command lines parameters (--version, --help)
-  * FEATURE: Added a popup menu for download list
-  * FEATURE: Double-click on an item now toggles the paused state of a download
-  * FEATURE: Improved code to be more portable (Windows & MacOS versions should arrive soon)
-  * FEATURE: Allow to toggle selected state of a file within a torrent using double-click
-  * FEATURE: Remember columns width in download and search results lists
-  * BUGFIX: Don't use pkg-config for libcurl anymore (easier to compile)
-  * BUGFIX: Fixed ETA calculation when downloading while connecting
-  * BUGFIX: Download progress is now displayed correctly during first seconds of execution (was 0% before)
-  * BUGFIX: Code cleanup & optimization
-  * BUGFIX: Fixed sorting in download list
-  * BUGFIX: Fixed sorting in search results list
-  * BUGFIX: Fixed Parameters passing between instances
-  * BUGFIX: Fixed missing icon for clear action in infoBar popup menu
-  * BUGFIX: Fixed truncated lines in search results
-  * BUGFIX: Don't refresh download list when user is in search tab (save CPU)
-  * BUGFIX: Don't update Progress/DL Speed/ETA for finished downloads (save CPU)
-  * BUGFIX: Save selected search engines only when they have changed (faster program exit)
-  * COSMETIC: Increased icon size in toolbar from 24px to 32px
-  * COSMETIC: Display a progress bar to visualize each download progress
-  * COSMETIC: Size of each result in search are displayed in user friendly units
-  * COSMETIC: Display a progress bar to visualize each file progress within a torrent
-  * COSMETIC: Renamed 'ratio' to 'Session ratio' (makes more sense)
-  * COSMETIC: Improved layout of torrent properties window when maximized
-  * COSMETIC: Now number of search results is updated in real time
-  * COSMETIC: Remember last window size
-  * COSMETIC: Improved splash screen look
-  * COSMETIC: Improved default width of columns in download and search results lists
-
- -- Christophe Dumez <chris@qbittorrent.org>  Wed,  22 Aug 2006 10:42:37 +0200
-
-qbittorrent (0.5.0) unstable; urgency=low
-  * Improved "Download from url" feature (now supports https, ftp & redirections)
-  * Added a torrent creation tool
-  * Display progress for each file within a torrent
-  * Based on new libtorrent v0.10 (lot of improvements)
-  * Now possible to clear log textbox (popup menu)
-  * Added two search engines (isohunt, torrentreactor)
-  * Now Display share ratio on main window
-  * Use OSD (On Screen Display) when a download or a search is finished
-  * Allow only one instance of qBittorrent (and add new parameters to download list)
-  * Remember last selected search engines in search tab
-  * Improved search engines status output (Aborted, timed out, finished, no results)
-  * qBittorrent can now update search plugin from qbittorrent.org
-  * Added Slovak, Italian, Portuguese, Romanian and Traditional Chinese languages
-  * Fixed ThePirateBay parser for search engine (website had changed)
-  * Fixed filenames for results from ThePirateBay search engine
-  * Fixed unicode support for ThePirateBay search engine
-  * Now search results are sorted by seeds
-  * Overwrite nova.py search plugin only if it is outdated
-  * Fixed possible division by 0 in ETA calculation
-  * Improved ETA calculation precision
-  * Fixed default tab in options
-  * When saving options, reconnect only when listening ports changed
-  * qBittorrent has now its own new logo
-  * Display status "downloading" if DL Speed > 0 (even when tracker is down)
-  * Added a splashscreen
-  * qBittorrent has new cute icons
-  * Display number of results in search tab
-  * Added icons for each item in download list according to its state
-  * Redesigned Locale settings
-  * Fixed search engines names width (were cut on the right)
-  * Moved search engines to the left of the window (better ui)
-
- -- Christophe Dumez <chris@qbittorrent.org>  Wed,  2 Aug 2006 19:46:32 +0200
-
-qbittorrent (0.4.1) unstable; urgency=low
-  * Not counting "protocol chatter" in UP/DL speed anymore
-  * Download speed is now 0 when download is finished
-  * Paused torrents remain paused when qbittorrent is re-started
-  * Added option "go to systray when minimizing"
-  * Added option "Clear finished downloads on exit"
-  * Added option "Ask user for confirmation on exit"
-  * Added "Stalled" status for downloads (colored in orange, paused are in red and finished in green)
-  * Fixed Search window layout on maximizing
-  * Fixed a bug that caused upload limit not to be always applied
-  * Added Bulgarian translation
-  * Updated Translations
-  * Code optimization
-
- -- Christophe Dumez <chris@qbittorrent.org>  Thu,  22 Jun 2006 20:14:27 +0200
-
-qbittorrent (0.4.0) unstable; urgency=low
-
-  * Added a search engine (supports Mininova & thepiratebay websites)
-  * Fixed critical bug: some options were not applied correctly to BT session
-  * Possibility to download a torrent file from an URL
-  * Added confirmation dialog on qbittorrent exit
-  * Enabled sorting in Download list
-  * Added Ukrainian translation
-  * Support urls as program parameters
-  * Added more actions to trayicon menu
-  * Fixed exception catching when retrieving fastresume data
-  * use Binary prefix standards from IEC 60027-2 for units (B, KiB, MiB, GiB, TiB)
-  * Iconification to systray when minimizing
-  * Code Cleanup & optimization
-
- -- Christophe Dumez <chris@qbittorrent.org>  Wed,  14 Jun 2006 14:47:27 +0200
-
-qbittorrent (0.3.1) unstable; urgency=low
-
-  * Fixed toolbar layout (spacing).
-  * Added Russian translation.
-  * Resume also finished files on startup (for seeding).
-  * Added colors corresponding to download state.
-  * Fixed a segfault when deleting a download (if no scan dir is set).
-
- -- Christophe Dumez <chris@qbittorrent.org>  Sat,  6 Jun 2006 21:36:27 +0200
-
-
-qbittorrent (0.3) unstable; urgency=low
-
-  * Initial Release.
-
- -- Christophe Dumez <chris@qbittorrent.org>  Sat,  3 Jun 2006 21:57:27 +0200
--- a/packaging/debian-unstable/debian/compat
+++ b/packaging/debian-unstable/debian/compat
@@ -1 +0,0 @@
-4
--- a/packaging/debian-unstable/debian/control
+++ b/packaging/debian-unstable/debian/control
@@ -1,15 +0,0 @@
-Source: qbittorrent
-Section: net
-Priority: optional
-Maintainer: Christophe Dumez <chris@qbittorrent.org>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, libqt4-core (>= 4.1.0), libqt4-dev (>= 4.1.0), libqt4-gui (>= 4.1.0), rb-libtorrent (>= 0.10), libcurl3-dev
-Standards-Version: 3.6.2
-
-Package: qbittorrent
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, rb-libtorrent (>= 0.10), python (>= 2.3)
-Description: Bittorrent client in Qt4.1 / C++
- qBittorrent is a bittorrent client programmed in C++ / Qt4.1
- using rb_libtorrent by Arvid Norberg. It aims to be a good 
- alternative to other bittorrent client out there. It is fast,
- stable and provides unicode support.
--- a/packaging/debian-unstable/debian/copyright
+++ b/packaging/debian-unstable/debian/copyright
@@ -1,26 +0,0 @@
-This is qbittorrent, written and maintained by Christophe Dumez <chris@qbittorrent.org>
-on Sat,  3 Jun 2006 21:57:27 +0200.
-
-The original source can always be found at:
-	ftp://ftp.debian.org/dists/unstable/main/source/
-
-Copyright (C) 2006  Christophe Dumez
-
-License:
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this package; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
--- a/packaging/debian-unstable/debian/dirs
+++ b/packaging/debian-unstable/debian/dirs
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
--- a/packaging/debian-unstable/debian/docs
+++ b/packaging/debian-unstable/debian/docs
@@ -1,3 +0,0 @@
-NEWS
-README
-TODO
--- a/packaging/debian-unstable/debian/rules
+++ b/packaging/debian-unstable/debian/rules
@@ -1,107 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-CFLAGS = -Wall
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-config.status: configure
-	dh_testdir
-	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --prefix=/usr
-
-
-build: build-stamp
-
-build-stamp:  config.status
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-	#docbook-to-man debian/qbittorrent.sgml > qbittorrent.1
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-
-	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	# Add here commands to install the package into debian/qbittorrent.
-	$(MAKE) install INSTALL_ROOT=$(CURDIR)/debian/qbittorrent
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs Changelog
-	dh_installdocs
-	dh_installexamples
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	dh_python
-#	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
--- a/packaging/mandriva/qbittorrent.spec
+++ b/packaging/mandriva/qbittorrent.spec
@@ -1,249 +0,0 @@
-
-%define name qbittorrent
-%define major 0
-%define minor 6
-%define patch 1
-%define version	%{major}.%{minor}.%{patch}
-%define release %mkrel 2
-%define _iconsdir %{_datadir}/icons
-%define _mandir %_datadir/man
-
-Name:           %{name}
-Summary:        A Bittorrent Client using C++ / Qt4
-Version:        %{version}
-Release:        %{release}
-Source0:        http://sourceforge.net/projects/qbittorrent/%{name}-%{version}.tar.gz
-URL:            http://sourceforge.net/projects/qbittorrent
-Vendor:			http://qbittorrent.sourceforge.net/
-Group:          Internet/File Transfer
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-License:        GPL
-BuildRequires:	libqt4-devel >= 4.1.2, libqtgui4 >= 4.1.2, libqtcore4 >= 4.1.2, libqtxml4 >= 4.1.2, libqtnetwork4 >= 4.1.2, rb_libtorrent-devel >= 0.10-3, libcurl3-devel
-Requires:		libqtgui4 >= 4.1.2, libqtcore4 >= 4.1.2, libqtxml4 >= 4.1.2, libqtnetwork4 >= 4.1.2, librb_libtorrent0 >= 0.10-3, python >= 2.3, libcurl3
-
-%description
-A Bittorrent client using C++ / libtorrent and a Qt4 Graphical User Interface.
-It aims to be as fast as possible and to provide multi-OS, unicode support.
-
-%prep
-%setup
-
-%build
-# Export the Environment variables
-export QTDIR=%_prefix/%_lib/qt4
-export KDEDIR=%_prefix
-export LD_LIBRARY_PATH=$QTDIR/%_lib:$KDEDIR/%_lib:$LD_LIBRARY_PATH
-export PATH=$QTDIR/bin:$KDEDIR/bin:$PATH
-
-
-# Change to the Source directory and configure
-#cd src
-CFLAGS="%optflags" CXXFLAGS="%optflags" \
-./configure --prefix=%{buildroot}%{_prefix}
-
-# Necessary to remove old compiled files.. if they exist
-make clean
-
-%make
-
-%install
-%makeinstall --directory=src
-
-
-# Create the menu directory
-install -d %{buildroot}%{_menudir}
-
-# Build the Menu
-#<package> <section> <file_in> <file_out> [requires] [title]
-kdedesktop2mdkmenu.pl %{name} "%{group}" %{buildroot}%{_datadir}/applications/qBittorrent.desktop %{buildroot}%{_menudir}/%{name}
-
-%clean
-%{__rm} -rf %{buildroot}
-
-%post
-/sbin/ldconfig
-%{update_menus}
-
-%postun
-/sbin/ldconfig
-%{clean_menus}
-
-
-%files
-%defattr(-,root,root)
-%doc README INSTALL NEWS COPYING AUTHORS TODO Changelog
-%doc %{_mandir}/man1/*.bz2
-
-
-# The binaries
-%_bindir/*
-
-
-# Icon files
-# Hi and Lo colour icons various sizes
-%_iconsdir/hicolor/128x128/apps/qbittorrent.png
-%_iconsdir/hicolor/16x16/apps/qbittorrent.png
-%_iconsdir/hicolor/192x192/apps/qbittorrent.png
-%_iconsdir/hicolor/22x22/apps/qbittorrent.png
-%_iconsdir/hicolor/24x24/apps/qbittorrent.png
-%_iconsdir/hicolor/32x32/apps/qbittorrent.png
-%_iconsdir/hicolor/36x36/apps/qbittorrent.png
-%_iconsdir/hicolor/48x48/apps/qbittorrent.png
-%_iconsdir/hicolor/64x64/apps/qbittorrent.png
-%_iconsdir/hicolor/72x72/apps/qbittorrent.png
-%_iconsdir/hicolor/96x96/apps/qbittorrent.png
-## %_iconsdir/hicolor/scalable/apps/qbittorrent.svgz
-
-
-# Desktop Link
-%_datadir/applications/qBittorrent.desktop
-
-# The qbittorrent Menu directory
-%dir %{_menudir}
-%{_menudir}/%{name}
-
-
-%changelog
-
-* Wed Aug 23 2006 - Christophe Dumez <chris@qbittorrent.org> - 0.6.0-0.1.2006mdk
- FEATURE: Rewritten the download list from scratch (more flexible)
- FEATURE: Rewritten the search results list from scratch (more flexible)
- FEATURE: Rewritten the torrent properties list from scratch (more flexible)
- FEATURE: Improved and cleaned up search engine code
- FEATURE: Search results are now displayed in real time (not sequentially)
- FEATURE: Added two command lines parameters (--version, --help)
- FEATURE: Added a popup menu for download list
- FEATURE: Double-click on an item now toggles the paused state of a download
- FEATURE: Improved code to be more portable (Windows & MacOS versions should arrive soon)
- FEATURE: Allow to toggle selected state of a file within a torrent using double-click
- FEATURE: Remember columns width in download and search results lists
- BUGFIX: Don't use pkg-config for libcurl anymore (easier to compile)
- BUGFIX: Fixed ETA calculation when downloading while connecting
- BUGFIX: Download progress is now displayed correctly during first seconds of execution (was 0% before)
- BUGFIX: Code cleanup & optimization
- BUGFIX: Fixed sorting in download list
- BUGFIX: Fixed sorting in search results list
- BUGFIX: Fixed Parameters passing between instances
- BUGFIX: Fixed missing icon for clear action in infoBar popup menu
- BUGFIX: Fixed truncated lines in search results
- BUGFIX: Don't refresh download list when user is in search tab (save CPU)
- BUGFIX: Don't update Progress/DL Speed/ETA for finished downloads (save CPU)
- BUGFIX: Save selected search engines only when they have changed (faster program exit)
- COSMETIC: Increased icon size in toolbar from 24px to 32px
- COSMETIC: Display a progress bar to visualize each download progress
- COSMETIC: Size of each result in search are displayed in user friendly units
- COSMETIC: Display a progress bar to visualize each file progress within a torrent
- COSMETIC: Renamed 'ratio' to 'Session ratio' (makes more sense)
- COSMETIC: Improved layout of torrent properties window when maximized
- COSMETIC: Now number of search results is updated in real time
- COSMETIC: Remember last window size
- COSMETIC: Improved splash screen look
- COSMETIC: Improved default width of columns in download and search results lists
-
-* Tue Aug 08 2006 - Christophe Dumez <chris@qbittorrent.org> - 0.5.0-0.1.20060mdk
- - FEATURE: Improved "Download from url" feature (now supports https, ftp & redirections)
- - FEATURE: Added a torrent creation tool
- - FEATURE: Display progress for each file within a torrent
- - FEATURE: Based on new libtorrent v0.10 (lot of improvements)
- - FEATURE: Now possible to clear log textbox (popup menu)
- - FEATURE: Added two search engines (isohunt, torrentreactor)
- - FEATURE: Now Display share ratio on main window
- - FEATURE: Use OSD (On Screen Display) when a download or a search is finished
- - FEATURE: Allow only one instance of qBittorrent (and add new parameters to download list)
- - FEATURE: Remember last selected search engines in search tab
- - FEATURE: Improved search engines status output (Aborted, timed out, finished, no results)
- - FEATURE: qBittorrent can now update search plugin from qbittorrent.org
- - I18N: Added Slovak, Italian, Portuguese, Romanian and Traditional Chinese languages
- - BUGFIX: Fixed ThePirateBay parser for search engine (website had changed)
- - BUGFIX: Fixed filenames for results from ThePirateBay search engine
- - BUGFIX: Fixed unicode support for ThePirateBay search engine
- - BUGFIX: Now search results are sorted by seeds
- - BUGFIX: Overwrite nova.py search plugin only if it is outdated
- - BUGFIX: Fixed possible division by 0 in ETA calculation
- - BUGFIX: Improved ETA calculation precision
- - BUGFIX: Fixed default tab in options
- - BUGFIX: When saving options, reconnect only when listening ports changed
- - COSMETIC: qBittorrent has now its own new logo
- - COSMETIC: Display status "downloading" if DL Speed > 0 (even when tracker is down)
- - COSMETIC: Added a splashscreen
- - COSMETIC: qBittorrent has new cute icons
- - COSMETIC: Display number of results in search tab
- - COSMETIC: Added icons for each item in download list according to its state
- - COSMETIC: Redesigned Locale settings
- - COSMETIC: Fixed search engines names width (were cut on the right)
- - COSMETIC: Moved search engines to the left of the window (better ui)
-
-* Fri Jun 23 2006 - Christophe Dumez <chris@qbittorrent.org> - 0.4.1-0.1.20060mdk
- Not counting "protocol chatter" in UP/DL speed anymore
- Download speed is now 0 when download is finished
- Paused torrents remain paused when qbittorrent is re-started
- Added option "go to systray when minimizing"
- Added option "Clear finished downloads on exit"
- Added option "Ask user for confirmation on exit"
- Added "Stalled" status for downloads (colored in orange, paused are in red and finished in green)
- Fixed Search window layout on maximizing
- Fixed a bug that caused upload limit not to be always applied
- Added Bulgarian translation
- Updated Translations
- Code optimization
-
-* Tue Jun 13 2006 - Christophe Dumez <chris@qbittorrent.org> - 0.4.0-0.1.20060mdk
- Added a search engine (supports Mininova & thepiratebay websites)
- Fixed critical bug: some options were not applied correctly to BT session
- Possibility to download a torrent file from an URL
- Added confirmation dialog on qbittorrent exit
- Enabled sorting in Download list
- Added Ukrainian translation
- Support urls as program parameters
- Added more actions to trayicon menu
- Fixed exception catching when retrieving fastresume data
- use Binary prefix standards from IEC 60027-2 for units (B, KiB, MiB, GiB, TiB)
- Iconification to systray when minimizing
- Code Cleanup & optimization
-
-* Tue Jun 06 2006 - Christophe Dumez <chris@qbittorrent.org> - 0.3.1-0.1.20060mdk
- Fixed toolbar layout (spacing)
- Added Russian translation
- Resume also finished files on startup (for seeding)
- Added colors corresponding to download state
- Fixed a segfault when deleting a download (if no scan dir is set)
-
-* Mon Jun 05 2006 - Christophe Dumez <chris@qbittorrent.org> - 0.3-0.1.20060mdk
- Fixed auto-resume (worked only once)
- Fixed BT_Backup dir creation on first startup (thanks Peter)
- Now min port and max port are inverted if (min port > max port)
- Fixed memory leaks
- Added qbittorrent man page
- Allow to disable max connections limit (default is disabled)
- Disable upload limit by default
- Added Menu Entry with icon (thanks Peter)
- Restructured directory, now Makefile is in main directory (not src/)
- Updated README / INSTALL
-
-* Fri Jun 02 2006 - Christophe Dumez <chris@qbittorrent.org> 0.2.3-0.1.20060mdk
- Fixed ports checking function (user couldn't type the value he wanted)
- Check tracker errors list size and clear it if it becomes too big.
- qBittorrent does not remove .torrent file from scanned directory anymore
- Small cosmetic change
-
-* Wed May 31 2006 Christophe Dumez <chris@qbittorrent.org> 0.2.2-0.1.20060mdk
- Fixed missing icons
-
-* Sat May 27 2006 Jeffery Fernandez <developer@jefferyfernandez.id.au> 0.2.1-0.1.20060mdk
- Initial Build for Mandriva Linux
-
-* Thu May 25 2006 Christophe Dumez <chris@qbittorrent.org>
- Fixed "make install" rule
- Disabled debug mode 
-
-* Thu May 25 2006 Christophe Dumez <chris@qbittorrent.org> - v0.2
- Fixed a compatibility problem with some versions of qmake
- Added translations : Greek, Swedish
- Fixed Polish translation selection
- Fixed come warning because of two unexisting slots
- Improved "Apply" button behaviour in options
- Windows are now resizable
-
-* Tue May 16 2006 Christophe Dumez <chris@qbittorrent.org> - v0.1
- Initial release (lack features & still need a lot of improvements)
-
--- a/packaging/mandriva/rb_libtorrent.spec
+++ b/packaging/mandriva/rb_libtorrent.spec
@@ -1,147 +0,0 @@
-
-%define package_name	rb_libtorrent
-%define orig_name libtorrent
-%define major 0
-%define minor .10
-%define patch .1
-%define version	%{major}%{minor}
-%define candidate -rc1
-%define lib_name %mklibname %{package_name} %{major}
-%define release	%mkrel 4
-
-Summary     	: libtorrent is a C++ bittorrent library.
-Name			: %{package_name}
-Version			: %{version}
-Release			: %{release}
-License			: GPL
-Group       	: Development/C++
-Source0			: http://www.rasterbar.com/products/libtorrent/libtorrent-%{version}.tar.gz
-URL				: http://www.rasterbar.com
-BuildRequires	: boost >= 1.33.1
-BuildRoot		:  %{_tmppath}/%{orig_name}-%{version}-%{release}-root
-Patch0			: file_progress_arvid.patch.bz2
-
-%description
- libtorrent is a C++ library that aims to be a good alternative 
-to all the other bittorrent implementations around.
-
-
-%package -n %{package_name}-devel
-Group			: Development/C++
-Summary			: Development files for %{package_name}
-Conflicts		: libtorrent7-devel
-
-%description -n %{package_name}-devel
- Development files for %{package_name}
-
-%package -n %{lib_name}
-Group			: Development/C++
-Summary			: Library files for %{package_name}
-Conflicts		: libtorrent7
-
-%description -n %{lib_name}
- Library files for %{package_name}
-
-%prep
-%setup -n %{orig_name}-%{version}
-
-%build
-%configure --prefix=%{_prefix}
-%make
-
-
-%install
-%makeinstall
-
-# Create directories for the package 
-install -d %{buildroot}%{_includedir}/%{orig_name}
-install -d %{buildroot}%{_libdir}/pkgconfig
-
-%clean
-rm -rf %{buildroot}
-
-# The binaries
-%files  %(orig_name)
-%defattr(0644, root, root, 0755)
-%{_bindir}/*
-
-# Documentation
-%defattr(-, root, root)
-%doc README AUTHORS INSTALL COPYING ChangeLog NEWS
-%doc docs/*
-
-
-# Devel Package
-%files -n %{package_name}-devel
-%defattr(-,root,root,-)
-%dir %{_includedir}/%{orig_name}/
-%dir %{_includedir}/%{orig_name}/asio/
-%dir %{_includedir}/%{orig_name}/asio/detail/
-%dir %{_includedir}/%{orig_name}/asio/impl/
-%dir %{_includedir}/%{orig_name}/asio/ip/
-%dir %{_includedir}/%{orig_name}/asio/ip/detail/
-%dir %{_includedir}/%{orig_name}/asio/ssl/
-%dir %{_includedir}/%{orig_name}/asio/ssl/detail/
-%{_includedir}/%{orig_name}/*.hpp
-%{_includedir}/%{orig_name}/asio/*.hpp
-%{_includedir}/%{orig_name}/asio/detail/*.hpp
-%{_includedir}/%{orig_name}/asio/impl/*.ipp
-%{_includedir}/%{orig_name}/asio/ip/*.hpp
-%{_includedir}/%{orig_name}/asio/ip/detail/*.hpp
-%{_includedir}/%{orig_name}/asio/ssl/*.hpp
-%{_includedir}/%{orig_name}/asio/ssl/detail/*.hpp
-
-
-
-
-
-%{_libdir}/%{orig_name}.a
-%{_libdir}/%{orig_name}.la
-%{_libdir}/%{orig_name}.so
-%{_libdir}/pkgconfig/libtorrent.pc
-
-
-# Library Package
-%files -n %{lib_name}
-%defattr(-,root,root,-)
-%_libdir/%{orig_name}.so.*
-
-
-%changelog
-
-* Wed Aug 23 2006 Christophe Dumez <chris@qbittorrent.org> 10.0.1-2006mdk
- Added patch for Torrent Properties crash fix
-
-* Sat Jul 1 2006 %{packager} %{version}-%{release}
- fixed a bug where the requested number of peers in a tracker request could
-  be too big.
- fixed a bug where empty files were not created in full allocation mode.
- fixed a bug in storage that would, in rare cases, fail to do a
-  complete check.
- exposed more settings for tweaking parameters in the piece-picker,
-  downloader and uploader (http_settings replaced by session_settings).
- tweaked default settings to improve high bandwidth transfers.
- improved the piece picker performance and made it possible to download
-  popular pieces in sequence to improve disk performance.
- added the possibility to control upload and download limits per peer.
- fixed problem with re-requesting skipped pieces when peer was sending pieces
-  out of fifo-order.
- added support for http seeding (the GetRight protocol)
- renamed identifiers called 'id' in the public interface to support linking
-  with Objective.C++
- changed the extensions protocol to use the new one, which is also
-  implemented by uTorrent.
- factorized the peer_connection and added web_peer_connection which is
-  able to download from http-sources.
- converted the network code to use asio (resulted in slight api changes
-  dealing with network addresses).
- made libtorrent build in vc7 (patches from Allen Zhao)
- fixed bug caused when binding outgoing connections to a non-local interface.
- add_torrent() will now throw if called while the session object is
-  being closed.
- added the ability to limit the number of simultaneous half-open
-  TCP connections. Flags in peer_info has been added.
-
-
-* Thu Jun 1 2006 %{packager} %{version}-%{release}
- Initial Build for Mandriva Linux 
--- a/packaging/ubuntu-dapper/debian/changelog
+++ b/packaging/ubuntu-dapper/debian/changelog
@@ -1,134 +0,0 @@
-qbittorrent (0.6.1-0ubuntu2) dapper; urgency=low
-
-  * Disabled debug mode
-
- -- Christophe Dumez <chris@qbittorrent.org>  Mon, 28 Aug 2006 19:29:17 +0000
-
-qbittorrent (0.6.1-0ubuntu1) dapper; urgency=low
-  * BUGFIX: Fixed possible segfaults when using context menus
-  * BUGFIX: Cleanup up context menus code
-  * BUGFIX: Used best gzip compressing for manpage
-
- -- Christophe Dumez <chris@qbittorrent.org>  Thu,  24 Aug 2006 19:53:32 +0200
-
-qbittorrent (0.6.0) dapper; urgency=low
-  * FEATURE: Rewritten the download list from scratch (more flexible)
-  * FEATURE: Rewritten the search results list from scratch (more flexible)
-  * FEATURE: Rewritten the torrent properties list from scratch (more flexible)
-  * FEATURE: Improved and cleaned up search engine code
-  * FEATURE: Search results are now displayed in real time (not sequentially)
-  * FEATURE: Added two command lines parameters (--version, --help)
-  * FEATURE: Added a popup menu for download list
-  * FEATURE: Double-click on an item now toggles the paused state of a download
-  * FEATURE: Improved code to be more portable (Windows & MacOS versions should arrive soon)
-  * FEATURE: Allow to toggle selected state of a file within a torrent using double-click
-  * FEATURE: Remember columns width in download and search results lists
-  * BUGFIX: Don't use pkg-config for libcurl anymore (easier to compile)
-  * BUGFIX: Fixed ETA calculation when downloading while connecting
-  * BUGFIX: Download progress is now displayed correctly during first seconds of execution (was 0% before)
-  * BUGFIX: Code cleanup & optimization
-  * BUGFIX: Fixed sorting in download list
-  * BUGFIX: Fixed sorting in search results list
-  * BUGFIX: Fixed Parameters passing between instances
-  * BUGFIX: Fixed missing icon for clear action in infoBar popup menu
-  * BUGFIX: Fixed truncated lines in search results
-  * BUGFIX: Don't refresh download list when user is in search tab (save CPU)
-  * BUGFIX: Don't update Progress/DL Speed/ETA for finished downloads (save CPU)
-  * BUGFIX: Save selected search engines only when they have changed (faster program exit)
-  * COSMETIC: Increased icon size in toolbar from 24px to 32px
-  * COSMETIC: Display a progress bar to visualize each download progress
-  * COSMETIC: Size of each result in search are displayed in user friendly units
-  * COSMETIC: Display a progress bar to visualize each file progress within a torrent
-  * COSMETIC: Renamed 'ratio' to 'Session ratio' (makes more sense)
-  * COSMETIC: Improved layout of torrent properties window when maximized
-  * COSMETIC: Now number of search results is updated in real time
-  * COSMETIC: Remember last window size
-  * COSMETIC: Improved splash screen look
-  * COSMETIC: Improved default width of columns in download and search results lists
-
- -- Christophe Dumez <chris@qbittorrent.org>  Wed,  22 Aug 2006 10:42:37 +0200
-
-qbittorrent (0.5.0) dapper; urgency=low
-  * Improved "Download from url" feature (now supports https, ftp & redirections)
-  * Added a torrent creation tool
-  * Display progress for each file within a torrent
-  * Based on new libtorrent v0.10 (lot of improvements)
-  * Now possible to clear log textbox (popup menu)
-  * Added two search engines (isohunt, torrentreactor)
-  * Now Display share ratio on main window
-  * Use OSD (On Screen Display) when a download or a search is finished
-  * Allow only one instance of qBittorrent (and add new parameters to download list)
-  * Remember last selected search engines in search tab
-  * Improved search engines status output (Aborted, timed out, finished, no results)
-  * qBittorrent can now update search plugin from qbittorrent.org
-  * Added Slovak, Italian, Portuguese, Romanian and Traditional Chinese languages
-  * Fixed ThePirateBay parser for search engine (website had changed)
-  * Fixed filenames for results from ThePirateBay search engine
-  * Fixed unicode support for ThePirateBay search engine
-  * Now search results are sorted by seeds
-  * Overwrite nova.py search plugin only if it is outdated
-  * Fixed possible division by 0 in ETA calculation
-  * Improved ETA calculation precision
-  * Fixed default tab in options
-  * When saving options, reconnect only when listening ports changed
-  * qBittorrent has now its own new logo
-  * Display status "downloading" if DL Speed > 0 (even when tracker is down)
-  * Added a splashscreen
-  * qBittorrent has new cute icons
-  * Display number of results in search tab
-  * Added icons for each item in download list according to its state
-  * Redesigned Locale settings
-  * Fixed search engines names width (were cut on the right)
-  * Moved search engines to the left of the window (better ui)
-
- -- Christophe Dumez <chris@qbittorrent.org>  Wed,  2 Aug 2006 19:46:32 +0200
-
-qbittorrent (0.4.1) dapper; urgency=low
-  * Not counting "protocol chatter" in UP/DL speed anymore
-  * Download speed is now 0 when download is finished
-  * Paused torrents remain paused when qbittorrent is re-started
-  * Added option "go to systray when minimizing"
-  * Added option "Clear finished downloads on exit"
-  * Added option "Ask user for confirmation on exit"
-  * Added "Stalled" status for downloads (colored in orange, paused are in red and finished in green)
-  * Fixed Search window layout on maximizing
-  * Fixed a bug that caused upload limit not to be always applied
-  * Added Bulgarian translation
-  * Updated Translations
-  * Code optimization
-
- -- Christophe Dumez <chris@qbittorrent.org>  Thu,  22 Jun 2006 20:14:27 +0200
-
-qbittorrent (0.4.0) dapper; urgency=low
-
-  * Added a search engine (supports Mininova & thepiratebay websites)
-  * Fixed critical bug: some options were not applied correctly to BT session
-  * Possibility to download a torrent file from an URL
-  * Added confirmation dialog on qbittorrent exit
-  * Enabled sorting in Download list
-  * Added Ukrainian translation
-  * Support urls as program parameters
-  * Added more actions to trayicon menu
-  * Fixed exception catching when retrieving fastresume data
-  * use Binary prefix standards from IEC 60027-2 for units (B, KiB, MiB, GiB, TiB)
-  * Iconification to systray when minimizing
-  * Code Cleanup & optimization
-
- -- Christophe Dumez <chris@qbittorrent.org>  Wed,  14 Jun 2006 14:47:27 +0200
-
-qbittorrent (0.3.1) dapper; urgency=low
-
-  * Fixed toolbar layout (spacing).
-  * Added Russian translation.
-  * Resume also finished files on startup (for seeding).
-  * Added colors corresponding to download state.
-  * Fixed a segfault when deleting a download (if no scan dir is set).
-
- -- Christophe Dumez <chris@qbittorrent.org>  Sat,  6 Jun 2006 21:36:27 +0200
-
-
-qbittorrent (0.3) dapper; urgency=low
-
-  * Initial Release.
-
- -- Christophe Dumez <chris@qbittorrent.org>  Sat,  3 Jun 2006 21:57:27 +0200
--- a/packaging/ubuntu-dapper/debian/compat
+++ b/packaging/ubuntu-dapper/debian/compat
@@ -1 +0,0 @@
-4
--- a/packaging/ubuntu-dapper/debian/control
+++ b/packaging/ubuntu-dapper/debian/control
@@ -1,15 +0,0 @@
-Source: qbittorrent
-Section: net
-Priority: optional
-Maintainer: Christophe Dumez <chris@qbittorrent.org>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, libqt4-core (>= 4.1.0), libqt4-dev (>= 4.1.0), libqt4-gui (>= 4.1.0), rb-libtorrent (>= 0.10), libcurl3-dev
-Standards-Version: 3.6.2
-
-Package: qbittorrent
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, rb-libtorrent (>= 0.10), python (>= 2.3)
-Description: Bittorrent client in Qt4.1 / C++
- qBittorrent is a bittorrent client programmed in C++ / Qt4.1
- using rb_libtorrent by Arvid Norberg. It aims to be a good 
- alternative to other bittorrent client out there. It is fast,
- stable and provides unicode support.
--- a/packaging/ubuntu-dapper/debian/copyright
+++ b/packaging/ubuntu-dapper/debian/copyright
@@ -1,26 +0,0 @@
-This is qbittorrent, written and maintained by Christophe Dumez <chris@qbittorrent.org>
-on Sat,  3 Jun 2006 21:57:27 +0200.
-
-The original source can always be found at:
-	ftp://ftp.debian.org/dists/unstable/main/source/
-
-Copyright (C) 2006  Christophe Dumez
-
-License:
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this package; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
--- a/packaging/ubuntu-dapper/debian/dirs
+++ b/packaging/ubuntu-dapper/debian/dirs
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
--- a/packaging/ubuntu-dapper/debian/docs
+++ b/packaging/ubuntu-dapper/debian/docs
@@ -1,3 +0,0 @@
-NEWS
-README
-TODO
--- a/packaging/ubuntu-dapper/debian/files
+++ b/packaging/ubuntu-dapper/debian/files
@@ -1 +0,0 @@
-qbittorrent_0.6.1-0ubuntu2_i386.deb net optional
--- a/packaging/ubuntu-dapper/debian/qbittorrent.substvars
+++ b/packaging/ubuntu-dapper/debian/qbittorrent.substvars
@@ -1 +0,0 @@
-shlibs:Depends=libboost-date-time1.33.1, libboost-filesystem1.33.1, libboost-thread1.33.1, libc6 (>= 2.3.4-1), libcurl3 (>= 7.15.0-1), libgcc1 (>= 1:4.0.2), libqt4-core (>= 4.1.2), libqt4-gui (>= 4.1.2), libstdc++6 (>= 4.0.2-4), libx11-6, libxext6, zlib1g (>= 1:1.2.1)
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`qbittorrent_0.6.1-0ubuntu2_i386.deb net optional`
				`@@ -1 +0,0 @@`
				`shlibs:Depends=libboost-date-time1.33.1, libboost-filesystem1.33.1, libboost-thread1.33.1, libc6 (>= 2.3.4-1), libcurl3 (>= 7.15.0-1), libgcc1 (>= 1:4.0.2), libqt4-core (>= 4.1.2), libqt4-gui (>= 4.1.2), libstdc++6 (>= 4.0.2-4), libx11-6, libxext6, zlib1g (>= 1:1.2.1)`