rev 13501 - in branches/kde4.2/packages/pkg-kde-tools/trunk: debian makefiles/1/cdbs pkg-kde-build/1 pkg-kde-build/1/policy

[Modestas Vainius]

Author: modax-guest
Date: 2009-01-24 13:44:48 +0000 (Sat, 24 Jan 2009)
New Revision: 13501

Added:
   branches/kde4.2/packages/pkg-kde-tools/trunk/pkg-kde-build/1/policy.mk
   branches/kde4.2/packages/pkg-kde-tools/trunk/pkg-kde-build/1/policy/
   branches/kde4.2/packages/pkg-kde-tools/trunk/pkg-kde-build/1/policy/unstable.mk
Removed:
   branches/kde4.2/packages/pkg-kde-tools/trunk/makefiles/1/cdbs/kde4.mk
Modified:
   branches/kde4.2/packages/pkg-kde-tools/trunk/debian/changelog
   branches/kde4.2/packages/pkg-kde-tools/trunk/pkg-kde-build/1/kde4.mk
Log:
* Add "distro policy" checking when building the package:
  - THIS_SHOULD_GO_TO_UNSTABLE moved policy/unstable.mk
  - policy/unstable.mk also emits a warning when KDE alpha or betas are to
    be uploaded to unstable.

Modified: branches/kde4.2/packages/pkg-kde-tools/trunk/debian/changelog
===================================================================
--- branches/kde4.2/packages/pkg-kde-tools/trunk/debian/changelog	2009-01-24 13:06:21 UTC (rev 13500)
+++ branches/kde4.2/packages/pkg-kde-tools/trunk/debian/changelog	2009-01-24 13:44:48 UTC (rev 13501)
@@ -1,4 +1,4 @@
-pkg-kde-tools (0.4.0~pre3) UNRELEASED; urgency=low
+pkg-kde-tools (0.4.0~pre4) UNRELEASED; urgency=low
 
   * pkgkde-symbolshelper: add support for resorting symbol files (useful after
     manual editing).
@@ -19,10 +19,12 @@
     - add README to discourage other developers from using pkg-kde-build.
   * Add makefiles/1/cdbs/symbolshelper.mk which hooks pkgkde-symbolshelper
     calls to cdbs.
-  * Add makefiles/1/cdbs/kde4.mk symlink to makefiles/1/cdbs/kde.mk for
-    clarity.
+  * Add "distro policy" checking when building the package:
+    - THIS_SHOULD_GO_TO_UNSTABLE moved policy/unstable.mk
+    - policy/unstable.mk also emits a warning when KDE alpha or betas are to
+      be uploaded to unstable.
 
- -- Modestas Vainius <modestas at vainius.eu>  Sat, 24 Jan 2009 11:35:33 +0200
+ -- Modestas Vainius <modestas at vainius.eu>  Sat, 24 Jan 2009 15:42:10 +0200
 
 pkg-kde-tools (0.3.1) experimental; urgency=low
 

Deleted: branches/kde4.2/packages/pkg-kde-tools/trunk/makefiles/1/cdbs/kde4.mk

Modified: branches/kde4.2/packages/pkg-kde-tools/trunk/pkg-kde-build/1/kde4.mk
===================================================================
--- branches/kde4.2/packages/pkg-kde-tools/trunk/pkg-kde-build/1/kde4.mk	2009-01-24 13:06:21 UTC (rev 13500)
+++ branches/kde4.2/packages/pkg-kde-tools/trunk/pkg-kde-build/1/kde4.mk	2009-01-24 13:44:48 UTC (rev 13501)
@@ -3,6 +3,11 @@
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
+# 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
+
 # Link with --as-needed by default
 DEB_KDE_LINK_WITH_AS_NEEDED ?= yes
 
@@ -36,10 +41,6 @@
 	touch debian/stamp-man-pages
 
 clean::
-ifndef THIS_SHOULD_GO_TO_UNSTABLE
-	#guard against experimental uploads to unstable
-	dpkg-parsechangelog | grep ^Distribution | grep -q 'experimental\|UNRELEASED\|jaunty'
-endif
 	rm -rf debian/man/out
 	-rmdir debian/man
 	rm -f debian/stamp-man-pages

Added: branches/kde4.2/packages/pkg-kde-tools/trunk/pkg-kde-build/1/policy/unstable.mk
===================================================================
--- branches/kde4.2/packages/pkg-kde-tools/trunk/pkg-kde-build/1/policy/unstable.mk	                        (rev 0)
+++ branches/kde4.2/packages/pkg-kde-tools/trunk/pkg-kde-build/1/policy/unstable.mk	2009-01-24 13:44:48 UTC (rev 13501)
@@ -0,0 +1,26 @@
+upstream_version_check:
+ifeq (srcpkg_ok,$(patsubst kde%,srcpkg_ok,$(DEB_SOURCE_PACKAGE)))
+ifeq (version_ok,$(patsubst 4:4.%,version_ok,$(DEB_VERSION)))
+	@\
+  if dpkg --compare-versions "$(DEB_KDE_MAJOR_VERSION).60" le "$(DEB_UPSTREAM_VERSION)" && \
+     dpkg --compare-versions "$(DEB_UPSTREAM_VERSION)" lt "$(DEB_KDE_MAJOR_VERSION).90"; then \
+          echo >&2; \
+          echo "    ###" >&2; \
+          echo "    ### CAUTION: early KDE development releases (alpha or beta) ($(DEB_UPSTREAM_VERSION))" >&2; \
+          echo "    ###          should not be uploaded to unstable" >&2; \
+          echo "    ###" >&2; \
+          echo >&2; \
+  fi
+endif
+endif
+
+binary-indep binary-arch: upstream_version_check
+
+pre-build clean:: upstream_version_check
+# HACK. I could not think of anything less hardcoded to replace it.
+# It is temporal anyway.
+ifndef THIS_SHOULD_GO_TO_UNSTABLE
+	@echo "Unstable uploads should be allowed explicitly (set THIS_SHOULD_GO_TO_UNSTABLE)" && /bin/false >&2
+endif
+
+.PHONY: upstream_version_check

Added: branches/kde4.2/packages/pkg-kde-tools/trunk/pkg-kde-build/1/policy.mk
===================================================================
--- branches/kde4.2/packages/pkg-kde-tools/trunk/pkg-kde-build/1/policy.mk	                        (rev 0)
+++ branches/kde4.2/packages/pkg-kde-tools/trunk/pkg-kde-build/1/policy.mk	2009-01-24 13:44:48 UTC (rev 13501)
@@ -0,0 +1,9 @@
+include /usr/share/cdbs/1/rules/buildvars.mk
+
+DEB_KDE_DISTRIBUTION := $(shell dpkg-parsechangelog | grep '^Distribution: ' | sed 's/^Distribution: \(.*\)/\1/g')
+DEB_KDE_MAJOR_VERSION := $(shell echo "$(DEB_UPSTREAM_VERSION)" | cut -d. -f1-2)
+
+# 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
+endif