rev 18112 - trunk/packages/kdebindings/debian

[Modestas Vainius]

Author: modax
Date: 2010-05-29 08:06:59 +0000 (Sat, 29 May 2010)
New Revision: 18112

Modified:
   trunk/packages/kdebindings/debian/changelog
   trunk/packages/kdebindings/debian/rules
Log:
Use default KDE 4 variables from variables.mk for building.

Modified: trunk/packages/kdebindings/debian/changelog
===================================================================
--- trunk/packages/kdebindings/debian/changelog	2010-05-29 07:55:16 UTC (rev 18111)
+++ trunk/packages/kdebindings/debian/changelog	2010-05-29 08:06:59 UTC (rev 18112)
@@ -18,6 +18,7 @@
   * Remove debian/README.source. Patch support is part of source format
     now.
   * Bump kde-sc-dev-latest build dependency to 4:4.4.4.
+  * Use default KDE 4 variables from variables.mk for building.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 28 May 2010 21:51:16 +0300
 

Modified: trunk/packages/kdebindings/debian/rules
===================================================================
--- trunk/packages/kdebindings/debian/rules	2010-05-29 07:55:16 UTC (rev 18111)
+++ trunk/packages/kdebindings/debian/rules	2010-05-29 08:06:59 UTC (rev 18112)
@@ -1,6 +1,7 @@
 #! /usr/bin/make -f
 
-include /usr/share/quilt/quilt.make
+DEB_KDE_LINK_WITH_AS_NEEDED := yes
+include /usr/share/pkg-kde-tools/makefiles/1/variables.mk
 
 ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 MONOARCHS := "i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 lpia ia64 arm armeb armel sparc s390"
@@ -31,25 +32,7 @@
 ##
 
 #generic kde4 stuff
-cmake_flags := \
-	-DCMAKE_BUILD_TYPE=Debian			\
-	-DCMAKE_USE_RELATIVE_PATHS=ON			\
-	-DCMAKE_INSTALL_PREFIX=/usr			\
-	-DCMAKE_VERBOSE_MAKEFILE=ON			\
-							\
-	-DKDE4_BUILD_TESTS=false			\
-	-DKDE4_USE_ALWAYS_FULL_RPATH=false		\
-	-DKDE_DISTRIBUTION_TEXT="Debian packages"	\
-							\
-	-DLIB_INSTALL_DIR=/usr/lib			\
-	-DSYSCONF_INSTALL_DIR=/etc			\
-	-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.kcf	\
-	-DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed"	\
-	-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed"	\
-	-DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed"
+cmake_flags := $(DEB_CMAKE_KDE4_FLAGS)
 
 # OK, here we disable all that we don't want.
 # Please remove lines as you add packaging support for them.