[SCM] Konversation packaging for Debian branch, master, updated. master/1.2-alpha4-2-4-g7b781de
Modestas Vainius
modax-guest at alioth.debian.org
Fri Jul 24 18:46:38 UTC 2009
The following commit has been merged in the master branch:
commit 89beb192c725e3100e7c804c24c7f7432929f485
Author: Modestas Vainius <modestas at vainius.eu>
Date: Fri Jul 24 21:32:27 2009 +0300
Use debhelper 7.3 for building.
debhelper 7.3 provides cmake support.
pkg-kde-tools 0.4.10 provides debhelper/kde.mk.
Adjust build dependencies and debian/rules accordingly.
Signed-off-by: Modestas Vainius <modestas at vainius.eu>
---
debian/changelog | 9 +++++
debian/control | 2 +-
debian/debhelper/cmake.mk | 25 -------------
debian/debhelper/kde.mk | 85 ---------------------------------------------
debian/rules | 7 ++--
5 files changed, 14 insertions(+), 114 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index dd6cd35..a42bb1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+konversation (1.2~alpha4-3) unstable; urgency=low
+
+ * Use debhelper 7.3 for building:
+ - debhelper 7.3 provides cmake support;
+ - pkg-kde-tools 0.4.10 provides debhelper/kde.mk;
+ - adjust build dependencies and debian/rules accordingly.
+
+ -- Modestas Vainius <modestas at vainius.eu> Fri, 24 Jul 2009 21:36:05 +0300
+
konversation (1.2~alpha4-2) unstable; urgency=low
* Add patch from upstream svn repository (r991115) to fix building with
diff --git a/debian/control b/debian/control
index 8eede7f..b5cfe58 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: net
Priority: optional
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
Uploaders: Modestas Vainius <modestas at vainius.eu>
-Build-Depends: debhelper (>= 7.0.50), cmake (>= 2.6.2), pkg-kde-tools (>= 0.4), quilt (>= 0.46-7~),
+Build-Depends: debhelper (>= 7.3), cmake (>= 2.6.2), pkg-kde-tools (>= 0.4.10), quilt (>= 0.46-7~),
libqt4-dev (>= 4.4.3), kdelibs5-dev (>= 4:4.2.0), kdepimlibs5-dev (>= 4:4.2.0),
libx11-dev, x11proto-core-dev, libxss-dev, libqca2-dev
Standards-Version: 3.8.2
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 8060e41..b557644 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,9 +2,7 @@
DEB_KDE_LINK_WITH_AS_NEEDED := yes
-DH = dh --with quilt
-
-include debian/debhelper/kde.mk
+include /usr/share/pkg-kde-tools/makefiles/1/debhelper/kde.mk
ifneq (,$(shell which tg))
QUILT_PATCH_DIR := debian/patches
@@ -18,3 +16,6 @@ override_dh_install:
if [ -d debian/konversation ]; then \
cp -a data/scripts/README debian/konversation/usr/share/doc/konversation/README.scripts; \
fi
+
+%:
+ dh --with quilt $@
--
Konversation packaging for Debian
More information about the pkg-kde-commits
mailing list