[SCM] KTorrent Debian packaging. branch, master, updated. master/3.2.2+dfsg.2-1-3-gb29d0c7

Modestas Vainius modax-guest at alioth.debian.org
Sat Jul 25 10:13:07 UTC 2009


The following commit has been merged in the master branch:
commit 07048e195a7e147cfac4829be01b66b54cbda1a4
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sat Jul 25 13:05:54 2009 +0300

    Make use of debhelper 7.3 cmake support and drop quilt for now.
    
    * Make use of debhelper 7.3 cmake support:
      - build depend on debhelper 7.3;
      - build depend on pkg-kde-tools 0.4.11 (for debhelper/kde.mk);
      - remove custom debian/debhelper scripts;
      - adjust debian/rules accordingly.
    * Drop quilt from build depends: unused at the moment.
---
 debian/changelog          |   11 ++++++
 debian/control            |    2 +-
 debian/debhelper/cmake.mk |   25 -------------
 debian/debhelper/kde.mk   |   85 ---------------------------------------------
 debian/rules              |    5 +--
 5 files changed, 13 insertions(+), 115 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 867ec5c..9e0594d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+ktorrent (3.2.2+dfsg.2-2) UNRELEASED; urgency=low
+
+  * Make use of debhelper 7.3 cmake support:
+    - build depend on debhelper 7.3;
+    - build depend on pkg-kde-tools 0.4.11 (for debhelper/kde.mk);
+    - drop custom debian/debhelper snippets;
+    - adjust debian/rules accordingly.
+  * Drop quilt from build depends: unused at the moment.
+
+ -- Modestas Vainius <modestas at vainius.eu>  Sat, 25 Jul 2009 13:06:00 +0300
+
 ktorrent (3.2.2+dfsg.2-1) unstable; urgency=low
 
   * New upstream tarball for 3.2.2 (3.2.2-1).
diff --git a/debian/control b/debian/control
index 59e4f0c..ac927c8 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Modestas Vainius <modestas at vainius.eu>
 DM-Upload-Allowed: yes
-Build-Depends: cmake (>= 2.6.2), debhelper (>= 7.0.50), quilt, pkg-kde-tools (>= 0.2),
+Build-Depends: cmake (>= 2.6.2), debhelper (>= 7.3), pkg-kde-tools (>= 0.4.11),
  kdelibs5-dev (>= 4:4.2.0), libphonon-dev (>= 4:4.3.0), kdepimlibs5-dev (>= 4:4.2.0),
  kdebase-workspace-dev (>= 4:4.2.0), libtag1-dev,
  pkg-config, libgeoip-dev, libgmp3-dev, libqca2-dev, libx11-dev, libboost-serialization-dev,
diff --git a/debian/debhelper/cmake.mk b/debian/debhelper/cmake.mk
deleted file mode 100644
index 37b1fd9..0000000
--- a/debian/debhelper/cmake.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-CMAKE_DEFAULT_ARGS = -DCMAKE_INSTALL_PREFIX=/usr -D\"CMAKE_C_FLAGS\"="$(CFLAGS)" \
-                       -D\"CMAKE_CXX_FLAGS\"="$(CXXFLAGS)" \
-                       -DCMAKE_SKIP_RPATH=ON -DCMAKE_VERBOSE_MAKEFILE=ON
-CMAKE_ARGS ?=
-DEB_BUILDDIR ?= obj-$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-ifeq (1,$(shell dh_listpackages | wc -l))
-DEB_DESTDIR ?= debian/$(shell dh_listpackages)
-else
-DEB_DESTDIR ?= debian/tmp
-endif
-
-$(DEB_BUILDDIR):
-	mkdir "$@"
-
-cmake_configure: $(DEB_BUILDDIR)
-	cd $(DEB_BUILDDIR) && cmake .. $(CMAKE_DEFAULT_ARGS) $(CMAKE_ARGS)
-
-cmake_build:
-	cd $(DEB_BUILDDIR) && make
-
-cmake_install:
-	cd $(DEB_BUILDDIR) && make DESTDIR=$(CURDIR)/$(DEB_DESTDIR) install
-
-cmake_clean:
-	rm -rf $(DEB_BUILDDIR)
diff --git a/debian/debhelper/kde.mk b/debian/debhelper/kde.mk
deleted file mode 100644
index 6473901..0000000
--- a/debian/debhelper/kde.mk
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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)
-
-# Source package name
-DEB_SOURCE_PACKAGE := $(shell grep '^Source:' debian/control | sed 's/^Source:[[:space:]]*\([^[:space:]]\+\).*$$/\1/')
-
-# Handle DEB_BUILD_OPTIONS=noopt and C(XX)FLAGS
-ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-    CFLAGS = -g -O2
-    CXXFLAGS = -g -O2
-else
-    CFLAGS = -g -O0
-    CXXFLAGS = -g -O0
-endif
-
-export CFLAGS
-export CXXFLAGS
-
-# DEB_BUILD_OPTIONS parallel=n support (policy 3.8.0 compliance)
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-    NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-    MAKEFLAGS += -j$(NUMJOBS)
-endif
-
-export MAKEFLAGS
-
-# Pass -DCMAKE_USE_RELATIVE_PATHS=ON to cmake when cmake >= 2.6.2-1 is used.
-CMAKE_DEB_VERSION := $(shell dpkg -l 'cmake' | grep 'ii' | awk '{print $$3}')
-ifeq (yes,$(shell dpkg --compare-versions '$(CMAKE_DEB_VERSION)' ge '2.6.2-1' && echo 'yes'))
-    DEB_CMAKE_CUSTOM_FLAGS += -DCMAKE_USE_RELATIVE_PATHS=ON
-endif
-
-# Default targets
-DEB_ALL_DEFAULT_TARGETS := build install binary binary-arch binary-indep clean
-KDE_ALL_DEFAULT_TARGETS :=  $(patsubst %,kde/%,$(DEB_ALL_DEFAULT_TARGETS))
-
-# Default overrides for cmake configuring/building/installing
-DEB_KDE_OVERRIDE_DH_AUTO_CONFIGURE ?= override_dh_auto_configure
-$(DEB_KDE_OVERRIDE_DH_AUTO_CONFIGURE): cmake_configure
-.PHONY: $(DEB_KDE_OVERRIDE_DH_AUTO_CONFIGURE)
-
-DEB_KDE_OVERRIDE_DH_AUTO_BUILD ?= override_dh_auto_build
-$(DEB_KDE_OVERRIDE_DH_AUTO_BUILD): cmake_build
-.PHONY: $(DEB_KDE_OVERRIDE_DH_AUTO_BUILD)
-
-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)))
-
-DEB_KDE_OVERRIDE_DH_STRIP ?= override_dh_strip
-$(DEB_KDE_OVERRIDE_DH_STRIP):
-	dh_strip --dbg-package=$(DEB_DBG_PACKAGE_NAME)
-
-endif
-
-# Required relationship between default targets
-$(filter-out build clean,$(DEB_ALL_DEFAULT_TARGETS)): build
-
-# Default implementation (DH) of default targets.
-$(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)
diff --git a/debian/rules b/debian/rules
index efa9c07..55803e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,15 @@
 #!/usr/bin/make -f
 
-# THIS_SHOULD_GO_TO_UNSTABLE=1
-
 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
+include /usr/share/pkg-kde-tools/makefiles/1/debhelper/kde.mk
 
 prune-tarball:
 	# Remove non-free components: flags and geoip stuff

-- 
KTorrent Debian packaging.



More information about the pkg-kde-commits mailing list