rev 2961 - in trunk/packages/koffice/debian: . patches

[Isaac Clerencia]

Author: isaac
Date: 2006-01-19 10:08:38 +0000 (Thu, 19 Jan 2006)
New Revision: 2961

Modified:
   trunk/packages/koffice/debian/koffice-data.install
   trunk/packages/koffice/debian/krita.install
   trunk/packages/koffice/debian/patches/10_karbon_ldmagick.diff
Log:
Fix 10_karbon_ldmagick patch
Fix install files


Modified: trunk/packages/koffice/debian/koffice-data.install
===================================================================
--- trunk/packages/koffice/debian/koffice-data.install	2006-01-19 10:02:27 UTC (rev 2960)
+++ trunk/packages/koffice/debian/koffice-data.install	2006-01-19 10:08:38 UTC (rev 2961)
@@ -1,6 +1,17 @@
 debian/tmp/usr/share/apps/koffice
 debian/tmp/usr/share/apps/xsltfilter
 debian/tmp/usr/share/apps/kofficewidgets
+debian/tmp/usr/share/apps/kross/python/gui.py
+debian/tmp/usr/share/apps/kross/python/RestrictedPython/__init__.py
+debian/tmp/usr/share/apps/kross/python/RestrictedPython/Eval.py
+debian/tmp/usr/share/apps/kross/python/RestrictedPython/Guards.py
+debian/tmp/usr/share/apps/kross/python/RestrictedPython/Limits.py
+debian/tmp/usr/share/apps/kross/python/RestrictedPython/MutatingWalker.py
+debian/tmp/usr/share/apps/kross/python/RestrictedPython/PrintCollector.py
+debian/tmp/usr/share/apps/kross/python/RestrictedPython/RCompile.py
+debian/tmp/usr/share/apps/kross/python/RestrictedPython/RestrictionMutator.py
+debian/tmp/usr/share/apps/kross/python/RestrictedPython/SelectCompiler.py
+debian/tmp/usr/share/apps/kross/python/RestrictedPython/Utilities.py
 debian/tmp/usr/share/doc/kde/HTML/en/koffice/*.bz2
 debian/tmp/usr/share/doc/kde/HTML/en/koffice/*.docbook
 debian/tmp/usr/share/doc/kde/HTML/en/koffice/common

Modified: trunk/packages/koffice/debian/krita.install
===================================================================
--- trunk/packages/koffice/debian/krita.install	2006-01-19 10:02:27 UTC (rev 2960)
+++ trunk/packages/koffice/debian/krita.install	2006-01-19 10:08:38 UTC (rev 2961)
@@ -308,7 +308,6 @@
 debian/tmp/usr/share/services/krita_rgb_u16_plugin.desktop
 debian/tmp/usr/share/services/krita_tiff_export.desktop
 debian/tmp/usr/share/services/krita_tiff_import.desktop
-debian/tmp/usr/share/services/kritabumpmapfilter.desktop
 debian/tmp/usr/share/services/kritacimg.desktop
 debian/tmp/usr/share/services/kritacmykplugin.desktop
 debian/tmp/usr/share/services/kritacolorrange.desktop

Modified: trunk/packages/koffice/debian/patches/10_karbon_ldmagick.diff
===================================================================
--- trunk/packages/koffice/debian/patches/10_karbon_ldmagick.diff	2006-01-19 10:02:27 UTC (rev 2960)
+++ trunk/packages/koffice/debian/patches/10_karbon_ldmagick.diff	2006-01-19 10:08:38 UTC (rev 2961)
@@ -1,11 +1,12 @@
---- koffice-1.4.2.orig/karbon/Makefile.am	2005-10-05 12:31:43.000000000 +0200
-+++ koffice-1.4.2/karbon/Makefile.am	2005-11-13 10:27:44.000000000 +0100
-@@ -30,7 +30,7 @@
- libkarbonbase_la_LDFLAGS = $(KDE_RPATH) -version-info 2:0:0 -no-undefined
- libkarbonbase_la_LIBADD = $(LIB_KOFFICEUI)
+diff -Nur koffice-1.4.88/karbon/Makefile.am koffice-1.4.88.new/karbon/Makefile.am
+--- koffice-1.4.88/karbon/Makefile.am	2006-01-13 11:36:40.000000000 +0100
++++ koffice-1.4.88.new/karbon/Makefile.am	2006-01-17 10:49:39.000000000 +0100
+@@ -16,7 +16,7 @@
  
--libkarboncommon_la_LDFLAGS = $(KDE_RPATH) $(LIBFREETYPE_RPATH)
-+libkarboncommon_la_LDFLAGS = $(KDE_RPATH) $(LIBFREETYPE_RPATH) $(LIBMAGICK_LDFLAGS)
- libkarboncommon_la_LIBADD = $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOPAINTER) $(LIB_KOTEXT) \
+ libkarboncommon_la_SOURCES = karbon_factory.cc 	karbon_resourceserver.cc 	karbon_part.cc 	karbon_part_iface.cc 	karbon_part_iface.skel 	karbon_view.cc 	karbon_view_iface.cc 	karbon_view_iface.skel karbon_drag.cpp karbon_grid_data.cpp karbon_tool_registry.cc karbon_tool_factory.cc	vtoolcontroller.cc vtool.cc
+ 
+-libkarboncommon_la_LDFLAGS = $(KDE_RPATH) $(LIBFREETYPE_RPATH) -no-undefined
++libkarboncommon_la_LDFLAGS = $(KDE_RPATH) $(LIBFREETYPE_RPATH) $(LIBMAGICK_LDFLAGS) -no-undefined
+ libkarboncommon_la_LIBADD = $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOPALETTE) $(LIB_KOPAINTER) $(LIB_KOTEXT) \
  	dockers/libkarbondockers.la \
  	widgets/libkarbonwidgets.la \