rev 6967 - branches/kde4/cdbs

[Fathi Boudra]

Author: fboudra-guest
Date: 2007-08-05 12:08:43 +0000 (Sun, 05 Aug 2007)
New Revision: 6967

Modified:
   branches/kde4/cdbs/cmake.mk
   branches/kde4/cdbs/kde.mk
Log:
* cmake.mk is general purpose cdbs makefile. BTS submitted #377524.
* kde.mk contains specific KDE4 only.
  specific KDE4 stuff previously in cmake.mk wers merged inside.
* utils.mk patched. BTS submitted #423394.


Modified: branches/kde4/cdbs/cmake.mk
===================================================================
--- branches/kde4/cdbs/cmake.mk	2007-08-05 11:27:16 UTC (rev 6966)
+++ branches/kde4/cdbs/cmake.mk	2007-08-05 12:08:43 UTC (rev 6967)
@@ -50,23 +50,11 @@
 	cd $(DEB_BUILDDIR) && cmake $(CURDIR)/$(DEB_SRCDIR) \
 	-DCMAKE_INSTALL_PREFIX="$(DEB_CMAKE_PREFIX)" \
 	$(DEB_CMAKE_EXTRA_FLAGS) -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" \
-	-DCMAKE_C_FLAGS="$(CFLAGS)" -DCMAKE_VERBOSE_MAKEFILE=ON \
-	$(DEB_CMAKE_DEBUG_FLAGS) \
-	$(KDE4-ENABLE-FINAL) \
-	-DKDE4_BUILD_TESTS=true \
-	-DKDE_DISTRIBUTION_TEXT="Debian packages" \
-	-DCMAKE_SKIP_RPATH=true \
-	-DCONFIG_INSTALL_DIR=/etc/kde4 \
-	-DDATA_INSTALL_DIR=/usr/share/kde4/apps \
-	-DHTML_INSTALL_DIR=/usr/share/doc/kde4/HTML \
-	-DKCFG_INSTALL_DIR=/usr/share/kde4/config.kcfg \
-	-DLIB_INSTALL_DIR=/usr/lib \
-	-DSYSCONF_INSTALL_DIR=/etc
+	-DCMAKE_C_FLAGS="$(CFLAGS)" -DCMAKE_VERBOSE_MAKEFILE=ON
 	mkdir -p $(DEB_DESTDIR)
 
 cleanbuilddir::
 	-if test "$(DEB_BUILDDIR)" != "$(DEB_SRCDIR)"; then rm -rf $(DEB_BUILDDIR); fi
-	rm -f CMakeCache.txt
 
 endif
 

Modified: branches/kde4/cdbs/kde.mk
===================================================================
--- branches/kde4/cdbs/kde.mk	2007-08-05 11:27:16 UTC (rev 6966)
+++ branches/kde4/cdbs/kde.mk	2007-08-05 12:08:43 UTC (rev 6967)
@@ -1,17 +1,31 @@
-export XDG_DATA_DIRS=/usr/share
-export XDG_CONFIG_DIRS=/etc/xdg
-
+# until bug 377524 resolved.
 include debian/cdbs/cmake.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+# until bug #423394 resolved.
 include debian/cdbs/utils.mk
 
+DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_CMAKE_EXTRA_FLAGS += \
+			$(DEB_CMAKE_DEBUG_FLAGS) \
+			$(KDE4-ENABLE-FINAL) \
+			-DKDE4_BUILD_TESTS=true \
+			-DKDE_DISTRIBUTION_TEXT="Debian packages" \
+			-DCMAKE_SKIP_RPATH=true \
+			-DCONFIG_INSTALL_DIR=/etc/kde4 \
+			-DDATA_INSTALL_DIR=/usr/share/kde4/apps \
+			-DHTML_INSTALL_DIR=/usr/share/doc/kde4/HTML \
+			-DKCFG_INSTALL_DIR=/usr/share/kde4/config.kcfg \
+			-DLIB_INSTALL_DIR=/usr/lib \
+			-DSYSCONF_INSTALL_DIR=/etc
+
+#DEB_CMAKE_PREFIX = /usr/lib/kde4
 DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+#DEB_DH_SHLIBDEPS_ARGS = -l/usr/lib/kde4/lib/
 DEB_KDE_ENABLE_FINAL ?=
+#DEB_MAKE_ENVVARS += XDG_CONFIG_DIRS=/etc/xdg XDG_DATA_DIRS=/usr/share
+#DEB_STRIP_EXCLUDE = so
 
-DEB_CMAKE_EXTRA_FLAGS += -DKDE4_BUILD_TESTS=true -DKDE_DISTRIBUTION_TEXT="Debian packages"
-
 ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
     cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
     ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
@@ -45,6 +59,7 @@
 	rm -rf debian/man/out
 	-rmdir debian/man
 	rm -f debian/stamp-man-pages
+	rm -f CMakeCache.txt
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \