[Pkg-kde-commits] rev 1943 - trunk/packages/koffice/debian/patches

[Isaac Clerencia]

Author: isaac
Date: 2005-10-13 00:43:09 +0000 (Thu, 13 Oct 2005)
New Revision: 1943

Modified:
   trunk/packages/koffice/debian/patches/kivio-plugins.diff
Log:
Update kivio-plugins patch


Modified: trunk/packages/koffice/debian/patches/kivio-plugins.diff
===================================================================
--- trunk/packages/koffice/debian/patches/kivio-plugins.diff	2005-10-13 00:42:32 UTC (rev 1942)
+++ trunk/packages/koffice/debian/patches/kivio-plugins.diff	2005-10-13 00:43:09 UTC (rev 1943)
@@ -1,43 +1,55 @@
---- koffice/kivio/plugins/kivioconnectortool/Makefile.am	2002/08/30 10:01:35	1.11
-+++ koffice/kivio/plugins/kivioconnectortool/Makefile.am	2002/09/08 00:33:32
+--- koffice-1.4.2/kivio/plugins/kivioconnectortool/Makefile.am	2005-10-12 19:36:36.000000000 +0200
++++ koffice-1.4.2.new/kivio/plugins/kivioconnectortool/Makefile.am	2005-10-12 22:28:09.000000000 +0200
 @@ -1,5 +1,5 @@
- SUBDIRS = straight_connector
+ SUBDIRS = straight_connector .
 -lib_LTLIBRARIES =libkivioconnectortool.la
 +kde_module_LTLIBRARIES =libkivioconnectortool.la
  
  
- INCLUDES = -I$(top_srcdir)/kivio/kiviopart\
---- koffice/kivio/plugins/kivioselecttool/Makefile.am	2002/08/30 10:01:35	1.9
-+++ koffice/kivio/plugins/kivioselecttool/Makefile.am	2002/09/08 00:33:32
+ INCLUDES = -I$(top_srcdir)/kivio/kiviopart/config \
+--- koffice-1.4.2/kivio/plugins/kivioselecttool/Makefile.am	2005-10-12 19:36:36.000000000 +0200
++++ koffice-1.4.2.new/kivio/plugins/kivioselecttool/Makefile.am	2005-10-12 22:27:12.000000000 +0200
 @@ -1,5 +1,5 @@
  SUBDIRS = select_pics
 -lib_LTLIBRARIES =libkivioselecttool.la
 +kde_module_LTLIBRARIES =libkivioselecttool.la
  
  
- INCLUDES = -I$(top_srcdir)/kivio/kiviopart\
---- koffice/kivio/plugins/kiviosmlconnector/Makefile.am	2002/08/30 10:01:35	1.11
-+++ koffice/kivio/plugins/kiviosmlconnector/Makefile.am	2002/09/08 00:33:32
-@@ -1,4 +1,4 @@
+ INCLUDES = -I$(top_srcdir)/kivio/kiviopart/config \
+--- koffice-1.4.2/kivio/plugins/kiviosmlconnector/Makefile.am	2005-10-12 19:36:36.000000000 +0200
++++ koffice-1.4.2.new/kivio/plugins/kiviosmlconnector/Makefile.am	2005-10-12 22:27:19.000000000 +0200
+@@ -1,5 +1,5 @@
  SUBDIRS=. sml_connector
 -lib_LTLIBRARIES =libkiviosmlconnector.la
 +kde_module_LTLIBRARIES =libkiviosmlconnector.la
  
- INCLUDES = -I$(top_srcdir)/kivio/kiviopart\
---- koffice/kivio/plugins/kiviotexttool/Makefile.am	2002/08/30 10:01:35	1.9
-+++ koffice/kivio/plugins/kiviotexttool/Makefile.am	2002/09/08 00:33:32
+ INCLUDES = -I$(top_srcdir)/kivio/kiviopart/config \
+ 	-I$(top_builddir)/kivio/kiviopart/config \
+--- koffice-1.4.2/kivio/plugins/kiviotargettool/Makefile.am	2005-10-05 12:27:36.000000000 +0200
++++ koffice-1.4.2.new/kivio/plugins/kiviotargettool/Makefile.am	2005-10-12 22:27:44.000000000 +0200
+@@ -7,7 +7,7 @@
+ 
+ METASOURCES = AUTO
+ 
+-lib_LTLIBRARIES =  libkiviotargettool.la
++kde_module__LTLIBRARIES =  libkiviotargettool.la
+ libkiviotargettool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+ libkiviotargettool_la_LIBADD = $(LIB_KOTEXT) $(LIB_KOPAINTER) $(top_builddir)/kivio/kiviopart/libkiviocommon.la
+ libkiviotargettool_la_SOURCES = kiviotargettool.cpp kiviotargettoolfactory.cpp
+--- koffice-1.4.2/kivio/plugins/kiviotexttool/Makefile.am	2005-10-12 19:36:36.000000000 +0200
++++ koffice-1.4.2.new/kivio/plugins/kiviotexttool/Makefile.am	2005-10-12 22:27:55.000000000 +0200
 @@ -1,4 +1,4 @@
 -lib_LTLIBRARIES =libkiviotexttool.la
 +kde_module_LTLIBRARIES =libkiviotexttool.la
  
  
- INCLUDES = -I$(top_srcdir)/kivio/kiviopart\
---- koffice/kivio/plugins/kiviozoomtool/Makefile.am	2002/08/30 10:01:35	1.10
-+++ koffice/kivio/plugins/kiviozoomtool/Makefile.am	2002/09/08 00:33:32
+ INCLUDES = -I$(top_srcdir)/kivio/kiviopart/config \
+--- koffice-1.4.2/kivio/plugins/kiviozoomtool/Makefile.am	2005-10-12 19:36:36.000000000 +0200
++++ koffice-1.4.2.new/kivio/plugins/kiviozoomtool/Makefile.am	2005-10-12 22:28:01.000000000 +0200
 @@ -1,5 +1,5 @@
  SUBDIRS = zoom_pics
 -lib_LTLIBRARIES =libkiviozoomtool.la
 +kde_module_LTLIBRARIES =libkiviozoomtool.la
  
- INCLUDES = -I$(top_srcdir)/kivio/kiviopart\
- 	-I$(top_srcdir)/kivio/kiviopart/kiviosdk\
+ INCLUDES = -I$(top_srcdir)/kivio/kiviopart/config \
+ 	-I$(top_builddir)/kivio/kiviopart/config \