[pkg-kde-commits] rev 2610 - trunk/packages/kdeaddons/debian/patches

[Christopher Martin]

Author: chrsmrtn
Date: 2005-12-09 18:40:50 +0000 (Fri, 09 Dec 2005)
New Revision: 2610

Modified:
   trunk/packages/kdeaddons/debian/patches/98_buildprep.diff
Log:
Sync up buildrep.diff.


Modified: trunk/packages/kdeaddons/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdeaddons/debian/patches/98_buildprep.diff	2005-12-09 18:40:32 UTC (rev 2609)
+++ trunk/packages/kdeaddons/debian/patches/98_buildprep.diff	2005-12-09 18:40:50 UTC (rev 2610)
@@ -14583,7 +14583,17 @@
  docs-am:
 --- konq-plugins/sidebar/metabar/src/Makefile.in
 +++ konq-plugins/sidebar/metabar/src/Makefile.in
-@@ -230,6 +230,9 @@
+@@ -65,8 +65,7 @@
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ konqsidebar_metabar_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am_konqsidebar_metabar_la_OBJECTS = metabar.lo metabarwidget.lo \
+ 	configdialog.lo serviceloader.lo defaultplugin.lo \
+ 	protocolplugin.lo settingsplugin.lo remoteplugin.lo \
+@@ -230,6 +229,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14593,8 +14603,19 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -402,9 +404,7 @@
+ 		remoteplugin.cpp httpplugin.cpp metabarfunctions.cpp
  
+ konqsidebar_metabar_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkonqsidebarplugin
+-konqsidebar_metabar_la_LIBADD = $(LIB_KIO) $(LIB_KHTML) $(LIB_KPARTS) \
+-	$(LIB_KFILE)
+-
++konqsidebar_metabar_la_LIBADD = $(LIB_KIO) $(LIB_KHTML) $(LIB_KPARTS)
+ metabar_entrydir = $(kde_datadir)/konqsidebartng/entries
+ metabar_entry_DATA = metabar.desktop
+ metabar_adddir = $(kde_datadir)/konqsidebartng/add
+@@ -422,7 +422,7 @@
+ 
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -14602,7 +14623,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -460,9 +460,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14614,6 +14635,16 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+@@ -806,6 +806,9 @@
+ 	uninstall-metabar_addDATA uninstall-metabar_dataDATA \
+ 	uninstall-metabar_entryDATA uninstall-metabar_themeDATA
+ 
++
++messages:
++	$(XGETTEXT) *.cpp *.h -o $(podir)/konqsidebar_metabar.pot
+ # 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:
 @@ -834,6 +837,13 @@
  mocs: remoteplugin.moc