[SCM] KTorrent Debian packaging. branch, master, updated. master/3.2.1+dfsg.1-1-10-ga7312b5

[Modestas Vainius]

The following commit has been merged in the master branch:
commit b48f4ebf208dc01428e70fb8b0a663c7d2b4fa6f
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Mon Jun 1 23:30:59 2009 +0300

    Update to newer version of the build make snippets.
    
    Signed-off-by: Modestas Vainius <modestas at vainius.eu>
---
 debian/README.source    |    4 ++--
 debian/changelog        |    3 ++-
 debian/debhelper/kde.mk |   27 +++++++++------------------
 debian/rules            |    6 ++++++
 4 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index 36a059c..df1ef7d 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -5,8 +5,8 @@ do other common tasks. Branch structure of the repository is as follows:
 
 * upstream   - upstream source code.
 * master     - the Debianization branch (upstream source and debian directory).
-* build      - build branch; master and exported debian/patches ready for
-               building. This branch is used for tagging.
+               This branch also contains exported debian/patches ready for
+               building.
 
 Topic branches should be named as follows:
 
diff --git a/debian/changelog b/debian/changelog
index a1884f7..97cc675 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ ktorrent (3.2.2+dfsg.1-1) UNRELEASED; urgency=low
   * 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).
 
- -- Modestas Vainius <modestas at vainius.eu>  Mon, 13 Apr 2009 13:41:22 +0300
+ -- Modestas Vainius <modestas at vainius.eu>  Mon, 01 Jun 2009 23:30:14 +0300
 
 ktorrent (3.2.1+dfsg.1-1) unstable; urgency=low
 
diff --git a/debian/debhelper/kde.mk b/debian/debhelper/kde.mk
index 647deff..6473901 100644
--- a/debian/debhelper/kde.mk
+++ b/debian/debhelper/kde.mk
@@ -1,12 +1,11 @@
-# Using quilt patch system
-include /usr/share/quilt/quilt.make
-
 # Include default KDE 4 cmake configuration variables
 include /usr/share/pkg-kde-tools/makefiles/1/variables.mk
 
 # CMake module
 include debian/debhelper/cmake.mk
 
+DH ?= dh
+
 # CMake configuration flags
 DEB_CMAKE_KDE_DEFAULT_FLAGS = $(DEB_CMAKE_KDE4_FLAGS) $(DEB_CMAKE_CUSTOM_FLAGS)
 CMAKE_ARGS = $(DEB_CMAKE_KDE_DEFAULT_FLAGS)
@@ -57,6 +56,10 @@ DEB_KDE_OVERRIDE_DH_AUTO_INSTALL ?= override_dh_auto_install
 $(DEB_KDE_OVERRIDE_DH_AUTO_INSTALL): cmake_install
 .PHONY: $(DEB_KDE_OVERRIDE_DH_AUTO_INSTALL)
 
+DEB_KDE_OVERRIDE_DH_AUTO_CLEAN ?= override_dh_auto_clean
+$(DEB_KDE_OVERRIDE_DH_AUTO_CLEAN): cmake_clean
+.PHONY: $(DEB_KDE_OVERRIDE_DH_AUTO_CLEAN)
+
 # dh_strip override - automatic -dbg package
 DEB_DBG_PACKAGE_NAME ?= $(DEB_SOURCE_PACKAGE)-dbg
 ifeq ($(DEB_DBG_PACKAGE_NAME),$(filter $(DEB_DBG_PACKAGE_NAME),$(shell dh_listpackages -s)))
@@ -67,28 +70,16 @@ $(DEB_KDE_OVERRIDE_DH_STRIP):
 
 endif
 
-# Clean rule is more complex. Cleaning should be done
-# before unpatching.
-clean_before_unpatch: cmake_clean
-	dh clean
-
-unpatch: clean_before_unpatch
-
-kde/clean: unpatch
-
 # Required relationship between default targets
 $(filter-out build clean,$(DEB_ALL_DEFAULT_TARGETS)): build
 
-kde/build: patch
-
 # Default implementation (DH) of default targets.
-# Exclude clean as we have a specific target for it
-$(filter-out kde/clean,$(KDE_ALL_DEFAULT_TARGETS)):
-	dh $(subst kde/,,$@)
+$(KDE_ALL_DEFAULT_TARGETS):
+	$(DH) $(subst kde/,,$@)
 
 # An implicit rule which runs default kde/ targets
 # It can be easily overriden.
 %: kde/%
 	
 
-.PHONY: $(KDE_ALL_DEFAULT_TARGETS) clean_before_unpatch
+.PHONY: $(KDE_ALL_DEFAULT_TARGETS)
diff --git a/debian/rules b/debian/rules
index ea3fc53..efa9c07 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +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
 

-- 
KTorrent Debian packaging.