rev 3157 - trunk/packages/kdeaddons/debian/patches

[Christopher Martin]

Author: chrsmrtn
Date: 2006-02-19 17:36:09 +0000 (Sun, 19 Feb 2006)
New Revision: 3157

Modified:
   trunk/packages/kdeaddons/debian/patches/98_buildprep.diff
Log:
kdeaddons buildprep update.


Modified: trunk/packages/kdeaddons/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdeaddons/debian/patches/98_buildprep.diff	2006-02-19 17:34:12 UTC (rev 3156)
+++ trunk/packages/kdeaddons/debian/patches/98_buildprep.diff	2006-02-19 17:36:09 UTC (rev 3157)
@@ -10997,7 +10997,7 @@
 +++ configure.in
 @@ -42,6 +42,8 @@
  dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdeaddons, "3.5.0") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdeaddons, "3.5.1") dnl searches for some needed programs
  
 +AM_MAINTAINER_MODE
 +
@@ -14583,17 +14583,7 @@
  docs-am:
 --- konq-plugins/sidebar/metabar/src/Makefile.in
 +++ konq-plugins/sidebar/metabar/src/Makefile.in
-@@ -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 @@
+@@ -229,6 +229,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14603,19 +14593,8 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -402,9 +404,7 @@
- 		remoteplugin.cpp httpplugin.cpp metabarfunctions.cpp
+@@ -419,7 +422,7 @@
  
- 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)
@@ -14623,7 +14602,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -460,9 +460,9 @@
+@@ -457,9 +460,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14635,16 +14614,6 @@
  	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