rev 3010 - trunk/packages/kdeutils/debian/patches

Christopher Martin chrsmrtn at costa.debian.org
Fri Jan 27 20:47:00 UTC 2006


Author: chrsmrtn
Date: 2006-01-27 20:46:58 +0000 (Fri, 27 Jan 2006)
New Revision: 3010

Modified:
   trunk/packages/kdeutils/debian/patches/98_buildprep.diff
Log:
Updated buildprep.


Modified: trunk/packages/kdeutils/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdeutils/debian/patches/98_buildprep.diff	2006-01-27 20:46:07 UTC (rev 3009)
+++ trunk/packages/kdeutils/debian/patches/98_buildprep.diff	2006-01-27 20:46:58 UTC (rev 3010)
@@ -2942,7 +2942,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1180,18 +1183,18 @@
+@@ -1181,18 +1184,18 @@
  ark_DEPENDENCIES = libkdeinit_ark.la
  
  #>+ 3
@@ -2967,7 +2967,7 @@
  
  #>+ 3
  arch.moc: $(srcdir)/arch.h
-@@ -1341,10 +1344,10 @@
+@@ -1342,10 +1345,10 @@
  
  #>+ 3
  clean-metasources:
@@ -2975,12 +2975,12 @@
 +	-rm -f  arkwidget.moc tar.moc arch.moc filelistview.moc rar.moc searchbar.moc ace.moc compressedfile.moc ark_part.moc arkviewer.moc lha.moc zoo.moc ar.moc zip.moc mainwindow.moc arkapp.moc sevenzip.moc extractiondialog.moc archiveformatdlg.moc
  
  #>+ 2
--KDE_DIST=archiveformatinfo.h arkutils.h hi128-app-ark.png extraction.ui arkui.rc tar.h common_texts.cpp ark.kcfg hi32-app-ark.png hi16-app-ark.png arkfactory.h arkapp.h ar.h ark_part_readonly.rc mainwindow.h rar.h arkviewer.h compressedfile.h archiveformatdlg.h arch.h addition.ui zoo.h ark_part.desktop settings.kcfgc arkwidget.h searchbar.h hi64-app-ark.png hi48-app-ark.png lha.h filelistview.h configure.in.in general.ui ark_part.rc Makefile.in sevenzip.h zip.h extractiondialog.h ark.desktop ark_part.h hisc-app-ark.svgz ace.h Makefile.am hi22-app-ark.png 
-+KDE_DIST=archiveformatinfo.h arkutils.h hi128-app-ark.png extraction.ui arkui.rc common_texts.cpp tar.h ark.kcfg hi32-app-ark.png hi16-app-ark.png arkapp.h arkfactory.h ar.h ark_part_readonly.rc mainwindow.h rar.h arkviewer.h compressedfile.h arch.h archiveformatdlg.h addition.ui zoo.h ark_part.desktop settings.kcfgc arkwidget.h searchbar.h hi64-app-ark.png hi48-app-ark.png lha.h filelistview.h configure.in.in general.ui ark_part.rc Makefile.in sevenzip.h zip.h extractiondialog.h ark.desktop ark_part.h hisc-app-ark.svgz ace.h Makefile.am hi22-app-ark.png 
+-KDE_DIST=archiveformatinfo.h arkutils.h hi128-app-ark.png extraction.ui arkui.rc tar.h common_texts.cpp ark.kcfg hi32-app-ark.png hi16-app-ark.png arkfactory.h arkapp.h ar.h ark_part_readonly.rc mainwindow.h rar.h arkviewer.h compressedfile.h archiveformatdlg.h arch.h addition.ui zoo.h ark_part.desktop settings.kcfgc arkwidget.h searchbar.h hi64-app-ark.png hi48-app-ark.png lha.h filelistview.h configure.in.in general.ui tarlistingthread.h ark_part.rc Makefile.in sevenzip.h zip.h extractiondialog.h ark.desktop ark_part.h hisc-app-ark.svgz ace.h Makefile.am hi22-app-ark.png 
++KDE_DIST=archiveformatinfo.h arkutils.h hi128-app-ark.png extraction.ui arkui.rc common_texts.cpp tar.h ark.kcfg hi32-app-ark.png hi16-app-ark.png arkapp.h arkfactory.h ar.h ark_part_readonly.rc mainwindow.h rar.h arkviewer.h compressedfile.h arch.h archiveformatdlg.h addition.ui zoo.h ark_part.desktop settings.kcfgc arkwidget.h searchbar.h hi64-app-ark.png hi48-app-ark.png lha.h filelistview.h configure.in.in general.ui ark_part.rc tarlistingthread.h Makefile.in sevenzip.h zip.h extractiondialog.h ark.desktop ark_part.h hisc-app-ark.svgz ace.h Makefile.am hi22-app-ark.png 
  
  #>+ 6
  clean-ui:
-@@ -1367,29 +1370,29 @@
+@@ -1368,29 +1371,29 @@
  
  #>+ 25
  install-kde-icons:
@@ -3019,12 +3019,12 @@
  
  #>+ 15
  force-reedit:
-@@ -1466,7 +1469,7 @@
+@@ -1467,7 +1470,7 @@
  	rm -f libark_common_la.all_cpp.final libark_common_la.all_cpp.files
  
  #>+ 11
--libarkpart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ark_part.cpp $(srcdir)/arkfactory.cpp $(srcdir)/zip.cpp $(srcdir)/tar.cpp $(srcdir)/filelistview.cpp $(srcdir)/arch.cpp $(srcdir)/lha.cpp $(srcdir)/compressedfile.cpp $(srcdir)/zoo.cpp $(srcdir)/rar.cpp $(srcdir)/ar.cpp $(srcdir)/arkutils.cpp $(srcdir)/archiveformatdlg.cpp $(srcdir)/arkwidget.cpp $(srcdir)/searchbar.cpp $(srcdir)/arkviewer.cpp $(srcdir)/sevenzip.cpp $(srcdir)/extractiondialog.cpp $(srcdir)/ace.cpp addition.cpp extraction.cpp general.cpp  general.moc arkwidget.moc tar.moc extraction.moc arch.moc filelistview.moc rar.moc searchbar.moc ace.moc compressedfile.moc ark_part.moc arkviewer.moc lha.moc addition.moc zoo.moc ar.moc zip.moc sevenzip.moc extractiondialog.moc archiveformatdlg.moc
-+libarkpart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ark_part.cpp $(srcdir)/arkfactory.cpp $(srcdir)/zip.cpp $(srcdir)/tar.cpp $(srcdir)/filelistview.cpp $(srcdir)/arch.cpp $(srcdir)/lha.cpp $(srcdir)/compressedfile.cpp $(srcdir)/zoo.cpp $(srcdir)/rar.cpp $(srcdir)/ar.cpp $(srcdir)/arkutils.cpp $(srcdir)/archiveformatdlg.cpp $(srcdir)/arkwidget.cpp $(srcdir)/searchbar.cpp $(srcdir)/arkviewer.cpp $(srcdir)/sevenzip.cpp $(srcdir)/extractiondialog.cpp $(srcdir)/ace.cpp addition.cpp extraction.cpp general.cpp  general.moc tar.moc arkwidget.moc extraction.moc arch.moc filelistview.moc rar.moc searchbar.moc ace.moc compressedfile.moc ark_part.moc arkviewer.moc lha.moc addition.moc zoo.moc ar.moc zip.moc sevenzip.moc extractiondialog.moc archiveformatdlg.moc
+-libarkpart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ark_part.cpp $(srcdir)/arkfactory.cpp $(srcdir)/zip.cpp $(srcdir)/tar.cpp $(srcdir)/filelistview.cpp $(srcdir)/arch.cpp $(srcdir)/lha.cpp $(srcdir)/compressedfile.cpp $(srcdir)/zoo.cpp $(srcdir)/rar.cpp $(srcdir)/ar.cpp $(srcdir)/arkutils.cpp $(srcdir)/archiveformatdlg.cpp $(srcdir)/arkwidget.cpp $(srcdir)/searchbar.cpp $(srcdir)/arkviewer.cpp $(srcdir)/sevenzip.cpp $(srcdir)/extractiondialog.cpp $(srcdir)/ace.cpp $(srcdir)/tarlistingthread.cpp addition.cpp extraction.cpp general.cpp  general.moc arkwidget.moc tar.moc extraction.moc arch.moc filelistview.moc rar.moc searchbar.moc ace.moc compressedfile.moc ark_part.moc arkviewer.moc lha.moc addition.moc zoo.moc ar.moc zip.moc sevenzip.moc extractiondialog.moc archiveformatdlg.moc
++libarkpart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ark_part.cpp $(srcdir)/arkfactory.cpp $(srcdir)/zip.cpp $(srcdir)/tar.cpp $(srcdir)/filelistview.cpp $(srcdir)/arch.cpp $(srcdir)/lha.cpp $(srcdir)/compressedfile.cpp $(srcdir)/zoo.cpp $(srcdir)/rar.cpp $(srcdir)/ar.cpp $(srcdir)/arkutils.cpp $(srcdir)/archiveformatdlg.cpp $(srcdir)/arkwidget.cpp $(srcdir)/searchbar.cpp $(srcdir)/arkviewer.cpp $(srcdir)/sevenzip.cpp $(srcdir)/extractiondialog.cpp $(srcdir)/ace.cpp $(srcdir)/tarlistingthread.cpp addition.cpp extraction.cpp general.cpp  general.moc tar.moc arkwidget.moc extraction.moc arch.moc filelistview.moc rar.moc searchbar.moc ace.moc compressedfile.moc ark_part.moc arkviewer.moc lha.moc addition.moc zoo.moc ar.moc zip.moc sevenzip.moc extractiondialog.moc archiveformatdlg.moc
  	@echo 'creating libarkpart_la.all_cpp.cpp ...'; \
  	rm -f libarkpart_la.all_cpp.files libarkpart_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libarkpart_la.all_cpp.final; \
@@ -3148,18 +3148,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- config.h.in
-+++ config.h.in
-@@ -49,6 +49,9 @@
- /* Define to 1 if you have the <inttypes.h> header file. */
- #undef HAVE_INTTYPES_H
- 
-+/* Define if you have knewstuff */
-+#undef HAVE_KNEWSTUFF
-+
- /* Define if you have libjpeg */
- #undef HAVE_LIBJPEG
- 
 --- configure
 +++ configure
 @@ -278,15 +278,15 @@
@@ -12488,15 +12476,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46675,6 +47235,7 @@
- 
- 
- 
-+kde_have_knewstuff=yes
- 
-      kde_save_LDFLAGS="$LDFLAGS"
-           kde_save_LIBS="$LIBS"
-@@ -46716,8 +47277,7 @@
+@@ -46717,8 +47277,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12506,30 +12486,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46744,13 +47304,22 @@
- echo "${ECHO_T}$ac_cv_lib_knewstuff_main" >&6
- if test $ac_cv_lib_knewstuff_main = yes; then
-   MY_LIBKNEWSTUFF="-lknewstuff"
-+else
-+  kde_have_knewstuff=no
- fi
- 
-      LDFLAGS="$kde_save_LDFLAGS"
-      LIBS="$kde_save_LIBS"
- 
-+if test "$kde_have_knewstuff" = "yes"; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_KNEWSTUFF 1
-+_ACEOF
- 
- 
-+fi
-+
- echo "$as_me:$LINENO: checking for main in -lkvm" >&5
- echo $ECHO_N "checking for main in -lkvm... $ECHO_C" >&6
- if test "${ac_cv_lib_kvm_main+set}" = set; then
-@@ -46783,8 +47352,7 @@
+@@ -46793,8 +47352,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12539,7 +12496,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47370,6 +47938,13 @@
+@@ -47380,6 +47938,13 @@
  LTLIBOBJS=$ac_ltlibobjs
  
  
@@ -12553,7 +12510,7 @@
  if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
    { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
-@@ -48274,6 +48849,9 @@
+@@ -48284,6 +48849,9 @@
  s, at AMTAR@,$AMTAR,;t t
  s, at am__tar@,$am__tar,;t t
  s, at am__untar@,$am__untar,;t t
@@ -12563,7 +12520,7 @@
  s, at KDECONFIG@,$KDECONFIG,;t t
  s, at kde_libs_prefix@,$kde_libs_prefix,;t t
  s, at kde_libs_htmldir@,$kde_libs_htmldir,;t t
-@@ -48688,11 +49266,6 @@
+@@ -48698,11 +49266,6 @@
    *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
    esac
  
@@ -12575,7 +12532,7 @@
    # Let's still pretend it is `configure' which instantiates (i.e., don't
    # use $as_me), people would be surprised to read:
    #    /* config.h.  Generated by config.status.  */
-@@ -48731,6 +49304,12 @@
+@@ -48741,6 +49304,12 @@
  	 fi;;
        esac
      done` || { (exit 1); exit 1; }
@@ -12592,28 +12549,13 @@
 +++ configure.in
 @@ -42,6 +42,8 @@
  dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdeutils, "3.5.0") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdeutils, "3.5.1") dnl searches for some needed programs
  
 +AM_MAINTAINER_MODE
 +
  KDE_SET_PREFIX
  
  dnl generate the config header
-@@ -508,8 +510,12 @@
- AC_SUBST(XMMS_LDFLAGS)
- AC_SUBST(XMMS_INCLUDES)
- 
--KDE_CHECK_LIB(knewstuff, main, [MY_LIBKNEWSTUFF="-lknewstuff"])
--AC_SUBST(MY_LIBKNEWSTUFF)
-+kde_have_knewstuff=yes
-+KDE_CHECK_LIB(knewstuff, main, [MY_LIBKNEWSTUFF="-lknewstuff"], kde_have_knewstuff=no)
-+if test "$kde_have_knewstuff" = "yes"; then
-+  AC_DEFINE(HAVE_KNEWSTUFF, 1, [Define if you have knewstuff])
-+  AC_SUBST(MY_LIBKNEWSTUFF)
-+fi
- 
- AC_CHECK_LIB(kvm, main, [LIBKVM="-lkvm"])
- AC_SUBST(LIBKVM)
 --- doc/ark/Makefile.in
 +++ doc/ark/Makefile.in
 @@ -175,6 +175,9 @@
@@ -13696,17 +13638,6 @@
  	@$(NORMAL_INSTALL)
 --- kcalc/knumber/tests/Makefile.in
 +++ kcalc/knumber/tests/Makefile.in
-@@ -31,8 +31,8 @@
- 
- #    You should have received a copy of the GNU Library General Public License
- #    along with this library; see the file COPYING.LIB.  If not, write to
--#    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
--#    Boston, MA 02111-1307, USA.
-+#    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+#    Boston, MA 02110-1301, USA.
- 
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
 @@ -228,6 +228,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -14828,15 +14759,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -1011,6 +1014,7 @@
- 	if test -n "$$LIST"; then \
- 	 $(XGETTEXT) $$LIST -o $(podir)/kgpg.pot; \
- 	fi
-+	rm -f tips.cpp
- # 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:
-@@ -1078,18 +1082,18 @@
+@@ -1079,18 +1082,18 @@
  mocs: kgpgview.moc
  
  #>+ 3
@@ -14861,7 +14784,7 @@
  
  #>+ 3
  keyservers.moc: $(srcdir)/keyservers.h
-@@ -1100,10 +1104,10 @@
+@@ -1101,10 +1104,10 @@
  
  #>+ 3
  clean-metasources:
@@ -14874,7 +14797,7 @@
  
  #>+ 4
  clean-idl:
-@@ -1140,20 +1144,20 @@
+@@ -1141,20 +1144,20 @@
  
  #>+ 16
  install-kde-icons:
@@ -14901,7 +14824,7 @@
  
  #>+ 15
  force-reedit:
-@@ -1194,7 +1198,7 @@
+@@ -1195,7 +1198,7 @@
  
  
  #>+ 11
@@ -15681,17 +15604,6 @@
  force-reedit:
 --- kmilo/asus/Makefile.in
 +++ kmilo/asus/Makefile.in
-@@ -31,8 +31,8 @@
- 
- #    You should have received a copy of the GNU Library General Public License
- #    along with this library; see the file COPYING.LIB.  If not, write to
--#    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
--#    Boston, MA 02111-1307, USA.
-+#    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+#    Boston, MA 02110-1301, USA.
- 
- #SUBDIRS = . kcmthinkpad
- 
 @@ -243,6 +243,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -15725,17 +15637,6 @@
  	@$(NORMAL_INSTALL)
 --- kmilo/delli8k/Makefile.in
 +++ kmilo/delli8k/Makefile.in
-@@ -31,8 +31,8 @@
- 
- #    You should have received a copy of the GNU Library General Public License
- #    along with this library; see the file COPYING.LIB.  If not, write to
--#    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
--#    Boston, MA 02111-1307, USA.
-+#    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+#    Boston, MA 02110-1301, USA.
- 
- 
- 
 @@ -241,6 +241,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -15769,17 +15670,6 @@
  	@$(NORMAL_INSTALL)
 --- kmilo/demo/Makefile.in
 +++ kmilo/demo/Makefile.in
-@@ -30,8 +30,8 @@
- 
- #    You should have received a copy of the GNU Library General Public License
- #    along with this library; see the file COPYING.LIB.  If not, write to
--#    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
--#    Boston, MA 02111-1307, USA.
-+#    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+#    Boston, MA 02110-1301, USA.
- 
- 
- 
 @@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -15813,17 +15703,6 @@
  	@$(NORMAL_INSTALL)
 --- kmilo/generic/Makefile.in
 +++ kmilo/generic/Makefile.in
-@@ -30,8 +30,8 @@
- 
- #    You should have received a copy of the GNU Library General Public License
- #    along with this library; see the file COPYING.LIB.  If not, write to
--#    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
--#    Boston, MA 02111-1307, USA.
-+#    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+#    Boston, MA 02110-1301, USA.
- 
- 
- 
 @@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -15857,17 +15736,6 @@
  	@$(NORMAL_INSTALL)
 --- kmilo/kmilod/Makefile.in
 +++ kmilo/kmilod/Makefile.in
-@@ -30,8 +30,8 @@
- 
- #    You should have received a copy of the GNU Library General Public License
- #    along with this library; see the file COPYING.LIB.  If not, write to
--#    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
--#    Boston, MA 02111-1307, USA.
-+#    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+#    Boston, MA 02110-1301, USA.
- 
- 
- 
 @@ -252,6 +252,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -15934,17 +15802,6 @@
  	@$(NORMAL_INSTALL)
 --- kmilo/kmilo_kvaio/Makefile.in
 +++ kmilo/kmilo_kvaio/Makefile.in
-@@ -30,8 +30,8 @@
- 
- #    You should have received a copy of the GNU Library General Public License
- #    along with this library; see the file COPYING.LIB.  If not, write to
--#    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
--#    Boston, MA 02111-1307, USA.
-+#    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+#    Boston, MA 02110-1301, USA.
- 
- 
- 
 @@ -257,6 +257,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -16045,17 +15902,6 @@
  mostlyclean-libtool:
 --- kmilo/powerbook/Makefile.in
 +++ kmilo/powerbook/Makefile.in
-@@ -30,8 +30,8 @@
- 
- #    You should have received a copy of the GNU Library General Public License
- #    along with this library; see the file COPYING.LIB.  If not, write to
--#    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
--#    Boston, MA 02111-1307, USA.
-+#    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+#    Boston, MA 02110-1301, USA.
- 
- 
- 
 @@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -16089,17 +15935,6 @@
  	@$(NORMAL_INSTALL)
 --- kmilo/powerbook2/Makefile.in
 +++ kmilo/powerbook2/Makefile.in
-@@ -30,8 +30,8 @@
- 
- #    You should have received a copy of the GNU Library General Public License
- #    along with this library; see the file COPYING.LIB.  If not, write to
--#    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
--#    Boston, MA 02111-1307, USA.
-+#    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+#    Boston, MA 02110-1301, USA.
- 
- 
- 
 @@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -16166,17 +16001,6 @@
  	@$(NORMAL_INSTALL)
 --- kmilo/thinkpad/Makefile.in
 +++ kmilo/thinkpad/Makefile.in
-@@ -30,8 +30,8 @@
- 
- #    You should have received a copy of the GNU Library General Public License
- #    along with this library; see the file COPYING.LIB.  If not, write to
--#    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
--#    Boston, MA 02111-1307, USA.
-+#    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+#    Boston, MA 02110-1301, USA.
- 
- 
- 
 @@ -254,6 +254,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -17779,7 +17603,7 @@
  mostlyclean-libtool:
 --- superkaramba/src/Makefile.in
 +++ superkaramba/src/Makefile.in
-@@ -281,6 +281,9 @@
+@@ -283,6 +283,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17789,7 +17613,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -533,7 +536,7 @@
+@@ -535,7 +538,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -17798,7 +17622,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +574,9 @@
+@@ -573,9 +576,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17810,7 +17634,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -941,18 +944,18 @@
+@@ -944,18 +947,18 @@
  mocs: input.moc
  
  #>+ 3
@@ -17835,7 +17659,7 @@
  
  #>+ 3
  datesensor.moc: $(srcdir)/datesensor.h
-@@ -969,18 +972,18 @@
+@@ -972,18 +975,18 @@
  mocs: themesdlg.moc
  
  #>+ 3
@@ -17860,7 +17684,7 @@
  
  #>+ 3
  bar.moc: $(srcdir)/bar.h
-@@ -1004,18 +1007,18 @@
+@@ -1007,18 +1010,18 @@
  mocs: themewidget.moc
  
  #>+ 3
@@ -17885,7 +17709,7 @@
  
  #>+ 3
  richtextlabel.moc: $(srcdir)/richtextlabel.h
-@@ -1088,18 +1091,18 @@
+@@ -1091,18 +1094,18 @@
  mocs: meter.moc
  
  #>+ 3
@@ -17910,7 +17734,7 @@
  
  #>+ 3
  graph.moc: $(srcdir)/graph.h
-@@ -1124,10 +1127,10 @@
+@@ -1127,10 +1130,10 @@
  
  #>+ 3
  clean-metasources:
@@ -17918,8 +17742,8 @@
 +	-rm -f  cpusensor.moc input.moc sensor.moc taskmanager.moc datesensor.moc themesdlg.moc programsensor.moc textlabel.moc bar.moc rsssensor.moc themewidget.moc karamba.moc imagelabel.moc richtextlabel.moc sensorsensor.moc clickmap.moc clickarea.moc kwidgetlistbox.moc systemtray.moc disksensor.moc memsensor.moc showdesktop.moc meter.moc xmmssensor.moc networksensor.moc graph.moc karambaapp.moc textfilesensor.moc
  
  #>+ 2
--KDE_DIST=themes_layout.ui noatunsensor.h sensor.h meter.h meter_python.h clickmap.h menu_python.h task_python.h richtextlabel_python.h sensorsensor.h karambalistboxitem.h taskmanager.h textlabel.h textlabel_python.h karambasessionmanaged.h richtextlabel.h showdesktop.h superkaramba.kcfg imagelabel.h uptimesensor.h systray_python.h taskbartest.h disksensor.h misc_python.h datesensor.h textfield.h imagelabel_python.h textfilesensor.h clickable.cpp widget_python.h bar.h taskbartest.cpp systemtray.h superkarambasettings.kcfgc rsssensor.h clickable.h graph.h xmmssensor.h dcopinterface.h superkaramba.lsm config_python.h graph_python.h karambainterface.h Makefile.in bar_python.h superkaramba.desktop networksensor.h sensorparams.h themewidget_layout.ui clickarea.h karambarootpixmap.h memsensor.h programsensor.h superkarambaui.rc Makefile.am cpusensor.h 
-+KDE_DIST=themes_layout.ui noatunsensor.h sensor.h meter.h meter_python.h clickmap.h menu_python.h task_python.h richtextlabel_python.h sensorsensor.h karambalistboxitem.h taskmanager.h textlabel.h textlabel_python.h richtextlabel.h karambasessionmanaged.h showdesktop.h superkaramba.kcfg imagelabel.h uptimesensor.h systray_python.h disksensor.h taskbartest.h datesensor.h misc_python.h textfield.h imagelabel_python.h textfilesensor.h clickable.cpp bar.h taskbartest.cpp widget_python.h superkarambasettings.kcfgc systemtray.h rsssensor.h graph.h clickable.h xmmssensor.h dcopinterface.h superkaramba.lsm config_python.h graph_python.h karambainterface.h Makefile.in bar_python.h superkaramba.desktop networksensor.h themewidget_layout.ui sensorparams.h karambarootpixmap.h clickarea.h memsensor.h programsensor.h superkarambaui.rc Makefile.am cpusensor.h 
+-KDE_DIST=themes_layout.ui noatunsensor.h sensor.h meter.h meter_python.h clickmap.h menu_python.h task_python.h richtextlabel_python.h sensorsensor.h karambalistboxitem.h taskmanager.h textlabel.h textlabel_python.h karambasessionmanaged.h richtextlabel.h showdesktop.h superkaramba.kcfg imagelabel.h svcgrp_python.h uptimesensor.h systray_python.h taskbartest.h disksensor.h misc_python.h datesensor.h textfield.h imagelabel_python.h textfilesensor.h clickable.cpp widget_python.h bar.h taskbartest.cpp systemtray.h superkarambasettings.kcfgc rsssensor.h clickable.h graph.h xmmssensor.h dcopinterface.h superkaramba.lsm config_python.h graph_python.h karambainterface.h Makefile.in bar_python.h superkaramba.desktop networksensor.h sensorparams.h themewidget_layout.ui clickarea.h karambarootpixmap.h memsensor.h programsensor.h superkarambaui.rc Makefile.am cpusensor.h 
++KDE_DIST=themes_layout.ui noatunsensor.h sensor.h meter.h meter_python.h clickmap.h menu_python.h task_python.h richtextlabel_python.h sensorsensor.h karambalistboxitem.h taskmanager.h textlabel.h textlabel_python.h richtextlabel.h karambasessionmanaged.h showdesktop.h superkaramba.kcfg imagelabel.h uptimesensor.h svcgrp_python.h systray_python.h disksensor.h taskbartest.h datesensor.h misc_python.h textfield.h imagelabel_python.h textfilesensor.h clickable.cpp bar.h taskbartest.cpp widget_python.h superkarambasettings.kcfgc systemtray.h rsssensor.h graph.h clickable.h xmmssensor.h dcopinterface.h superkaramba.lsm config_python.h graph_python.h karambainterface.h Makefile.in bar_python.h superkaramba.desktop networksensor.h themewidget_layout.ui sensorparams.h karambarootpixmap.h clickarea.h memsensor.h programsensor.h superkarambaui.rc Makefile.am cpusensor.h 
  
  #>+ 5
  clean-idl:




More information about the pkg-kde-commits mailing list