rev 9443 - in trunk/packages/kdeutils/debian: . patches
Modestas Vainius
modax-guest at alioth.debian.org
Wed Feb 20 15:53:22 UTC 2008
Author: modax-guest
Date: 2008-02-20 15:53:19 +0000 (Wed, 20 Feb 2008)
New Revision: 9443
Added:
trunk/packages/kdeutils/debian/patches/01_admin_cleanup.diff
trunk/packages/kdeutils/debian/patches/97_automake_cleanup.diff
Removed:
trunk/packages/kdeutils/debian/patches/11_floppy_nodes.diff
trunk/packages/kdeutils/debian/patches/18_remove_temporal_file_kgpg.diff
Modified:
trunk/packages/kdeutils/debian/changelog
trunk/packages/kdeutils/debian/control
trunk/packages/kdeutils/debian/control.in
trunk/packages/kdeutils/debian/patches/13_klaptopdaemon_dpkg_statoverride.diff
trunk/packages/kdeutils/debian/patches/14_kmilo_actions.diff
trunk/packages/kdeutils/debian/patches/98_buildprep.diff
trunk/packages/kdeutils/debian/rules
Log:
kdeutils 3.5.9 is ready and dpkg-shlibdeps clean
Modified: trunk/packages/kdeutils/debian/changelog
===================================================================
--- trunk/packages/kdeutils/debian/changelog 2008-02-20 13:52:59 UTC (rev 9442)
+++ trunk/packages/kdeutils/debian/changelog 2008-02-20 15:53:19 UTC (rev 9443)
@@ -1,9 +1,26 @@
-kdeutils (4:3.5.9-1) UNRELEASED; urgency=low
+kdeutils (4:3.5.9-1~pre2) unstable; urgency=low
+ +++ Changes by Ana Beatriz Guerrero Lopez:
+
* New upstream release. (Closes: #444500, #464070)
- -- Ana Beatriz Guerrero Lopez <ana at debian.org> Mon, 21 Jan 2008 15:00:29 +0100
+ +++ Changes by Modestas Vainius:
+ * Resync patches:
+ - 11_floppy_nodes.diff - remove, a bit different version merged upstream.
+ - 13_klaptopdaemon_dpkg_statoverride.diff - fix offsets.
+ - 14_kmilo_actions.diff - adopt to upstream changes.
+ - 18_remove_temporal_file_kgpg.diff - remove, merged upstream.
+ * Add automake cleanup patches:
+ - 01_admin_cleanup.diff
+ - 97_automake_cleanup.diff
+ * Use ${source:Upstream-Version} for kdelibs4-dev dependency.
+ * debian/rules:
+ - remove PACKAGES_WITH_LIBS
+ - bump shlibs to 3.5.9
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 20 Feb 2008 17:28:44 +0200
+
kdeutils (4:3.5.8-2) unstable; urgency=low
* Update to debhelper 6.
Modified: trunk/packages/kdeutils/debian/control
===================================================================
--- trunk/packages/kdeutils/debian/control 2008-02-20 13:52:59 UTC (rev 9442)
+++ trunk/packages/kdeutils/debian/control 2008-02-20 15:53:19 UTC (rev 9443)
@@ -2,7 +2,7 @@
Section: kde
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Fathi Boudra <fabo at debian.org>, Josh Metzler <joshdeb at metzlers.org>, Sune Vuorela <debian at pusling.com>
+Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Fathi Boudra <fabo at debian.org>, Josh Metzler <joshdeb at metzlers.org>, Modestas Vainius <modestas at vainius.eu>, Sune Vuorela <debian at pusling.com>
Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 6), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.8), kdebase-dev (>= 4:3.5.8), libkonq4-dev (>= 4:3.5.8), libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, pbbuttonsd-dev [powerpc], sharutils
Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, kdelibs4-doc
Standards-Version: 3.7.3
@@ -55,7 +55,7 @@
Package: kdeutils-dev
Section: utils
Architecture: any
-Depends: ark (= ${binary:Version}), kcalc (= ${binary:Version}), kdelirc (= ${binary:Version}), kedit (= ${binary:Version}), khexedit (= ${binary:Version}), klaptopdaemon (= ${binary:Version}), kmilo (= ${binary:Version}), kregexpeditor (= ${binary:Version}), ksim (= ${binary:Version}), kdelibs4-dev (>= 4:3.5.8)
+Depends: ark (= ${binary:Version}), kcalc (= ${binary:Version}), kdelirc (= ${binary:Version}), kedit (= ${binary:Version}), khexedit (= ${binary:Version}), klaptopdaemon (= ${binary:Version}), kmilo (= ${binary:Version}), kregexpeditor (= ${binary:Version}), ksim (= ${binary:Version}), kdelibs4-dev (>= ${source:Upstream-Version})
Description: development files for the KDE utilities module
This package contains development files needed to compile kdeutils
applications.
Modified: trunk/packages/kdeutils/debian/control.in
===================================================================
--- trunk/packages/kdeutils/debian/control.in 2008-02-20 13:52:59 UTC (rev 9442)
+++ trunk/packages/kdeutils/debian/control.in 2008-02-20 15:53:19 UTC (rev 9443)
@@ -55,7 +55,7 @@
Package: kdeutils-dev
Section: utils
Architecture: any
-Depends: ark (= ${binary:Version}), kcalc (= ${binary:Version}), kdelirc (= ${binary:Version}), kedit (= ${binary:Version}), khexedit (= ${binary:Version}), klaptopdaemon (= ${binary:Version}), kmilo (= ${binary:Version}), kregexpeditor (= ${binary:Version}), ksim (= ${binary:Version}), kdelibs4-dev (>= 4:3.5.8)
+Depends: ark (= ${binary:Version}), kcalc (= ${binary:Version}), kdelirc (= ${binary:Version}), kedit (= ${binary:Version}), khexedit (= ${binary:Version}), klaptopdaemon (= ${binary:Version}), kmilo (= ${binary:Version}), kregexpeditor (= ${binary:Version}), ksim (= ${binary:Version}), kdelibs4-dev (>= ${source:Upstream-Version})
Description: development files for the KDE utilities module
This package contains development files needed to compile kdeutils
applications.
Added: trunk/packages/kdeutils/debian/patches/01_admin_cleanup.diff
===================================================================
--- trunk/packages/kdeutils/debian/patches/01_admin_cleanup.diff (rev 0)
+++ trunk/packages/kdeutils/debian/patches/01_admin_cleanup.diff 2008-02-20 15:53:19 UTC (rev 9443)
@@ -0,0 +1,70 @@
+--- kde/admin/acinclude.m4.in 2008-02-19 01:31:24.000000000 +0200
++++ kde/admin/acinclude.m4.in 2008-02-20 17:12:56.000000000 +0200
+@@ -1613,6 +1613,11 @@
+ fi
+ done
+
++# Export just Qt libs in LIB_QT, "extended" version will be exported as LIB_QT_EXT
++LIB_QT_EXT="$LIB_QT"
++LIB_QT="$kde_int_qt"
++
++AC_SUBST(LIB_QT_EXT)
+ AC_SUBST(LIB_QT)
+ AC_SUBST(LIB_QPE)
+
+@@ -2696,7 +2701,7 @@
+ ],
+ [return (TIFFOpen( "", "r") == 0); ],
+ [
+- kde_cv_libtiff_$1="-l$1 $LIBJPEG $LIBZ"
++ kde_cv_libtiff_$1="-l$1"
+ ], [
+ kde_cv_libtiff_$1=no
+ ])
+@@ -4486,7 +4491,7 @@
+ kde_save_cflags="$CFLAGS"
+ CFLAGS="$CFLAGS $PYTHONINC"
+ kde_save_libs="$LIBS"
+-LIBS="$LIBS $LIBPYTHON $2 $LIBDL $LIBSOCKET"
++LIBS="$LIBS $LIBPYTHON $2 $LIBSOCKET"
+ kde_save_ldflags="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $PYTHONLIB"
+
+@@ -4624,7 +4629,7 @@
+ and contact the authors to let them know about this problem])
+ ])
+
+- LIBPYTHON="$LIBPYTHON $LIBDL $LIBSOCKET"
++ LIBPYTHON="$LIBPYTHON $LIBSOCKET"
+ AC_SUBST(PYTHONINC)
+ AC_SUBST(PYTHONLIB)
+ AC_SUBST(LIBPYTHON)
+--- kde/admin/ltmain.sh 2008-02-19 03:20:35.000000000 +0200
++++ kde/admin/ltmain.sh 2008-02-19 03:16:14.000000000 +0200
+@@ -2377,16 +2377,16 @@
+ # It is a libtool convenience library, so add in its objects.
+ convenience="$convenience $ladir/$objdir/$old_library"
+ old_convenience="$old_convenience $ladir/$objdir/$old_library"
+- tmp_libs=
+- for deplib in $dependency_libs; do
+- deplibs="$deplib $deplibs"
+- if test "X$duplicate_deps" = "Xyes" ; then
+- case "$tmp_libs " in
+- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+- esac
+- fi
+- tmp_libs="$tmp_libs $deplib"
+- done
++# tmp_libs=
++# for deplib in $dependency_libs; do
++# deplibs="$deplib $deplibs"
++# if test "X$duplicate_deps" = "Xyes" ; then
++# case "$tmp_libs " in
++# *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++# esac
++# fi
++# tmp_libs="$tmp_libs $deplib"
++# done
+ elif test "$linkmode" != prog && test "$linkmode" != lib; then
+ $echo "$modename: \`$lib' is not a convenience library" 1>&2
+ exit $EXIT_FAILURE
Deleted: trunk/packages/kdeutils/debian/patches/11_floppy_nodes.diff
Modified: trunk/packages/kdeutils/debian/patches/13_klaptopdaemon_dpkg_statoverride.diff
===================================================================
--- trunk/packages/kdeutils/debian/patches/13_klaptopdaemon_dpkg_statoverride.diff 2008-02-20 13:52:59 UTC (rev 9442)
+++ trunk/packages/kdeutils/debian/patches/13_klaptopdaemon_dpkg_statoverride.diff 2008-02-20 15:53:19 UTC (rev 9443)
@@ -1,6 +1,6 @@
--- kde.orig/klaptopdaemon/acpi.cpp
+++ kde.patched/klaptopdaemon/acpi.cpp
-@@ -186,7 +186,7 @@
+@@ -178,7 +178,7 @@
proc << kdesu;
proc << "-u";
proc << "root";
@@ -20,7 +20,7 @@
proc.start(KProcess::Block); // run it sync so has_apm below sees the results
}
} else {
-@@ -208,7 +208,7 @@
+@@ -200,7 +200,7 @@
proc << kdesu;
proc << "-u";
proc << "root";
Modified: trunk/packages/kdeutils/debian/patches/14_kmilo_actions.diff
===================================================================
--- trunk/packages/kdeutils/debian/patches/14_kmilo_actions.diff 2008-02-20 13:52:59 UTC (rev 9442)
+++ trunk/packages/kdeutils/debian/patches/14_kmilo_actions.diff 2008-02-20 15:53:19 UTC (rev 9443)
@@ -1,29 +1,34 @@
-diff -Nur kdeutils-3.5.5/kmilo/generic/generic_monitor.cpp kdeutils-3.5.5.new/kmilo/generic/generic_monitor.cpp
---- kdeutils-3.5.5/kmilo/generic/generic_monitor.cpp 2006-10-01 19:28:15.000000000 +0200
-+++ kdeutils-3.5.5.new/kmilo/generic/generic_monitor.cpp 2006-11-02 17:35:45.000000000 +0100
-@@ -25,6 +25,7 @@
-
+--- kdeutils-3.5.9/kmilo/generic/generic_monitor.cpp 2008-02-20 16:10:20.000000000 +0200
++++ kdeutils-3.5.9/kmilo/generic/generic_monitor.cpp 2008-02-20 16:22:24.000000000 +0200
+@@ -26,6 +26,7 @@
#include <kgenericfactory.h>
#include <kdebug.h>
+ #include <kconfig.h>
+#include <kprocess.h>
#include <sys/types.h>
#include <unistd.h>
-@@ -33,6 +34,7 @@
+@@ -34,6 +35,7 @@
#include "kmilointerface.h"
#include <qmessagebox.h>
#include <qfile.h>
+#include <qdir.h>
+ #define CONFIG_FILE "kmilodrc"
- // FIXME: use DCOPRef where possible instead of hand-rolled DCOP calls.
-@@ -58,7 +60,21 @@
+@@ -67,13 +69,25 @@
bool GenericMonitor::init()
{
-+ config = new KConfig("kmilodrc");
+- KConfig config(CONFIG_FILE);
+- reconfigure(&config);
++ config = new KConfig(CONFIG_FILE);
++ reconfigure(config);
+ config->setGroup("kubuntu");
-+
+
+ if(!m_enabled)
+ return false; // exit early if we are not supposed to run
+
static const ShortcutInfo shortcuts[] = {
+ { "Search", KShortcut("XF86Search"), SLOT(launchSearch()) },
+ { "Home Folder", KShortcut("XF86MyComputer"), SLOT(launchHomeFolder()) },
@@ -39,8 +44,8 @@
{ "FastVolumeUp", Qt::Key_VolumeUp, SLOT(fastVolumeUp()) },
{ "FastVolumeDown", Qt::Key_VolumeDown, SLOT(fastVolumeDown()) },
{ "SlowVolumeUp", Qt::CTRL+Qt::Key_VolumeUp, SLOT(slowVolumeUp()) },
-@@ -249,6 +265,68 @@
- return m_displayType;
+@@ -216,6 +230,70 @@
+ displayVolume();
}
+void GenericMonitor::launch(QString configKey, QString defaultApplication)
@@ -105,12 +110,13 @@
+ kdDebug() << "lightBulb()" << endl;
+ _interface->displayText("Screen Light");
+}
-
- K_EXPORT_COMPONENT_FACTORY(kmilo_generic, KGenericFactory<GenericMonitor>("kmilo_generic"))
-
-diff -Nur kdeutils-3.5.5/kmilo/generic/generic_monitor.h kdeutils-3.5.5.new/kmilo/generic/generic_monitor.h
---- kdeutils-3.5.5/kmilo/generic/generic_monitor.h 2006-01-19 17:49:13.000000000 +0100
-+++ kdeutils-3.5.5.new/kmilo/generic/generic_monitor.h 2006-11-02 17:37:42.000000000 +0100
++
++
+ void GenericMonitor::slowVolumeUp() { volumeChange( 1, m_volumeStepSlow); }
+ void GenericMonitor::slowVolumeDown() { volumeChange(-1, m_volumeStepSlow); }
+ void GenericMonitor::fastVolumeUp() { volumeChange( 1, m_volumeStepFast); }
+--- kdeutils-3.5.9/kmilo/generic/generic_monitor.h 2008-02-20 16:18:01.000000000 +0200
++++ kdeutils-3.5.9/kmilo/generic/generic_monitor.h 2008-02-20 16:19:29.000000000 +0200
@@ -29,6 +29,7 @@
#include <kglobalaccel.h>
#include <dcopref.h>
@@ -119,7 +125,7 @@
#include "kmilod.h"
#include "monitor.h"
-@@ -62,6 +63,16 @@
+@@ -63,6 +64,16 @@
void fastVolumeUp();
void fastVolumeDown();
void mute();
@@ -135,8 +141,8 @@
+ void lightBulb();
private:
- void volumeUp(int step);
-@@ -69,8 +80,10 @@
+ bool retrieveKmixDevices();
+@@ -70,8 +81,10 @@
bool retrieveMute();
bool retrieveVolume();
void displayVolume();
Deleted: trunk/packages/kdeutils/debian/patches/18_remove_temporal_file_kgpg.diff
Added: trunk/packages/kdeutils/debian/patches/97_automake_cleanup.diff
===================================================================
--- trunk/packages/kdeutils/debian/patches/97_automake_cleanup.diff (rev 0)
+++ trunk/packages/kdeutils/debian/patches/97_automake_cleanup.diff 2008-02-20 15:53:19 UTC (rev 9443)
@@ -0,0 +1,384 @@
+--- kdeutils-3.5.9/ark/Makefile.am 2006-01-19 18:49:29.000000000 +0200
++++ kdeutils-3.5.9/ark/Makefile.am 2008-02-20 17:02:15.000000000 +0200
+@@ -10,7 +10,7 @@
+
+ ark_la_SOURCES = main.cpp arkapp.cpp mainwindow.cpp
+ ark_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-ark_la_LIBADD = libark_common.la $(LIB_KPARTS)
++ark_la_LIBADD = libark_common.la $(LIB_KPARTS) $(LIB_QT) $(LIB_KDEUI) -lDCOP $(LIB_KIO) $(LIB_KDECORE)
+ ark_la_COMPILE_FIRST = settings.h
+
+ noinst_LTLIBRARIES = libark_common.la
+@@ -21,7 +21,7 @@
+
+ kde_module_LTLIBRARIES = libarkpart.la
+ libarkpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
+-libarkpart_la_LIBADD = libark_common.la $(LIB_KPARTS)
++libarkpart_la_LIBADD = libark_common.la $(LIB_KPARTS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDECORE)
+ libarkpart_la_COMPILE_FIRST = settings.h
+
+ libarkpart_la_SOURCES = ark_part.cpp arkfactory.cpp zip.cpp tar.cpp \
+--- kdeutils-3.5.9/charselectapplet/Makefile.am 2005-09-10 11:21:27.000000000 +0300
++++ kdeutils-3.5.9/charselectapplet/Makefile.am 2008-02-20 17:02:15.000000000 +0200
+@@ -13,7 +13,7 @@
+ EXTRA_DIST = $(lnk_DATA)
+
+ kcharselect_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+-kcharselect_panelapplet_la_LIBADD = $(LIB_KDEUI)
++kcharselect_panelapplet_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
+
+ messages:
+ $(XGETTEXT) *.cpp *.h -o $(podir)/kcharselectapplet.pot
+--- kdeutils-3.5.9/kcalc/Makefile.am 2005-11-19 12:03:01.000000000 +0200
++++ kdeutils-3.5.9/kcalc/Makefile.am 2008-02-20 17:02:15.000000000 +0200
+@@ -19,7 +19,7 @@
+ kcalctype.h dlabel.h stats.h
+
+ kcalc_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kcalc_la_LIBADD = $(LIB_KDEUI) knumber/libknumber.la
++kcalc_la_LIBADD = $(LIB_KDEUI) knumber/libknumber.la $(LIBGMP) $(LIB_QT) $(LIB_KDECORE)
+
+ KDE_ICON = kcalc
+
+--- kdeutils-3.5.9/kcharselect/Makefile.am 2005-09-10 11:21:27.000000000 +0300
++++ kdeutils-3.5.9/kcharselect/Makefile.am 2008-02-20 17:03:15.000000000 +0200
+@@ -1,5 +1,5 @@
+ INCLUDES = $(all_includes)
+-LDADD = $(LIB_KFILE)
++LDADD = $(LIB_KDEUI)
+ bin_PROGRAMS = kcharselect
+
+ kcharselect_SOURCES = kcharselectdia.cc main.cc
+--- kdeutils-3.5.9/kdelirc/irkick/Makefile.am 2005-09-10 11:21:34.000000000 +0300
++++ kdeutils-3.5.9/kdelirc/irkick/Makefile.am 2008-02-20 17:02:15.000000000 +0200
+@@ -12,7 +12,7 @@
+
+ libirkick_common_la_LDFLAGS = $(all_libraries)
+
+-irkick_la_LIBADD = libirkick_common.la
++irkick_la_LIBADD = libirkick_common.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lDCOP
+ irkick_la_SOURCES = dummy.cpp
+ irkick_la_LDFLAGS = $(all_libraries) -module -avoid-version
+
+--- kdeutils-3.5.9/kdelirc/kcmlirc/Makefile.am 2005-09-10 11:21:34.000000000 +0300
++++ kdeutils-3.5.9/kdelirc/kcmlirc/Makefile.am 2008-02-20 17:02:15.000000000 +0200
+@@ -6,7 +6,7 @@
+
+ noinst_HEADERS = kcmlirc.h addaction.h addactionbase.h
+ kcm_kcmlirc_la_SOURCES = selectprofile.ui newmode.ui kcmlircbase.ui kcmlirc.cpp addactionbase.ui addaction.cpp kcmlirc.skel editactionbase.ui editmodebase.ui editmode.cpp editaction.cpp modeslist.cpp
+-kcm_kcmlirc_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE) ../kdelirc/libkdelirc.la
++kcm_kcmlirc_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE) ../kdelirc/libkdelirc.la $(LIB_QT) -lDCOP $(LIB_KDECORE)
+ kcm_kcmlirc_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
+
+ xdg_apps_DATA = kcmlirc.desktop
+--- kdeutils-3.5.9/kdf/Makefile.am 2005-09-10 11:21:30.000000000 +0300
++++ kdeutils-3.5.9/kdf/Makefile.am 2008-02-20 17:02:15.000000000 +0200
+@@ -20,7 +20,7 @@
+
+ kcm_kdf_la_SOURCES = kcmdf.cpp
+ kcm_kdf_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-kcm_kdf_la_LIBADD = libkdf_common.la $(LIB_KFILE)
++kcm_kdf_la_LIBADD = libkdf_common.la $(LIB_KFILE) $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
+
+ noinst_HEADERS = kdfwidget.h kcmdf.h kdfconfig.h mntconfig.h \
+ disks.h kdf.h disklist.h kwikdisk.h listview.h optiondialog.h stdoption.h
+--- kdeutils-3.5.9/kedit/Makefile.am 2005-09-10 11:21:28.000000000 +0300
++++ kdeutils-3.5.9/kedit/Makefile.am 2008-02-20 17:02:15.000000000 +0200
+@@ -12,7 +12,7 @@
+ kdeinit_LTLIBRARIES = kedit.la
+
+ kedit_la_SOURCES = kedit.cpp ktextfiledlg.cpp misc.ui color.ui prefs.kcfgc
+-kedit_la_LIBADD = -lkdeprint $(LIB_KFILE)
++kedit_la_LIBADD = -lkdeprint $(LIB_KFILE) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+ kedit_la_LDFLAGS = -module -avoid-version $(KDE_PLUGIN) $(all_libraries)
+
+ noinst_HEADERS = kedit.h ktextfiledlg.h\
+--- kdeutils-3.5.9/khexedit/lib/Makefile.am 2005-09-10 11:21:32.000000000 +0300
++++ kdeutils-3.5.9/khexedit/lib/Makefile.am 2008-02-20 17:02:15.000000000 +0200
+@@ -7,7 +7,7 @@
+ # this library is used by the kbytesedit part and the khepart part
+ lib_LTLIBRARIES = libkhexeditcommon.la
+ libkhexeditcommon_la_LDFLAGS = $(all_libraries) -no-undefined
+-libkhexeditcommon_la_LIBADD = controller/libkcontroller.la codecs/libkhecodecs.la $(LIB_KDECORE)
++libkhexeditcommon_la_LIBADD = controller/libkcontroller.la codecs/libkhecodecs.la $(LIB_KDECORE) $(LIB_QT)
+ libkhexeditcommon_la_SOURCES = kcolumn.cpp kbordercolumn.cpp koffsetcolumn.cpp \
+ kbuffercolumn.cpp kvaluecolumn.cpp kcharcolumn.cpp \
+ kcolumnsview.cpp khexedit.cpp kbytesedit.cpp \
+--- kdeutils-3.5.9/khexedit/parts/kbytesedit/Makefile.am 2005-09-10 11:21:31.000000000 +0300
++++ kdeutils-3.5.9/khexedit/parts/kbytesedit/Makefile.am 2008-02-20 17:04:42.000000000 +0200
+@@ -9,7 +9,7 @@
+ libkbyteseditwidget_la_SOURCES = kbyteseditwidget.cpp
+
+ libkbyteseditwidget_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -avoid-version -no-undefined
+-libkbyteseditwidget_la_LIBADD = ../../lib/libkhexeditcommon.la $(LIB_KPARTS)
++libkbyteseditwidget_la_LIBADD = ../../lib/libkhexeditcommon.la $(LIB_QT) $(LIB_KDECORE)
+
+ service_DATA = kbyteseditwidget.desktop
+ servicedir = $(kde_servicesdir)
+--- kdeutils-3.5.9/khexedit/parts/kpart/Makefile.am 2005-09-10 11:21:31.000000000 +0300
++++ kdeutils-3.5.9/khexedit/parts/kpart/Makefile.am 2008-02-20 17:04:21.000000000 +0200
+@@ -9,7 +9,7 @@
+ libkhexedit2part_la_SOURCES = khepart.cpp khebrowserextension.cpp khepartfactory.cpp
+
+ libkhexedit2part_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -no-undefined
+-libkhexedit2part_la_LIBADD = ../../lib/libkhexeditcommon.la $(LIB_KPARTS) $(LIB_KIO)
++libkhexedit2part_la_LIBADD = ../../lib/libkhexeditcommon.la $(LIB_KPARTS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+
+ partdesktop_DATA = khexedit2part.desktop
+ partdesktopdir = $(kde_servicesdir)
+--- kdeutils-3.5.9/klaptopdaemon/Makefile.am 2007-10-08 12:49:45.000000000 +0300
++++ kdeutils-3.5.9/klaptopdaemon/Makefile.am 2008-02-20 17:05:09.000000000 +0200
+@@ -5,23 +5,23 @@
+
+ libkcmlaptop_la_SOURCES = portable.cpp smapidev.c daemon_state.cpp wake_laptop.cpp krichtextlabel.cpp
+ libkcmlaptop_la_LDFLAGS = $(all_libraries)
+-libkcmlaptop_la_LIBADD = $(LIB_KDEUI)
++libkcmlaptop_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) -lDCOP
+
+ MESSAGE_SOURCES = laptop_daemon.cpp kpcmcia.cpp xautolock.cc kpcmciainfo.cpp daemondock.cpp xautolock_diy.c xautolock_engine.c
+ kded_klaptopdaemon_la_SOURCES = $(MESSAGE_SOURCES) laptop_daemon.skel
+ kded_klaptopdaemon_la_LDFLAGS = $(all_libraries) -module -avoid-version -lXtst
+-kded_klaptopdaemon_la_LIBADD = $(LIB_KDEUI) $(LIB_XSS) libkcmlaptop.la
++kded_klaptopdaemon_la_LIBADD = $(LIB_KDEUI) $(LIB_XSS) libkcmlaptop.la $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_X11) -lkdeinit_kded
+
+ klaptop_acpi_helper_SOURCES = acpi_helper.cpp
+
+ klaptop_check_SOURCES = laptop_check.cpp
+ klaptop_check_LDFLAGS = $(all_libraries)
+-klaptop_check_LDADD = $(LIB_KFILE) $(LIB_KDEUI) libkcmlaptop.la
++klaptop_check_LDADD = libkcmlaptop.la
+
+ kcm_laptop_la_SOURCES = battery.cpp main.cpp pcmcia.cpp power.cpp warning.cpp \
+ acpi.cpp sony.cpp profile.cpp buttons.cpp apm.cpp
+ kcm_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+-kcm_laptop_la_LIBADD = $(LIB_KFILE) $(LIB_KDEUI) libkcmlaptop.la
++kcm_laptop_la_LIBADD = $(LIB_KFILE) $(LIB_KDEUI) libkcmlaptop.la $(LIB_QT) $(LIBZ) $(LIB_KDECORE)
+ kcm_laptop_la_COMPILE_FIRST = crcresult.h
+
+ AM_CPPFLAGS = $(all_includes)
+--- kdeutils-3.5.9/kmilo/asus/Makefile.am 2006-01-19 18:49:13.000000000 +0200
++++ kdeutils-3.5.9/kmilo/asus/Makefile.am 2008-02-20 17:05:54.000000000 +0200
+@@ -24,7 +24,7 @@
+ kde_module_LTLIBRARIES = kmilo_asus.la
+
+ kmilo_asus_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+-kmilo_asus_la_LIBADD = ../kmilod/libkmilo.la $(LIB_KIO)
++kmilo_asus_la_LIBADD = ../kmilod/libkmilo.la $(LIB_QT) $(LIB_KDECORE)
+ kmilo_asus_la_SOURCES = asus.cpp
+ METASOURCES = AUTO
+
+--- kdeutils-3.5.9/kmilo/delli8k/Makefile.am 2006-01-19 18:49:13.000000000 +0200
++++ kdeutils-3.5.9/kmilo/delli8k/Makefile.am 2008-02-20 17:07:05.000000000 +0200
+@@ -22,7 +22,7 @@
+ kde_module_LTLIBRARIES = kmilo_delli8k.la
+
+ kmilo_delli8k_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+-kmilo_delli8k_la_LIBADD = ../kmilod/libkmilo.la $(LIB_KIO)
++kmilo_delli8k_la_LIBADD = ../kmilod/libkmilo.la $(LIB_QT) $(LIB_KDECORE) -lDCOP
+ kmilo_delli8k_la_SOURCES = delli8k.cpp
+ METASOURCES = AUTO
+
+--- kdeutils-3.5.9/kmilo/generic/Makefile.am 2006-01-19 18:49:13.000000000 +0200
++++ kdeutils-3.5.9/kmilo/generic/Makefile.am 2008-02-20 17:05:40.000000000 +0200
+@@ -21,7 +21,7 @@
+ kde_module_LTLIBRARIES = kmilo_generic.la
+
+ kmilo_generic_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+-kmilo_generic_la_LIBADD = ../kmilod/libkmilo.la $(LIB_KIO)
++kmilo_generic_la_LIBADD = ../kmilod/libkmilo.la $(LIB_QT) $(LIB_KDECORE) -lDCOP
+ kmilo_generic_la_SOURCES = generic_monitor.cpp
+ METASOURCES = AUTO
+
+--- kdeutils-3.5.9/kmilo/kmilod/Makefile.am 2006-01-19 18:49:10.000000000 +0200
++++ kdeutils-3.5.9/kmilo/kmilod/Makefile.am 2008-02-20 17:02:15.000000000 +0200
+@@ -20,7 +20,7 @@
+
+ kde_module_LTLIBRARIES = kded_kmilod.la
+ kded_kmilod_la_LDFLAGS = -module -avoid-version $(all_libraries)
+-kded_kmilod_la_LIBADD = $(LIB_KIO) libkmilo.la
++kded_kmilod_la_LIBADD = $(LIB_KIO) libkmilo.la $(LIB_QT) -lDCOP $(LIB_KDECORE) -lkdeinit_kded
+ kded_kmilod_la_SOURCES = kmilod.cpp kmilod.skel defaultskin.cpp \
+ defaultwidget.ui kmilointerface.cpp
+
+--- kdeutils-3.5.9/kmilo/kmilo_kvaio/kcmkvaio/Makefile.am 2005-09-10 11:21:33.000000000 +0300
++++ kdeutils-3.5.9/kmilo/kmilo_kvaio/kcmkvaio/Makefile.am 2008-02-20 17:02:15.000000000 +0200
+@@ -3,7 +3,7 @@
+ kcm_kvaio_la_SOURCES = kcmkvaio_general.ui main.cpp
+
+ kcm_kvaio_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+-kcm_kvaio_la_LIBADD = ../kvaiodriverinterface.lo $(LIB_KDEUI)
++kcm_kvaio_la_LIBADD = ../kvaiodriverinterface.lo $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) -lDCOP
+
+ INCLUDES= $(all_includes)
+
+--- kdeutils-3.5.9/kmilo/kmilo_kvaio/Makefile.am 2006-01-19 18:49:12.000000000 +0200
++++ kdeutils-3.5.9/kmilo/kmilo_kvaio/Makefile.am 2008-02-20 17:06:35.000000000 +0200
+@@ -23,7 +23,7 @@
+ kde_module_LTLIBRARIES = kmilo_kvaio.la
+
+ kmilo_kvaio_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+-kmilo_kvaio_la_LIBADD = ../kmilod/libkmilo.la $(LIB_KIO) -lXext -lXtst
++kmilo_kvaio_la_LIBADD = ../kmilod/libkmilo.la $(LIB_QT) $(LIB_KDECORE) -lDCOP $(LIB_X11)
+ kmilo_kvaio_la_SOURCES = kmilo_kvaio.cpp kvaiodriverinterface.cpp kvaio.cpp
+
+ METASOURCES = AUTO
+--- kdeutils-3.5.9/kmilo/thinkpad/kcmthinkpad/Makefile.am 2007-05-14 10:40:45.000000000 +0300
++++ kdeutils-3.5.9/kmilo/thinkpad/kcmthinkpad/Makefile.am 2008-02-20 17:02:15.000000000 +0200
+@@ -3,7 +3,7 @@
+ kcm_thinkpad_la_SOURCES = kcmthinkpad_general.ui main.cpp
+
+ kcm_thinkpad_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+-kcm_thinkpad_la_LIBADD = $(LIB_KIO)
++kcm_thinkpad_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) -lDCOP $(LIB_KDEUI)
+
+ INCLUDES= $(all_includes) -DKDE_BINDIR="\"$(bindir)\""
+
+--- kdeutils-3.5.9/kmilo/thinkpad/Makefile.am 2006-01-19 18:49:10.000000000 +0200
++++ kdeutils-3.5.9/kmilo/thinkpad/Makefile.am 2008-02-20 17:02:15.000000000 +0200
+@@ -23,7 +23,7 @@
+ kde_module_LTLIBRARIES = kmilo_thinkpad.la
+
+ kmilo_thinkpad_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+-kmilo_thinkpad_la_LIBADD = ../kmilod/libkmilo.la $(LIB_KIO)
++kmilo_thinkpad_la_LIBADD = ../kmilod/libkmilo.la $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) -lDCOP
+ kmilo_thinkpad_la_SOURCES = thinkpad.cpp
+ METASOURCES = AUTO
+
+--- kdeutils-3.5.9/kregexpeditor/Makefile.am 2005-09-10 11:21:34.000000000 +0300
++++ kdeutils-3.5.9/kregexpeditor/Makefile.am 2008-02-20 17:07:38.000000000 +0200
+@@ -29,7 +29,7 @@
+
+ libkregexpeditorcommon_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
+ libkregexpeditorcommon_la_LIBADD = KMultiFormListBox/libkmultiformlistbox.la \
+- KWidgetStreamer/libkwidgetstreamer.la $(LIB_KIO)
++ KWidgetStreamer/libkwidgetstreamer.la $(LIB_KIO) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+
+ METASOURCES = AUTO
+
+@@ -40,14 +40,14 @@
+ kde_module_LTLIBRARIES = libkregexpeditorgui.la
+ libkregexpeditorgui_la_SOURCES = kregexpeditorfactory.cpp
+ libkregexpeditorgui_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+-libkregexpeditorgui_la_LIBADD = libkregexpeditorcommon.la
++libkregexpeditorgui_la_LIBADD = libkregexpeditorcommon.la $(LIB_QT) $(LIB_KDECORE)
+
+ #### Binary
+
+ bin_PROGRAMS = kregexpeditor
+ kregexpeditor_SOURCES = main.cpp
+ kregexpeditor_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+-kregexpeditor_LDADD = libkregexpeditorcommon.la $(LIB_KIO)
++kregexpeditor_LDADD = libkregexpeditorcommon.la
+ kregexpeditor_INCLUDES = $(all_includes)
+
+ xdg_apps_DATA = kregexpeditor.desktop
+--- kdeutils-3.5.9/ksim/library/Makefile.am 2005-09-10 11:21:29.000000000 +0300
++++ kdeutils-3.5.9/ksim/library/Makefile.am 2008-02-20 17:02:15.000000000 +0200
+@@ -7,7 +7,7 @@
+ pluginmodule.cpp ksimconfig.cpp
+
+ libksimcore_la_LDFLAGS = $(all_libraries) -version-info 1:0 -no-undefined
+-libksimcore_la_LIBADD = $(LIB_KDEUI)
++libksimcore_la_LIBADD = $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) -lkdefx
+
+ ksiminclude_HEADERS = common.h themeloader.h \
+ chart.h label.h \
+--- kdeutils-3.5.9/ksim/Makefile.am 2007-01-15 13:25:34.000000000 +0200
++++ kdeutils-3.5.9/ksim/Makefile.am 2008-02-20 17:02:15.000000000 +0200
+@@ -10,7 +10,7 @@
+ themeprefs.cpp
+
+ ksim_panelextension_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+-ksim_panelextension_la_LIBADD = ./library/libksimcore.la libsysteminfo.la $(LIB_KIO) $(LIB_KDEUI)
++ksim_panelextension_la_LIBADD = ./library/libksimcore.la libsysteminfo.la $(LIB_KIO) $(LIB_KDEUI) $(LIB_QT) -lDCOP $(LIB_KDECORE)
+
+ SUBDIRS = themes library monitors pics
+ EXTRA_DIST = ksim.desktop
+--- kdeutils-3.5.9/ksim/monitors/cpu/Makefile.am 2005-10-10 17:59:12.000000000 +0300
++++ kdeutils-3.5.9/ksim/monitors/cpu/Makefile.am 2008-02-20 17:02:15.000000000 +0200
+@@ -1,7 +1,7 @@
+ kde_module_LTLIBRARIES = ksim_cpu.la
+ ksim_cpu_la_SOURCES = ksimcpu.cpp
+
+-ksim_cpu_la_LIBADD = ../../library/libksimcore.la
++ksim_cpu_la_LIBADD = ../../library/libksimcore.la $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+ ksim_cpu_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+
+ EXTRA_DIST = cpu.desktop
+--- kdeutils-3.5.9/ksim/monitors/disk/Makefile.am 2005-10-10 17:59:12.000000000 +0300
++++ kdeutils-3.5.9/ksim/monitors/disk/Makefile.am 2008-02-20 17:02:15.000000000 +0200
+@@ -2,7 +2,7 @@
+ ksim_disk_la_SOURCES = ksimdisk.cpp
+
+ ksim_disk_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-ksim_disk_la_LIBADD = $(LIB_DEVSTAT) ../../library/libksimcore.la
++ksim_disk_la_LIBADD = $(LIB_DEVSTAT) ../../library/libksimcore.la $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+
+ EXTRA_DIST = disk.desktop
+
+--- kdeutils-3.5.9/ksim/monitors/filesystem/Makefile.am 2005-10-10 17:59:12.000000000 +0300
++++ kdeutils-3.5.9/ksim/monitors/filesystem/Makefile.am 2008-02-20 17:02:15.000000000 +0200
+@@ -3,7 +3,7 @@
+ fsystemiface.skel filesystemwidget.cpp filesystemstats.cpp
+
+ ksim_filesystem_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-ksim_filesystem_la_LIBADD = ../../library/libksimcore.la
++ksim_filesystem_la_LIBADD = ../../library/libksimcore.la $(LIB_QT) -lDCOP $(LIB_KDEUI) $(LIB_KDECORE)
+
+ EXTRA_DIST = DFree.desktop
+
+--- kdeutils-3.5.9/ksim/monitors/lm_sensors/Makefile.am 2005-10-10 17:59:12.000000000 +0300
++++ kdeutils-3.5.9/ksim/monitors/lm_sensors/Makefile.am 2008-02-20 17:02:15.000000000 +0200
+@@ -12,7 +12,7 @@
+ sensorbase.cpp ksimsensorsiface.skel
+
+ ksim_sensors_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-ksim_sensors_la_LIBADD = ../../library/libksimcore.la $(NVCTRL_LIB)
++ksim_sensors_la_LIBADD = ../../library/libksimcore.la $(NVCTRL_LIB) $(LIB_QT) -lDCOP $(LIB_XEXT) $(LIB_KDEUI) $(LIB_X11) $(LIB_KDECORE)
+
+ EXTRA_DIST = Lm_sensors.desktop
+
+--- kdeutils-3.5.9/ksim/monitors/net/Makefile.am 2005-10-10 17:59:12.000000000 +0300
++++ kdeutils-3.5.9/ksim/monitors/net/Makefile.am 2008-02-20 17:02:15.000000000 +0200
+@@ -2,7 +2,7 @@
+ ksim_net_la_SOURCES = ksimnet.cpp netdialog.cpp netconfig.cpp
+
+ ksim_net_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-ksim_net_la_LIBADD = ../../library/libksimcore.la $(LIB_KIO)
++ksim_net_la_LIBADD = ../../library/libksimcore.la $(LIB_KIO) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+
+ EXTRA_DIST = Net.desktop
+
+--- kdeutils-3.5.9/ksim/monitors/snmp/Makefile.am 2005-10-10 17:59:12.000000000 +0300
++++ kdeutils-3.5.9/ksim/monitors/snmp/Makefile.am 2008-02-20 17:02:15.000000000 +0200
+@@ -6,7 +6,7 @@
+ walker.cpp
+
+ ksim_snmp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-ksim_snmp_la_LIBADD = ../../library/libksimcore.la $(LIB_KIO) $(LIBSNMP)
++ksim_snmp_la_LIBADD = ../../library/libksimcore.la $(LIB_KIO) $(LIBSNMP) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
+
+ INCLUDES= -I$(top_srcdir)/ksim/library $(all_includes)
+
+--- kdeutils-3.5.9/kwallet/konfigurator/Makefile.am 2005-09-10 11:21:30.000000000 +0300
++++ kdeutils-3.5.9/kwallet/konfigurator/Makefile.am 2008-02-20 17:02:15.000000000 +0200
+@@ -4,7 +4,7 @@
+ kde_module_LTLIBRARIES = kcm_kwallet.la
+ kcm_kwallet_la_SOURCES = walletconfigwidget.ui konfigurator.cpp
+ kcm_kwallet_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-kcm_kwallet_la_LIBADD = $(LIB_KDEUI) -lkwalletclient
++kcm_kwallet_la_LIBADD = $(LIB_KDEUI) -lkwalletclient $(LIB_QT) $(LIB_KDECORE) -lDCOP
+
+ messages: rc.cpp
+ $(XGETTEXT) *.cpp -o $(podir)/kcmkwallet.pot
+--- kdeutils-3.5.9/superkaramba/src/Makefile.am 2008-02-20 16:27:15.000000000 +0200
++++ kdeutils-3.5.9/superkaramba/src/Makefile.am 2008-02-20 17:08:21.000000000 +0200
+@@ -42,7 +42,7 @@
+
+ superkaramba_LDFLAGS = -Wl,-export-dynamic $(KDE_RPATH) $(all_libraries) $(PYTHONLIB)
+ #superkaramba_LDADD = -lkio $(LIB_KDEUI) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF)
+-superkaramba_LDADD = -lkio $(LIB_KDEUI) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF)
++superkaramba_LDADD = $(LIB_KIO) $(LIB_KDEUI) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF)
+
+ # this is where the desktop file will go
+ shelldesktopdir = $(kde_appsdir)/Utilities
Modified: trunk/packages/kdeutils/debian/patches/98_buildprep.diff
===================================================================
Modified: trunk/packages/kdeutils/debian/rules
===================================================================
--- trunk/packages/kdeutils/debian/rules 2008-02-20 13:52:59 UTC (rev 9442)
+++ trunk/packages/kdeutils/debian/rules 2008-02-20 15:53:19 UTC (rev 9443)
@@ -11,14 +11,12 @@
DEB_DH_STRIP_ARGS := --dbg-package=kdeutils-dbg
-PACKAGES_WITH_LIBS := khexedit klaptopdaemon kmilo kregexpeditor ksim
+DEB_DH_MAKESHLIBS_ARGS_khexedit := -V'khexedit (>= 4:3.5.9)'
+DEB_DH_MAKESHLIBS_ARGS_klaptopdaemon := -V'klaptopdaemon (>= 4:3.5.9)'
+DEB_DH_MAKESHLIBS_ARGS_kmilo := -V'kmilo (>= 4:3.5.9)'
+DEB_DH_MAKESHLIBS_ARGS_kregexpeditor := -V'kregexpeditor (>= 4:3.5.9)'
+DEB_DH_MAKESHLIBS_ARGS_ksim := -V'ksim (>= 4:3.5.9)'
-DEB_DH_MAKESHLIBS_ARGS_khexedit := -V'khexedit (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_klaptopdaemon := -V'klaptopdaemon (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_kmilo := -V'kmilo (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_kregexpeditor := -V'kregexpeditor (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_ksim := -V'ksim (>= 4:3.5.7-1)'
-
#shlibs_ver = 4:3.5.0-1
#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
More information about the pkg-kde-commits
mailing list