rev 3805 - trunk/packages/koffice/debian/patches

Isaac Clerencia isaac at costa.debian.org
Mon May 22 07:25:18 UTC 2006 

Author: isaac
Date: 2006-05-22 07:25:12 +0000 (Mon, 22 May 2006)
New Revision: 3805

Modified:
   trunk/packages/koffice/debian/patches/98_buildprep.diff
Log:
Update buildprep yet again


Modified: trunk/packages/koffice/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/koffice/debian/patches/98_buildprep.diff	2006-05-22 07:24:40 UTC (rev 3804)
+++ trunk/packages/koffice/debian/patches/98_buildprep.diff	2006-05-22 07:25:12 UTC (rev 3805)
@@ -81650,7 +81650,15 @@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
-@@ -339,6 +337,9 @@
+@@ -89,6 +87,7 @@
+ libkexiformutils_la_DEPENDENCIES =  \
+ 	$(top_builddir)/kexi/core/libkexicore.la \
+ 	$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
++	$(top_builddir)/kexi/formeditor/libkformdesigner.la \
+ 	$(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la
+ am_libkexiformutils_la_OBJECTS = kexiformdataiteminterface.lo \
+ 	kexidataawarewidgetinfo.lo kexidataprovider.lo \
+@@ -339,6 +338,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -81660,7 +81668,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -550,6 +551,8 @@
+@@ -550,6 +552,8 @@
  kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
  kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
  kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
@@ -81669,7 +81677,7 @@
  koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
  koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
  kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -598,6 +601,7 @@
+@@ -598,6 +602,7 @@
  servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
  servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
  sharedstatedir = @sharedstatedir@
@@ -81677,8 +81685,20 @@
  sysconfdir = @sysconfdir@
  target = @target@
  target_alias = @target_alias@
-@@ -687,7 +691,7 @@
+@@ -658,9 +663,10 @@
+ 	kexidbtextwidgetinterface.cpp kexiactionselectiondialog.cpp kexiformmanager.cpp \
+ 	kexidatasourcepage.cpp kexiformpart.cpp kexiformview.cpp
  
+-libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved
++libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO)
+ libkexiformutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \
+ 	$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
++	$(top_builddir)/kexi/formeditor/libkformdesigner.la \
+ 	$(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la
+ 
+ kformdesignerservicesdir = $(kde_servicesdir)/kformdesigner
+@@ -687,7 +693,7 @@
+ 
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(srcdir)/../Makefile.common $(am__configure_deps)
@@ -81686,7 +81706,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -725,9 +729,9 @@
+@@ -725,9 +731,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -82152,7 +82172,44 @@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
-@@ -329,6 +327,9 @@
+@@ -65,16 +63,20 @@
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
+ kexihandler_report_la_DEPENDENCIES = ../../core/libkexicore.la \
+-	../../widget/utils/libkexiguiutils.la \
+-	../../widget/libkexiextendedwidgets.la \
+-	../../formeditor/libkformdesigner.la \
+-	../forms/libkexiformutils.la ./libkexireportutils.la
++	$(top_builddir)/kexi/widget/utils/libkexiguiutils.la \
++	$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
++	$(top_builddir)/kexi/formeditor/libkformdesigner.la \
++	$(top_builddir)/kexi/plugins/forms/libkexiformutils.la \
++	./libkexireportutils.la
+ am_kexihandler_report_la_OBJECTS = kexireports.lo
+ #>- kexihandler_report_la_OBJECTS = $(am_kexihandler_report_la_OBJECTS)
+ #>+ 1
+ kexihandler_report_la_OBJECTS = kexireports.lo
+ kexireportwidgets_la_DEPENDENCIES =  \
+ 	$(top_builddir)/kexi/formeditor/libkformdesigner.la \
++	$(top_builddir)/kexi/plugins/forms/libkexiformutils.la \
++	$(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \
++	$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
+ 	./libkexireportutils.la
+ am_kexireportwidgets_la_OBJECTS = reportwidgets.lo \
+ 	kexireportfactory.lo
+@@ -87,8 +89,10 @@
+ @KDE_USE_FINAL_TRUE at kexireportwidgets_la_OBJECTS = $(kexireportwidgets_la_final_OBJECTS)
+ libkexireportutils_la_DEPENDENCIES =  \
+ 	$(top_builddir)/kexi/core/libkexicore.la \
++	$(top_builddir)/kexi/formeditor/libkformdesigner.la \
++	$(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \
+ 	$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
+-	$(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la
++	$(top_builddir)/kexi/plugins/forms/libkexiformutils.la
+ am_libkexireportutils_la_OBJECTS = kexireportpart.lo kexireportview.lo \
+ 	kexireportform.lo
+ #>- libkexireportutils_la_OBJECTS = $(am_libkexireportutils_la_OBJECTS)
+@@ -329,6 +333,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -82162,7 +82219,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -540,6 +541,8 @@
+@@ -540,6 +547,8 @@
  kformula_SUBDIR_included_TRUE = @kformula_SUBDIR_included_TRUE@
  kivio_SUBDIR_included_FALSE = @kivio_SUBDIR_included_FALSE@
  kivio_SUBDIR_included_TRUE = @kivio_SUBDIR_included_TRUE@
@@ -82171,7 +82228,7 @@
  koshell_SUBDIR_included_FALSE = @koshell_SUBDIR_included_FALSE@
  koshell_SUBDIR_included_TRUE = @koshell_SUBDIR_included_TRUE@
  kounavail_SUBDIR_included_FALSE = @kounavail_SUBDIR_included_FALSE@
-@@ -588,6 +591,7 @@
+@@ -588,6 +597,7 @@
  servicetypes_SUBDIR_included_FALSE = @servicetypes_SUBDIR_included_FALSE@
  servicetypes_SUBDIR_included_TRUE = @servicetypes_SUBDIR_included_TRUE@
  sharedstatedir = @sharedstatedir@
@@ -82179,8 +82236,45 @@
  sysconfdir = @sysconfdir@
  target = @target@
  target_alias = @target_alias@
-@@ -670,7 +674,7 @@
+@@ -630,25 +640,30 @@
+ #>+ 1
+ kexihandler_report_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined $(KDE_NO_UNDEFINED)
+ kexihandler_report_la_LIBADD = ../../core/libkexicore.la \
+-  ../../widget/utils/libkexiguiutils.la \
+-  ../../widget/libkexiextendedwidgets.la \
+-  ../../formeditor/libkformdesigner.la \
+-  ../forms/libkexiformutils.la \
++  $(top_builddir)/kexi/widget/utils/libkexiguiutils.la \
++  $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
++	$(top_builddir)/kexi/formeditor/libkformdesigner.la \
++  $(top_builddir)/kexi/plugins/forms/libkexiformutils.la \
+   ./libkexireportutils.la
  
+ kexireportwidgets_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module
+ kexireportwidgets_la_SOURCES = reportwidgets.cpp kexireportfactory.cpp
+ kexireportwidgets_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la \
++	$(top_builddir)/kexi/plugins/forms/libkexiformutils.la \
++	$(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \
++	$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
+ 	./libkexireportutils.la
+ 
+ lib_LTLIBRARIES = libkexireportutils.la
+ libkexireportutils_la_SOURCES = \
+ 	kexireportpart.cpp kexireportview.cpp kexireportform.cpp
+ 
+-libkexireportutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved
++libkexireportutils_la_LDFLAGS = $(all_libraries) $(VER_INFO)
+ libkexireportutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \
++	$(top_builddir)/kexi/formeditor/libkformdesigner.la \
++	$(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \
+ 	$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
+-	$(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la
++	$(top_builddir)/kexi/plugins/forms/libkexiformutils.la
+ 
+ kformdesignerservicesdir = $(kde_servicesdir)/kformdesigner
+ kformdesignerservices_DATA = kformdesigner_kexireportfactory.desktop
+@@ -670,7 +685,7 @@
+ 
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(srcdir)/../Makefile.common $(am__configure_deps)
@@ -82188,7 +82282,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -708,9 +712,9 @@
+@@ -708,9 +723,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

More information about the pkg-kde-commits mailing list