[SCM] Debian Qt/KDE packaging tools branch, master, updated. master/0.4.2-1-g146b56f

[Fathi Boudra]

The following commit has been merged in the master branch:
commit 146b56f4aee9cb973bd9d6d4fe3f064770a778a3
Author: Fathi BOUDRA <fabo at debian.org>
Date:   Mon Apr 27 00:26:01 2009 +0200

    Re-word README.Debian:
     - use 80 colons max
     - add a note on DEB_KDE_LINK_AS_NEEDED usage
     - improve debhelper snippet based on dh-make template
     - fix typo kde4.mk -> kde.mk
     - remove extra lines

diff --git a/debian/README.Debian b/debian/README.Debian
index e17ccfc..afbd55c 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,38 +1,54 @@
 pkg-kde-tools for Debian
 ------------------------
 
- These snippets should be universal usable. If your package uses cdbs, you should be able to just
- include the kde4.mk file.
- If you use other tools, include the variables.mk file and run cmake with $(DEB_CMAKE_KDE4_FLAGS) to get 
- the kde4 default vars.
+ These snippets should be universal usable:
+  - If your package uses CDBS, you should be able to just include the kde.mk
+    file.
+  - If you use other tools, include the variables.mk file and run cmake with
+    $(DEB_CMAKE_KDE4_FLAGS) to get the kde4 default variables.
+
+ 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:
 
-A cdbs using package:
+A CDBS using package:
 
 #!/usr/bin/make -f
 
 include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-#end makefile
+#end cdbs makefile
 
-A non-cdbs-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.
 
 #!/usr/bin/make -f
 
 include /usr/share/pkg-kde-tools/makefiles/1/variables.mk
 
 builddir/Makefile:
-        mkdir -p builddir
-	cd builddir && cmake .. $(DEB_CMAKE_KDE4_FLAGS)
-
+	dh_testdir
+
+	mkdir -p builddir
+	cd builddir && cmake .. \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_C_FLAGS="$(CFLAGS)" \
+		-DCMAKE_LD_FLAGS="-Wl,-z,defs" \
+		-DCMAKE_CXX_FLAGS="$(CXXFLAGS)" \
+		-DCMAKE_SKIP_RPATH=ON \
+		-DCMAKE_VERBOSE_MAKEFILE=ON \
+		$(DEB_CMAKE_KDE4_FLAGS)
+
+build: build-stamp
 build-stamp: builddir/Makefile
+	dh_testdir
+
 	$(MAKE) -C builddir
+
 	touch $@
 
 #end snippet
 
-
-
  -- Sune Vuorela <debian at pusling.com>  Thu, 18 Sep 2008 21:39:35 +0200

-- 
Debian Qt/KDE packaging tools