rev 5512 - trunk/packages/kdebindings/debian

[Ricardo Cardenes]

Author: rcardenes
Date: 2007-02-01 19:35:43 +0100 (Thu, 01 Feb 2007)
New Revision: 5512

Modified:
   trunk/packages/kdebindings/debian/changelog
   trunk/packages/kdebindings/debian/rules
Log:
Bump version number (new release)
Solves #406725 and #406726



Modified: trunk/packages/kdebindings/debian/changelog
===================================================================
--- trunk/packages/kdebindings/debian/changelog	2007-02-01 18:31:44 UTC (rev 5511)
+++ trunk/packages/kdebindings/debian/changelog	2007-02-01 18:35:43 UTC (rev 5512)
@@ -1,3 +1,17 @@
+kdebindings (4:3.5.6-1) unstable; urgency=low
+
+  [ Debian Qt/KDE Maintainers ]
+  * New upstream release
+
+  +++ Changes by Ricardo Cardenes:
+
+  * Clean-up the dcopjava directory. (Closes: #406725)
+  * Workaround at debian/rules the substitution of DEB_BUILDDIR
+    from /usr/share/cdbs/1/class/kde.mk which leads to ignoring
+    the existing config.status. (Closes: #406726)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu,  1 Feb 2007 18:26:59 +0000
+
 kdebindings (4:3.5.5-1) unstable; urgency=low
 
   [ Debian Qt/KDE Maintainers ]

Modified: trunk/packages/kdebindings/debian/rules
===================================================================
--- trunk/packages/kdebindings/debian/rules	2007-02-01 18:31:44 UTC (rev 5511)
+++ trunk/packages/kdebindings/debian/rules	2007-02-01 18:35:43 UTC (rev 5512)
@@ -3,12 +3,14 @@
 DEB_QUILT_PATCHDIR_LINK :=
 export QUILT_PATCHES=debian/patches
 
+
 include /usr/share/cdbs/1/rules/debhelper.mk
+override DEB_BUILDDIR := $(DEB_SRCDIR)
 include debian/cdbs/debian-qt-kde.mk
+DEB_BUILDDIR := $(DEB_SRCDIR)
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_BUILDDIR := $(DEB_SRCDIR)
 
 ###
 
@@ -40,13 +42,21 @@
 clean::
 	rm -f kjsembed/docs/embedding/simple-embed/Makefile
 	rm -f debian/stamp-install-dcopjava
+	-$(MAKE) -C dcopjava distclean
+	# Just in case
+	rm -f $(DEB_SRCDIR)/dcopjava/dcopidl2java/dcopidl2java
+	rm -f $(DEB_SRCDIR)/dcopjava/dcopidl2java/dcopidl2java.all_cpp.o
+	rm -f $(DEB_SRCDIR)/dcopjava/binding/org/kde/DCOP/*.class
+	rm -rf $(DEB_SRCDIR)/dcopjava/binding/.libs
 
-common-build-indep::
+common-build-indep:: stamp-build-dcopjava
+stamp-build-dcopjava:
 ifndef WITHOUT_JAVA
 	# build dcopjava even though it's disabled upstream.
 	cd $(DEB_BUILDDIR) && \
 	$(MAKE) -C dcopjava 
 endif
+	touch debian/$@
 
 stamp-install-dcopjava:
 ifndef WITHOUT_JAVA