[SCM] Debian Qt/KDE packaging tools branch, master, updated. master/0.4.11-9-g7f6bfdd

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 7f6bfddbd8017c974dd88b9c4e6dba5ef9e427ff
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Thu Aug 27 17:32:50 2009 +0300

    Update README.Debian with new information about debhelper addons.
---
 debian/README.Debian |   76 +++++++++++++++++++++++++++++++++----------------
 1 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 0575a34..4ada196 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,50 +1,54 @@
 pkg-kde-tools for Debian
 ------------------------
 
- These snippets (/usr/share/pkg-kde-tools/makefiles/1) should be universal
+ These snippets (/usr/share/pkg-kde-tools/makefiles/1) should be universally
  usable:
   - If your package uses CDBS, you should be able to just include the
     cdbs/kde.mk file.
-  - If your package uses Debhelper dh(1) command sequencer (Debhelper v7.3.0 or
-    later is required), you can include debhelper/kde.mk in your debian/rules.
-    It will take care of passing default KDE 4 flags to CMake by overriding
-    dh_auto_configure. Custom CMake flags can be passed by setting
-    DEB_CMAKE_CUSTOM_FLAGS make variable. The snippet runs a standard dh $@ by
-    default.
   - If you use other tools, include the variables.mk file and run cmake with
     $(DEB_CMAKE_KDE4_FLAGS) to get the kde4 default variables.
+  - If you want to use Debhelper dh(1) command sequencer, you will find section
+    "Using with Debhelper Command Sequencer `dh`" below interesting. Please
+    note that debhelper/kde.mk snippet is deprecated since pkg-kde-tools 0.5.0.
 
  Note: to enable linking with --as-needed (disabled by default), you should set
        DEB_KDE_LINK_WITH_AS_NEEDED to 'yes' before the include.
 
-Examples:
+Using with Debhelper Command Sequencer `dh`
+------------------------------------------
 
-A CDBS using package:
+pkg-kde-tools provides a couple of additions to dh(1) and its toolset.
 
--------> debian/rules <-------
-#!/usr/bin/make -f
+* Debhelper build system 'kde'. It is based on the debhelper build system
+  'cmake'. The only difference is that in addition it passes KDE 4 specific
+  flags to cmake by default. In order to use it, pass --buildsystem=kde when
+  running dh_auto_*. Debhelper 7.3.0 or later is required to use this build
+  system.
+* dh sequence addon 'kde'. It will tweak default dh sequences to be best
+  suitable for building KDE applications. For example, that includes passing of
+  --buildsystem=kde to all dh_auto_* commands by default and other
+  enhancements. Debhelper 7.3.16 or later is required to use this addon.
 
-include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-------------------------------
+In order to build a simple KDE package, all you need to do is to pass `--with
+kde` option to dh(1). More advanced usage (e.g. to pass additional flags to
+cmake) may require overriding of some debhelper commands (e.g.
+dh_auto_configure). See examples below for more details.
 
-A package using dh(1) (full example):
 
--------> debian/rules <-------
-#!/usr/bin/make -f
+Examples
+--------
 
-include /usr/share/pkg-kde-tools/makefiles/1/debhelper/kde.mk
+* A CDBS using package.
 
-# If you need to pass additional CMake flags, do it like this:
-DEB_CMAKE_CUSTOM_FLAGS += -DSOME_FLAG=some_value
+-------> debian/rules <-------
+#!/usr/bin/make -f
 
-# You may pass additional arguments to dh(1) like this:
-%:
-	dh --with quilt $@
+include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
 ------------------------------
 
-A non CDBS or dh(7) using package could start with something like the following
-and end up like any other cmake using package.
+* A non CDBS using package could start with something like the following
+  and end up like any other cmake using package.
 
 -------> debian/rules <-------
 #!/usr/bin/make -f
@@ -72,3 +76,25 @@ build-stamp: builddir/Makefile
 
 	touch $@
 ------------------------------
+
+* A very simple KDE package using dh.
+
+-------> debian/rules <-------
+#!/usr/bin/make -f
+
+%:
+	dh --with kde $@
+------------------------------
+
+* A more complicated KDE package using dh. Additional -DSOME_FLAG is passed to
+  cmake and quilt addon is used for managing patches.
+
+-------> debian/rules <-------
+#!/usr/bin/make -f
+
+override_dh_auto_configure:
+	dh_auto_configure --buildsystem=kde -- -DSOME_FLAG=some_value
+
+%:
+	dh --with quilt,kde $@
+------------------------------

-- 
Debian Qt/KDE packaging tools