[Pkg-kde-commits] rev 2036 - branches/kde-3.4.0/packages/kdebindings/debian/patches

Adeodato Simó adeodato at costa.debian.org
Wed Oct 19 19:08:48 UTC 2005 

Author: adeodato
Date: 2005-10-19 19:08:46 +0000 (Wed, 19 Oct 2005)
New Revision: 2036

Modified:
   branches/kde-3.4.0/packages/kdebindings/debian/patches/011-kdejava_koala_org_kde_koala_Makefile.am-encoding.diff
   branches/kde-3.4.0/packages/kdebindings/debian/patches/021-dont-install-example-kjsembed-plugins.diff
   branches/kde-3.4.0/packages/kdebindings/debian/patches/026-install-qtruby-and-korundum-in-usr.diff
Log:
Adjust patches for KDE 3.4.


Modified: branches/kde-3.4.0/packages/kdebindings/debian/patches/011-kdejava_koala_org_kde_koala_Makefile.am-encoding.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebindings/debian/patches/011-kdejava_koala_org_kde_koala_Makefile.am-encoding.diff	2005-10-19 16:20:08 UTC (rev 2035)
+++ branches/kde-3.4.0/packages/kdebindings/debian/patches/011-kdejava_koala_org_kde_koala_Makefile.am-encoding.diff	2005-10-19 19:08:46 UTC (rev 2036)
@@ -8,7 +8,7 @@
 @@ -12,6 +12,6 @@
  
  JAVAROOT = ../../..
- CLASSPATH = $(srcdir)/../../..:$(srcdir)/../../../../../qtjava/javalib:$(srcdir)
+ CLASSPATH = $(srcdir)/../../..:$(srcdir)/../../../../../qtjava/javalib/qtjava.jar:$(srcdir)
 -JAVACFLAGS = -classpath $(CLASSPATH)
 +JAVACFLAGS = -classpath $(CLASSPATH) -encoding iso-8859-1
  # Prevent stupid automake from putting JAVAC=javac in Makefile.in

Modified: branches/kde-3.4.0/packages/kdebindings/debian/patches/021-dont-install-example-kjsembed-plugins.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebindings/debian/patches/021-dont-install-example-kjsembed-plugins.diff	2005-10-19 16:20:08 UTC (rev 2035)
+++ branches/kde-3.4.0/packages/kdebindings/debian/patches/021-dont-install-example-kjsembed-plugins.diff	2005-10-19 19:08:46 UTC (rev 2036)
@@ -1,25 +1,22 @@
-Index: kdebindings/kjsembed/plugins/Makefile.am
-===================================================================
-RCS file: /home/kde/kdebindings/kjsembed/plugins/Makefile.am,v
-retrieving revision 1.4
-diff -u -r1.4 Makefile.am
---- kdebindings/kjsembed/plugins/Makefile.am	12 Apr 2004 14:00:42 -0000	1.4
-+++ kdebindings/kjsembed/plugins/Makefile.am	2 Aug 2004 18:46:54 -0000
-@@ -1,7 +1,8 @@
- INCLUDES= -I$(srcdir)/../.. $(all_includes)
+--- 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
  
--kde_module_LTLIBRARIES = libcustomobjectplugin.la libcustomqobjectplugin.la libimagefxplugin.la libqprocessplugin.la
-+kde_module_LTLIBRARIES = libimagefxplugin.la libqprocessplugin.la
-+noinst_LTLIBRARIES = libcustomobjectplugin.la libcustomqobjectplugin.la 
+-kde_module_LTLIBRARIES = libcustomobjectplugin.la libcustomqobjectplugin.la \
+-	libimagefxplugin.la libqprocessplugin.la libfileitemplugin.la
++kde_module_LTLIBRARIES = libimagefxplugin.la libqprocessplugin.la libfileitemplugin.la
++noinst_LTLIBRARIES = libcustomobjectplugin.la libcustomqobjectplugin.la
+ METASOURCES = AUTO
  
  # the Plugin's source, library search path, and link libraries
- libcustomobjectplugin_la_SOURCES = customobject_plugin.cpp
-@@ -27,5 +28,6 @@
+@@ -33,6 +33,6 @@
  
  # this is where the desktop file will go
  plugindesktopdir   = $(kde_servicesdir)
--plugindesktop_DATA = customobject_plugin.desktop customqobject_plugin.desktop imagefx_plugin.desktop qprocess_plugin.desktop
-+plugindesktop_DATA = imagefx_plugin.desktop qprocess_plugin.desktop
+-plugindesktop_DATA = customobject_plugin.desktop customqobject_plugin.desktop imagefx_plugin.desktop\
+-	 qprocess_plugin.desktop kfileitem_plugin.desktop
++plugindesktop_DATA = imagefx_plugin.desktop qprocess_plugin.desktop kfileitem_plugin.desktop
 +noinst_DATA = customobject_plugin.desktop customqobject_plugin.desktop
  

Modified: branches/kde-3.4.0/packages/kdebindings/debian/patches/026-install-qtruby-and-korundum-in-usr.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebindings/debian/patches/026-install-qtruby-and-korundum-in-usr.diff	2005-10-19 16:20:08 UTC (rev 2035)
+++ branches/kde-3.4.0/packages/kdebindings/debian/patches/026-install-qtruby-and-korundum-in-usr.diff	2005-10-19 19:08:46 UTC (rev 2036)
@@ -1,10 +1,5 @@
-Index: kdebindings/qtruby/rubylib/qtruby/configure.in.in
-===================================================================
-RCS file: /home/kde/kdebindings/qtruby/rubylib/qtruby/configure.in.in,v
-retrieving revision 1.9
-diff -u -r1.9 configure.in.in
---- kdebindings/qtruby/rubylib/qtruby/configure.in.in	20 Jan 2004 23:09:13 -0000	1.9
-+++ kdebindings/qtruby/rubylib/qtruby/configure.in.in	4 Aug 2004 22:08:31 -0000
+--- 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"@:>@)'`
@@ -20,43 +15,43 @@
    AC_SUBST(RUBY_LIBDIR)
    AC_SUBST(RUBY_LIBRUBYARG)
  fi
-Index: kdebindings/qtruby/rubylib/qtruby/lib/Qt/Makefile.am
-===================================================================
-RCS file: /home/kde/kdebindings/qtruby/rubylib/qtruby/lib/Qt/Makefile.am,v
-retrieving revision 1.5
-diff -u -r1.5 Makefile.am
---- kdebindings/qtruby/rubylib/qtruby/lib/Qt/Makefile.am	5 Jan 2004 23:46:50 -0000	1.5
-+++ kdebindings/qtruby/rubylib/qtruby/lib/Qt/Makefile.am	4 Aug 2004 22:08:31 -0000
-@@ -1,5 +1,5 @@
+--- 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
+ 
+-rubylibdir = $(RUBY_SITEARCHDIR)
++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
+@@ -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
+@@ -1,2 +1,2 @@
 -qtrubylibdir = $(RUBY_SITEDIR)/Qt
 +qtrubylibdir = $(RUBY_RUBYLIBDIR)/Qt
  qtrubylib_DATA = qtruby.rb
-Index: kdebindings/korundum/rubylib/korundum/lib/KDE/Makefile.am
-===================================================================
-RCS file: /home/kde/kdebindings/korundum/rubylib/korundum/lib/KDE/Makefile.am,v
-retrieving revision 1.2
-diff -u -r1.2 Makefile.am
---- kdebindings/korundum/rubylib/korundum/lib/KDE/Makefile.am	5 Jan 2004 23:30:34 -0000	1.2
-+++ kdebindings/korundum/rubylib/korundum/lib/KDE/Makefile.am	4 Aug 2004 22:08:31 -0000
-@@ -1,5 +1,5 @@
--kderubylibdir = $(RUBY_SITEDIR)/KDE
-+kderubylibdir = $(RUBY_RUBYLIBDIR)/KDE
- kderubylib_DATA = korundum.rb
+--- 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)
  
--rubylibdir = $(RUBY_SITEDIR)
-+rubylibdir = $(RUBY_RUBYLIBDIR)
- rubylib_DATA = Korundum.rb
-Index: kdebindings/korundum/rubylib/korundum/configure.in.in
-===================================================================
-RCS file: /home/kde/kdebindings/korundum/rubylib/korundum/configure.in.in,v
-retrieving revision 1.2
-diff -u -r1.2 configure.in.in
---- kdebindings/korundum/rubylib/korundum/configure.in.in	28 Dec 2003 13:41:48 -0000	1.2
-+++ kdebindings/korundum/rubylib/korundum/configure.in.in	4 Aug 2004 22:08:31 -0000
+-rubylibdir = $(RUBY_SITEARCHDIR)
++rubylibdir = $(RUBY_ARCHDIR)
+ 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
 @@ -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"@:>@)'`
@@ -69,29 +64,8 @@
    AC_SUBST(RUBY_SITEDIR)
  fi
  
-Index: kdebindings/qtruby/rubylib/qtruby/Makefile.am
-===================================================================
-RCS file: /home/kde/kdebindings/qtruby/rubylib/qtruby/Makefile.am,v
-retrieving revision 1.13
-diff -u -r1.13 Makefile.am
---- kdebindings/qtruby/rubylib/qtruby/Makefile.am	5 Jan 2004 23:46:49 -0000	1.13
-+++ kdebindings/qtruby/rubylib/qtruby/Makefile.am	4 Aug 2004 22:08:52 -0000
-@@ -6,7 +6,7 @@
- libqtrubyinternal_la_SOURCES = Qt.cpp handlers.cpp 
- libqtrubyinternal_la_METASOURCES = AUTO
- 
--rubylibdir = $(RUBY_SITEARCHDIR)
-+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/
-Index: kdebindings/korundum/rubylib/korundum/Makefile.am
-===================================================================
-RCS file: /home/kde/kdebindings/korundum/rubylib/korundum/Makefile.am,v
-retrieving revision 1.2
-diff -u -r1.2 Makefile.am
---- kdebindings/korundum/rubylib/korundum/Makefile.am	5 Jan 2004 23:30:34 -0000	1.2
-+++ kdebindings/korundum/rubylib/korundum/Makefile.am	4 Aug 2004 22:08:52 -0000
+--- 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)
  
@@ -100,13 +74,13 @@
  rubylib_LTLIBRARIES = korundum.la
  korundum_la_LDFLAGS = -module $(all_libraries) -version-info 0:0:0 -L$(top_srcdir)/smoke/kde/
  korundum_la_METASOURCES = AUTO
---- 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)
+--- 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
+ kderubylib_DATA = korundum.rb
  
--rubylibdir = $(RUBY_SITEARCHDIR)
-+rubylibdir = $(RUBY_ARCHDIR)
- rubylib_LTLIBRARIES = qui.la
- qui_la_SOURCES = qui.cpp
- qui_la_LDFLAGS = -module -export-dynamic $(all_libraries) -version-info 0:0:0
+-rubylibdir = $(RUBY_SITEDIR)
++rubylibdir = $(RUBY_RUBYLIBDIR)
+ rubylib_DATA = Korundum.rb

More information about the pkg-kde-commits mailing list