rev 13516 - in branches/kde4.2/packages/pkg-kde-tools/trunk: debian qt-kde-team/1

[Modestas Vainius]

Author: modax-guest
Date: 2009-01-24 23:46:21 +0000 (Sat, 24 Jan 2009)
New Revision: 13516

Modified:
   branches/kde4.2/packages/pkg-kde-tools/trunk/debian/changelog
   branches/kde4.2/packages/pkg-kde-tools/trunk/debian/install
   branches/kde4.2/packages/pkg-kde-tools/trunk/qt-kde-team/1/debian-qt-kde.mk
   branches/kde4.2/packages/pkg-kde-tools/trunk/qt-kde-team/1/policy.mk
Log:
* Add stuff from svn pkg-kde/cdbs as qt-kde-team. Port kde.mk and rename
  - add README to discourage other developers from using qt-kde-team.

Modified: branches/kde4.2/packages/pkg-kde-tools/trunk/debian/changelog
===================================================================
--- branches/kde4.2/packages/pkg-kde-tools/trunk/debian/changelog	2009-01-24 23:36:19 UTC (rev 13515)
+++ branches/kde4.2/packages/pkg-kde-tools/trunk/debian/changelog	2009-01-24 23:46:21 UTC (rev 13516)
@@ -1,4 +1,4 @@
-pkg-kde-tools (0.4.0~pre4) UNRELEASED; urgency=low
+pkg-kde-tools (0.4.0~pre5) UNRELEASED; urgency=low
 
   * pkgkde-symbolshelper: add support for resorting symbol files (useful after
     manual editing).
@@ -9,14 +9,12 @@
     - add POD help and generate manual page from it;
     - add support for the external reference package.
   * Pass -X.svn to dh_install
-  * Add stuff from svn pkg-kde/cdbs as pkg-kde-build. Port kde.mk and rename
+  * Add stuff from svn pkg-kde/cdbs as qt-kde-team. Port kde.mk and rename
     it to debian-qt-kde.mk as it was called in kde3 when stored in cdbs/ dir.
     - use /usr/share/pkg-kde-tools/makefiles/1/variables.mk;
     - link with --as-needed by default;
     - remove lintian section, we should use dh_lintian;
-    - add versions.mk and control.mk too. The latter needs porting if it is
-      useful;
-    - add README to discourage other developers from using pkg-kde-build.
+    - add README to discourage other developers from using qt-kde-team.
   * Add makefiles/1/cdbs/symbolshelper.mk which hooks pkgkde-symbolshelper
     calls to cdbs.
   * Add "distro policy" checking when building the package:

Modified: branches/kde4.2/packages/pkg-kde-tools/trunk/debian/install
===================================================================
--- branches/kde4.2/packages/pkg-kde-tools/trunk/debian/install	2009-01-24 23:36:19 UTC (rev 13515)
+++ branches/kde4.2/packages/pkg-kde-tools/trunk/debian/install	2009-01-24 23:46:21 UTC (rev 13516)
@@ -1,2 +1,2 @@
 makefiles /usr/share/pkg-kde-tools/
-pkg-kde-build /usr/share/pkg-kde-tools/
+qt-kde-team /usr/share/pkg-kde-tools/

Modified: branches/kde4.2/packages/pkg-kde-tools/trunk/qt-kde-team/1/debian-qt-kde.mk
===================================================================
--- branches/kde4.2/packages/pkg-kde-tools/trunk/qt-kde-team/1/debian-qt-kde.mk	2009-01-24 23:36:19 UTC (rev 13515)
+++ branches/kde4.2/packages/pkg-kde-tools/trunk/qt-kde-team/1/debian-qt-kde.mk	2009-01-24 23:46:21 UTC (rev 13516)
@@ -1,3 +1,6 @@
+ifndef _cdbs_debian_qt_kde
+_cdbs_debian_qt_kde = 1
+
 include /usr/share/cdbs/1/class/cmake.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
@@ -3,14 +6,18 @@
 include /usr/share/cdbs/1/rules/utils.mk
 
+DEB_PKG_KDE_DATA := /usr/share/pkg-kde-tools
+DEB_PKG_KDE_MAKEFILES := $(DEB_PKG_KDE_DATA)/makefiles/1
+DEB_PKG_KDE_QT_KDE_TEAM := $(DEB_PKG_KDE_DATA)/qt-kde-team/1
+
 # DEB_KDE_DISABLE_POLICY_CHECK lists distributions for which
 # policy check should be disabled
 DEB_KDE_DISABLE_POLICY_CHECK ?=
-include /usr/share/pkg-kde-tools/pkg-kde-build/1/policy.mk
+include $(DEB_PKG_KDE_QT_KDE_TEAM)/policy.mk
 
 # Link with --as-needed by default
 DEB_KDE_LINK_WITH_AS_NEEDED ?= yes
 
 # Include default KDE 4 cmake configuration variables
-include /usr/share/pkg-kde-tools/makefiles/1/variables.mk
+include $(DEB_PKG_KDE_MAKEFILES)/variables.mk
 
 # Since cmake 2.6.2 or higher is required from now on, enable
@@ -78,3 +85,6 @@
 # Run dh_sameversiondep
 common-binary-predeb-arch common-binary-predeb-indep::
 	dh_sameversiondep $(if $(filter common-binary-predeb-arch,$@),-a,-i)
+
+# _cdbs_debian_qt_kde
+endif

Modified: branches/kde4.2/packages/pkg-kde-tools/trunk/qt-kde-team/1/policy.mk
===================================================================
--- branches/kde4.2/packages/pkg-kde-tools/trunk/qt-kde-team/1/policy.mk	2009-01-24 23:36:19 UTC (rev 13515)
+++ branches/kde4.2/packages/pkg-kde-tools/trunk/qt-kde-team/1/policy.mk	2009-01-24 23:46:21 UTC (rev 13516)
@@ -1,3 +1,6 @@
+# policy.mk must be included from debian_qt_kde.mk
+ifdef _cdbs_debian_qt_kde
+
 include /usr/share/cdbs/1/rules/buildvars.mk
 
 DEB_KDE_DISTRIBUTION := $(shell dpkg-parsechangelog | grep '^Distribution: ' | sed 's/^Distribution: \(.*\)/\1/g')
@@ -5,5 +8,7 @@
 
 # Policy file may not exist. It is fine
 ifeq (,$(filter $(DEB_KDE_DISTRIBUTION),$(DEB_KDE_DISABLE_POLICY_CHECK)))
-  -include /usr/share/pkg-kde-tools/pkg-kde-build/1/policy/$(DEB_KDE_DISTRIBUTION).mk
+  -include $(DEB_PKG_KDE_QT_KDE_TEAM)/policy/$(DEB_KDE_DISTRIBUTION).mk
 endif
+
+endif