rev 11365 - in kde-extras/ktorrent/branches/ktorrent2.2/debian: . patches

Modestas Vainius modax-guest at alioth.debian.org
Mon Jul 7 10:41:22 UTC 2008


Author: modax-guest
Date: 2008-07-07 10:41:22 +0000 (Mon, 07 Jul 2008)
New Revision: 11365

Added:
   kde-extras/ktorrent/branches/ktorrent2.2/debian/ktorrent2.2.docs
   kde-extras/ktorrent/branches/ktorrent2.2/debian/ktorrent2.2.install
   kde-extras/ktorrent/branches/ktorrent2.2/debian/ktorrent2.2.manpages
   kde-extras/ktorrent/branches/ktorrent2.2/debian/ktorrent2.2.menu
Removed:
   kde-extras/ktorrent/branches/ktorrent2.2/debian/ktorrent.docs
   kde-extras/ktorrent/branches/ktorrent2.2/debian/ktorrent.install
   kde-extras/ktorrent/branches/ktorrent2.2/debian/ktorrent.manpages
   kde-extras/ktorrent/branches/ktorrent2.2/debian/ktorrent.menu
Modified:
   kde-extras/ktorrent/branches/ktorrent2.2/debian/NEWS
   kde-extras/ktorrent/branches/ktorrent2.2/debian/README.Debian
   kde-extras/ktorrent/branches/ktorrent2.2/debian/changelog
   kde-extras/ktorrent/branches/ktorrent2.2/debian/control
   kde-extras/ktorrent/branches/ktorrent2.2/debian/overrides.lintian
   kde-extras/ktorrent/branches/ktorrent2.2/debian/patches/98_buildprep.diff
   kde-extras/ktorrent/branches/ktorrent2.2/debian/rules
Log:
* Since ktorrent source package is about provide KDE4 based version, keep old
  KDE3 based KTorrent in ktorrent2.2 source package for lenny. The following
  changes were done:
  - Rename ktorrent source package to ktorrent2.2.
  - Rename ktorrent and ktorrent-dbg binary packages to ktorrent2.2 and
    ktorrent2.2-dbg respectively.
  - Make "new" binary packages conflict with ktorrent and ktorrent-dbg
    respectively. ktorrent2.2 2.2.x and ktorrent 3.x packages are not
    co-installable. 
  - Add NEWS entry.
  - Explain KTorrent 2.2.x vs. KTorrent 3.x situation in README.Debian.
* New upstream bugfix release.
  - This release fixes a nasty infinite loop in the QM.

Modified: kde-extras/ktorrent/branches/ktorrent2.2/debian/NEWS
===================================================================
--- kde-extras/ktorrent/branches/ktorrent2.2/debian/NEWS	2008-07-07 10:38:33 UTC (rev 11364)
+++ kde-extras/ktorrent/branches/ktorrent2.2/debian/NEWS	2008-07-07 10:41:22 UTC (rev 11365)
@@ -1,3 +1,26 @@
+ktorrent2.2 (2.2.7.dfsg.1-1) unstable; urgency=low
+
+  * Since there have been two stable KTorrent 3.x (for KDE4) releases by the
+    time of writing and KTorrent 2.2.x (for KDE3) has not been updated much in
+    the meantime, I decided to ship both versions in Debian Lenny choosing
+    KTorrent 3.x as default. Therefore:
+    - you can get the old KTorrent 2.2.x release by installing ktorrent2.2
+      package if you don't want to install KDE4 runtime dependencies or new
+      features are not important for you;
+    - since ktorrent binary package provides KDE4 based release from now on,
+      it will pull in KDE4 runtime dependencies. However, it is a newer
+      KTorrent upstream release and has more features. It should work fine
+      with KDE3 desktop environment;
+    - you cannot co-install both ktorrent2.2 and ktorrent. They conflict with
+      each other and you can have only one of them on the system at the same
+      time.
+    - KTorrent 3.1 supports migration of torrents from KTorrent 2.2 but not
+      vice-versa. Therefore, if you start downloading/uploading torrents with
+      KTorrent 3.1, you will probably not be able to resume them with
+      KTorrent 2.2 if you downgrade.
+
+ -- Modestas Vainius <modestas at vainius.eu>  Mon, 30 Jun 2008 22:46:56 +0300
+
 ktorrent (2.1.4.dfsg.1-1) unstable; urgency=low
 
   * Now KTorrent uses system-wide GeoIP library (libgeoip1) and its default

Modified: kde-extras/ktorrent/branches/ktorrent2.2/debian/README.Debian
===================================================================
--- kde-extras/ktorrent/branches/ktorrent2.2/debian/README.Debian	2008-07-07 10:38:33 UTC (rev 11364)
+++ kde-extras/ktorrent/branches/ktorrent2.2/debian/README.Debian	2008-07-07 10:41:22 UTC (rev 11365)
@@ -1,3 +1,29 @@
+--- KTorrent 2.2.x (KDE3) and KTorrent 3.x (KDE4) in Debian 5.0 (Lenny) ---
+
+Since there have been two stable KTorrent 3.x (for KDE4) releases by the time
+of writing and KTorrent 2.2.x (for KDE3) has not been updated much in the
+meantime, I decided to ship both versions in Debian 5.0 (Lenny) choosing
+KTorrent 3.x as default. As a result of this decision:
+
+* You can get the old KTorrent 2.2.x release by installing ktorrent2.2 package if
+  you don't want to install KDE4 runtime dependencies or new features are not
+  important for you.
+
+* Since ktorrent binary package provides KDE4 based release from now on,
+  it will pull in KDE4 runtime dependencies. However, it is a newer KTorrent
+  upstream release and has more features. It should work fine with KDE3 desktop
+  environment.
+
+* You cannot co-install both ktorrent2.2 and ktorrent. They conflict with
+  each other and you can have only one of them on the system at the same time.
+
+* KTorrent 3.1 supports migration of torrents from KTorrent 2.2 but not
+  vice-versa. Therefore, if you start downloading/uploading torrents with
+  KTorrent 3.1, you will probably not be able to resume them with KTorrent 2.2
+  if you downgrade.
+
+--- GeoIP and builtin contry flags licensing issues ---
+
 Due to licensing restrictions, the source and binary packages of ktorrent do
 not include a GeoIP database. The upstream source has been patched to use
 system-wide GeoIP library (available in the libgeoip1 package). That package
@@ -23,6 +49,3 @@
 
 The commands used to modify upstream source tarball can be found at debian/rules 
 "prune-tarball" target.
-
- -- Modestas Vainius <modestas at vainius.eu>  Mon, 23 Jul 2007 21:25:17 +0300
-

Modified: kde-extras/ktorrent/branches/ktorrent2.2/debian/changelog
===================================================================
--- kde-extras/ktorrent/branches/ktorrent2.2/debian/changelog	2008-07-07 10:38:33 UTC (rev 11364)
+++ kde-extras/ktorrent/branches/ktorrent2.2/debian/changelog	2008-07-07 10:41:22 UTC (rev 11365)
@@ -1,3 +1,26 @@
+ktorrent2.2 (2.2.7.dfsg.1-1) unstable; urgency=low
+
+  * Since ktorrent source package is about provide KDE4 based version, keep old
+    KDE3 based KTorrent in ktorrent2.2 source package for lenny. The following
+    changes were done:
+    - Rename ktorrent source package to ktorrent2.2.
+    - Rename ktorrent and ktorrent-dbg binary packages to ktorrent2.2 and
+      ktorrent2.2-dbg respectively.
+    - Make "new" binary packages conflict with ktorrent and ktorrent-dbg
+      respectively. ktorrent2.2 2.2.x and ktorrent 3.x packages are not
+      co-installable. 
+    - Add NEWS entry.
+    - Explain KTorrent 2.2.x vs. KTorrent 3.x situation in README.Debian.
+
+ -- Modestas Vainius <modestas at vainius.eu>  Tue, 01 Jul 2008 00:03:36 +0300
+
+ktorrent (2.2.7.dfsg.1-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+    - This release fixes a nasty infinite loop in the QM.
+
+ -- Modestas Vainius <modestas at vainius.eu>  Mon, 26 May 2008 05:04:11 +0300
+
 ktorrent (2.2.6.dfsg.1-1) unstable; urgency=low
   
   * New upstream bugfix release.

Modified: kde-extras/ktorrent/branches/ktorrent2.2/debian/control
===================================================================
--- kde-extras/ktorrent/branches/ktorrent2.2/debian/control	2008-07-07 10:38:33 UTC (rev 11364)
+++ kde-extras/ktorrent/branches/ktorrent2.2/debian/control	2008-07-07 10:41:22 UTC (rev 11365)
@@ -1,4 +1,4 @@
-Source: ktorrent
+Source: ktorrent2.2
 Section: kde
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
@@ -8,14 +8,18 @@
 Standards-Version: 3.7.3.0
 Homepage: http://ktorrent.org
 
-Package: ktorrent
+Package: ktorrent2.2
 Architecture: any
 Depends: ${shlibs:Depends}
-Recommends: kdebase-data, kdebase-kio-plugins | kdebase-runtime-data-common 
+Recommends: kdebase-data, kdebase-kio-plugins | kdebase-runtime-data-common
 Suggests: php5-cli
-Description: BitTorrent client for KDE
+Conflicts: ktorrent
+Description: KTorrent v2.2.x - BitTorrent client for KDE3
  KTorrent is a BitTorrent program for KDE. You can use it to download and upload
- files on the BitTorrent network. Additional KTorrent features include:
+ files on the BitTorrent network. This package contains the latest revision of
+ KTorrent 2.2 series which is the last release for KDE3.
+ .
+ Additional KTorrent features include:
    - uTorrent compatible peer exchange
    - Zeroconf extension to find peers on the local network
    - WebGUI plugin
@@ -42,12 +46,13 @@
    - Statistics plugin
  .
 
-Package: ktorrent-dbg
+Package: ktorrent2.2-dbg
 Architecture: any
 Priority: extra
-Depends: ktorrent (= ${binary:Version})
+Depends: ktorrent2.2 (= ${binary:Version})
 Recommends: kdelibs-dbg
-Description: KTorrent debugging symbols
+Conflicts: ktorrent-dbg
+Description: KTorrent v2.2.x debugging symbols
  This package contains debugging symbols for KTorrent. When KTorrent crashes,
  in most cases this package is needed to get a backtrace that is useful for
  developers. If you have experienced KTorrent crash without this package

Deleted: kde-extras/ktorrent/branches/ktorrent2.2/debian/ktorrent.docs

Deleted: kde-extras/ktorrent/branches/ktorrent2.2/debian/ktorrent.install

Deleted: kde-extras/ktorrent/branches/ktorrent2.2/debian/ktorrent.manpages

Deleted: kde-extras/ktorrent/branches/ktorrent2.2/debian/ktorrent.menu

Added: kde-extras/ktorrent/branches/ktorrent2.2/debian/ktorrent2.2.docs
===================================================================
--- kde-extras/ktorrent/branches/ktorrent2.2/debian/ktorrent2.2.docs	                        (rev 0)
+++ kde-extras/ktorrent/branches/ktorrent2.2/debian/ktorrent2.2.docs	2008-07-07 10:41:22 UTC (rev 11365)
@@ -0,0 +1 @@
+AUTHORS

Added: kde-extras/ktorrent/branches/ktorrent2.2/debian/ktorrent2.2.install
===================================================================
--- kde-extras/ktorrent/branches/ktorrent2.2/debian/ktorrent2.2.install	                        (rev 0)
+++ kde-extras/ktorrent/branches/ktorrent2.2/debian/ktorrent2.2.install	2008-07-07 10:41:22 UTC (rev 11365)
@@ -0,0 +1,17 @@
+debian/tmp/usr/bin/ktorrent
+debian/tmp/usr/bin/ktshell
+debian/tmp/usr/lib/libktorrent-*.so
+debian/tmp/usr/lib/kde3/*
+debian/tmp/usr/share/applications/kde/ktorrent.desktop
+debian/tmp/usr/share/apps/ktorrent/icons/*
+debian/tmp/usr/share/apps/ktorrent/www/*
+debian/tmp/usr/share/apps/ktorrent/ktorrentui.rc
+debian/tmp/usr/share/apps/ktorrent/ktpartfileimportpluginui.rc
+debian/tmp/usr/share/apps/ktorrent/ktschedulerpluginui.rc
+debian/tmp/usr/share/config.kcfg/*
+debian/tmp/usr/share/icons/*
+debian/tmp/usr/share/locale/*
+debian/tmp/usr/share/services/*
+debian/tmp/usr/share/servicetypes/*
+
+debian/ktorrent.xpm usr/share/pixmaps/

Added: kde-extras/ktorrent/branches/ktorrent2.2/debian/ktorrent2.2.manpages
===================================================================
--- kde-extras/ktorrent/branches/ktorrent2.2/debian/ktorrent2.2.manpages	                        (rev 0)
+++ kde-extras/ktorrent/branches/ktorrent2.2/debian/ktorrent2.2.manpages	2008-07-07 10:41:22 UTC (rev 11365)
@@ -0,0 +1,2 @@
+debian/ktshell.1
+debian/ktorrent.1

Added: kde-extras/ktorrent/branches/ktorrent2.2/debian/ktorrent2.2.menu
===================================================================
--- kde-extras/ktorrent/branches/ktorrent2.2/debian/ktorrent2.2.menu	                        (rev 0)
+++ kde-extras/ktorrent/branches/ktorrent2.2/debian/ktorrent2.2.menu	2008-07-07 10:41:22 UTC (rev 11365)
@@ -0,0 +1,8 @@
+?package(ktorrent):\
+  needs="X11"\
+  section="Applications/Network/File Transfer"\
+  title="KTorrent"\
+  command="ktorrent"\
+  hints="KDE,Network,FileTransfer"\
+  icon="/usr/share/pixmaps/ktorrent.xpm"
+

Modified: kde-extras/ktorrent/branches/ktorrent2.2/debian/overrides.lintian
===================================================================
--- kde-extras/ktorrent/branches/ktorrent2.2/debian/overrides.lintian	2008-07-07 10:38:33 UTC (rev 11364)
+++ kde-extras/ktorrent/branches/ktorrent2.2/debian/overrides.lintian	2008-07-07 10:41:22 UTC (rev 11365)
@@ -1 +1 @@
-ktorrent: package-name-doesnt-match-sonames
+ktorrent2.2: package-name-doesnt-match-sonames

Modified: kde-extras/ktorrent/branches/ktorrent2.2/debian/patches/98_buildprep.diff
===================================================================

Modified: kde-extras/ktorrent/branches/ktorrent2.2/debian/rules
===================================================================
--- kde-extras/ktorrent/branches/ktorrent2.2/debian/rules	2008-07-07 10:38:33 UTC (rev 11364)
+++ kde-extras/ktorrent/branches/ktorrent2.2/debian/rules	2008-07-07 10:41:22 UTC (rev 11365)
@@ -79,7 +79,7 @@
 	dh_installman
 	dh_install
 	dh_installmenu
-	dh_strip --dbg-package=ktorrent-dbg
+	dh_strip --dbg-package=ktorrent2.2-dbg
 	dh_compress
 	dh_fixperms
 	dh_makeshlibs




More information about the pkg-kde-commits mailing list