[Pkg-kde-commits] rev 2052 - in branches/kde-3.4.0/packages/kdebindings/debian: . patches

[Adeodato Simó]

Author: adeodato
Date: 2005-10-19 23:09:39 +0000 (Wed, 19 Oct 2005)
New Revision: 2052

Added:
   branches/kde-3.4.0/packages/kdebindings/debian/patches/013-kdejava_qtjava_objdir_classpath.diff
Modified:
   branches/kde-3.4.0/packages/kdebindings/debian/changelog
   branches/kde-3.4.0/packages/kdebindings/debian/patches/98_buildprep.diff
Log:
Added 013-kdejava_qtjava_objdir_classpath.diff to look for compiled
classes in the appropriate dir now that srcdir != builddir.

buildprep update.


Modified: branches/kde-3.4.0/packages/kdebindings/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdebindings/debian/changelog	2005-10-19 22:25:05 UTC (rev 2051)
+++ branches/kde-3.4.0/packages/kdebindings/debian/changelog	2005-10-19 23:09:39 UTC (rev 2052)
@@ -18,9 +18,14 @@
     Introduce a wilcard in the .install file, and don't pass a hardcoded path
     to ./configure.
 
-  * Further improve 030-koala-makefile-too-much-arguments.diff to do test -n
-    "$<" instead of "$?", to avoid new "Argument list too long" errors.
+  * Patch reworking:
 
+    - Further improve 030-koala-makefile-too-much-arguments.diff to do test -n
+      "$<" instead of "$?", to avoid new "Argument list too long" errors.
+
+    - Added 013-kdejava_qtjava_objdir_classpath.diff to look for compiled
+      classes in the appropriate dir now that srcdir != builddir.
+
   * Install python-dcop examples. (Closes: #303654)
 
   * CDBSized debian/rules, to match the rest of KDE packages.

Added: branches/kde-3.4.0/packages/kdebindings/debian/patches/013-kdejava_qtjava_objdir_classpath.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebindings/debian/patches/013-kdejava_qtjava_objdir_classpath.diff	2005-10-19 22:25:05 UTC (rev 2051)
+++ branches/kde-3.4.0/packages/kdebindings/debian/patches/013-kdejava_qtjava_objdir_classpath.diff	2005-10-19 23:09:39 UTC (rev 2052)
@@ -0,0 +1,22 @@
+--- kdebindings/qtjava/javalib/org/kde/qt/Makefile.am
++++ kdebindings/qtjava/javalib/org/kde/qt/Makefile.am
+@@ -11,7 +11,7 @@
+ #install-data-hook:	uninstall-javaJAVA
+ 
+ JAVAROOT = ../../..
+-CLASSPATH = $(srcdir)/../../..
++CLASSPATH = ../../..
+ JAVACFLAGS = -classpath $(CLASSPATH)
+ # Prevent stupid automake from putting JAVAC=javac in Makefile.in
+ JAVAC = @JAVAC@
+--- kdebindings/kdejava/koala/org/kde/koala/Makefile.am
++++ kdebindings/kdejava/koala/org/kde/koala/Makefile.am
+@@ -11,7 +11,7 @@
+ #install-data-hook:	uninstall-javaJAVA
+ 
+ JAVAROOT = ../../..
+-CLASSPATH = $(srcdir)/../../..:$(srcdir)/../../../../../qtjava/javalib/qtjava.jar:$(srcdir)
++CLASSPATH = ../../..:../../../../../qtjava/javalib/qtjava.jar:.
+ JAVACFLAGS = -classpath $(CLASSPATH) -encoding iso-8859-1
+ # Prevent stupid automake from putting JAVAC=javac in Makefile.in
+ JAVAC = @JAVAC@

Modified: branches/kde-3.4.0/packages/kdebindings/debian/patches/98_buildprep.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebindings/debian/patches/98_buildprep.diff	2005-10-19 22:25:05 UTC (rev 2051)
+++ branches/kde-3.4.0/packages/kdebindings/debian/patches/98_buildprep.diff	2005-10-19 23:09:39 UTC (rev 2052)
@@ -64,7 +64,7 @@
  
  #>+ 2
 -KDE_DIST=subdirs Makefile.in configure.in.bot configure.files config.h.in Makefile.am.in.wo kdebindings.lsm configure.in aclocal.m4 configure.in.in acinclude.m4 Makefile.am Makefile.am.in 
-+KDE_DIST=stamp-h.in subdirs Makefile.in configure.in.bot configure.files config.h.in Makefile.am.in.wo kdebindings.lsm configure.in aclocal.m4 configure.in.in configure Makefile.am acinclude.m4 Makefile.am.in 
++KDE_DIST=stamp-h.in subdirs Makefile.in configure.in.bot configure.files config.h.in 040-configure-give-kde_java_libgcjdir.diff Makefile.am.in.wo kdebindings.lsm configure.in aclocal.m4 configure.in.in acinclude.m4 configure Makefile.am 030-koala-makefile-too-much-arguments.diff Makefile.am.in 
  
  #>+ 2
  docs-am:
@@ -10597,11 +10597,13 @@
  RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
  RUBY_SITEDIR = @RUBY_SITEDIR@
  SET_MAKE = @SET_MAKE@
-@@ -649,13 +653,13 @@
+@@ -648,14 +652,14 @@
+ #javadir = $(kde_libraries)/java/org/kde/koala
  #install-data-hook:	uninstall-javaJAVA
  JAVAROOT = ../../..
- CLASSPATH = $(srcdir)/../../..:$(srcdir)/../../../../../qtjava/javalib/qtjava.jar:$(srcdir)
+-CLASSPATH = $(srcdir)/../../..:$(srcdir)/../../../../../qtjava/javalib/qtjava.jar:$(srcdir)
 -JAVACFLAGS = -classpath $(CLASSPATH)
++CLASSPATH = ../../..:../../../../../qtjava/javalib/qtjava.jar:.
 +JAVACFLAGS = -classpath $(CLASSPATH) -encoding iso-8859-1
  #>- all: all-am
  #>+ 1
@@ -12599,7 +12601,15 @@
  RUBY_SITEARCHDIR = @RUBY_SITEARCHDIR@
  RUBY_SITEDIR = @RUBY_SITEDIR@
  SET_MAKE = @SET_MAKE@
-@@ -518,7 +522,7 @@
+@@ -511,14 +515,14 @@
+ noinst_JAVA = $(EXTRA_DIST)
+ #install-data-hook:	uninstall-javaJAVA
+ JAVAROOT = ../../..
+-CLASSPATH = $(srcdir)/../../..
++CLASSPATH = ../../..
+ JAVACFLAGS = -classpath $(CLASSPATH)
+ #>- all: all-am
+ #>+ 1
  all: docs-am  all-am
  
  .SUFFIXES: