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

Pierre Habouzit madcoder at costa.debian.org
Tue Jul 11 00:53:36 UTC 2006 

Author: madcoder
Date: 2006-07-11 00:53:33 +0000 (Tue, 11 Jul 2006)
New Revision: 4097

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:
refresh patches as some apply with fuzz.

while quilt push; do quilt refresh; done
quilt pop -a

:D



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:45:17 UTC (rev 4096)
+++ trunk/packages/kdebindings/debian/patches/011-kdejava_koala_org_kde_koala_Makefile.am-encoding.diff	2006-07-11 00:53:33 UTC (rev 4097)
@@ -1,5 +1,7 @@
---- kdebindings/kdejava/koala/org/kde/koala/Makefile.am
-+++ kdebindings/kdejava/koala/org/kde/koala/Makefile.am
+Index: kdejava/koala/org/kde/koala/Makefile.am
+===================================================================
+--- kdejava/koala/org/kde/koala/Makefile.am.orig
++++ 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:45:17 UTC (rev 4096)
+++ trunk/packages/kdebindings/debian/patches/012-dcoppython_lib_Makefile.am-sitepackages.diff	2006-07-11 00:53:33 UTC (rev 4097)
@@ -1,5 +1,7 @@
---- kdebindings/dcoppython/lib/Makefile.am
-+++ kdebindings/dcoppython/lib/Makefile.am
+Index: dcoppython/lib/Makefile.am
+===================================================================
+--- dcoppython/lib/Makefile.am.orig
++++ 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:45:17 UTC (rev 4096)
+++ trunk/packages/kdebindings/debian/patches/013-kdejava_qtjava_objdir_classpath.diff	2006-07-11 00:53:33 UTC (rev 4097)
@@ -1,5 +1,7 @@
---- kdebindings/qtjava/javalib/org/kde/qt/Makefile.am
-+++ kdebindings/qtjava/javalib/org/kde/qt/Makefile.am
+Index: qtjava/javalib/org/kde/qt/Makefile.am
+===================================================================
+--- qtjava/javalib/org/kde/qt/Makefile.am.orig
++++ qtjava/javalib/org/kde/qt/Makefile.am
 @@ -11,7 +11,7 @@
  #install-data-hook:	uninstall-javaJAVA
  
@@ -9,8 +11,10 @@
  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
+Index: kdejava/koala/org/kde/koala/Makefile.am
+===================================================================
+--- kdejava/koala/org/kde/koala/Makefile.am.orig
++++ 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:45:17 UTC (rev 4096)
+++ trunk/packages/kdebindings/debian/patches/014_kdejava_link_qtjava.la_not_-lqtjava.diff	2006-07-11 00:53:33 UTC (rev 4097)
@@ -1,5 +1,7 @@
---- kdebindings/kdejava/koala/Makefile.am
-+++ kdebindings/kdejava/koala/Makefile.am
+Index: kdejava/koala/Makefile.am
+===================================================================
+--- kdejava/koala/Makefile.am.orig
++++ 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:45:17 UTC (rev 4096)
+++ trunk/packages/kdebindings/debian/patches/017-install-jnilibs-in-lib-jni.diff	2006-07-11 00:53:33 UTC (rev 4097)
@@ -1,5 +1,7 @@
---- kdebindings/kdejava/koala/kdejava/Makefile.am
-+++ kdebindings/kdejava/koala/kdejava/Makefile.am
+Index: kdejava/koala/kdejava/Makefile.am
+===================================================================
+--- kdejava/koala/kdejava/Makefile.am.orig
++++ kdejava/koala/kdejava/Makefile.am
 @@ -1,5 +1,6 @@
  ####### kdevelop will overwrite this part!!! (begin)##########
 -lib_LTLIBRARIES = libkdejava.la
@@ -8,8 +10,10 @@
  
  
  ## INCLUDES were found outside kdevelop specific part
---- kdebindings/qtjava/javalib/qtjava/Makefile.am
-+++ kdebindings/qtjava/javalib/qtjava/Makefile.am
+Index: qtjava/javalib/qtjava/Makefile.am
+===================================================================
+--- qtjava/javalib/qtjava/Makefile.am.orig
++++ 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:45:17 UTC (rev 4096)
+++ trunk/packages/kdebindings/debian/patches/018-juic-uixsldir.diff	2006-07-11 00:53:33 UTC (rev 4097)
@@ -1,5 +1,7 @@
---- kdebindings/qtjava/designer/juic/bin/juic
-+++ kdebindings/qtjava/designer/juic/bin/juic
+Index: qtjava/designer/juic/bin/juic
+===================================================================
+--- qtjava/designer/juic/bin/juic.orig
++++ qtjava/designer/juic/bin/juic
 @@ -43,8 +43,7 @@
  #              common/
  #              java
@@ -9,4 +11,4 @@
 +UIXSLDIR=/usr/share/juic
  UIXSL=${UIXSLDIR}/juic.xsl
  
- ABSTRACT=
+ ABSTRACT="true"

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:45:17 UTC (rev 4096)
+++ trunk/packages/kdebindings/debian/patches/019-kdejava_koala_no-enable-final.diff	2006-07-11 00:53:33 UTC (rev 4097)
@@ -1,6 +1,8 @@
---- kdebindings/kdejava/koala/kdejava/Makefile.am
-+++ kdebindings/kdejava/koala/kdejava/Makefile.am
-@@ -34,4 +34,4 @@
+Index: kdejava/koala/kdejava/Makefile.am
+===================================================================
+--- kdejava/koala/kdejava/Makefile.am.orig
++++ kdejava/koala/kdejava/Makefile.am
+@@ -35,4 +35,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:45:17 UTC (rev 4096)
+++ trunk/packages/kdebindings/debian/patches/021-dont-install-example-kjsembed-plugins.diff	2006-07-11 00:53:33 UTC (rev 4097)
@@ -1,5 +1,7 @@
---- kdebindings/kjsembed/plugins/Makefile.am
-+++ kdebindings/kjsembed/plugins/Makefile.am
+Index: kjsembed/plugins/Makefile.am
+===================================================================
+--- kjsembed/plugins/Makefile.am.orig
++++ 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:45:17 UTC (rev 4096)
+++ trunk/packages/kdebindings/debian/patches/023-dont-install-jsaccess.diff	2006-07-11 00:53:33 UTC (rev 4097)
@@ -1,5 +1,7 @@
---- kdebindings/kjsembed/cpptests/jsaccess/Makefile.am
-+++ kdebindings/kjsembed/cpptests/jsaccess/Makefile.am
+Index: kjsembed/cpptests/jsaccess/Makefile.am
+===================================================================
+--- kjsembed/cpptests/jsaccess/Makefile.am.orig
++++ 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:45:17 UTC (rev 4096)
+++ trunk/packages/kdebindings/debian/patches/024-dont-install-javalib-test-program.diff	2006-07-11 00:53:33 UTC (rev 4097)
@@ -1,5 +1,7 @@
---- kdebindings/qtjava/javalib/Makefile.am
-+++ kdebindings/qtjava/javalib/Makefile.am
+Index: qtjava/javalib/Makefile.am
+===================================================================
+--- qtjava/javalib/Makefile.am.orig
++++ 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:45:17 UTC (rev 4096)
+++ trunk/packages/kdebindings/debian/patches/025-dont-install-koala-test-program.diff	2006-07-11 00:53:33 UTC (rev 4097)
@@ -1,5 +1,7 @@
---- kdebindings/kdejava/koala/Makefile.am
-+++ kdebindings/kdejava/koala/Makefile.am
+Index: kdejava/koala/Makefile.am
+===================================================================
+--- kdejava/koala/Makefile.am.orig
++++ 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:45:17 UTC (rev 4096)
+++ trunk/packages/kdebindings/debian/patches/026-install-qtruby-and-korundum-in-usr.diff	2006-07-11 00:53:33 UTC (rev 4097)
@@ -1,5 +1,7 @@
---- kdebindings/qtruby/rubylib/qtruby/configure.in.in
-+++ kdebindings/qtruby/rubylib/qtruby/configure.in.in
+Index: qtruby/rubylib/qtruby/configure.in.in
+===================================================================
+--- qtruby/rubylib/qtruby/configure.in.in.orig
++++ 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"@:>@)'`
@@ -15,8 +17,10 @@
    AC_SUBST(RUBY_LIBDIR)
    AC_SUBST(RUBY_LIBRUBYARG)
  fi
---- kdebindings/qtruby/rubylib/qtruby/Makefile.am
-+++ kdebindings/qtruby/rubylib/qtruby/Makefile.am
+Index: qtruby/rubylib/qtruby/Makefile.am
+===================================================================
+--- qtruby/rubylib/qtruby/Makefile.am.orig
++++ qtruby/rubylib/qtruby/Makefile.am
 @@ -6,7 +6,7 @@
  libqtrubyinternal_la_SOURCES = Qt.cpp handlers.cpp 
  libqtrubyinternal_la_METASOURCES = AUTO
@@ -25,23 +29,29 @@
 +rubylibdir = $(RUBY_ARCHDIR)
  rubylib_LTLIBRARIES = qtruby.la
  qtruby_la_SOURCES = 
- 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
+ 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
 @@ -1,4 +1,4 @@
  SUBDIRS = Qt 
  
 -rubylibdir = $(RUBY_SITEDIR)
 +rubylibdir = $(RUBY_RUBYLIBDIR)
  rubylib_DATA = Qt.rb
---- kdebindings/qtruby/rubylib/qtruby/lib/Qt/Makefile.am
-+++ kdebindings/qtruby/rubylib/qtruby/lib/Qt/Makefile.am
+Index: qtruby/rubylib/qtruby/lib/Qt/Makefile.am
+===================================================================
+--- qtruby/rubylib/qtruby/lib/Qt/Makefile.am.orig
++++ qtruby/rubylib/qtruby/lib/Qt/Makefile.am
 @@ -1,2 +1,2 @@
 -qtrubylibdir = $(RUBY_SITEDIR)/Qt
 +qtrubylibdir = $(RUBY_RUBYLIBDIR)/Qt
  qtrubylib_DATA = qtruby.rb
---- kdebindings/qtruby/rubylib/designer/uilib/Makefile.am
-+++ kdebindings/qtruby/rubylib/designer/uilib/Makefile.am
+Index: qtruby/rubylib/designer/uilib/Makefile.am
+===================================================================
+--- qtruby/rubylib/designer/uilib/Makefile.am.orig
++++ 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)
  
@@ -50,8 +60,10 @@
  rubylib_LTLIBRARIES = qui.la
  qui_la_SOURCES = qui.cpp
  qui_la_LDFLAGS = -module -export-dynamic $(all_libraries) -version-info 0:0:0
---- kdebindings/korundum/rubylib/korundum/configure.in.in
-+++ kdebindings/korundum/rubylib/korundum/configure.in.in
+Index: korundum/rubylib/korundum/configure.in.in
+===================================================================
+--- korundum/rubylib/korundum/configure.in.in.orig
++++ 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"@:>@)'`
@@ -64,18 +76,22 @@
    AC_SUBST(RUBY_SITEDIR)
  fi
  
---- kdebindings/korundum/rubylib/korundum/Makefile.am
-+++ kdebindings/korundum/rubylib/korundum/Makefile.am
+Index: korundum/rubylib/korundum/Makefile.am
+===================================================================
+--- korundum/rubylib/korundum/Makefile.am.orig
++++ 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 -L$(top_srcdir)/smoke/kde/
+ korundum_la_LDFLAGS = -module $(all_libraries) -version-info 0:0:0
  korundum_la_METASOURCES = AUTO
---- kdebindings/korundum/rubylib/korundum/lib/KDE/Makefile.am
-+++ kdebindings/korundum/rubylib/korundum/lib/KDE/Makefile.am
+Index: korundum/rubylib/korundum/lib/KDE/Makefile.am
+===================================================================
+--- korundum/rubylib/korundum/lib/KDE/Makefile.am.orig
++++ 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:45:17 UTC (rev 4096)
+++ trunk/packages/kdebindings/debian/patches/027-fix-dcopjava-deps.diff	2006-07-11 00:53:33 UTC (rev 4097)
@@ -1,5 +1,7 @@
---- kdebindings/dcopjava/binding/Makefile.am
-+++ kdebindings/dcopjava/binding/Makefile.am
+Index: dcopjava/binding/Makefile.am
+===================================================================
+--- dcopjava/binding/Makefile.am.orig
++++ 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:45:17 UTC (rev 4096)
+++ trunk/packages/kdebindings/debian/patches/028-make-cmdline.js-executable.diff	2006-07-11 00:53:33 UTC (rev 4097)
@@ -1,5 +1,7 @@
---- kdebindings/kjsembed/stdlib/Makefile.am
-+++ kdebindings/kjsembed/stdlib/Makefile.am
+Index: kjsembed/stdlib/Makefile.am
+===================================================================
+--- kjsembed/stdlib/Makefile.am.orig
++++ 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:45:17 UTC (rev 4096)
+++ trunk/packages/kdebindings/debian/patches/029-ruby1.8-not-just-ruby.diff	2006-07-11 00:53:33 UTC (rev 4097)
@@ -1,13 +1,17 @@
---- kdebindings/qtruby/bin/rbqtapi
-+++ kdebindings/qtruby/bin/rbqtapi
+Index: qtruby/bin/rbqtapi
+===================================================================
+--- qtruby/bin/rbqtapi.orig
++++ 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.
---- kdebindings/qtruby/bin/rbqtsh
-+++ kdebindings/qtruby/bin/rbqtsh
+Index: qtruby/bin/rbqtsh
+===================================================================
+--- qtruby/bin/rbqtsh.orig
++++ 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:45:17 UTC (rev 4096)
+++ trunk/packages/kdebindings/debian/patches/030-koala-makefile-too-much-arguments.diff	2006-07-11 00:53:33 UTC (rev 4097)
@@ -1,6 +1,8 @@
---- kdebindings/kdejava/koala/org/kde/koala/Makefile.in
-+++ kdebindings/kdejava/koala/org/kde/koala/Makefile.in
-@@ -426,8 +426,7 @@
+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 @@
  uninstall-info-am:
  
  classnoinst.stamp: $(noinst_JAVA)
@@ -10,9 +12,11 @@
  	  $(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) \
  	    $(AM_JAVACFLAGS) $(JAVACFLAGS) $?; \
  	else :; fi
---- kdebindings/qtjava/javalib/org/kde/qt/Makefile.in
-+++ kdebindings/qtjava/javalib/org/kde/qt/Makefile.in
-@@ -426,8 +426,7 @@
+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 @@
  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:45:17 UTC (rev 4096)
+++ trunk/packages/kdebindings/debian/patches/98_buildprep.diff	2006-07-11 00:53:33 UTC (rev 4097)
@@ -1,6 +1,8 @@
 #DPATCHLEVEL=0
 # vi: ft=diff
---- acinclude.m4
+Index: acinclude.m4
+===================================================================
+--- acinclude.m4.orig
 +++ acinclude.m4
 @@ -1689,15 +1689,6 @@
         KDE_USE_CLOSURE_TRUE="#"
@@ -3834,7 +3836,9 @@
    cat /dev/null > conftest.in
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
---- aclocal.m4
+Index: aclocal.m4
+===================================================================
+--- aclocal.m4.orig
 +++ aclocal.m4
 @@ -350,7 +350,7 @@
  # with or without modifications, as long as this notice is preserved.
@@ -3881,7 +3885,9 @@
  # Check to see how 'make' treats includes.	            -*- Autoconf -*-
  
  # Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
---- config.h.in
+Index: config.h.in
+===================================================================
+--- config.h.in.orig
 +++ config.h.in
 @@ -120,22 +120,22 @@
  /* Define where your java executable is */
@@ -3912,7 +3918,9 @@
  #undef SIZEOF_UNSIGNED_LONG
  
  /* Define to 1 if you have the ANSI C header files. */
---- configure
+Index: configure
+===================================================================
+--- configure.orig
 +++ configure
 @@ -1,8 +1,9 @@
  #! /bin/sh
@@ -57656,7 +57664,9 @@
  
  { (exit 0); exit 0; }
  _ACEOF
---- configure.files
+Index: configure.files
+===================================================================
+--- configure.files.orig
 +++ configure.files
 @@ -1,5 +1,7 @@
  ./admin/configure.in.min
@@ -57666,7 +57676,9 @@
  ./dcopc/configure.in.in
  ./dcopjava/configure.in.in
  ./dcopperl/configure.in.in
---- configure.in
+Index: configure.in
+===================================================================
+--- configure.in.orig
 +++ configure.in
 @@ -42,6 +42,8 @@
  dnl Automake doc recommends to do this only here. (Janos)
@@ -57753,7 +57765,9 @@
    AC_SUBST(RUBY_LIBDIR)
    AC_SUBST(RUBY_LIBRUBYARG)
  fi
---- dcopc/Makefile.in
+Index: dcopc/Makefile.in
+===================================================================
+--- dcopc/Makefile.in.orig
 +++ dcopc/Makefile.in
 @@ -144,6 +144,7 @@
  GLINC = @GLINC@
@@ -57864,7 +57878,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- dcopjava/binding/Makefile.in
+Index: dcopjava/binding/Makefile.in
+===================================================================
+--- dcopjava/binding/Makefile.in.orig
 +++ dcopjava/binding/Makefile.in
 @@ -155,6 +155,7 @@
  GLINC = @GLINC@
@@ -57992,7 +58008,9 @@
  # 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:
---- dcopjava/binding/org/kde/DCOP/Makefile.in
+Index: dcopjava/binding/org/kde/DCOP/Makefile.in
+===================================================================
+--- dcopjava/binding/org/kde/DCOP/Makefile.in.orig
 +++ dcopjava/binding/org/kde/DCOP/Makefile.in
 @@ -112,6 +112,7 @@
  GLINC = @GLINC@
@@ -58103,7 +58121,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- dcopjava/binding/org/kde/Makefile.in
+Index: dcopjava/binding/org/kde/Makefile.in
+===================================================================
+--- dcopjava/binding/org/kde/Makefile.in.orig
 +++ dcopjava/binding/org/kde/Makefile.in
 @@ -118,6 +118,7 @@
  GLINC = @GLINC@
@@ -58214,7 +58234,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- dcopjava/binding/org/Makefile.in
+Index: dcopjava/binding/org/Makefile.in
+===================================================================
+--- dcopjava/binding/org/Makefile.in.orig
 +++ dcopjava/binding/org/Makefile.in
 @@ -118,6 +118,7 @@
  GLINC = @GLINC@
@@ -58325,7 +58347,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- dcopjava/dcopidl2java/Makefile.in
+Index: dcopjava/dcopidl2java/Makefile.in
+===================================================================
+--- dcopjava/dcopidl2java/Makefile.in.orig
 +++ dcopjava/dcopidl2java/Makefile.in
 @@ -144,6 +144,7 @@
  GLINC = @GLINC@
@@ -58436,7 +58460,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
---- dcopjava/Makefile.in
+Index: dcopjava/Makefile.in
+===================================================================
+--- dcopjava/Makefile.in.orig
 +++ dcopjava/Makefile.in
 @@ -118,6 +118,7 @@
  GLINC = @GLINC@
@@ -58547,7 +58573,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- dcopjava/tests/Makefile.in
+Index: dcopjava/tests/Makefile.in
+===================================================================
+--- dcopjava/tests/Makefile.in.orig
 +++ dcopjava/tests/Makefile.in
 @@ -148,6 +148,7 @@
  GLINC = @GLINC@
@@ -58667,7 +58695,9 @@
  
  #>+ 4
  clean-idl:
---- dcoppython/lib/Makefile.in
+Index: dcoppython/lib/Makefile.in
+===================================================================
+--- dcoppython/lib/Makefile.in.orig
 +++ dcoppython/lib/Makefile.in
 @@ -112,6 +112,7 @@
  GLINC = @GLINC@
@@ -58785,7 +58815,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- dcoppython/Makefile.in
+Index: dcoppython/Makefile.in
+===================================================================
+--- dcoppython/Makefile.in.orig
 +++ dcoppython/Makefile.in
 @@ -118,6 +118,7 @@
  GLINC = @GLINC@
@@ -58896,7 +58928,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- dcoppython/shell/Makefile.in
+Index: dcoppython/shell/Makefile.in
+===================================================================
+--- dcoppython/shell/Makefile.in.orig
 +++ dcoppython/shell/Makefile.in
 @@ -147,6 +147,7 @@
  GLINC = @GLINC@
@@ -59007,7 +59041,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-pythlibLTLIBRARIES: $(pythlib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- dcoppython/test/dcopserver/Makefile.in
+Index: dcoppython/test/dcopserver/Makefile.in
+===================================================================
+--- dcoppython/test/dcopserver/Makefile.in.orig
 +++ dcoppython/test/dcopserver/Makefile.in
 @@ -155,6 +155,7 @@
  GLINC = @GLINC@
@@ -59145,7 +59181,9 @@
  
  #>+ 15
  force-reedit:
---- dcoppython/test/Makefile.in
+Index: dcoppython/test/Makefile.in
+===================================================================
+--- dcoppython/test/Makefile.in.orig
 +++ dcoppython/test/Makefile.in
 @@ -102,6 +102,7 @@
  GLINC = @GLINC@
@@ -59265,7 +59303,9 @@
  
  #>+ 2
  docs-am:
---- kdejava/koala/kdejava/Makefile.in
+Index: kdejava/koala/kdejava/Makefile.in
+===================================================================
+--- kdejava/koala/kdejava/Makefile.in.orig
 +++ kdejava/koala/kdejava/Makefile.in
 @@ -56,9 +56,9 @@
      *) f=$$p;; \
@@ -59574,7 +59614,9 @@
  
  #>+ 3
  kde-rpo-clean:
---- kdejava/koala/Makefile.in
+Index: kdejava/koala/Makefile.in
+===================================================================
+--- kdejava/koala/Makefile.in.orig
 +++ kdejava/koala/Makefile.in
 @@ -39,7 +39,7 @@
  build_triplet = @build@
@@ -59824,7 +59866,9 @@
  
  
  koala.jar: org/kde/koala/classnoinst.stamp
---- kdejava/koala/org/kde/koala/Makefile.in
+Index: kdejava/koala/org/kde/koala/Makefile.in
+===================================================================
+--- kdejava/koala/org/kde/koala/Makefile.in.orig
 +++ kdejava/koala/org/kde/koala/Makefile.in
 @@ -105,6 +105,7 @@
  GLINC = @GLINC@
@@ -59944,7 +59988,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kdejava/koala/org/kde/Makefile.in
+Index: kdejava/koala/org/kde/Makefile.in
+===================================================================
+--- kdejava/koala/org/kde/Makefile.in.orig
 +++ kdejava/koala/org/kde/Makefile.in
 @@ -120,6 +120,7 @@
  GLINC = @GLINC@
@@ -60055,7 +60101,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kdejava/koala/org/Makefile.in
+Index: kdejava/koala/org/Makefile.in
+===================================================================
+--- kdejava/koala/org/Makefile.in.orig
 +++ kdejava/koala/org/Makefile.in
 @@ -120,6 +120,7 @@
  GLINC = @GLINC@
@@ -60166,7 +60214,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kdejava/Makefile.in
+Index: kdejava/Makefile.in
+===================================================================
+--- kdejava/Makefile.in.orig
 +++ kdejava/Makefile.in
 @@ -121,6 +121,7 @@
  GLINC = @GLINC@
@@ -60277,7 +60327,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kjsembed/bindings/Makefile.in
+Index: kjsembed/bindings/Makefile.in
+===================================================================
+--- kjsembed/bindings/Makefile.in.orig
 +++ kjsembed/bindings/Makefile.in
 @@ -147,6 +147,7 @@
  GLINC = @GLINC@
@@ -60427,7 +60479,9 @@
  	@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; \
---- kjsembed/builtins/Makefile.in
+Index: kjsembed/builtins/Makefile.in
+===================================================================
+--- kjsembed/builtins/Makefile.in.orig
 +++ kjsembed/builtins/Makefile.in
 @@ -143,6 +143,7 @@
  GLINC = @GLINC@
@@ -60538,7 +60592,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
---- kjsembed/cpptests/jsaccess/Makefile.in
+Index: kjsembed/cpptests/jsaccess/Makefile.in
+===================================================================
+--- kjsembed/cpptests/jsaccess/Makefile.in.orig
 +++ kjsembed/cpptests/jsaccess/Makefile.in
 @@ -40,7 +40,7 @@
  build_triplet = @build@
@@ -60757,7 +60813,9 @@
  
  # 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.
---- kjsembed/cpptests/Makefile.in
+Index: kjsembed/cpptests/Makefile.in
+===================================================================
+--- kjsembed/cpptests/Makefile.in.orig
 +++ kjsembed/cpptests/Makefile.in
 @@ -118,6 +118,7 @@
  GLINC = @GLINC@
@@ -60868,7 +60926,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kjsembed/docs/embedding/Makefile.in
+Index: kjsembed/docs/embedding/Makefile.in
+===================================================================
+--- kjsembed/docs/embedding/Makefile.in.orig
 +++ kjsembed/docs/embedding/Makefile.in
 @@ -118,6 +118,7 @@
  GLINC = @GLINC@
@@ -60979,7 +61039,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kjsembed/docs/embedding/simple-embed/Makefile.in
+Index: kjsembed/docs/embedding/simple-embed/Makefile.in
+===================================================================
+--- kjsembed/docs/embedding/simple-embed/Makefile.in.orig
 +++ kjsembed/docs/embedding/simple-embed/Makefile.in
 @@ -154,6 +154,7 @@
  GLINC = @GLINC@
@@ -61090,7 +61152,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
---- kjsembed/docs/Makefile.in
+Index: kjsembed/docs/Makefile.in
+===================================================================
+--- kjsembed/docs/Makefile.in.orig
 +++ kjsembed/docs/Makefile.in
 @@ -119,6 +119,7 @@
  GLINC = @GLINC@
@@ -61201,7 +61265,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kjsembed/kscript/Makefile.in
+Index: kjsembed/kscript/Makefile.in
+===================================================================
+--- kjsembed/kscript/Makefile.in.orig
 +++ kjsembed/kscript/Makefile.in
 @@ -149,6 +149,7 @@
  GLINC = @GLINC@
@@ -61312,7 +61378,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kjsembed/Makefile.in
+Index: kjsembed/Makefile.in
+===================================================================
+--- kjsembed/Makefile.in.orig
 +++ kjsembed/Makefile.in
 @@ -203,6 +203,7 @@
  GLINC = @GLINC@
@@ -61423,7 +61491,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kjsembed/plugin/Makefile.in
+Index: kjsembed/plugin/Makefile.in
+===================================================================
+--- kjsembed/plugin/Makefile.in.orig
 +++ kjsembed/plugin/Makefile.in
 @@ -144,6 +144,7 @@
  GLINC = @GLINC@
@@ -61534,7 +61604,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kjsembed/plugins/Makefile.in
+Index: kjsembed/plugins/Makefile.in
+===================================================================
+--- kjsembed/plugins/Makefile.in.orig
 +++ kjsembed/plugins/Makefile.in
 @@ -58,7 +58,7 @@
  am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
@@ -61750,7 +61822,9 @@
  	maintainer-clean-generic mostlyclean mostlyclean-compile \
  	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
  	tags uninstall uninstall-am uninstall-info-am \
---- kjsembed/qtbindings/Makefile.in
+Index: kjsembed/qtbindings/Makefile.in
+===================================================================
+--- kjsembed/qtbindings/Makefile.in.orig
 +++ kjsembed/qtbindings/Makefile.in
 @@ -154,6 +154,7 @@
  GLINC = @GLINC@
@@ -61861,7 +61935,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
---- kjsembed/stdlib/Makefile.in
+Index: kjsembed/stdlib/Makefile.in
+===================================================================
+--- kjsembed/stdlib/Makefile.in.orig
 +++ kjsembed/stdlib/Makefile.in
 @@ -50,17 +50,11 @@
  mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
@@ -62084,7 +62160,9 @@
  
  # 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.
---- korundum/bin/Makefile.in
+Index: korundum/bin/Makefile.in
+===================================================================
+--- korundum/bin/Makefile.in.orig
 +++ korundum/bin/Makefile.in
 @@ -138,6 +138,7 @@
  GLINC = @GLINC@
@@ -62195,7 +62273,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
---- korundum/Makefile.in
+Index: korundum/Makefile.in
+===================================================================
+--- korundum/Makefile.in.orig
 +++ korundum/Makefile.in
 @@ -119,6 +119,7 @@
  GLINC = @GLINC@
@@ -62306,7 +62386,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- korundum/rubylib/korundum/lib/KDE/Makefile.in
+Index: korundum/rubylib/korundum/lib/KDE/Makefile.in
+===================================================================
+--- korundum/rubylib/korundum/lib/KDE/Makefile.in.orig
 +++ korundum/rubylib/korundum/lib/KDE/Makefile.in
 @@ -114,6 +114,7 @@
  GLINC = @GLINC@
@@ -62428,7 +62510,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- korundum/rubylib/korundum/lib/Makefile.in
+Index: korundum/rubylib/korundum/lib/Makefile.in
+===================================================================
+--- korundum/rubylib/korundum/lib/Makefile.in.orig
 +++ korundum/rubylib/korundum/lib/Makefile.in
 @@ -118,6 +118,7 @@
  GLINC = @GLINC@
@@ -62539,7 +62623,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- korundum/rubylib/korundum/Makefile.in
+Index: korundum/rubylib/korundum/Makefile.in
+===================================================================
+--- korundum/rubylib/korundum/Makefile.in.orig
 +++ korundum/rubylib/korundum/Makefile.in
 @@ -158,6 +158,7 @@
  GLINC = @GLINC@
@@ -62659,7 +62745,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-rubylibLTLIBRARIES: $(rubylib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- korundum/rubylib/Makefile.in
+Index: korundum/rubylib/Makefile.in
+===================================================================
+--- korundum/rubylib/Makefile.in.orig
 +++ korundum/rubylib/Makefile.in
 @@ -118,6 +118,7 @@
  GLINC = @GLINC@
@@ -62770,7 +62858,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- korundum/rubylib/rbkconfig_compiler/Makefile.in
+Index: korundum/rubylib/rbkconfig_compiler/Makefile.in
+===================================================================
+--- korundum/rubylib/rbkconfig_compiler/Makefile.in.orig
 +++ korundum/rubylib/rbkconfig_compiler/Makefile.in
 @@ -150,6 +150,7 @@
  GLINC = @GLINC@
@@ -62881,7 +62971,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
---- korundum/rubylib/rbkconfig_compiler/tests/Makefile.in
+Index: korundum/rubylib/rbkconfig_compiler/tests/Makefile.in
+===================================================================
+--- korundum/rubylib/rbkconfig_compiler/tests/Makefile.in.orig
 +++ korundum/rubylib/rbkconfig_compiler/tests/Makefile.in
 @@ -141,6 +141,7 @@
  GLINC = @GLINC@
@@ -62992,7 +63084,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-checkPROGRAMS:
---- Makefile.in
+Index: Makefile.in
+===================================================================
+--- Makefile.in.orig
 +++ Makefile.in
 @@ -148,6 +148,7 @@
  GLINC = @GLINC@
@@ -63124,7 +63218,9 @@
  
  #>+ 2
  docs-am:
---- python/Makefile.in
+Index: python/Makefile.in
+===================================================================
+--- python/Makefile.in.orig
 +++ python/Makefile.in
 @@ -108,6 +108,7 @@
  GLINC = @GLINC@
@@ -63235,7 +63331,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- qtjava/javalib/docs/en/Makefile.in
+Index: qtjava/javalib/docs/en/Makefile.in
+===================================================================
+--- qtjava/javalib/docs/en/Makefile.in.orig
 +++ qtjava/javalib/docs/en/Makefile.in
 @@ -104,6 +104,7 @@
  GLINC = @GLINC@
@@ -63346,7 +63444,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- qtjava/javalib/docs/Makefile.in
+Index: qtjava/javalib/docs/Makefile.in
+===================================================================
+--- qtjava/javalib/docs/Makefile.in.orig
 +++ qtjava/javalib/docs/Makefile.in
 @@ -120,6 +120,7 @@
  GLINC = @GLINC@
@@ -63457,7 +63557,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- qtjava/javalib/Makefile.in
+Index: qtjava/javalib/Makefile.in
+===================================================================
+--- qtjava/javalib/Makefile.in.orig
 +++ qtjava/javalib/Makefile.in
 @@ -39,7 +39,7 @@
  build_triplet = @build@
@@ -63690,7 +63792,9 @@
  
  
  qtjava.jar: org/kde/qt/classnoinst.stamp
---- qtjava/javalib/org/kde/Makefile.in
+Index: qtjava/javalib/org/kde/Makefile.in
+===================================================================
+--- qtjava/javalib/org/kde/Makefile.in.orig
 +++ qtjava/javalib/org/kde/Makefile.in
 @@ -118,6 +118,7 @@
  GLINC = @GLINC@
@@ -63801,7 +63905,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- qtjava/javalib/org/kde/qt/Makefile.in
+Index: qtjava/javalib/org/kde/qt/Makefile.in
+===================================================================
+--- qtjava/javalib/org/kde/qt/Makefile.in.orig
 +++ qtjava/javalib/org/kde/qt/Makefile.in
 @@ -105,6 +105,7 @@
  GLINC = @GLINC@
@@ -63920,7 +64026,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- qtjava/javalib/org/Makefile.in
+Index: qtjava/javalib/org/Makefile.in
+===================================================================
+--- qtjava/javalib/org/Makefile.in.orig
 +++ qtjava/javalib/org/Makefile.in
 @@ -118,6 +118,7 @@
  GLINC = @GLINC@
@@ -64031,7 +64139,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- qtjava/javalib/qtjava/Makefile.in
+Index: qtjava/javalib/qtjava/Makefile.in
+===================================================================
+--- qtjava/javalib/qtjava/Makefile.in.orig
 +++ qtjava/javalib/qtjava/Makefile.in
 @@ -56,9 +56,10 @@
      *) f=$$p;; \
@@ -64267,7 +64377,9 @@
  
  # 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.
---- qtjava/Makefile.in
+Index: qtjava/Makefile.in
+===================================================================
+--- qtjava/Makefile.in.orig
 +++ qtjava/Makefile.in
 @@ -121,6 +121,7 @@
  GLINC = @GLINC@
@@ -64378,7 +64490,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- qtruby/bin/Makefile.in
+Index: qtruby/bin/Makefile.in
+===================================================================
+--- qtruby/bin/Makefile.in.orig
 +++ qtruby/bin/Makefile.in
 @@ -141,6 +141,7 @@
  GLINC = @GLINC@
@@ -64489,7 +64603,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
---- qtruby/Makefile.in
+Index: qtruby/Makefile.in
+===================================================================
+--- qtruby/Makefile.in.orig
 +++ qtruby/Makefile.in
 @@ -119,6 +119,7 @@
  GLINC = @GLINC@
@@ -64600,7 +64716,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- qtruby/rubylib/designer/Makefile.in
+Index: qtruby/rubylib/designer/Makefile.in
+===================================================================
+--- qtruby/rubylib/designer/Makefile.in.orig
 +++ qtruby/rubylib/designer/Makefile.in
 @@ -118,6 +118,7 @@
  GLINC = @GLINC@
@@ -64711,7 +64829,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- qtruby/rubylib/designer/rbuic/Makefile.in
+Index: qtruby/rubylib/designer/rbuic/Makefile.in
+===================================================================
+--- qtruby/rubylib/designer/rbuic/Makefile.in.orig
 +++ qtruby/rubylib/designer/rbuic/Makefile.in
 @@ -148,6 +148,7 @@
  GLINC = @GLINC@
@@ -64822,7 +64942,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
---- qtruby/rubylib/designer/uilib/Makefile.in
+Index: qtruby/rubylib/designer/uilib/Makefile.in
+===================================================================
+--- qtruby/rubylib/designer/uilib/Makefile.in.orig
 +++ qtruby/rubylib/designer/uilib/Makefile.in
 @@ -140,6 +140,7 @@
  GLINC = @GLINC@
@@ -64942,7 +65064,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-rubylibLTLIBRARIES: $(rubylib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- qtruby/rubylib/Makefile.in
+Index: qtruby/rubylib/Makefile.in
+===================================================================
+--- qtruby/rubylib/Makefile.in.orig
 +++ qtruby/rubylib/Makefile.in
 @@ -118,6 +118,7 @@
  GLINC = @GLINC@
@@ -65053,7 +65177,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- qtruby/rubylib/qtruby/lib/Makefile.in
+Index: qtruby/rubylib/qtruby/lib/Makefile.in
+===================================================================
+--- qtruby/rubylib/qtruby/lib/Makefile.in.orig
 +++ qtruby/rubylib/qtruby/lib/Makefile.in
 @@ -128,6 +128,7 @@
  GLINC = @GLINC@
@@ -65172,7 +65298,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- qtruby/rubylib/qtruby/lib/Qt/Makefile.in
+Index: qtruby/rubylib/qtruby/lib/Qt/Makefile.in
+===================================================================
+--- qtruby/rubylib/qtruby/lib/Qt/Makefile.in.orig
 +++ qtruby/rubylib/qtruby/lib/Qt/Makefile.in
 @@ -112,6 +112,7 @@
  GLINC = @GLINC@
@@ -65291,7 +65419,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- qtruby/rubylib/qtruby/Makefile.in
+Index: qtruby/rubylib/qtruby/Makefile.in
+===================================================================
+--- qtruby/rubylib/qtruby/Makefile.in.orig
 +++ qtruby/rubylib/qtruby/Makefile.in
 @@ -175,6 +175,7 @@
  GLINC = @GLINC@
@@ -65411,7 +65541,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
---- qtsharp/Makefile.in
+Index: qtsharp/Makefile.in
+===================================================================
+--- qtsharp/Makefile.in.orig
 +++ qtsharp/Makefile.in
 @@ -119,6 +119,7 @@
  GLINC = @GLINC@
@@ -65522,7 +65654,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- qtsharp/src/bindings/Makefile.in
+Index: qtsharp/src/bindings/Makefile.in
+===================================================================
+--- qtsharp/src/bindings/Makefile.in.orig
 +++ qtsharp/src/bindings/Makefile.in
 @@ -102,6 +102,7 @@
  GLINC = @GLINC@
@@ -65633,7 +65767,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- qtsharp/src/examples/Makefile.in
+Index: qtsharp/src/examples/Makefile.in
+===================================================================
+--- qtsharp/src/examples/Makefile.in.orig
 +++ qtsharp/src/examples/Makefile.in
 @@ -118,6 +118,7 @@
  GLINC = @GLINC@
@@ -65744,7 +65880,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- qtsharp/src/examples/samples/Makefile.in
+Index: qtsharp/src/examples/samples/Makefile.in
+===================================================================
+--- qtsharp/src/examples/samples/Makefile.in.orig
 +++ qtsharp/src/examples/samples/Makefile.in
 @@ -102,6 +102,7 @@
  GLINC = @GLINC@
@@ -65855,7 +65993,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- qtsharp/src/examples/tutorials/Makefile.in
+Index: qtsharp/src/examples/tutorials/Makefile.in
+===================================================================
+--- qtsharp/src/examples/tutorials/Makefile.in.orig
 +++ qtsharp/src/examples/tutorials/Makefile.in
 @@ -102,6 +102,7 @@
  GLINC = @GLINC@
@@ -65966,7 +66106,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- qtsharp/src/generator/Makefile.in
+Index: qtsharp/src/generator/Makefile.in
+===================================================================
+--- qtsharp/src/generator/Makefile.in.orig
 +++ qtsharp/src/generator/Makefile.in
 @@ -102,6 +102,7 @@
  GLINC = @GLINC@
@@ -66077,7 +66219,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- qtsharp/src/libqtsharp/Makefile.in
+Index: qtsharp/src/libqtsharp/Makefile.in
+===================================================================
+--- qtsharp/src/libqtsharp/Makefile.in.orig
 +++ qtsharp/src/libqtsharp/Makefile.in
 @@ -143,6 +143,7 @@
  GLINC = @GLINC@
@@ -66188,7 +66332,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- qtsharp/src/Makefile.in
+Index: qtsharp/src/Makefile.in
+===================================================================
+--- qtsharp/src/Makefile.in.orig
 +++ qtsharp/src/Makefile.in
 @@ -118,6 +118,7 @@
  GLINC = @GLINC@
@@ -66299,7 +66445,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- qtsharp/src/tests/Makefile.in
+Index: qtsharp/src/tests/Makefile.in
+===================================================================
+--- qtsharp/src/tests/Makefile.in.orig
 +++ qtsharp/src/tests/Makefile.in
 @@ -102,6 +102,7 @@
  GLINC = @GLINC@
@@ -66410,7 +66558,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- qtsharp/src/uicsharp/Makefile.in
+Index: qtsharp/src/uicsharp/Makefile.in
+===================================================================
+--- qtsharp/src/uicsharp/Makefile.in.orig
 +++ qtsharp/src/uicsharp/Makefile.in
 @@ -102,6 +102,7 @@
  GLINC = @GLINC@
@@ -66521,7 +66671,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- smoke/kde/Makefile.in
+Index: smoke/kde/Makefile.in
+===================================================================
+--- smoke/kde/Makefile.in.orig
 +++ smoke/kde/Makefile.in
 @@ -148,6 +148,7 @@
  GLINC = @GLINC@
@@ -66632,7 +66784,9 @@
  	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)/$@
---- smoke/Makefile.in
+Index: smoke/Makefile.in
+===================================================================
+--- smoke/Makefile.in.orig
 +++ smoke/Makefile.in
 @@ -129,6 +129,7 @@
  GLINC = @GLINC@
@@ -66743,7 +66897,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- smoke/qt/Makefile.in
+Index: smoke/qt/Makefile.in
+===================================================================
+--- smoke/qt/Makefile.in.orig
 +++ smoke/qt/Makefile.in
 @@ -146,6 +146,7 @@
  GLINC = @GLINC@
@@ -66854,7 +67010,9 @@
  	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)/$@
---- xparts/Makefile.in
+Index: xparts/Makefile.in
+===================================================================
+--- xparts/Makefile.in.orig
 +++ xparts/Makefile.in
 @@ -119,6 +119,7 @@
  GLINC = @GLINC@
@@ -66965,7 +67123,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- xparts/mozilla/Makefile.in
+Index: xparts/mozilla/Makefile.in
+===================================================================
+--- xparts/mozilla/Makefile.in.orig
 +++ xparts/mozilla/Makefile.in
 @@ -168,6 +168,7 @@
  GLINC = @GLINC@
@@ -67076,7 +67236,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- xparts/src/gtk/Makefile.in
+Index: xparts/src/gtk/Makefile.in
+===================================================================
+--- xparts/src/gtk/Makefile.in.orig
 +++ xparts/src/gtk/Makefile.in
 @@ -140,6 +140,7 @@
  GLINC = @GLINC@
@@ -67187,7 +67349,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- xparts/src/interfaces/Makefile.in
+Index: xparts/src/interfaces/Makefile.in
+===================================================================
+--- xparts/src/interfaces/Makefile.in.orig
 +++ xparts/src/interfaces/Makefile.in
 @@ -115,6 +115,7 @@
  GLINC = @GLINC@
@@ -67298,7 +67462,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- xparts/src/kde/Makefile.in
+Index: xparts/src/kde/Makefile.in
+===================================================================
+--- xparts/src/kde/Makefile.in.orig
 +++ xparts/src/kde/Makefile.in
 @@ -144,6 +144,7 @@
  GLINC = @GLINC@
@@ -67409,7 +67575,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- xparts/src/Makefile.in
+Index: xparts/src/Makefile.in
+===================================================================
+--- xparts/src/Makefile.in.orig
 +++ xparts/src/Makefile.in
 @@ -118,6 +118,7 @@
  GLINC = @GLINC@
@@ -67520,7 +67688,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- xparts/xpart_notepad/Makefile.in
+Index: xparts/xpart_notepad/Makefile.in
+===================================================================
+--- xparts/xpart_notepad/Makefile.in.orig
 +++ 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:45:17 UTC (rev 4096)
+++ trunk/packages/kdebindings/debian/patches/series	2006-07-11 00:53:33 UTC (rev 4097)
@@ -1,22 +1,22 @@
-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
+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
 98_buildprep.diff -p0

More information about the pkg-kde-commits mailing list