rev 6251 - in trunk/packages/kdebindings/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2007-05-16 23:30:08 +0000 (Wed, 16 May 2007)
New Revision: 6251

Added:
   trunk/packages/kdebindings/debian/patches/031_correct_-classpath_to_gcj_instead_of_CLASSPATH.diff
Removed:
   trunk/packages/kdebindings/debian/patches/030-koala-makefile-too-much-arguments.diff
   trunk/packages/kdebindings/debian/patches/kdebindings-3.5.6-build-against-python-before-2.5.diff
Modified:
   trunk/packages/kdebindings/debian/changelog
   trunk/packages/kdebindings/debian/patches/series
   trunk/packages/kdebindings/debian/rules
Log:
hopefully kdebindings3.5.7


Modified: trunk/packages/kdebindings/debian/changelog
===================================================================
--- trunk/packages/kdebindings/debian/changelog	2007-05-16 23:27:19 UTC (rev 6250)
+++ trunk/packages/kdebindings/debian/changelog	2007-05-16 23:30:08 UTC (rev 6251)
@@ -1,3 +1,17 @@
+kdebindings (4:3.5.7-1) unstable; urgency=low
+
+  +++ Changes by Sune Vuorela:
+
+  * New upstream release.
+  * Newer javah seems to not respect the CLASSPATH env var, but needs a
+    -classpath argument instead. Fixes FTBFS. (Closes: #421990)
+  * Improve clean target to actually clean up
+  * Remove patch to build against newer pythons. Applied upstream.
+  * Remove patch about number of arguments to make. It isn't needed now that
+    we build in sourcedir.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 16 May 2007 22:54:19 +0200
+
 kdebindings (4:3.5.6-2) unstable; urgency=low
 
   +++ Changes by Ana Beatriz Guerrero Lopez:

Deleted: trunk/packages/kdebindings/debian/patches/030-koala-makefile-too-much-arguments.diff

Added: trunk/packages/kdebindings/debian/patches/031_correct_-classpath_to_gcj_instead_of_CLASSPATH.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/031_correct_-classpath_to_gcj_instead_of_CLASSPATH.diff	                        (rev 0)
+++ trunk/packages/kdebindings/debian/patches/031_correct_-classpath_to_gcj_instead_of_CLASSPATH.diff	2007-05-16 23:30:08 UTC (rev 6251)
@@ -0,0 +1,11 @@
+--- kdebindings/dcopjava/binding/Makefile.am	2007-05-17 00:25:33.000000000 +0200
++++ kdebindings/dcopjava/binding/Makefile.am	2007-05-17 00:26:19.000000000 +0200
+@@ -12,7 +12,7 @@
+ 
+ org_kde_DCOP_Client.h:
+ 	$(MAKE) -C org
+-	CLASSPATH=.:$(srcdir) $(JAVAH) -jni org.kde.DCOP.Client
++	$(JAVAH)  -classpath .:$(srcdir) -jni org.kde.DCOP.Client
+ 
+ SUBDIRS = org
+ 

Deleted: trunk/packages/kdebindings/debian/patches/kdebindings-3.5.6-build-against-python-before-2.5.diff

Modified: trunk/packages/kdebindings/debian/patches/series
===================================================================
--- trunk/packages/kdebindings/debian/patches/series	2007-05-16 23:27:19 UTC (rev 6250)
+++ trunk/packages/kdebindings/debian/patches/series	2007-05-16 23:30:08 UTC (rev 6251)
@@ -1,4 +1,3 @@
-common/02_autotools_update.diff
 common/03_libtool_update.diff
 common/04_am_maintainer_mode.diff
 common/05_pedantic-errors.diff
@@ -18,6 +17,5 @@
 027-fix-dcopjava-deps.diff
 028-make-cmdline.js-executable.diff
 029-ruby1.8-not-just-ruby.diff
+031_correct_-classpath_to_gcj_instead_of_CLASSPATH.diff
 98_buildprep.diff
-030-koala-makefile-too-much-arguments.diff
-kdebindings-3.5.6-build-against-python-before-2.5.diff -p0

Modified: trunk/packages/kdebindings/debian/rules
===================================================================
--- trunk/packages/kdebindings/debian/rules	2007-05-16 23:27:19 UTC (rev 6250)
+++ trunk/packages/kdebindings/debian/rules	2007-05-16 23:30:08 UTC (rev 6251)
@@ -43,12 +43,22 @@
 	rm -f kjsembed/docs/embedding/simple-embed/Makefile
 	rm -f debian/stamp-install-dcopjava
 	-$(MAKE) -C dcopjava distclean
+	find . -name 'Makefile' -exec rm {} \;
 	# 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
+	rm -f dcopjava/binding/client.lo
+	rm -f dcopjava/binding/libjavadcop.la
+	rm -f dcopjava/binding/org_kde_DCOP_Client.h
+	rm -f dcopjava/dcopidl2java/dcopidl2java.all_cpp.cpp
+	rm -f smoke/kde/qtdefines
+	rm -f smoke/kde/smokedata.cpp.diff
+	rm -f smoke/qt/qtdefines
+	rm -f smoke/qt/smokedata.cpp.diff
 
+
 common-build-indep:: stamp-build-dcopjava
 stamp-build-dcopjava:
 ifndef WITHOUT_JAVA