diff -Nru lp/ktorrent-4.0.5/debian/changelog ktorrent-4.1.1/debian/changelog --- lp/ktorrent-4.0.5/debian/changelog 2011-02-11 10:35:13.000000000 +0100 +++ ktorrent-4.1.1/debian/changelog 2011-05-30 17:48:54.314368949 +0200 @@ -1,3 +1,47 @@ +ktorrent (4.1.1-2ubuntu1) oneiric; urgency=low + + * Merge from debian unstable. Remaining changes: (LP: #790265) + - debian/rules: + + Add export KUBUNTU_DESKTOP_POT=extragear-network_ktorrent + + -- Rohan Garg Sat, 28 May 2011 09:22:25 +0100 + +ktorrent (4.1.1-2) unstable; urgency=low + + * Add kdebase-workspace-dev (<< 4:4.6) to Build-Conflicts temporary. Needed + for KDE SC 4.6 transition. + * Upload to unstable. + + -- Modestas Vainius Sat, 28 May 2011 01:49:14 +0300 + +ktorrent (4.1.1-1) experimental; urgency=low + + * New upstream release. + * Require libktorrent-dev 1.1.1. + * Bump Standards-Version to 3.9.2: no changes needed. + * Correct menu-icon-missing override. + + -- Modestas Vainius Tue, 03 May 2011 01:25:00 +0300 + +ktorrent (4.1.0-1) experimental; urgency=low + + * New upstream release. + * Require libktorrent-dev 1.1.0. + * Drop upstream_kde4.4_compat.diff patch, merged upstream. + * Build depend on libqtwebkit-dev | libqt4-dev (<< 4:4.7.0). + + -- Modestas Vainius Wed, 23 Mar 2011 02:24:35 +0200 + +ktorrent (4.1~rc1-1) experimental; urgency=low + + * New upstream release. + * Require libktorrent 1.1~rc1. + * Add upstream_kde4.4_compat.diff patch in order to restore compatibility + with KDE Devel Platform 4.4. + * Update install files. + + -- Modestas Vainius Sat, 19 Feb 2011 02:53:14 +0200 + ktorrent (4.0.5-3ubuntu1) natty; urgency=low * Merge from debian unstable. Remaining changes: (LP: #716639) @@ -63,6 +107,14 @@ -- Alessandro Ghersi Sat, 23 Oct 2010 23:59:52 +0200 +ktorrent (4.0.3-1) experimental; urgency=low + + * New upstream release. + * Bump Standards-Version to 3.9.1: no changes needed. + * Require libktorrent 1.0.3 per upstream recommendation. + + -- Modestas Vainius Wed, 29 Sep 2010 00:40:16 +0300 + ktorrent (4.0.3-0ubuntu1) maverick; urgency=low * New upstream bugfix release @@ -88,10 +140,9 @@ * New upstream release. * Bump libktorrent-dev build dependency to 1.0.2. - * Bump Standards-Version to 3.9.0: add Breaks next to Replaces where - needed. - * No longer reference BSD from common-licenses in debian/copyright, - replace it with copyright/license blob. + * Bump Standards-Version to 3.9.0: add Breaks next to Replaces where needed. + * No longer reference BSD from common-licenses in debian/copyright, replace + it with copyright/license blob. * Fix indentation style in debian/copyright. -- Modestas Vainius Thu, 08 Jul 2010 23:31:43 +0300 @@ -320,7 +371,7 @@ ktorrent (3.2.5+dfsg.1-1) unstable; urgency=low * New upstream release. - * Build conflict with Qt 4.5.2 and drop patch + * Build conflict with Qt 4.5.2 and drop patch debian/qt_4.5.2-1_phonon_ftbfs_fix.diff. The bug is fixed in Qt 4:4.5.3 and later. * Merge old 3.1.x changelog entries from lenny: 3.1.2+dfsg.1-1, @@ -703,44 +754,44 @@ ktorrent (3.1.4+dfsg.1-1) unstable; urgency=low - * New upstream bugfix release: - - Make sure user is properly logged in when handling a torrent post in the - webgui. - - Prevent PHP injection attacks in webgui. - - Update file size in CacheFile::growFile, this fixes a SIGBUS error. - - Fix bug causing infinite DNS lookups in UDP tracker when lookup fails - (Closes: #502071). - - Remove default label text KSqueezedTextLabel in trackerview. - * Disable both 97_fix_target_link_libraries.diff patches. + * New upstream bugfix release: + - Make sure user is properly logged in when handling a torrent post in the + webgui. + - Prevent PHP injection attacks in webgui. + - Update file size in CacheFile::growFile, this fixes a SIGBUS error. + - Fix bug causing infinite DNS lookups in UDP tracker when lookup fails + (Closes: #502071). + - Remove default label text KSqueezedTextLabel in trackerview. + * Disable both 97_fix_target_link_libraries.diff patches. -- Modestas Vainius Mon, 20 Oct 2008 14:40:23 +0300 ktorrent (3.1.3+dfsg.2-1) unstable; urgency=low - * No real code changes. Upstream tarball includes the patch below. - * Remove 01_webinterface_httpserver_time_h.diff - merged upstream. - * Build conflict with Qt 4.4.2-2 as it has broken shlibs. + * No real code changes. Upstream tarball includes the patch below. + * Remove 01_webinterface_httpserver_time_h.diff - merged upstream. + * Build conflict with Qt 4.4.2-2 as it has broken shlibs. -- Modestas Vainius Wed, 01 Oct 2008 19:38:25 +0300 ktorrent (3.1.3+dfsg.1-1) unstable; urgency=low - * New upstream release. - * Update patches (library minor version bumps). - * Update debian/not-installed. - * Add patch (01_webinterface_httpserver_time_h.diff) to fix upstream FTBFS - in plugins/webinterface/httpserver.cpp - missing include. + * New upstream release. + * Update patches (library minor version bumps). + * Update debian/not-installed. + * Add patch (01_webinterface_httpserver_time_h.diff) to fix upstream FTBFS + in plugins/webinterface/httpserver.cpp - missing include. -- Modestas Vainius Tue, 30 Sep 2008 00:31:08 +0300 ktorrent (3.1.2+dfsg.1-1) unstable; urgency=low - * New upstream bugfix release. - * Remove 01_arm_qreal_fixes.diff - merged upstream. - * Update other patches. - * Update ktorrent.install file. + * New upstream bugfix release. + * Remove 01_arm_qreal_fixes.diff - merged upstream. + * Update other patches. + * Update ktorrent.install file. - -- Modestas Vainius Wed, 06 Aug 2008 18:39:28 +0300 + -- Modestas Vainius Wed, 06 Aug 2008 18:39:28 +0300 ktorrent (3.1.1+dfsg.1-1) unstable; urgency=medium @@ -1568,4 +1619,3 @@ * Add linda override (missing manpage) -- Joel Johnson Thu, 24 Oct 2005 08:47:09 -0700 - diff -Nru lp/ktorrent-4.0.5/debian/control ktorrent-4.1.1/debian/control --- lp/ktorrent-4.0.5/debian/control 2011-02-11 10:33:10.000000000 +0100 +++ ktorrent-4.1.1/debian/control 2011-05-29 21:59:13.933024603 +0200 @@ -5,11 +5,12 @@ XSBC-Original-Maintainer: Debian KDE Extras Team Uploaders: Modestas Vainius Build-Depends: cmake (>= 2.6.2), debhelper (>= 7.3.16), pkg-kde-tools (>= 0.5), - libqt4-dev (>= 4:4.7.0), kdelibs5-dev (>= 4:4.4), libphonon-dev (>= 4:4.7.0really4.4.2), - kdepimlibs5-dev (>= 4:4.5), libboost1.42-dev, - kdebase-workspace-dev (>= 4:4.5.2-0ubuntu3), libktorrent-dev (>= 1.0.5), + libqt4-dev (>= 4:4.6), kdelibs5-dev (>= 4:4.4), libphonon-dev (>= 4:4.3), + kdepimlibs5-dev (>= 4:4.4), libboost-dev, libqtwebkit-dev | libqt4-dev (<< 4:4.7.0), + kdebase-workspace-dev (>= 4:4.4), libktorrent-dev (>= 1.1.1), libtag1-dev, libgeoip-dev, libx11-dev -Standards-Version: 3.9.1 +Build-Conflicts: kdebase-workspace-dev (<< 4:4.6) +Standards-Version: 3.9.2 Homepage: http://ktorrent.org/ Vcs-Git: git://git.debian.org/pkg-kde/kde-extras/ktorrent.git Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-extras/ktorrent.git;a=summary diff -Nru lp/ktorrent-4.0.5/debian/ktorrent-data.install ktorrent-4.1.1/debian/ktorrent-data.install --- lp/ktorrent-4.0.5/debian/ktorrent-data.install 2010-07-08 22:21:33.000000000 +0200 +++ ktorrent-4.1.1/debian/ktorrent-data.install 2011-05-28 10:22:08.000000000 +0200 @@ -1,4 +1,8 @@ debian/ktorrent.xpm usr/share/pixmaps/ +usr/share/doc/kde/HTML/en/ktorrent/common +usr/share/doc/kde/HTML/en/ktorrent/index.cache.bz2 +usr/share/doc/kde/HTML/en/ktorrent/index.docbook usr/share/icons/hicolor/* usr/share/kde4/apps/ktorrent/* +usr/share/kde4/config.kcfg/magnetsettings.kcfg usr/share/locale/* diff -Nru lp/ktorrent-4.0.5/debian/ktorrent.install ktorrent-4.1.1/debian/ktorrent.install --- lp/ktorrent-4.0.5/debian/ktorrent.install 2010-07-08 23:18:31.000000000 +0200 +++ ktorrent-4.1.1/debian/ktorrent.install 2011-05-28 10:22:08.000000000 +0200 @@ -1,6 +1,7 @@ usr/bin/ktmagnetdownloader usr/bin/ktorrent usr/bin/ktupnptest +usr/lib/kde4/kio_magnet.so usr/lib/kde4/ktbwschedulerplugin.so usr/lib/kde4/ktdownloadorderplugin.so usr/lib/kde4/ktinfowidgetplugin.so @@ -18,7 +19,6 @@ usr/lib/kde4/ktwebinterfaceplugin.so usr/lib/kde4/ktzeroconfplugin.so usr/lib/libktcore.so.* -usr/lib/libktupnp.so.* usr/share/applications/kde4/ktorrent.desktop usr/share/kde4/services/ktbwschedulerplugin.desktop usr/share/kde4/services/ktdownloadorderplugin.desktop diff -Nru lp/ktorrent-4.0.5/debian/ktorrent.lintian-overrides ktorrent-4.1.1/debian/ktorrent.lintian-overrides --- lp/ktorrent-4.0.5/debian/ktorrent.lintian-overrides 2010-07-08 22:21:33.000000000 +0200 +++ ktorrent-4.1.1/debian/ktorrent.lintian-overrides 2011-05-28 10:22:08.000000000 +0200 @@ -1,2 +1,2 @@ ktorrent: package-name-doesnt-match-sonames -ktorrent: menu-icon-missing /usr/share/pixmaps/ktorrent.xpm +ktorrent: menu-icon-missing usr/share/pixmaps/ktorrent.xpm