[SCM] KTorrent Debian packaging. branch, experimental, updated. master/3.2.2+dfsg.1-1-10-g6b584c3

[Modestas Vainius]

The following commit has been merged in the experimental branch:
commit a9ea12889f2d8e2b4face33a9f248965cd298869
Merge: af61afc44aeafbec22a9d82981945627ceb7373a a7312b57a4ce1ccad483a0a52667704b131254ac
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Tue Jun 2 00:25:29 2009 +0300

    Merge branch 'master' into experimental
    
    Merge 3.2.2+dfsg.1-1 release.
    
    Conflicts:
    	debian/changelog
    
    Signed-off-by: Modestas Vainius <modestas at vainius.eu>

 debian/README.source                               |    4 +-
 debian/changelog                                   |   12 +++++++
 debian/debhelper/kde.mk                            |   27 +++++----------
 .../general/qt_tracker_default_https_port_fix.diff |   35 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 debian/rules                                       |    6 +++
 6 files changed, 65 insertions(+), 20 deletions(-)

diff --combined debian/changelog
index 40d96ba,1c7897e..cdaa535
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,15 +1,30 @@@
 +ktorrent (3.3~~svn975833-1) experimental; urgency=low
 +
 +  * New upstream development snapshot:
 +    - Last Changed Author: guisson
 +    - Last Changed Rev: 975833
 +    - Last Changed Date: 2009-05-31 14:16:26 +0300
 +  * Change ktorrent-dbg section to debug.
 +  * Bump debhelper build depend to 7.0.50.
 +  * Bump Standards-Version to 3.8.1 (no changes needed).
 +  * Clean up prune-tarball: some files were removed upstream,
 +    there is no need to rm them.
 +  * Update ktorrent.install: add a shutdown plugin.
 +
 + -- Modestas Vainius <modestas at vainius.eu>  Mon, 01 Jun 2009 03:47:07 +0300
 +
+ ktorrent (3.2.2+dfsg.1-1) unstable; urgency=low
+ 
+   * New upstream release.
+    - Messages.sh is included in the tarball (Closes: #526067).
+   * Change ktorrent-dbg section to debug.
+   * Bump debhelper build depend to 7.0.50.
+   * Bump Standards-Version to 3.8.1 (no changes needed).
+   * Update to newer version of build snippets (and add topgit support).
+   * Add a patch to fix default port for https in Qt based tracker announces.
+ 
+  -- Modestas Vainius <modestas at vainius.eu>  Mon, 01 Jun 2009 23:39:57 +0300
+ 
  ktorrent (3.2.1+dfsg.1-1) unstable; urgency=low
  
    * New upstream release.
diff --combined debian/rules
index 21cad93,efa9c07..6e8418c
--- a/debian/rules
+++ b/debian/rules
@@@ -5,6 -5,12 +5,12 @@@
  DEB_CMAKE_CUSTOM_FLAGS += -DWITH_SYSTEM_GEOIP:BOOL=ON \
                            -DWITH_BUILTIN_COUNTRY_FLAGS:BOOL=OFF
  DEB_KDE_LINK_WITH_AS_NEEDED := yes
+ DH := dh --with quilt
+ 
+ ifneq (,$(shell which tg))
+ include /usr/share/quilt/quilt.make
+ include /usr/share/topgit/tg2quilt.mk
+ endif
  
  include debian/debhelper/kde.mk
  
@@@ -12,8 -18,8 +18,8 @@@ prune-tarball
  	# Remove non-free components: flags and geoip stuff
  	rm -f plugins/infowidget/geoip/*.png
  	rm -f plugins/infowidget/geoip/FLAGS_LICENCE
 -	rm -f plugins/infowidget/geoip/geoip.dat
 -	rm -f plugins/infowidget/geoip/GeoIP-LICENSE.txt
 +#	rm -f plugins/infowidget/geoip/geoip.dat
 +#	rm -f plugins/infowidget/geoip/GeoIP-LICENSE.txt
  	rm -f plugins/infowidget/GeoIP.c
  	rm -f plugins/infowidget/GeoIP.h
  .PHONY: prune-tarball

-- 
KTorrent Debian packaging.