[Pkg-kde-commits] rev 1559 - branches/kde-3.4.0/cdbs

[Adeodato Simó]

Author: adeodato
Date: 2005-08-24 13:48:31 +0000 (Wed, 24 Aug 2005)
New Revision: 1559

Modified:
   branches/kde-3.4.0/cdbs/debian-qt-kde.mk
   branches/kde-3.4.0/cdbs/versions.pl
Log:
debian/package.substvars is cleaner than DEB_DH_GENCONTROL_ARGS.


Modified: branches/kde-3.4.0/cdbs/debian-qt-kde.mk
===================================================================
--- branches/kde-3.4.0/cdbs/debian-qt-kde.mk	2005-08-24 13:39:06 UTC (rev 1558)
+++ branches/kde-3.4.0/cdbs/debian-qt-kde.mk	2005-08-24 13:48:31 UTC (rev 1559)
@@ -25,8 +25,6 @@
 DEB_DH_MAKESHLIBS_ARGS_ALL := -V
 DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
 
-DEB_DH_GENCONTROL_ARGS := $(shell perl debian/cdbs/versions.pl)
-
 common-build-arch:: debian/stamp-man-pages
 debian/stamp-man-pages:
 	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
@@ -39,6 +37,13 @@
 	done
 	touch debian/stamp-man-pages
 
+common-binary-arch::
+	perl debian/cdbs/versions.pl >debian/versions.tmp
+	for p in $(DEB_ALL_PACKAGES); do \
+	    cat debian/versions.tmp >>debian/$$p.substvars; \
+	done
+	rm -f debian/versions.tmp
+
 clean::
 	rm -rf debian/man/out
 	-rmdir debian/man

Modified: branches/kde-3.4.0/cdbs/versions.pl
===================================================================
--- branches/kde-3.4.0/cdbs/versions.pl	2005-08-24 13:39:06 UTC (rev 1558)
+++ branches/kde-3.4.0/cdbs/versions.pl	2005-08-24 13:48:31 UTC (rev 1559)
@@ -13,6 +13,7 @@
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)$/($1+1)/e;
 ($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
 
-print "-- ";
-print "-VKDE-Version3=$version3 -VKDE-Next-Version3=$version3_next ";
-print "-VKDE-Version2=$version2 -VKDE-Next-Version2=$version2_next ";
+print "KDE-Version3=$version3\n";
+print "KDE-Version2=$version2\n";
+print "KDE-Next-Version3=$version3_next\n";
+print "KDE-Next-Version2=$version2_next\n";