rev 4098 - trunk/packages/kdebindings/debian/patches

Pierre Habouzit madcoder at costa.debian.org
Tue Jul 11 01:00:09 UTC 2006 

Author: madcoder
Date: 2006-07-11 01:00:05 +0000 (Tue, 11 Jul 2006)
New Revision: 4098

Modified:
   trunk/packages/kdebindings/debian/patches/011-kdejava_koala_org_kde_koala_Makefile.am-encoding.diff
   trunk/packages/kdebindings/debian/patches/012-dcoppython_lib_Makefile.am-sitepackages.diff
   trunk/packages/kdebindings/debian/patches/013-kdejava_qtjava_objdir_classpath.diff
   trunk/packages/kdebindings/debian/patches/014_kdejava_link_qtjava.la_not_-lqtjava.diff
   trunk/packages/kdebindings/debian/patches/017-install-jnilibs-in-lib-jni.diff
   trunk/packages/kdebindings/debian/patches/018-juic-uixsldir.diff
   trunk/packages/kdebindings/debian/patches/019-kdejava_koala_no-enable-final.diff
   trunk/packages/kdebindings/debian/patches/021-dont-install-example-kjsembed-plugins.diff
   trunk/packages/kdebindings/debian/patches/023-dont-install-jsaccess.diff
   trunk/packages/kdebindings/debian/patches/024-dont-install-javalib-test-program.diff
   trunk/packages/kdebindings/debian/patches/025-dont-install-koala-test-program.diff
   trunk/packages/kdebindings/debian/patches/026-install-qtruby-and-korundum-in-usr.diff
   trunk/packages/kdebindings/debian/patches/027-fix-dcopjava-deps.diff
   trunk/packages/kdebindings/debian/patches/028-make-cmdline.js-executable.diff
   trunk/packages/kdebindings/debian/patches/029-ruby1.8-not-just-ruby.diff
   trunk/packages/kdebindings/debian/patches/030-koala-makefile-too-much-arguments.diff
   trunk/packages/kdebindings/debian/patches/98_buildprep.diff
   trunk/packages/kdebindings/debian/patches/series
Log:
I messed up the patch regeneration, revert last commit and do it again

Modified: trunk/packages/kdebindings/debian/patches/011-kdejava_koala_org_kde_koala_Makefile.am-encoding.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/011-kdejava_koala_org_kde_koala_Makefile.am-encoding.diff	2006-07-11 00:53:33 UTC (rev 4097)
+++ trunk/packages/kdebindings/debian/patches/011-kdejava_koala_org_kde_koala_Makefile.am-encoding.diff	2006-07-11 01:00:05 UTC (rev 4098)
@@ -1,7 +1,5 @@
-Index: kdejava/koala/org/kde/koala/Makefile.am
-===================================================================
---- kdejava/koala/org/kde/koala/Makefile.am.orig
-+++ kdejava/koala/org/kde/koala/Makefile.am
+--- kdebindings/kdejava/koala/org/kde/koala/Makefile.am
++++ kdebindings/kdejava/koala/org/kde/koala/Makefile.am
 @@ -12,6 +12,6 @@
  
  JAVAROOT = ../../..

Modified: trunk/packages/kdebindings/debian/patches/012-dcoppython_lib_Makefile.am-sitepackages.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/012-dcoppython_lib_Makefile.am-sitepackages.diff	2006-07-11 00:53:33 UTC (rev 4097)
+++ trunk/packages/kdebindings/debian/patches/012-dcoppython_lib_Makefile.am-sitepackages.diff	2006-07-11 01:00:05 UTC (rev 4098)
@@ -1,7 +1,5 @@
-Index: dcoppython/lib/Makefile.am
-===================================================================
---- dcoppython/lib/Makefile.am.orig
-+++ dcoppython/lib/Makefile.am
+--- kdebindings/dcoppython/lib/Makefile.am
++++ kdebindings/dcoppython/lib/Makefile.am
 @@ -1,4 +1,4 @@
  
  pyt_DATA = pydcop.py 

Modified: trunk/packages/kdebindings/debian/patches/013-kdejava_qtjava_objdir_classpath.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/013-kdejava_qtjava_objdir_classpath.diff	2006-07-11 00:53:33 UTC (rev 4097)
+++ trunk/packages/kdebindings/debian/patches/013-kdejava_qtjava_objdir_classpath.diff	2006-07-11 01:00:05 UTC (rev 4098)
@@ -1,7 +1,5 @@
-Index: qtjava/javalib/org/kde/qt/Makefile.am
-===================================================================
---- qtjava/javalib/org/kde/qt/Makefile.am.orig
-+++ qtjava/javalib/org/kde/qt/Makefile.am
+--- 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
  
@@ -11,10 +9,8 @@
  JAVACFLAGS = -classpath $(CLASSPATH)
  # Prevent stupid automake from putting JAVAC=javac in Makefile.in
  JAVAC = @JAVAC@
-Index: kdejava/koala/org/kde/koala/Makefile.am
-===================================================================
---- kdejava/koala/org/kde/koala/Makefile.am.orig
-+++ kdejava/koala/org/kde/koala/Makefile.am
+--- 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
  

Modified: trunk/packages/kdebindings/debian/patches/014_kdejava_link_qtjava.la_not_-lqtjava.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/014_kdejava_link_qtjava.la_not_-lqtjava.diff	2006-07-11 00:53:33 UTC (rev 4097)
+++ trunk/packages/kdebindings/debian/patches/014_kdejava_link_qtjava.la_not_-lqtjava.diff	2006-07-11 01:00:05 UTC (rev 4098)
@@ -1,7 +1,5 @@
-Index: kdejava/koala/Makefile.am
-===================================================================
---- kdejava/koala/Makefile.am.orig
-+++ kdejava/koala/Makefile.am
+--- kdebindings/kdejava/koala/Makefile.am
++++ kdebindings/kdejava/koala/Makefile.am
 @@ -4,7 +4,7 @@
  ## INCLUDES were found outside kdevelop specific part
  

Modified: trunk/packages/kdebindings/debian/patches/017-install-jnilibs-in-lib-jni.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/017-install-jnilibs-in-lib-jni.diff	2006-07-11 00:53:33 UTC (rev 4097)
+++ trunk/packages/kdebindings/debian/patches/017-install-jnilibs-in-lib-jni.diff	2006-07-11 01:00:05 UTC (rev 4098)
@@ -1,7 +1,5 @@
-Index: kdejava/koala/kdejava/Makefile.am
-===================================================================
---- kdejava/koala/kdejava/Makefile.am.orig
-+++ kdejava/koala/kdejava/Makefile.am
+--- kdebindings/kdejava/koala/kdejava/Makefile.am
++++ kdebindings/kdejava/koala/kdejava/Makefile.am
 @@ -1,5 +1,6 @@
  ####### kdevelop will overwrite this part!!! (begin)##########
 -lib_LTLIBRARIES = libkdejava.la
@@ -10,10 +8,8 @@
  
  
  ## INCLUDES were found outside kdevelop specific part
-Index: qtjava/javalib/qtjava/Makefile.am
-===================================================================
---- qtjava/javalib/qtjava/Makefile.am.orig
-+++ qtjava/javalib/qtjava/Makefile.am
+--- kdebindings/qtjava/javalib/qtjava/Makefile.am
++++ kdebindings/qtjava/javalib/qtjava/Makefile.am
 @@ -1,5 +1,7 @@
  ####### kdevelop will overwrite this part!!! (begin)##########
 -lib_LTLIBRARIES = libqtjava.la libqtjavasupport.la

Modified: trunk/packages/kdebindings/debian/patches/018-juic-uixsldir.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/018-juic-uixsldir.diff	2006-07-11 00:53:33 UTC (rev 4097)
+++ trunk/packages/kdebindings/debian/patches/018-juic-uixsldir.diff	2006-07-11 01:00:05 UTC (rev 4098)
@@ -1,7 +1,5 @@
-Index: qtjava/designer/juic/bin/juic
-===================================================================
---- qtjava/designer/juic/bin/juic.orig
-+++ qtjava/designer/juic/bin/juic
+--- kdebindings/qtjava/designer/juic/bin/juic
++++ kdebindings/qtjava/designer/juic/bin/juic
 @@ -43,8 +43,7 @@
  #              common/
  #              java
@@ -11,4 +9,4 @@
 +UIXSLDIR=/usr/share/juic
  UIXSL=${UIXSLDIR}/juic.xsl
  
- ABSTRACT="true"
+ ABSTRACT=

Modified: trunk/packages/kdebindings/debian/patches/019-kdejava_koala_no-enable-final.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/019-kdejava_koala_no-enable-final.diff	2006-07-11 00:53:33 UTC (rev 4097)
+++ trunk/packages/kdebindings/debian/patches/019-kdejava_koala_no-enable-final.diff	2006-07-11 01:00:05 UTC (rev 4098)
@@ -1,8 +1,6 @@
-Index: kdejava/koala/kdejava/Makefile.am
-===================================================================
---- kdejava/koala/kdejava/Makefile.am.orig
-+++ kdejava/koala/kdejava/Makefile.am
-@@ -35,4 +35,4 @@
+--- kdebindings/kdejava/koala/kdejava/Makefile.am
++++ kdebindings/kdejava/koala/kdejava/Makefile.am
+@@ -34,4 +34,4 @@
  
  libkdejava_la_LIBADD = $(top_builddir)/qtjava/javalib/qtjava/libqtjavasupport.la -lkmdi $(LIB_KHTML) $(LIB_KSPELL) $(LIB_KIO)
  

Modified: trunk/packages/kdebindings/debian/patches/021-dont-install-example-kjsembed-plugins.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/021-dont-install-example-kjsembed-plugins.diff	2006-07-11 00:53:33 UTC (rev 4097)
+++ trunk/packages/kdebindings/debian/patches/021-dont-install-example-kjsembed-plugins.diff	2006-07-11 01:00:05 UTC (rev 4098)
@@ -1,7 +1,5 @@
-Index: kjsembed/plugins/Makefile.am
-===================================================================
---- kjsembed/plugins/Makefile.am.orig
-+++ kjsembed/plugins/Makefile.am
+--- kdebindings/kjsembed/plugins/Makefile.am
++++ kdebindings/kjsembed/plugins/Makefile.am
 @@ -1,8 +1,8 @@
  INCLUDES=  -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes)
  KDE_CXXFLAGS = -DQT_NO_ASCII_CAST -DQT_CLEAN_NAMESPACE

Modified: trunk/packages/kdebindings/debian/patches/023-dont-install-jsaccess.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/023-dont-install-jsaccess.diff	2006-07-11 00:53:33 UTC (rev 4097)
+++ trunk/packages/kdebindings/debian/patches/023-dont-install-jsaccess.diff	2006-07-11 01:00:05 UTC (rev 4098)
@@ -1,7 +1,5 @@
-Index: kjsembed/cpptests/jsaccess/Makefile.am
-===================================================================
---- kjsembed/cpptests/jsaccess/Makefile.am.orig
-+++ kjsembed/cpptests/jsaccess/Makefile.am
+--- kdebindings/kjsembed/cpptests/jsaccess/Makefile.am
++++ kdebindings/kjsembed/cpptests/jsaccess/Makefile.am
 @@ -5,7 +5,7 @@
  
  INCLUDES += -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST

Modified: trunk/packages/kdebindings/debian/patches/024-dont-install-javalib-test-program.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/024-dont-install-javalib-test-program.diff	2006-07-11 00:53:33 UTC (rev 4097)
+++ trunk/packages/kdebindings/debian/patches/024-dont-install-javalib-test-program.diff	2006-07-11 01:00:05 UTC (rev 4098)
@@ -1,7 +1,5 @@
-Index: qtjava/javalib/Makefile.am
-===================================================================
---- qtjava/javalib/Makefile.am.orig
-+++ qtjava/javalib/Makefile.am
+--- kdebindings/qtjava/javalib/Makefile.am
++++ kdebindings/qtjava/javalib/Makefile.am
 @@ -1,5 +1,5 @@
  ####### kdevelop will overwrite this part!!! (begin)##########
 -bin_PROGRAMS = javalib

Modified: trunk/packages/kdebindings/debian/patches/025-dont-install-koala-test-program.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/025-dont-install-koala-test-program.diff	2006-07-11 00:53:33 UTC (rev 4097)
+++ trunk/packages/kdebindings/debian/patches/025-dont-install-koala-test-program.diff	2006-07-11 01:00:05 UTC (rev 4098)
@@ -1,7 +1,5 @@
-Index: kdejava/koala/Makefile.am
-===================================================================
---- kdejava/koala/Makefile.am.orig
-+++ kdejava/koala/Makefile.am
+--- kdebindings/kdejava/koala/Makefile.am
++++ kdebindings/kdejava/koala/Makefile.am
 @@ -1,5 +1,5 @@
  ####### kdevelop will overwrite this part!!! (begin)##########
 -bin_PROGRAMS = koala

Modified: trunk/packages/kdebindings/debian/patches/026-install-qtruby-and-korundum-in-usr.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/026-install-qtruby-and-korundum-in-usr.diff	2006-07-11 00:53:33 UTC (rev 4097)
+++ trunk/packages/kdebindings/debian/patches/026-install-qtruby-and-korundum-in-usr.diff	2006-07-11 01:00:05 UTC (rev 4098)
@@ -1,7 +1,5 @@
-Index: qtruby/rubylib/qtruby/configure.in.in
-===================================================================
---- qtruby/rubylib/qtruby/configure.in.in.orig
-+++ qtruby/rubylib/qtruby/configure.in.in
+--- kdebindings/qtruby/rubylib/qtruby/configure.in.in
++++ kdebindings/qtruby/rubylib/qtruby/configure.in.in
 @@ -7,12 +7,14 @@
    RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
    RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
@@ -17,10 +15,8 @@
    AC_SUBST(RUBY_LIBDIR)
    AC_SUBST(RUBY_LIBRUBYARG)
  fi
-Index: qtruby/rubylib/qtruby/Makefile.am
-===================================================================
---- qtruby/rubylib/qtruby/Makefile.am.orig
-+++ qtruby/rubylib/qtruby/Makefile.am
+--- kdebindings/qtruby/rubylib/qtruby/Makefile.am
++++ kdebindings/qtruby/rubylib/qtruby/Makefile.am
 @@ -6,7 +6,7 @@
  libqtrubyinternal_la_SOURCES = Qt.cpp handlers.cpp 
  libqtrubyinternal_la_METASOURCES = AUTO
@@ -29,29 +25,23 @@
 +rubylibdir = $(RUBY_ARCHDIR)
  rubylib_LTLIBRARIES = qtruby.la
  qtruby_la_SOURCES = 
- qtruby_la_LDFLAGS = -module $(all_libraries) -version-info 0:0:0
-Index: qtruby/rubylib/qtruby/lib/Makefile.am
-===================================================================
---- qtruby/rubylib/qtruby/lib/Makefile.am.orig
-+++ qtruby/rubylib/qtruby/lib/Makefile.am
+ qtruby_la_LDFLAGS = -module $(all_libraries) -version-info 0:0:0 -L$(top_srcdir)/smoke/qt/
+--- kdebindings/qtruby/rubylib/qtruby/lib/Makefile.am
++++ kdebindings/qtruby/rubylib/qtruby/lib/Makefile.am
 @@ -1,4 +1,4 @@
  SUBDIRS = Qt 
  
 -rubylibdir = $(RUBY_SITEDIR)
 +rubylibdir = $(RUBY_RUBYLIBDIR)
  rubylib_DATA = Qt.rb
-Index: qtruby/rubylib/qtruby/lib/Qt/Makefile.am
-===================================================================
---- qtruby/rubylib/qtruby/lib/Qt/Makefile.am.orig
-+++ qtruby/rubylib/qtruby/lib/Qt/Makefile.am
+--- kdebindings/qtruby/rubylib/qtruby/lib/Qt/Makefile.am
++++ kdebindings/qtruby/rubylib/qtruby/lib/Qt/Makefile.am
 @@ -1,2 +1,2 @@
 -qtrubylibdir = $(RUBY_SITEDIR)/Qt
 +qtrubylibdir = $(RUBY_RUBYLIBDIR)/Qt
  qtrubylib_DATA = qtruby.rb
-Index: qtruby/rubylib/designer/uilib/Makefile.am
-===================================================================
---- qtruby/rubylib/designer/uilib/Makefile.am.orig
-+++ qtruby/rubylib/designer/uilib/Makefile.am
+--- kdebindings/qtruby/rubylib/designer/uilib/Makefile.am
++++ kdebindings/qtruby/rubylib/designer/uilib/Makefile.am
 @@ -1,6 +1,6 @@
  INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtruby/rubylib/qtruby $(all_includes) -I$(RUBY_ARCHDIR)
  
@@ -60,10 +50,8 @@
  rubylib_LTLIBRARIES = qui.la
  qui_la_SOURCES = qui.cpp
  qui_la_LDFLAGS = -module -export-dynamic $(all_libraries) -version-info 0:0:0
-Index: korundum/rubylib/korundum/configure.in.in
-===================================================================
---- korundum/rubylib/korundum/configure.in.in.orig
-+++ korundum/rubylib/korundum/configure.in.in
+--- kdebindings/korundum/rubylib/korundum/configure.in.in
++++ kdebindings/korundum/rubylib/korundum/configure.in.in
 @@ -7,9 +7,11 @@
    RUBY_ARCHDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
    RUBY_SITEARCHDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
@@ -76,22 +64,18 @@
    AC_SUBST(RUBY_SITEDIR)
  fi
  
-Index: korundum/rubylib/korundum/Makefile.am
-===================================================================
---- korundum/rubylib/korundum/Makefile.am.orig
-+++ korundum/rubylib/korundum/Makefile.am
+--- kdebindings/korundum/rubylib/korundum/Makefile.am
++++ kdebindings/korundum/rubylib/korundum/Makefile.am
 @@ -1,6 +1,6 @@
  INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtruby/rubylib/qtruby $(all_includes) -I$(RUBY_ARCHDIR)
  
 -rubylibdir = $(RUBY_SITEARCHDIR)
 +rubylibdir = $(RUBY_ARCHDIR)
  rubylib_LTLIBRARIES = korundum.la
- korundum_la_LDFLAGS = -module $(all_libraries) -version-info 0:0:0
+ korundum_la_LDFLAGS = -module $(all_libraries) -version-info 0:0:0 -L$(top_srcdir)/smoke/kde/
  korundum_la_METASOURCES = AUTO
-Index: korundum/rubylib/korundum/lib/KDE/Makefile.am
-===================================================================
---- korundum/rubylib/korundum/lib/KDE/Makefile.am.orig
-+++ korundum/rubylib/korundum/lib/KDE/Makefile.am
+--- kdebindings/korundum/rubylib/korundum/lib/KDE/Makefile.am
++++ kdebindings/korundum/rubylib/korundum/lib/KDE/Makefile.am
 @@ -1,5 +1,5 @@
 -kderubylibdir = $(RUBY_SITEDIR)/KDE
 +kderubylibdir = $(RUBY_RUBYLIBDIR)/KDE

Modified: trunk/packages/kdebindings/debian/patches/027-fix-dcopjava-deps.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/027-fix-dcopjava-deps.diff	2006-07-11 00:53:33 UTC (rev 4097)
+++ trunk/packages/kdebindings/debian/patches/027-fix-dcopjava-deps.diff	2006-07-11 01:00:05 UTC (rev 4098)
@@ -1,7 +1,5 @@
-Index: dcopjava/binding/Makefile.am
-===================================================================
---- dcopjava/binding/Makefile.am.orig
-+++ dcopjava/binding/Makefile.am
+--- kdebindings/dcopjava/binding/Makefile.am
++++ kdebindings/dcopjava/binding/Makefile.am
 @@ -6,10 +6,13 @@
  
  INCLUDES = $(jni_includes) $(all_includes)

Modified: trunk/packages/kdebindings/debian/patches/028-make-cmdline.js-executable.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/028-make-cmdline.js-executable.diff	2006-07-11 00:53:33 UTC (rev 4097)
+++ trunk/packages/kdebindings/debian/patches/028-make-cmdline.js-executable.diff	2006-07-11 01:00:05 UTC (rev 4098)
@@ -1,7 +1,5 @@
-Index: kjsembed/stdlib/Makefile.am
-===================================================================
---- kjsembed/stdlib/Makefile.am.orig
-+++ kjsembed/stdlib/Makefile.am
+--- kdebindings/kjsembed/stdlib/Makefile.am
++++ kdebindings/kjsembed/stdlib/Makefile.am
 @@ -1,5 +1,5 @@
  # -*- makefile -*-
  

Modified: trunk/packages/kdebindings/debian/patches/029-ruby1.8-not-just-ruby.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/029-ruby1.8-not-just-ruby.diff	2006-07-11 00:53:33 UTC (rev 4097)
+++ trunk/packages/kdebindings/debian/patches/029-ruby1.8-not-just-ruby.diff	2006-07-11 01:00:05 UTC (rev 4098)
@@ -1,17 +1,13 @@
-Index: qtruby/bin/rbqtapi
-===================================================================
---- qtruby/bin/rbqtapi.orig
-+++ qtruby/bin/rbqtapi
+--- kdebindings/qtruby/bin/rbqtapi
++++ kdebindings/qtruby/bin/rbqtapi
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env ruby
 +#!/usr/bin/env ruby1.8
  
  # Note: this program is part of qtruby and makes use of its internal functions.
  #       You should not rely on those in your own programs.
-Index: qtruby/bin/rbqtsh
-===================================================================
---- qtruby/bin/rbqtsh.orig
-+++ qtruby/bin/rbqtsh
+--- kdebindings/qtruby/bin/rbqtsh
++++ kdebindings/qtruby/bin/rbqtsh
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env ruby
 +#!/usr/bin/env ruby1.8

Modified: trunk/packages/kdebindings/debian/patches/030-koala-makefile-too-much-arguments.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/030-koala-makefile-too-much-arguments.diff	2006-07-11 00:53:33 UTC (rev 4097)
+++ trunk/packages/kdebindings/debian/patches/030-koala-makefile-too-much-arguments.diff	2006-07-11 01:00:05 UTC (rev 4098)
@@ -1,8 +1,6 @@
-Index: kdejava/koala/org/kde/koala/Makefile.in
-===================================================================
---- kdejava/koala/org/kde/koala/Makefile.in.orig
-+++ kdejava/koala/org/kde/koala/Makefile.in
-@@ -713,8 +713,7 @@
+--- kdebindings/kdejava/koala/org/kde/koala/Makefile.in
++++ kdebindings/kdejava/koala/org/kde/koala/Makefile.in
+@@ -426,8 +426,7 @@
  uninstall-info-am:
  
  classnoinst.stamp: $(noinst_JAVA)
@@ -12,11 +10,9 @@
  	  $(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) \
  	    $(AM_JAVACFLAGS) $(JAVACFLAGS) $?; \
  	else :; fi
-Index: qtjava/javalib/org/kde/qt/Makefile.in
-===================================================================
---- qtjava/javalib/org/kde/qt/Makefile.in.orig
-+++ qtjava/javalib/org/kde/qt/Makefile.in
-@@ -576,8 +576,7 @@
+--- kdebindings/qtjava/javalib/org/kde/qt/Makefile.in
++++ kdebindings/qtjava/javalib/org/kde/qt/Makefile.in
+@@ -426,8 +426,7 @@
  uninstall-info-am:
  
  classnoinst.stamp: $(noinst_JAVA)

Modified: trunk/packages/kdebindings/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/98_buildprep.diff	2006-07-11 00:53:33 UTC (rev 4097)
+++ trunk/packages/kdebindings/debian/patches/98_buildprep.diff	2006-07-11 01:00:05 UTC (rev 4098)
@@ -1,8 +1,6 @@
 #DPATCHLEVEL=0
 # vi: ft=diff
-Index: acinclude.m4
-===================================================================
---- acinclude.m4.orig
+--- acinclude.m4
 +++ acinclude.m4
 @@ -1689,15 +1689,6 @@
         KDE_USE_CLOSURE_TRUE="#"
@@ -3836,9 +3834,7 @@
    cat /dev/null > conftest.in
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-Index: aclocal.m4
-===================================================================
---- aclocal.m4.orig
+--- aclocal.m4
 +++ aclocal.m4
 @@ -350,7 +350,7 @@
  # with or without modifications, as long as this notice is preserved.
@@ -3885,9 +3881,7 @@
  # Check to see how 'make' treats includes.	            -*- Autoconf -*-
  
  # Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-Index: config.h.in
-===================================================================
---- config.h.in.orig
+--- config.h.in
 +++ config.h.in
 @@ -120,22 +120,22 @@
  /* Define where your java executable is */
@@ -3918,9 +3912,7 @@
  #undef SIZEOF_UNSIGNED_LONG
  
  /* Define to 1 if you have the ANSI C header files. */
-Index: configure
-===================================================================
---- configure.orig
+--- configure
 +++ configure
 @@ -1,8 +1,9 @@
  #! /bin/sh
@@ -57664,9 +57656,7 @@
  
  { (exit 0); exit 0; }
  _ACEOF
-Index: configure.files
-===================================================================
---- configure.files.orig
+--- configure.files
 +++ configure.files
 @@ -1,5 +1,7 @@
  ./admin/configure.in.min
@@ -57676,9 +57666,7 @@
  ./dcopc/configure.in.in
  ./dcopjava/configure.in.in
  ./dcopperl/configure.in.in
-Index: configure.in
-===================================================================
---- configure.in.orig
+--- configure.in
 +++ configure.in
 @@ -42,6 +42,8 @@
  dnl Automake doc recommends to do this only here. (Janos)
@@ -57765,9 +57753,7 @@
    AC_SUBST(RUBY_LIBDIR)
    AC_SUBST(RUBY_LIBRUBYARG)
  fi
-Index: dcopc/Makefile.in
-===================================================================
---- dcopc/Makefile.in.orig
+--- dcopc/Makefile.in
 +++ dcopc/Makefile.in
 @@ -144,6 +144,7 @@
  GLINC = @GLINC@
@@ -57878,9 +57864,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-Index: dcopjava/binding/Makefile.in
-===================================================================
---- dcopjava/binding/Makefile.in.orig
+--- dcopjava/binding/Makefile.in
 +++ dcopjava/binding/Makefile.in
 @@ -155,6 +155,7 @@
  GLINC = @GLINC@
@@ -58008,9 +57992,7 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: dcopjava/binding/org/kde/DCOP/Makefile.in
-===================================================================
---- dcopjava/binding/org/kde/DCOP/Makefile.in.orig
+--- dcopjava/binding/org/kde/DCOP/Makefile.in
 +++ dcopjava/binding/org/kde/DCOP/Makefile.in
 @@ -112,6 +112,7 @@
  GLINC = @GLINC@
@@ -58121,9 +58103,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: dcopjava/binding/org/kde/Makefile.in
-===================================================================
---- dcopjava/binding/org/kde/Makefile.in.orig
+--- dcopjava/binding/org/kde/Makefile.in
 +++ dcopjava/binding/org/kde/Makefile.in
 @@ -118,6 +118,7 @@
  GLINC = @GLINC@
@@ -58234,9 +58214,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: dcopjava/binding/org/Makefile.in
-===================================================================
---- dcopjava/binding/org/Makefile.in.orig
+--- dcopjava/binding/org/Makefile.in
 +++ dcopjava/binding/org/Makefile.in
 @@ -118,6 +118,7 @@
  GLINC = @GLINC@
@@ -58347,9 +58325,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: dcopjava/dcopidl2java/Makefile.in
-===================================================================
---- dcopjava/dcopidl2java/Makefile.in.orig
+--- dcopjava/dcopidl2java/Makefile.in
 +++ dcopjava/dcopidl2java/Makefile.in
 @@ -144,6 +144,7 @@
  GLINC = @GLINC@
@@ -58460,9 +58436,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-Index: dcopjava/Makefile.in
-===================================================================
---- dcopjava/Makefile.in.orig
+--- dcopjava/Makefile.in
 +++ dcopjava/Makefile.in
 @@ -118,6 +118,7 @@
  GLINC = @GLINC@
@@ -58573,9 +58547,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: dcopjava/tests/Makefile.in
-===================================================================
---- dcopjava/tests/Makefile.in.orig
+--- dcopjava/tests/Makefile.in
 +++ dcopjava/tests/Makefile.in
 @@ -148,6 +148,7 @@
  GLINC = @GLINC@
@@ -58695,9 +58667,7 @@
  
  #>+ 4
  clean-idl:
-Index: dcoppython/lib/Makefile.in
-===================================================================
---- dcoppython/lib/Makefile.in.orig
+--- dcoppython/lib/Makefile.in
 +++ dcoppython/lib/Makefile.in
 @@ -112,6 +112,7 @@
  GLINC = @GLINC@
@@ -58815,9 +58785,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: dcoppython/Makefile.in
-===================================================================
---- dcoppython/Makefile.in.orig
+--- dcoppython/Makefile.in
 +++ dcoppython/Makefile.in
 @@ -118,6 +118,7 @@
  GLINC = @GLINC@
@@ -58928,9 +58896,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: dcoppython/shell/Makefile.in
-===================================================================
---- dcoppython/shell/Makefile.in.orig
+--- dcoppython/shell/Makefile.in
 +++ dcoppython/shell/Makefile.in
 @@ -147,6 +147,7 @@
  GLINC = @GLINC@
@@ -59041,9 +59007,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-pythlibLTLIBRARIES: $(pythlib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-Index: dcoppython/test/dcopserver/Makefile.in
-===================================================================
---- dcoppython/test/dcopserver/Makefile.in.orig
+--- dcoppython/test/dcopserver/Makefile.in
 +++ dcoppython/test/dcopserver/Makefile.in
 @@ -155,6 +155,7 @@
  GLINC = @GLINC@
@@ -59181,9 +59145,7 @@
  
  #>+ 15
  force-reedit:
-Index: dcoppython/test/Makefile.in
-===================================================================
---- dcoppython/test/Makefile.in.orig
+--- dcoppython/test/Makefile.in
 +++ dcoppython/test/Makefile.in
 @@ -102,6 +102,7 @@
  GLINC = @GLINC@
@@ -59303,9 +59265,7 @@
  
  #>+ 2
  docs-am:
-Index: kdejava/koala/kdejava/Makefile.in
-===================================================================
---- kdejava/koala/kdejava/Makefile.in.orig
+--- kdejava/koala/kdejava/Makefile.in
 +++ kdejava/koala/kdejava/Makefile.in
 @@ -56,9 +56,9 @@
      *) f=$$p;; \
@@ -59614,9 +59574,7 @@
  
  #>+ 3
  kde-rpo-clean:
-Index: kdejava/koala/Makefile.in
-===================================================================
---- kdejava/koala/Makefile.in.orig
+--- kdejava/koala/Makefile.in
 +++ kdejava/koala/Makefile.in
 @@ -39,7 +39,7 @@
  build_triplet = @build@
@@ -59866,9 +59824,7 @@
  
  
  koala.jar: org/kde/koala/classnoinst.stamp
-Index: kdejava/koala/org/kde/koala/Makefile.in
-===================================================================
---- kdejava/koala/org/kde/koala/Makefile.in.orig
+--- kdejava/koala/org/kde/koala/Makefile.in
 +++ kdejava/koala/org/kde/koala/Makefile.in
 @@ -105,6 +105,7 @@
  GLINC = @GLINC@
@@ -59988,9 +59944,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: kdejava/koala/org/kde/Makefile.in
-===================================================================
---- kdejava/koala/org/kde/Makefile.in.orig
+--- kdejava/koala/org/kde/Makefile.in
 +++ kdejava/koala/org/kde/Makefile.in
 @@ -120,6 +120,7 @@
  GLINC = @GLINC@
@@ -60101,9 +60055,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: kdejava/koala/org/Makefile.in
-===================================================================
---- kdejava/koala/org/Makefile.in.orig
+--- kdejava/koala/org/Makefile.in
 +++ kdejava/koala/org/Makefile.in
 @@ -120,6 +120,7 @@
  GLINC = @GLINC@
@@ -60214,9 +60166,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: kdejava/Makefile.in
-===================================================================
---- kdejava/Makefile.in.orig
+--- kdejava/Makefile.in
 +++ kdejava/Makefile.in
 @@ -121,6 +121,7 @@
  GLINC = @GLINC@
@@ -60327,9 +60277,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: kjsembed/bindings/Makefile.in
-===================================================================
---- kjsembed/bindings/Makefile.in.orig
+--- kjsembed/bindings/Makefile.in
 +++ kjsembed/bindings/Makefile.in
 @@ -147,6 +147,7 @@
  GLINC = @GLINC@
@@ -60479,9 +60427,7 @@
  	@echo 'creating libkjsembedbindings_la.all_cpp.cpp ...'; \
  	rm -f libkjsembedbindings_la.all_cpp.files libkjsembedbindings_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkjsembedbindings_la.all_cpp.final; \
-Index: kjsembed/builtins/Makefile.in
-===================================================================
---- kjsembed/builtins/Makefile.in.orig
+--- kjsembed/builtins/Makefile.in
 +++ kjsembed/builtins/Makefile.in
 @@ -143,6 +143,7 @@
  GLINC = @GLINC@
@@ -60592,9 +60538,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-Index: kjsembed/cpptests/jsaccess/Makefile.in
-===================================================================
---- kjsembed/cpptests/jsaccess/Makefile.in.orig
+--- kjsembed/cpptests/jsaccess/Makefile.in
 +++ kjsembed/cpptests/jsaccess/Makefile.in
 @@ -40,7 +40,7 @@
  build_triplet = @build@
@@ -60813,9 +60757,7 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: kjsembed/cpptests/Makefile.in
-===================================================================
---- kjsembed/cpptests/Makefile.in.orig
+--- kjsembed/cpptests/Makefile.in
 +++ kjsembed/cpptests/Makefile.in
 @@ -118,6 +118,7 @@
  GLINC = @GLINC@
@@ -60926,9 +60868,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: kjsembed/docs/embedding/Makefile.in
-===================================================================
---- kjsembed/docs/embedding/Makefile.in.orig
+--- kjsembed/docs/embedding/Makefile.in
 +++ kjsembed/docs/embedding/Makefile.in
 @@ -118,6 +118,7 @@
  GLINC = @GLINC@
@@ -61039,9 +60979,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: kjsembed/docs/embedding/simple-embed/Makefile.in
-===================================================================
---- kjsembed/docs/embedding/simple-embed/Makefile.in.orig
+--- kjsembed/docs/embedding/simple-embed/Makefile.in
 +++ kjsembed/docs/embedding/simple-embed/Makefile.in
 @@ -154,6 +154,7 @@
  GLINC = @GLINC@
@@ -61152,9 +61090,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-Index: kjsembed/docs/Makefile.in
-===================================================================
---- kjsembed/docs/Makefile.in.orig
+--- kjsembed/docs/Makefile.in
 +++ kjsembed/docs/Makefile.in
 @@ -119,6 +119,7 @@
  GLINC = @GLINC@
@@ -61265,9 +61201,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: kjsembed/kscript/Makefile.in
-===================================================================
---- kjsembed/kscript/Makefile.in.orig
+--- kjsembed/kscript/Makefile.in
 +++ kjsembed/kscript/Makefile.in
 @@ -149,6 +149,7 @@
  GLINC = @GLINC@
@@ -61378,9 +61312,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-Index: kjsembed/Makefile.in
-===================================================================
---- kjsembed/Makefile.in.orig
+--- kjsembed/Makefile.in
 +++ kjsembed/Makefile.in
 @@ -203,6 +203,7 @@
  GLINC = @GLINC@
@@ -61491,9 +61423,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-Index: kjsembed/plugin/Makefile.in
-===================================================================
---- kjsembed/plugin/Makefile.in.orig
+--- kjsembed/plugin/Makefile.in
 +++ kjsembed/plugin/Makefile.in
 @@ -144,6 +144,7 @@
  GLINC = @GLINC@
@@ -61604,9 +61534,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-Index: kjsembed/plugins/Makefile.in
-===================================================================
---- kjsembed/plugins/Makefile.in.orig
+--- kjsembed/plugins/Makefile.in
 +++ kjsembed/plugins/Makefile.in
 @@ -58,7 +58,7 @@
  am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
@@ -61822,9 +61750,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-compile \
  	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
  	tags uninstall uninstall-am uninstall-info-am \
-Index: kjsembed/qtbindings/Makefile.in
-===================================================================
---- kjsembed/qtbindings/Makefile.in.orig
+--- kjsembed/qtbindings/Makefile.in
 +++ kjsembed/qtbindings/Makefile.in
 @@ -154,6 +154,7 @@
  GLINC = @GLINC@
@@ -61935,9 +61861,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-Index: kjsembed/stdlib/Makefile.in
-===================================================================
---- kjsembed/stdlib/Makefile.in.orig
+--- kjsembed/stdlib/Makefile.in
 +++ kjsembed/stdlib/Makefile.in
 @@ -50,17 +50,11 @@
  mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
@@ -62160,9 +62084,7 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: korundum/bin/Makefile.in
-===================================================================
---- korundum/bin/Makefile.in.orig
+--- korundum/bin/Makefile.in
 +++ korundum/bin/Makefile.in
 @@ -138,6 +138,7 @@
  GLINC = @GLINC@
@@ -62273,9 +62195,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-Index: korundum/Makefile.in
-===================================================================
---- korundum/Makefile.in.orig
+--- korundum/Makefile.in
 +++ korundum/Makefile.in
 @@ -119,6 +119,7 @@
  GLINC = @GLINC@
@@ -62386,9 +62306,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: korundum/rubylib/korundum/lib/KDE/Makefile.in
-===================================================================
---- korundum/rubylib/korundum/lib/KDE/Makefile.in.orig
+--- korundum/rubylib/korundum/lib/KDE/Makefile.in
 +++ korundum/rubylib/korundum/lib/KDE/Makefile.in
 @@ -114,6 +114,7 @@
  GLINC = @GLINC@
@@ -62510,9 +62428,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: korundum/rubylib/korundum/lib/Makefile.in
-===================================================================
---- korundum/rubylib/korundum/lib/Makefile.in.orig
+--- korundum/rubylib/korundum/lib/Makefile.in
 +++ korundum/rubylib/korundum/lib/Makefile.in
 @@ -118,6 +118,7 @@
  GLINC = @GLINC@
@@ -62623,9 +62539,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: korundum/rubylib/korundum/Makefile.in
-===================================================================
---- korundum/rubylib/korundum/Makefile.in.orig
+--- korundum/rubylib/korundum/Makefile.in
 +++ korundum/rubylib/korundum/Makefile.in
 @@ -158,6 +158,7 @@
  GLINC = @GLINC@
@@ -62745,9 +62659,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-rubylibLTLIBRARIES: $(rubylib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-Index: korundum/rubylib/Makefile.in
-===================================================================
---- korundum/rubylib/Makefile.in.orig
+--- korundum/rubylib/Makefile.in
 +++ korundum/rubylib/Makefile.in
 @@ -118,6 +118,7 @@
  GLINC = @GLINC@
@@ -62858,9 +62770,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: korundum/rubylib/rbkconfig_compiler/Makefile.in
-===================================================================
---- korundum/rubylib/rbkconfig_compiler/Makefile.in.orig
+--- korundum/rubylib/rbkconfig_compiler/Makefile.in
 +++ korundum/rubylib/rbkconfig_compiler/Makefile.in
 @@ -150,6 +150,7 @@
  GLINC = @GLINC@
@@ -62971,9 +62881,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-Index: korundum/rubylib/rbkconfig_compiler/tests/Makefile.in
-===================================================================
---- korundum/rubylib/rbkconfig_compiler/tests/Makefile.in.orig
+--- korundum/rubylib/rbkconfig_compiler/tests/Makefile.in
 +++ korundum/rubylib/rbkconfig_compiler/tests/Makefile.in
 @@ -141,6 +141,7 @@
  GLINC = @GLINC@
@@ -63084,9 +62992,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-checkPROGRAMS:
-Index: Makefile.in
-===================================================================
---- Makefile.in.orig
+--- Makefile.in
 +++ Makefile.in
 @@ -148,6 +148,7 @@
  GLINC = @GLINC@
@@ -63218,9 +63124,7 @@
  
  #>+ 2
  docs-am:
-Index: python/Makefile.in
-===================================================================
---- python/Makefile.in.orig
+--- python/Makefile.in
 +++ python/Makefile.in
 @@ -108,6 +108,7 @@
  GLINC = @GLINC@
@@ -63331,9 +63235,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: qtjava/javalib/docs/en/Makefile.in
-===================================================================
---- qtjava/javalib/docs/en/Makefile.in.orig
+--- qtjava/javalib/docs/en/Makefile.in
 +++ qtjava/javalib/docs/en/Makefile.in
 @@ -104,6 +104,7 @@
  GLINC = @GLINC@
@@ -63444,9 +63346,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: qtjava/javalib/docs/Makefile.in
-===================================================================
---- qtjava/javalib/docs/Makefile.in.orig
+--- qtjava/javalib/docs/Makefile.in
 +++ qtjava/javalib/docs/Makefile.in
 @@ -120,6 +120,7 @@
  GLINC = @GLINC@
@@ -63557,9 +63457,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: qtjava/javalib/Makefile.in
-===================================================================
---- qtjava/javalib/Makefile.in.orig
+--- qtjava/javalib/Makefile.in
 +++ qtjava/javalib/Makefile.in
 @@ -39,7 +39,7 @@
  build_triplet = @build@
@@ -63792,9 +63690,7 @@
  
  
  qtjava.jar: org/kde/qt/classnoinst.stamp
-Index: qtjava/javalib/org/kde/Makefile.in
-===================================================================
---- qtjava/javalib/org/kde/Makefile.in.orig
+--- qtjava/javalib/org/kde/Makefile.in
 +++ qtjava/javalib/org/kde/Makefile.in
 @@ -118,6 +118,7 @@
  GLINC = @GLINC@
@@ -63905,9 +63801,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: qtjava/javalib/org/kde/qt/Makefile.in
-===================================================================
---- qtjava/javalib/org/kde/qt/Makefile.in.orig
+--- qtjava/javalib/org/kde/qt/Makefile.in
 +++ qtjava/javalib/org/kde/qt/Makefile.in
 @@ -105,6 +105,7 @@
  GLINC = @GLINC@
@@ -64026,9 +63920,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: qtjava/javalib/org/Makefile.in
-===================================================================
---- qtjava/javalib/org/Makefile.in.orig
+--- qtjava/javalib/org/Makefile.in
 +++ qtjava/javalib/org/Makefile.in
 @@ -118,6 +118,7 @@
  GLINC = @GLINC@
@@ -64139,9 +64031,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: qtjava/javalib/qtjava/Makefile.in
-===================================================================
---- qtjava/javalib/qtjava/Makefile.in.orig
+--- qtjava/javalib/qtjava/Makefile.in
 +++ qtjava/javalib/qtjava/Makefile.in
 @@ -56,9 +56,10 @@
      *) f=$$p;; \
@@ -64377,9 +64267,7 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: qtjava/Makefile.in
-===================================================================
---- qtjava/Makefile.in.orig
+--- qtjava/Makefile.in
 +++ qtjava/Makefile.in
 @@ -121,6 +121,7 @@
  GLINC = @GLINC@
@@ -64490,9 +64378,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: qtruby/bin/Makefile.in
-===================================================================
---- qtruby/bin/Makefile.in.orig
+--- qtruby/bin/Makefile.in
 +++ qtruby/bin/Makefile.in
 @@ -141,6 +141,7 @@
  GLINC = @GLINC@
@@ -64603,9 +64489,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-Index: qtruby/Makefile.in
-===================================================================
---- qtruby/Makefile.in.orig
+--- qtruby/Makefile.in
 +++ qtruby/Makefile.in
 @@ -119,6 +119,7 @@
  GLINC = @GLINC@
@@ -64716,9 +64600,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: qtruby/rubylib/designer/Makefile.in
-===================================================================
---- qtruby/rubylib/designer/Makefile.in.orig
+--- qtruby/rubylib/designer/Makefile.in
 +++ qtruby/rubylib/designer/Makefile.in
 @@ -118,6 +118,7 @@
  GLINC = @GLINC@
@@ -64829,9 +64711,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: qtruby/rubylib/designer/rbuic/Makefile.in
-===================================================================
---- qtruby/rubylib/designer/rbuic/Makefile.in.orig
+--- qtruby/rubylib/designer/rbuic/Makefile.in
 +++ qtruby/rubylib/designer/rbuic/Makefile.in
 @@ -148,6 +148,7 @@
  GLINC = @GLINC@
@@ -64942,9 +64822,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-Index: qtruby/rubylib/designer/uilib/Makefile.in
-===================================================================
---- qtruby/rubylib/designer/uilib/Makefile.in.orig
+--- qtruby/rubylib/designer/uilib/Makefile.in
 +++ qtruby/rubylib/designer/uilib/Makefile.in
 @@ -140,6 +140,7 @@
  GLINC = @GLINC@
@@ -65064,9 +64942,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-rubylibLTLIBRARIES: $(rubylib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-Index: qtruby/rubylib/Makefile.in
-===================================================================
---- qtruby/rubylib/Makefile.in.orig
+--- qtruby/rubylib/Makefile.in
 +++ qtruby/rubylib/Makefile.in
 @@ -118,6 +118,7 @@
  GLINC = @GLINC@
@@ -65177,9 +65053,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: qtruby/rubylib/qtruby/lib/Makefile.in
-===================================================================
---- qtruby/rubylib/qtruby/lib/Makefile.in.orig
+--- qtruby/rubylib/qtruby/lib/Makefile.in
 +++ qtruby/rubylib/qtruby/lib/Makefile.in
 @@ -128,6 +128,7 @@
  GLINC = @GLINC@
@@ -65298,9 +65172,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: qtruby/rubylib/qtruby/lib/Qt/Makefile.in
-===================================================================
---- qtruby/rubylib/qtruby/lib/Qt/Makefile.in.orig
+--- qtruby/rubylib/qtruby/lib/Qt/Makefile.in
 +++ qtruby/rubylib/qtruby/lib/Qt/Makefile.in
 @@ -112,6 +112,7 @@
  GLINC = @GLINC@
@@ -65419,9 +65291,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: qtruby/rubylib/qtruby/Makefile.in
-===================================================================
---- qtruby/rubylib/qtruby/Makefile.in.orig
+--- qtruby/rubylib/qtruby/Makefile.in
 +++ qtruby/rubylib/qtruby/Makefile.in
 @@ -175,6 +175,7 @@
  GLINC = @GLINC@
@@ -65541,9 +65411,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-Index: qtsharp/Makefile.in
-===================================================================
---- qtsharp/Makefile.in.orig
+--- qtsharp/Makefile.in
 +++ qtsharp/Makefile.in
 @@ -119,6 +119,7 @@
  GLINC = @GLINC@
@@ -65654,9 +65522,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: qtsharp/src/bindings/Makefile.in
-===================================================================
---- qtsharp/src/bindings/Makefile.in.orig
+--- qtsharp/src/bindings/Makefile.in
 +++ qtsharp/src/bindings/Makefile.in
 @@ -102,6 +102,7 @@
  GLINC = @GLINC@
@@ -65767,9 +65633,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: qtsharp/src/examples/Makefile.in
-===================================================================
---- qtsharp/src/examples/Makefile.in.orig
+--- qtsharp/src/examples/Makefile.in
 +++ qtsharp/src/examples/Makefile.in
 @@ -118,6 +118,7 @@
  GLINC = @GLINC@
@@ -65880,9 +65744,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: qtsharp/src/examples/samples/Makefile.in
-===================================================================
---- qtsharp/src/examples/samples/Makefile.in.orig
+--- qtsharp/src/examples/samples/Makefile.in
 +++ qtsharp/src/examples/samples/Makefile.in
 @@ -102,6 +102,7 @@
  GLINC = @GLINC@
@@ -65993,9 +65855,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: qtsharp/src/examples/tutorials/Makefile.in
-===================================================================
---- qtsharp/src/examples/tutorials/Makefile.in.orig
+--- qtsharp/src/examples/tutorials/Makefile.in
 +++ qtsharp/src/examples/tutorials/Makefile.in
 @@ -102,6 +102,7 @@
  GLINC = @GLINC@
@@ -66106,9 +65966,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: qtsharp/src/generator/Makefile.in
-===================================================================
---- qtsharp/src/generator/Makefile.in.orig
+--- qtsharp/src/generator/Makefile.in
 +++ qtsharp/src/generator/Makefile.in
 @@ -102,6 +102,7 @@
  GLINC = @GLINC@
@@ -66219,9 +66077,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: qtsharp/src/libqtsharp/Makefile.in
-===================================================================
---- qtsharp/src/libqtsharp/Makefile.in.orig
+--- qtsharp/src/libqtsharp/Makefile.in
 +++ qtsharp/src/libqtsharp/Makefile.in
 @@ -143,6 +143,7 @@
  GLINC = @GLINC@
@@ -66332,9 +66188,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-Index: qtsharp/src/Makefile.in
-===================================================================
---- qtsharp/src/Makefile.in.orig
+--- qtsharp/src/Makefile.in
 +++ qtsharp/src/Makefile.in
 @@ -118,6 +118,7 @@
  GLINC = @GLINC@
@@ -66445,9 +66299,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: qtsharp/src/tests/Makefile.in
-===================================================================
---- qtsharp/src/tests/Makefile.in.orig
+--- qtsharp/src/tests/Makefile.in
 +++ qtsharp/src/tests/Makefile.in
 @@ -102,6 +102,7 @@
  GLINC = @GLINC@
@@ -66558,9 +66410,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: qtsharp/src/uicsharp/Makefile.in
-===================================================================
---- qtsharp/src/uicsharp/Makefile.in.orig
+--- qtsharp/src/uicsharp/Makefile.in
 +++ qtsharp/src/uicsharp/Makefile.in
 @@ -102,6 +102,7 @@
  GLINC = @GLINC@
@@ -66671,9 +66521,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: smoke/kde/Makefile.in
-===================================================================
---- smoke/kde/Makefile.in.orig
+--- smoke/kde/Makefile.in
 +++ smoke/kde/Makefile.in
 @@ -148,6 +148,7 @@
  GLINC = @GLINC@
@@ -66784,9 +66632,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  qtguess.pl: $(top_builddir)/config.status $(srcdir)/qtguess.pl.in
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-Index: smoke/Makefile.in
-===================================================================
---- smoke/Makefile.in.orig
+--- smoke/Makefile.in
 +++ smoke/Makefile.in
 @@ -129,6 +129,7 @@
  GLINC = @GLINC@
@@ -66897,9 +66743,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: smoke/qt/Makefile.in
-===================================================================
---- smoke/qt/Makefile.in.orig
+--- smoke/qt/Makefile.in
 +++ smoke/qt/Makefile.in
 @@ -146,6 +146,7 @@
  GLINC = @GLINC@
@@ -67010,9 +66854,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  qtguess.pl: $(top_builddir)/config.status $(srcdir)/qtguess.pl.in
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-Index: xparts/Makefile.in
-===================================================================
---- xparts/Makefile.in.orig
+--- xparts/Makefile.in
 +++ xparts/Makefile.in
 @@ -119,6 +119,7 @@
  GLINC = @GLINC@
@@ -67123,9 +66965,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: xparts/mozilla/Makefile.in
-===================================================================
---- xparts/mozilla/Makefile.in.orig
+--- xparts/mozilla/Makefile.in
 +++ xparts/mozilla/Makefile.in
 @@ -168,6 +168,7 @@
  GLINC = @GLINC@
@@ -67236,9 +67076,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-Index: xparts/src/gtk/Makefile.in
-===================================================================
---- xparts/src/gtk/Makefile.in.orig
+--- xparts/src/gtk/Makefile.in
 +++ xparts/src/gtk/Makefile.in
 @@ -140,6 +140,7 @@
  GLINC = @GLINC@
@@ -67349,9 +67187,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-Index: xparts/src/interfaces/Makefile.in
-===================================================================
---- xparts/src/interfaces/Makefile.in.orig
+--- xparts/src/interfaces/Makefile.in
 +++ xparts/src/interfaces/Makefile.in
 @@ -115,6 +115,7 @@
  GLINC = @GLINC@
@@ -67462,9 +67298,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: xparts/src/kde/Makefile.in
-===================================================================
---- xparts/src/kde/Makefile.in.orig
+--- xparts/src/kde/Makefile.in
 +++ xparts/src/kde/Makefile.in
 @@ -144,6 +144,7 @@
  GLINC = @GLINC@
@@ -67575,9 +67409,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-Index: xparts/src/Makefile.in
-===================================================================
---- xparts/src/Makefile.in.orig
+--- xparts/src/Makefile.in
 +++ xparts/src/Makefile.in
 @@ -118,6 +118,7 @@
  GLINC = @GLINC@
@@ -67688,9 +67520,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-Index: xparts/xpart_notepad/Makefile.in
-===================================================================
---- xparts/xpart_notepad/Makefile.in.orig
+--- xparts/xpart_notepad/Makefile.in
 +++ xparts/xpart_notepad/Makefile.in
 @@ -164,6 +164,7 @@
  GLINC = @GLINC@

Modified: trunk/packages/kdebindings/debian/patches/series
===================================================================
--- trunk/packages/kdebindings/debian/patches/series	2006-07-11 00:53:33 UTC (rev 4097)
+++ trunk/packages/kdebindings/debian/patches/series	2006-07-11 01:00:05 UTC (rev 4098)
@@ -1,22 +1,22 @@
-common/02_autotools_update.diff -p0
-common/03_libtool_update.diff -p0
-common/04_am_maintainer_mode.diff -p0
-common/05_pedantic-errors.diff -p0
-common/06_disable_no_undefined.diff -p0
-011-kdejava_koala_org_kde_koala_Makefile.am-encoding.diff -p0
-012-dcoppython_lib_Makefile.am-sitepackages.diff -p0
-013-kdejava_qtjava_objdir_classpath.diff -p0
-014_kdejava_link_qtjava.la_not_-lqtjava.diff -p0
-017-install-jnilibs-in-lib-jni.diff -p0
-018-juic-uixsldir.diff -p0
-019-kdejava_koala_no-enable-final.diff -p0
-021-dont-install-example-kjsembed-plugins.diff -p0
-023-dont-install-jsaccess.diff -p0
-024-dont-install-javalib-test-program.diff -p0
-025-dont-install-koala-test-program.diff -p0
-026-install-qtruby-and-korundum-in-usr.diff -p0
-027-fix-dcopjava-deps.diff -p0
-028-make-cmdline.js-executable.diff -p0
-029-ruby1.8-not-just-ruby.diff -p0
-030-koala-makefile-too-much-arguments.diff -p0
+common/02_autotools_update.diff
+common/03_libtool_update.diff
+common/04_am_maintainer_mode.diff
+common/05_pedantic-errors.diff
+common/06_disable_no_undefined.diff
+011-kdejava_koala_org_kde_koala_Makefile.am-encoding.diff
+012-dcoppython_lib_Makefile.am-sitepackages.diff
+013-kdejava_qtjava_objdir_classpath.diff
+014_kdejava_link_qtjava.la_not_-lqtjava.diff
+017-install-jnilibs-in-lib-jni.diff
+018-juic-uixsldir.diff
+019-kdejava_koala_no-enable-final.diff
+021-dont-install-example-kjsembed-plugins.diff
+023-dont-install-jsaccess.diff
+024-dont-install-javalib-test-program.diff
+025-dont-install-koala-test-program.diff
+026-install-qtruby-and-korundum-in-usr.diff
+027-fix-dcopjava-deps.diff
+028-make-cmdline.js-executable.diff
+029-ruby1.8-not-just-ruby.diff
+030-koala-makefile-too-much-arguments.diff
 98_buildprep.diff -p0

More information about the pkg-kde-commits mailing list