[SCM] KTorrent Debian packaging. branch, experimental, updated. debian/4.0-beta2-1

Modestas Vainius modax at alioth.debian.org
Mon Apr 5 14:40:20 UTC 2010


The following commit has been merged in the experimental branch:
commit b1b6b1221969e51459e2151c89d1884fc7c459bc
Merge: 84bf66b5ebf39c1965f99d3a018e07dca93e57ad 5c386212cd19124de36c7aac0cb174207b401270
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Mon Apr 5 16:11:04 2010 +0300

    Merge branch 'master' into experimental
    
    Conflicts:
    	debian/changelog
    	debian/patches/general/fix_target_link_libraries.diff

 debian/changelog                                   |   13 +++++++++++++
 .../patches/general/fix_target_link_libraries.diff |    4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 00678fa,6d461f3..ca9cc2c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,16 +1,35 @@@
 +ktorrent (4.0~beta2-0r1) UNRELEASED; urgency=low
 +
 +  * New upstream release.
 +  * Enable parallel building: pass --parallel option to dh.
 +
 + -- Modestas Vainius <modax at debian.org>  Mon, 28 Dec 2009 15:00:04 +0200
 +
 +ktorrent (4.0~beta1-1) experimental; urgency=low
 +
 +  * New upstream development release.
 +  * DFSG offensive files removed upstream, using vanilla tarball from now on:
 +    - drop prune-nonfree target from debian/rules;
 +    - no longer pass -DWITH_BUILTIN_COUNTRY_FLAGS:BOOL=OFF to cmake.
 +  * Update install files.
 +  * Adapt general/fix_target_link_libraries.diff to upstream changes.
 +  * Skip test suite.
 +
 + -- Modestas Vainius <modax at debian.org>  Mon, 28 Dec 2009 14:51:55 +0200
 +
+ ktorrent (3.3.4+dfsg.1-1) unstable; urgency=low
+ 
+   * New upstream release (Closes: #568850).
+ 
+  -- Modestas Vainius <modax at debian.org>  Wed, 10 Feb 2010 23:19:48 +0200
+ 
+ ktorrent (3.3.3+dfsg.1-1) unstable; urgency=low
+ 
+   * New upstream release (Closes: #565678).
+   * Update general/fix_target_link_libraries.diff patch.
+ 
+  -- Modestas Vainius <modax at debian.org>  Mon, 18 Jan 2010 02:04:07 +0200
+ 
  ktorrent (3.3.2+dfsg.1-1) unstable; urgency=low
  
    * New upstream release.

-- 
KTorrent Debian packaging.



More information about the pkg-kde-commits mailing list