rev 10351 - in branches/kde4/packages/kdebase/debian: . patches
Modestas Vainius
modax-guest at alioth.debian.org
Mon Apr 28 22:32:15 UTC 2008
Author: modax-guest
Date: 2008-04-28 22:32:14 +0000 (Mon, 28 Apr 2008)
New Revision: 10351
Added:
branches/kde4/packages/kdebase/debian/kdebase.docs
branches/kde4/packages/kdebase/debian/patches/
branches/kde4/packages/kdebase/debian/patches/97_fix_target_link_libraries.diff
branches/kde4/packages/kdebase/debian/patches/series
Removed:
branches/kde4/packages/kdebase/debian/docs
Modified:
branches/kde4/packages/kdebase/debian/changelog
branches/kde4/packages/kdebase/debian/control
branches/kde4/packages/kdebase/debian/dolphin.install
branches/kde4/packages/kdebase/debian/kappfinder.install
branches/kde4/packages/kdebase/debian/kdebase-bin.install
branches/kde4/packages/kdebase/debian/kdebase-data.install
branches/kde4/packages/kdebase/debian/kinfocenter.install
branches/kde4/packages/kdebase/debian/konqueror.install
branches/kde4/packages/kdebase/debian/konsole.install
branches/kde4/packages/kdebase/debian/libkonq5-dev.install
branches/kde4/packages/kdebase/debian/libkonq5-templates.install
Log:
kdebase snapshot packaged.
Modified: branches/kde4/packages/kdebase/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase/debian/changelog 2008-04-28 22:27:51 UTC (rev 10350)
+++ branches/kde4/packages/kdebase/debian/changelog 2008-04-28 22:32:14 UTC (rev 10351)
@@ -1,3 +1,22 @@
+kdebase (4:4.0.71+svn802233-1~pre1) UNRELEASED; urgency=low
+
+ * New upstream development snapshot:
+ - The latest upstream commit is r802233 by ppenz
+ - Date: Mon, 28 Apr 2008 22:05:20 -0000
+
+ +++ Changes by Modestas Vainius:
+
+ * Add libstreamanalyzer-dev, libxrender-dev, zlib1g-dev, libglu1-mesa-dev,
+ libpci-dev, libxt-dev, pkg-config (for getting strigi version) to
+ build depends.
+ * Add 97_fix_target_link_libraries.diff.
+ * Update install files, sort them.
+ * Remove AUTHORS from debian/docs.
+ * Do not install README to each package. It's pointless. Install it only
+ to kdebase.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 29 Apr 2008 01:24:53 +0300
+
kdebase (4:4.0.68+svn794641-1) experimental; urgency=low
* New upstream snapshot.
Modified: branches/kde4/packages/kdebase/debian/control
===================================================================
--- branches/kde4/packages/kdebase/debian/control 2008-04-28 22:27:51 UTC (rev 10350)
+++ branches/kde4/packages/kdebase/debian/control 2008-04-28 22:32:14 UTC (rev 10351)
@@ -6,7 +6,8 @@
Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt, cmake,
kdepimlibs5-dev (>= 4:4.0.68), libphonon-dev (>= 4:4.0.68),
libqimageblitz-dev (>= 1:0.0.4-2), libsmbclient-dev, libusb-dev, libxkbfile-dev,
- libraw1394-dev
+ libraw1394-dev, libstreamanalyzer-dev, libxrender-dev, zlib1g-dev, libglu1-mesa-dev,
+ libpci-dev, libxt-dev, pkg-config
Standards-Version: 3.7.3
Homepage: http://www.kde.org/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/branches/kde4/packages/kdebase
Deleted: branches/kde4/packages/kdebase/debian/docs
Modified: branches/kde4/packages/kdebase/debian/dolphin.install
===================================================================
--- branches/kde4/packages/kdebase/debian/dolphin.install 2008-04-28 22:27:51 UTC (rev 10350)
+++ branches/kde4/packages/kdebase/debian/dolphin.install 2008-04-28 22:32:14 UTC (rev 10351)
@@ -8,9 +8,9 @@
usr/share/doc/kde4/HTML/en/dolphin/breadcrumb.png
usr/share/doc/kde4/HTML/en/dolphin/browsebutton.png
usr/share/doc/kde4/HTML/en/dolphin/common
+usr/share/doc/kde4/HTML/en/dolphin/configurationwindow.png
usr/share/doc/kde4/HTML/en/dolphin/configurationwindow2.png
usr/share/doc/kde4/HTML/en/dolphin/configurationwindow3.png
-usr/share/doc/kde4/HTML/en/dolphin/configurationwindow.png
usr/share/doc/kde4/HTML/en/dolphin/directorypath.png
usr/share/doc/kde4/HTML/en/dolphin/dolphin.png
usr/share/doc/kde4/HTML/en/dolphin/hiddenfolder.png
@@ -34,6 +34,10 @@
usr/share/kde4/apps/dolphin/icons/oxygen/48x48/actions/view-file-columns.png
usr/share/kde4/apps/dolphin/icons/oxygen/scalable/actions/view-file-columns.svgz
usr/share/kde4/apps/dolphinpart/dolphinpart.rc
+usr/share/kde4/apps/dolphinpart/kpartplugins/kremoteencodingplugin.desktop
+usr/share/kde4/apps/dolphinpart/kpartplugins/kremoteencodingplugin.rc
+usr/share/kde4/apps/dolphinpart/kpartplugins/kshellcmdplugin.desktop
+usr/share/kde4/apps/dolphinpart/kpartplugins/kshellcmdplugin.rc
usr/share/kde4/config.kcfg/dolphin_columnmodesettings.kcfg
usr/share/kde4/config.kcfg/dolphin_detailsmodesettings.kcfg
usr/share/kde4/config.kcfg/dolphin_directoryviewpropertysettings.kcfg
Modified: branches/kde4/packages/kdebase/debian/kappfinder.install
===================================================================
--- branches/kde4/packages/kdebase/debian/kappfinder.install 2008-04-28 22:27:51 UTC (rev 10350)
+++ branches/kde4/packages/kdebase/debian/kappfinder.install 2008-04-28 22:32:14 UTC (rev 10351)
@@ -6,12 +6,12 @@
usr/share/icons/hicolor/32x32/apps/kappfinder.png
usr/share/icons/hicolor/48x48/apps/kappfinder.png
usr/share/icons/hicolor/64x64/apps/kappfinder.png
+usr/share/kde4/apps/kappfinder/apps/Development/Forte.desktop
usr/share/kde4/apps/kappfinder/apps/Development/assistant.desktop
usr/share/kde4/apps/kappfinder/apps/Development/ddd.desktop
usr/share/kde4/apps/kappfinder/apps/Development/designer.desktop
usr/share/kde4/apps/kappfinder/apps/Development/dlgedit.desktop
usr/share/kde4/apps/kappfinder/apps/Development/eclipse.desktop
-usr/share/kde4/apps/kappfinder/apps/Development/Forte.desktop
usr/share/kde4/apps/kappfinder/apps/Development/j2mewtk.desktop
usr/share/kde4/apps/kappfinder/apps/Development/linguist.desktop
usr/share/kde4/apps/kappfinder/apps/Development/pose.desktop
@@ -24,20 +24,20 @@
usr/share/kde4/apps/kappfinder/apps/Editors/pico.desktop
usr/share/kde4/apps/kappfinder/apps/Editors/xedit.desktop
usr/share/kde4/apps/kappfinder/apps/Editors/xemacs.desktop
-usr/share/kde4/apps/kappfinder/apps/Games/Arcade/alephone.desktop
-usr/share/kde4/apps/kappfinder/apps/Games/Arcade/alephone-nogl.desktop
usr/share/kde4/apps/kappfinder/apps/Games/Arcade/ClanBomber.desktop
-usr/share/kde4/apps/kappfinder/apps/Games/Arcade/cxhextris.desktop
usr/share/kde4/apps/kappfinder/apps/Games/Arcade/FrozenBubble.desktop
usr/share/kde4/apps/kappfinder/apps/Games/Arcade/Gnibbles.desktop
usr/share/kde4/apps/kappfinder/apps/Games/Arcade/GnobotsII.desktop
usr/share/kde4/apps/kappfinder/apps/Games/Arcade/Mures.desktop
-usr/share/kde4/apps/kappfinder/apps/Games/Arcade/rocksndiamonds.desktop
usr/share/kde4/apps/kappfinder/apps/Games/Arcade/SuperMethaneBrothers.desktop
usr/share/kde4/apps/kappfinder/apps/Games/Arcade/Trophy.desktop
usr/share/kde4/apps/kappfinder/apps/Games/Arcade/TuxRacer.desktop
usr/share/kde4/apps/kappfinder/apps/Games/Arcade/XKobo.desktop
usr/share/kde4/apps/kappfinder/apps/Games/Arcade/XSoldier.desktop
+usr/share/kde4/apps/kappfinder/apps/Games/Arcade/alephone-nogl.desktop
+usr/share/kde4/apps/kappfinder/apps/Games/Arcade/alephone.desktop
+usr/share/kde4/apps/kappfinder/apps/Games/Arcade/cxhextris.desktop
+usr/share/kde4/apps/kappfinder/apps/Games/Arcade/rocksndiamonds.desktop
usr/share/kde4/apps/kappfinder/apps/Games/Board/Gataxx.desktop
usr/share/kde4/apps/kappfinder/apps/Games/Board/Gchess.desktop
usr/share/kde4/apps/kappfinder/apps/Games/Board/Glines.desktop
@@ -48,17 +48,15 @@
usr/share/kde4/apps/kappfinder/apps/Games/Board/Gstones.desktop
usr/share/kde4/apps/kappfinder/apps/Games/Board/Iagno.desktop
usr/share/kde4/apps/kappfinder/apps/Games/Board/SameGnome.desktop
+usr/share/kde4/apps/kappfinder/apps/Games/Board/Xgammon.desktop
usr/share/kde4/apps/kappfinder/apps/Games/Board/xboard.desktop
-usr/share/kde4/apps/kappfinder/apps/Games/Board/Xgammon.desktop
usr/share/kde4/apps/kappfinder/apps/Games/Card/AisleRiot.desktop
usr/share/kde4/apps/kappfinder/apps/Games/Card/FreeCell.desktop
usr/share/kde4/apps/kappfinder/apps/Games/Card/PySol.desktop
usr/share/kde4/apps/kappfinder/apps/Games/Card/XPat2.desktop
usr/share/kde4/apps/kappfinder/apps/Games/Clanbomber.desktop
-usr/share/kde4/apps/kappfinder/apps/Games/defendguin.desktop
usr/share/kde4/apps/kappfinder/apps/Games/Emulators/qmamecat.desktop
usr/share/kde4/apps/kappfinder/apps/Games/GTali.desktop
-usr/share/kde4/apps/kappfinder/apps/Games/penguin-command.desktop
usr/share/kde4/apps/kappfinder/apps/Games/Roguelikes/angband.desktop
usr/share/kde4/apps/kappfinder/apps/Games/Roguelikes/moria.desktop
usr/share/kde4/apps/kappfinder/apps/Games/Roguelikes/nethack.desktop
@@ -68,46 +66,62 @@
usr/share/kde4/apps/kappfinder/apps/Games/TacticStrategy/freeciv.desktop
usr/share/kde4/apps/kappfinder/apps/Games/TacticStrategy/freecivserver.desktop
usr/share/kde4/apps/kappfinder/apps/Games/TacticStrategy/xscorch.desktop
+usr/share/kde4/apps/kappfinder/apps/Games/defendguin.desktop
+usr/share/kde4/apps/kappfinder/apps/Games/penguin-command.desktop
usr/share/kde4/apps/kappfinder/apps/Games/xshipwars.desktop
+usr/share/kde4/apps/kappfinder/apps/Graphics/ElectricEyes.desktop
+usr/share/kde4/apps/kappfinder/apps/Graphics/GPhoto.desktop
+usr/share/kde4/apps/kappfinder/apps/Graphics/GnomeColorSelector.desktop
+usr/share/kde4/apps/kappfinder/apps/Graphics/GnomeIconEditor.desktop
+usr/share/kde4/apps/kappfinder/apps/Graphics/Gqview.desktop
+usr/share/kde4/apps/kappfinder/apps/Graphics/Sketch.desktop
+usr/share/kde4/apps/kappfinder/apps/Graphics/Xpcd.desktop
+usr/share/kde4/apps/kappfinder/apps/Graphics/Xwpick.desktop
usr/share/kde4/apps/kappfinder/apps/Graphics/bitmap.desktop
usr/share/kde4/apps/kappfinder/apps/Graphics/blender.desktop
-usr/share/kde4/apps/kappfinder/apps/Graphics/ElectricEyes.desktop
usr/share/kde4/apps/kappfinder/apps/Graphics/ghostview.desktop
usr/share/kde4/apps/kappfinder/apps/Graphics/gimp.desktop
-usr/share/kde4/apps/kappfinder/apps/Graphics/GnomeColorSelector.desktop
-usr/share/kde4/apps/kappfinder/apps/Graphics/GnomeIconEditor.desktop
-usr/share/kde4/apps/kappfinder/apps/Graphics/GPhoto.desktop
-usr/share/kde4/apps/kappfinder/apps/Graphics/Gqview.desktop
usr/share/kde4/apps/kappfinder/apps/Graphics/gv.desktop
usr/share/kde4/apps/kappfinder/apps/Graphics/inkscape.desktop
-usr/share/kde4/apps/kappfinder/apps/Graphics/Sketch.desktop
usr/share/kde4/apps/kappfinder/apps/Graphics/sodipodi.desktop
usr/share/kde4/apps/kappfinder/apps/Graphics/tgif.desktop
usr/share/kde4/apps/kappfinder/apps/Graphics/xdvi.desktop
usr/share/kde4/apps/kappfinder/apps/Graphics/xfig.desktop
usr/share/kde4/apps/kappfinder/apps/Graphics/xpaint.desktop
-usr/share/kde4/apps/kappfinder/apps/Graphics/Xpcd.desktop
usr/share/kde4/apps/kappfinder/apps/Graphics/xv.desktop
-usr/share/kde4/apps/kappfinder/apps/Graphics/Xwpick.desktop
+usr/share/kde4/apps/kappfinder/apps/Internet/BlueFish.desktop
+usr/share/kde4/apps/kappfinder/apps/Internet/Dpsftp.desktop
+usr/share/kde4/apps/kappfinder/apps/Internet/DrakSync.desktop
+usr/share/kde4/apps/kappfinder/apps/Internet/Evolution.desktop
+usr/share/kde4/apps/kappfinder/apps/Internet/Faces.desktop
+usr/share/kde4/apps/kappfinder/apps/Internet/Fetchmailconf.desktop
+usr/share/kde4/apps/kappfinder/apps/Internet/Gabber.desktop
+usr/share/kde4/apps/kappfinder/apps/Internet/Galeon.desktop
+usr/share/kde4/apps/kappfinder/apps/Internet/GnomeICU.desktop
+usr/share/kde4/apps/kappfinder/apps/Internet/Netscapemessenger.desktop
+usr/share/kde4/apps/kappfinder/apps/Internet/Nmapfe.desktop
+usr/share/kde4/apps/kappfinder/apps/Internet/Pan.desktop
+usr/share/kde4/apps/kappfinder/apps/Internet/Sylpheed.desktop
+usr/share/kde4/apps/kappfinder/apps/Internet/Terminal/Links.desktop
+usr/share/kde4/apps/kappfinder/apps/Internet/Terminal/Lynx.desktop
+usr/share/kde4/apps/kappfinder/apps/Internet/Terminal/btdownloadcurses.desktop
+usr/share/kde4/apps/kappfinder/apps/Internet/Terminal/lftp.desktop
+usr/share/kde4/apps/kappfinder/apps/Internet/Terminal/mutt.desktop
+usr/share/kde4/apps/kappfinder/apps/Internet/Terminal/ncftp.desktop
+usr/share/kde4/apps/kappfinder/apps/Internet/Terminal/pine.desktop
+usr/share/kde4/apps/kappfinder/apps/Internet/Terminal/silc.desktop
+usr/share/kde4/apps/kappfinder/apps/Internet/Terminal/slrn.desktop
+usr/share/kde4/apps/kappfinder/apps/Internet/Terminal/w3m.desktop
usr/share/kde4/apps/kappfinder/apps/Internet/arena.desktop
usr/share/kde4/apps/kappfinder/apps/Internet/balsa.desktop
-usr/share/kde4/apps/kappfinder/apps/Internet/BlueFish.desktop
usr/share/kde4/apps/kappfinder/apps/Internet/btdownloadgui.desktop
usr/share/kde4/apps/kappfinder/apps/Internet/coolmail.desktop
usr/share/kde4/apps/kappfinder/apps/Internet/dc_gui.desktop
-usr/share/kde4/apps/kappfinder/apps/Internet/Dpsftp.desktop
-usr/share/kde4/apps/kappfinder/apps/Internet/DrakSync.desktop
usr/share/kde4/apps/kappfinder/apps/Internet/ed2k_gui.desktop
usr/share/kde4/apps/kappfinder/apps/Internet/epiphany.desktop
usr/share/kde4/apps/kappfinder/apps/Internet/ethereal.desktop
-usr/share/kde4/apps/kappfinder/apps/Internet/Evolution.desktop
-usr/share/kde4/apps/kappfinder/apps/Internet/Faces.desktop
-usr/share/kde4/apps/kappfinder/apps/Internet/Fetchmailconf.desktop
-usr/share/kde4/apps/kappfinder/apps/Internet/Gabber.desktop
+usr/share/kde4/apps/kappfinder/apps/Internet/gFTP.desktop
usr/share/kde4/apps/kappfinder/apps/Internet/gaim.desktop
-usr/share/kde4/apps/kappfinder/apps/Internet/Galeon.desktop
-usr/share/kde4/apps/kappfinder/apps/Internet/gFTP.desktop
-usr/share/kde4/apps/kappfinder/apps/Internet/GnomeICU.desktop
usr/share/kde4/apps/kappfinder/apps/Internet/gnomemeeting.desktop
usr/share/kde4/apps/kappfinder/apps/Internet/gnometalk.desktop
usr/share/kde4/apps/kappfinder/apps/Internet/gtelnet.desktop
@@ -116,38 +130,27 @@
usr/share/kde4/apps/kappfinder/apps/Internet/knews.desktop
usr/share/kde4/apps/kappfinder/apps/Internet/licq.desktop
usr/share/kde4/apps/kappfinder/apps/Internet/mldonkey_gui.desktop
-usr/share/kde4/apps/kappfinder/apps/Internet/mozilla.desktop
usr/share/kde4/apps/kappfinder/apps/Internet/mozilla-firefox.desktop
usr/share/kde4/apps/kappfinder/apps/Internet/mozilla-thunderbird.desktop
+usr/share/kde4/apps/kappfinder/apps/Internet/mozilla.desktop
+usr/share/kde4/apps/kappfinder/apps/Internet/netscape.desktop
usr/share/kde4/apps/kappfinder/apps/Internet/netscape6.desktop
-usr/share/kde4/apps/kappfinder/apps/Internet/netscape.desktop
-usr/share/kde4/apps/kappfinder/apps/Internet/Netscapemessenger.desktop
-usr/share/kde4/apps/kappfinder/apps/Internet/Nmapfe.desktop
usr/share/kde4/apps/kappfinder/apps/Internet/opera.desktop
-usr/share/kde4/apps/kappfinder/apps/Internet/Pan.desktop
-usr/share/kde4/apps/kappfinder/apps/Internet/Sylpheed.desktop
-usr/share/kde4/apps/kappfinder/apps/Internet/Terminal/btdownloadcurses.desktop
-usr/share/kde4/apps/kappfinder/apps/Internet/Terminal/lftp.desktop
-usr/share/kde4/apps/kappfinder/apps/Internet/Terminal/Links.desktop
-usr/share/kde4/apps/kappfinder/apps/Internet/Terminal/Lynx.desktop
-usr/share/kde4/apps/kappfinder/apps/Internet/Terminal/mutt.desktop
-usr/share/kde4/apps/kappfinder/apps/Internet/Terminal/ncftp.desktop
-usr/share/kde4/apps/kappfinder/apps/Internet/Terminal/pine.desktop
-usr/share/kde4/apps/kappfinder/apps/Internet/Terminal/silc.desktop
-usr/share/kde4/apps/kappfinder/apps/Internet/Terminal/slrn.desktop
-usr/share/kde4/apps/kappfinder/apps/Internet/Terminal/w3m.desktop
usr/share/kde4/apps/kappfinder/apps/Internet/wireshark.desktop
usr/share/kde4/apps/kappfinder/apps/Internet/xbiff.desktop
usr/share/kde4/apps/kappfinder/apps/Internet/xchat.desktop
usr/share/kde4/apps/kappfinder/apps/Internet/xfmail.desktop
usr/share/kde4/apps/kappfinder/apps/Internet/xftp.desktop
+usr/share/kde4/apps/kappfinder/apps/Multimedia/Aumix.desktop
+usr/share/kde4/apps/kappfinder/apps/Multimedia/Grip.desktop
+usr/share/kde4/apps/kappfinder/apps/Multimedia/MP3info.desktop
+usr/share/kde4/apps/kappfinder/apps/Multimedia/XMovie.desktop
usr/share/kde4/apps/kappfinder/apps/Multimedia/alevt.desktop
usr/share/kde4/apps/kappfinder/apps/Multimedia/alsamixergui.desktop
usr/share/kde4/apps/kappfinder/apps/Multimedia/ams.desktop
usr/share/kde4/apps/kappfinder/apps/Multimedia/amsynth.desktop
usr/share/kde4/apps/kappfinder/apps/Multimedia/ardour.desktop
usr/share/kde4/apps/kappfinder/apps/Multimedia/audacity.desktop
-usr/share/kde4/apps/kappfinder/apps/Multimedia/Aumix.desktop
usr/share/kde4/apps/kappfinder/apps/Multimedia/aviplay.desktop
usr/share/kde4/apps/kappfinder/apps/Multimedia/bcast2000.desktop
usr/share/kde4/apps/kappfinder/apps/Multimedia/djplay.desktop
@@ -156,7 +159,6 @@
usr/share/kde4/apps/kappfinder/apps/Multimedia/freebirth.desktop
usr/share/kde4/apps/kappfinder/apps/Multimedia/freqtweak.desktop
usr/share/kde4/apps/kappfinder/apps/Multimedia/galan.desktop
-usr/share/kde4/apps/kappfinder/apps/Multimedia/Grip.desktop
usr/share/kde4/apps/kappfinder/apps/Multimedia/gtv.desktop
usr/share/kde4/apps/kappfinder/apps/Multimedia/hydrogen.desktop
usr/share/kde4/apps/kappfinder/apps/Multimedia/jack-rack.desktop
@@ -164,7 +166,6 @@
usr/share/kde4/apps/kappfinder/apps/Multimedia/jazz.desktop
usr/share/kde4/apps/kappfinder/apps/Multimedia/meterbridge.desktop
usr/share/kde4/apps/kappfinder/apps/Multimedia/mixxx.desktop
-usr/share/kde4/apps/kappfinder/apps/Multimedia/MP3info.desktop
usr/share/kde4/apps/kappfinder/apps/Multimedia/mplayer.desktop
usr/share/kde4/apps/kappfinder/apps/Multimedia/mtv.desktop
usr/share/kde4/apps/kappfinder/apps/Multimedia/muse.desktop
@@ -180,58 +181,57 @@
usr/share/kde4/apps/kappfinder/apps/Multimedia/xawtv.desktop
usr/share/kde4/apps/kappfinder/apps/Multimedia/xcam.desktop
usr/share/kde4/apps/kappfinder/apps/Multimedia/xine.desktop
+usr/share/kde4/apps/kappfinder/apps/Multimedia/xmms-enqueue.desktop
usr/share/kde4/apps/kappfinder/apps/Multimedia/xmms.desktop
-usr/share/kde4/apps/kappfinder/apps/Multimedia/xmms-enqueue.desktop
-usr/share/kde4/apps/kappfinder/apps/Multimedia/XMovie.desktop
usr/share/kde4/apps/kappfinder/apps/Multimedia/zynaddsubfx.desktop
-usr/share/kde4/apps/kappfinder/apps/Office/abiword.desktop
-usr/share/kde4/apps/kappfinder/apps/Office/acroread.desktop
usr/share/kde4/apps/kappfinder/apps/Office/Applix.desktop
usr/share/kde4/apps/kappfinder/apps/Office/Dia.desktop
usr/share/kde4/apps/kappfinder/apps/Office/Gnome-Cal.desktop
usr/share/kde4/apps/kappfinder/apps/Office/Gnome-Card.desktop
usr/share/kde4/apps/kappfinder/apps/Office/GnomeTimeTracker.desktop
-usr/share/kde4/apps/kappfinder/apps/Office/gnucash.desktop
usr/share/kde4/apps/kappfinder/apps/Office/Gnumeric.desktop
usr/share/kde4/apps/kappfinder/apps/Office/Guppi.desktop
usr/share/kde4/apps/kappfinder/apps/Office/Ical.desktop
+usr/share/kde4/apps/kappfinder/apps/Office/WordPerfect.desktop
+usr/share/kde4/apps/kappfinder/apps/Office/WordPerfect2000.desktop
+usr/share/kde4/apps/kappfinder/apps/Office/XAcc.desktop
+usr/share/kde4/apps/kappfinder/apps/Office/XsLite.desktop
+usr/share/kde4/apps/kappfinder/apps/Office/abiword.desktop
+usr/share/kde4/apps/kappfinder/apps/Office/acroread.desktop
+usr/share/kde4/apps/kappfinder/apps/Office/gnucash.desktop
usr/share/kde4/apps/kappfinder/apps/Office/lyx.desktop
usr/share/kde4/apps/kappfinder/apps/Office/mrproject.desktop
usr/share/kde4/apps/kappfinder/apps/Office/netscapeaddressbook.desktop
usr/share/kde4/apps/kappfinder/apps/Office/plan.desktop
usr/share/kde4/apps/kappfinder/apps/Office/pybliographic.desktop
usr/share/kde4/apps/kappfinder/apps/Office/scribus.desktop
-usr/share/kde4/apps/kappfinder/apps/Office/WordPerfect2000.desktop
-usr/share/kde4/apps/kappfinder/apps/Office/WordPerfect.desktop
-usr/share/kde4/apps/kappfinder/apps/Office/XAcc.desktop
usr/share/kde4/apps/kappfinder/apps/Office/xpdf.desktop
-usr/share/kde4/apps/kappfinder/apps/Office/XsLite.desktop
-usr/share/kde4/apps/kappfinder/apps/System/citrix_ica.desktop
-usr/share/kde4/apps/kappfinder/apps/System/editres.desktop
-usr/share/kde4/apps/kappfinder/apps/System/sam.desktop
usr/share/kde4/apps/kappfinder/apps/System/Terminal/aterm.desktop
usr/share/kde4/apps/kappfinder/apps/System/Terminal/procinfo.desktop
usr/share/kde4/apps/kappfinder/apps/System/Terminal/rxvt.desktop
usr/share/kde4/apps/kappfinder/apps/System/Terminal/vmstat.desktop
+usr/share/kde4/apps/kappfinder/apps/System/citrix_ica.desktop
+usr/share/kde4/apps/kappfinder/apps/System/editres.desktop
+usr/share/kde4/apps/kappfinder/apps/System/sam.desktop
usr/share/kde4/apps/kappfinder/apps/System/wine.desktop
usr/share/kde4/apps/kappfinder/apps/System/xosview.desktop
usr/share/kde4/apps/kappfinder/apps/Toys/xeyes.desktop
usr/share/kde4/apps/kappfinder/apps/Toys/xpinguin.desktop
-usr/share/kde4/apps/kappfinder/apps/Utilities/calctool.desktop
-usr/share/kde4/apps/kappfinder/apps/Utilities/e-notes.desktop
usr/share/kde4/apps/kappfinder/apps/Utilities/GKrellM.desktop
usr/share/kde4/apps/kappfinder/apps/Utilities/GnomeWho.desktop
-usr/share/kde4/apps/kappfinder/apps/Utilities/oclock.desktop
usr/share/kde4/apps/kappfinder/apps/Utilities/SystemInfo.desktop
usr/share/kde4/apps/kappfinder/apps/Utilities/SystemLogViewer.desktop
-usr/share/kde4/apps/kappfinder/apps/Utilities/xgnokii.desktop
+usr/share/kde4/apps/kappfinder/apps/Utilities/XUtilities/Xkill.desktop
+usr/share/kde4/apps/kappfinder/apps/Utilities/XUtilities/Xrefresh.desktop
+usr/share/kde4/apps/kappfinder/apps/Utilities/XUtilities/Xtraceroute.desktop
usr/share/kde4/apps/kappfinder/apps/Utilities/XUtilities/xcalc.desktop
usr/share/kde4/apps/kappfinder/apps/Utilities/XUtilities/xclipboard.desktop
usr/share/kde4/apps/kappfinder/apps/Utilities/XUtilities/xclock.desktop
usr/share/kde4/apps/kappfinder/apps/Utilities/XUtilities/xconsole.desktop
-usr/share/kde4/apps/kappfinder/apps/Utilities/XUtilities/Xkill.desktop
usr/share/kde4/apps/kappfinder/apps/Utilities/XUtilities/xload.desktop
usr/share/kde4/apps/kappfinder/apps/Utilities/XUtilities/xmag.desktop
-usr/share/kde4/apps/kappfinder/apps/Utilities/XUtilities/Xrefresh.desktop
usr/share/kde4/apps/kappfinder/apps/Utilities/XUtilities/xterm.desktop
-usr/share/kde4/apps/kappfinder/apps/Utilities/XUtilities/Xtraceroute.desktop
+usr/share/kde4/apps/kappfinder/apps/Utilities/calctool.desktop
+usr/share/kde4/apps/kappfinder/apps/Utilities/e-notes.desktop
+usr/share/kde4/apps/kappfinder/apps/Utilities/oclock.desktop
+usr/share/kde4/apps/kappfinder/apps/Utilities/xgnokii.desktop
Modified: branches/kde4/packages/kdebase/debian/kdebase-bin.install
===================================================================
--- branches/kde4/packages/kdebase/debian/kdebase-bin.install 2008-04-28 22:27:51 UTC (rev 10350)
+++ branches/kde4/packages/kdebase/debian/kdebase-bin.install 2008-04-28 22:32:14 UTC (rev 10351)
@@ -5,8 +5,8 @@
usr/lib/kde4/kcm_filetypes.so
usr/lib/kde4/kcm_info.so
usr/lib/kde4/kcm_kio.so
+usr/lib/kde4/kcm_konq.so
usr/lib/kde4/kcm_konqhtml.so
-usr/lib/kde4/kcm_konq.so
usr/lib/kde4/kcm_kurifilt.so
usr/lib/kde4/kcm_nic.so
usr/lib/kde4/kcm_opengl.so
Modified: branches/kde4/packages/kdebase/debian/kdebase-data.install
===================================================================
--- branches/kde4/packages/kdebase/debian/kdebase-data.install 2008-04-28 22:27:51 UTC (rev 10350)
+++ branches/kde4/packages/kdebase/debian/kdebase-data.install 2008-04-28 22:32:14 UTC (rev 10351)
@@ -50,8 +50,8 @@
usr/share/icons/oxygen/16x16/apps/gnomemeeting.png
usr/share/icons/oxygen/16x16/apps/gnucash.png
usr/share/icons/oxygen/16x16/apps/gnumeric.png
+usr/share/icons/oxygen/16x16/apps/gv.png
usr/share/icons/oxygen/16x16/apps/gvim.png
-usr/share/icons/oxygen/16x16/apps/gv.png
usr/share/icons/oxygen/16x16/apps/licq.png
usr/share/icons/oxygen/16x16/apps/linguist.png
usr/share/icons/oxygen/16x16/apps/lyx.png
@@ -59,8 +59,8 @@
usr/share/icons/oxygen/16x16/apps/opera.png
usr/share/icons/oxygen/16x16/apps/pan.png
usr/share/icons/oxygen/16x16/apps/penguin.png
+usr/share/icons/oxygen/16x16/apps/plan.png
usr/share/icons/oxygen/16x16/apps/planner.png
-usr/share/icons/oxygen/16x16/apps/plan.png
usr/share/icons/oxygen/16x16/apps/pybliographic.png
usr/share/icons/oxygen/16x16/apps/realplayer.png
usr/share/icons/oxygen/16x16/apps/sodipodi.png
@@ -103,8 +103,8 @@
usr/share/icons/oxygen/32x32/apps/gnomemeeting.png
usr/share/icons/oxygen/32x32/apps/gnucash.png
usr/share/icons/oxygen/32x32/apps/gnumeric.png
+usr/share/icons/oxygen/32x32/apps/gv.png
usr/share/icons/oxygen/32x32/apps/gvim.png
-usr/share/icons/oxygen/32x32/apps/gv.png
usr/share/icons/oxygen/32x32/apps/licq.png
usr/share/icons/oxygen/32x32/apps/linguist.png
usr/share/icons/oxygen/32x32/apps/lyx.png
@@ -113,8 +113,8 @@
usr/share/icons/oxygen/32x32/apps/pan.png
usr/share/icons/oxygen/32x32/apps/penguin.png
usr/share/icons/oxygen/32x32/apps/pinguin.png
+usr/share/icons/oxygen/32x32/apps/plan.png
usr/share/icons/oxygen/32x32/apps/planner.png
-usr/share/icons/oxygen/32x32/apps/plan.png
usr/share/icons/oxygen/32x32/apps/pybliographic.png
usr/share/icons/oxygen/32x32/apps/realplayer.png
usr/share/icons/oxygen/32x32/apps/sodipodi.png
@@ -259,8 +259,8 @@
usr/share/kde4/services/useragentstrings/ie60oncurrent.desktop
usr/share/kde4/services/useragentstrings/ie60onwinnt51.desktop
usr/share/kde4/services/useragentstrings/lynxoncurrent.desktop
+usr/share/kde4/services/useragentstrings/mozoncurrent.desktop
usr/share/kde4/services/useragentstrings/mozoncurrent12.desktop
-usr/share/kde4/services/useragentstrings/mozoncurrent.desktop
usr/share/kde4/services/useragentstrings/mozonwinxp.desktop
usr/share/kde4/services/useragentstrings/nn301oncurrent.desktop
usr/share/kde4/services/useragentstrings/nn475oncurrent.desktop
Copied: branches/kde4/packages/kdebase/debian/kdebase.docs (from rev 10340, branches/kde4/packages/kdebase/debian/docs)
===================================================================
--- branches/kde4/packages/kdebase/debian/kdebase.docs (rev 0)
+++ branches/kde4/packages/kdebase/debian/kdebase.docs 2008-04-28 22:32:14 UTC (rev 10351)
@@ -0,0 +1 @@
+README
Modified: branches/kde4/packages/kdebase/debian/kinfocenter.install
===================================================================
--- branches/kde4/packages/kdebase/debian/kinfocenter.install 2008-04-28 22:27:51 UTC (rev 10350)
+++ branches/kde4/packages/kdebase/debian/kinfocenter.install 2008-04-28 22:32:14 UTC (rev 10351)
@@ -1,4 +1,9 @@
usr/bin/kinfocenter
+usr/lib/kde4/kcm_ioslaveinfo.so
+usr/lib/kde4/kcm_memory.so
+usr/lib/kde4/kcm_partition.so exists
+usr/lib/kde4/kcm_pci.so
+usr/lib/kde4/kcm_samba.so
usr/lib/libkdeinit4_kinfocenter.so
usr/share/applications/kde4/kinfocenter.desktop
usr/share/doc/kde4/HTML/en/kinfocenter/common
@@ -63,12 +68,14 @@
usr/share/kde4/services/dma.desktop
usr/share/kde4/services/interrupts.desktop
usr/share/kde4/services/ioports.desktop
+usr/share/kde4/services/ioslaveinfo.desktop
+usr/share/kde4/services/kcm_memory.desktop
+usr/share/kde4/services/kcm_partition.desktop
+usr/share/kde4/services/kcm_pci.desktop
usr/share/kde4/services/kcmusb.desktop
-usr/share/kde4/services/memory.desktop
usr/share/kde4/services/nic.desktop
usr/share/kde4/services/opengl.desktop
-usr/share/kde4/services/partitions.desktop
-usr/share/kde4/services/pci.desktop
usr/share/kde4/services/scsi.desktop
+usr/share/kde4/services/smbstatus.desktop
usr/share/kde4/services/sound.desktop
usr/share/kde4/services/xserver.desktop
Modified: branches/kde4/packages/kdebase/debian/konqueror.install
===================================================================
--- branches/kde4/packages/kdebase/debian/konqueror.install 2008-04-28 22:27:51 UTC (rev 10350)
+++ branches/kde4/packages/kdebase/debian/konqueror.install 2008-04-28 22:32:14 UTC (rev 10351)
@@ -29,8 +29,8 @@
usr/share/applications/kde4/konqbrowser.desktop
usr/share/applications/kde4/konquerorsu.desktop
usr/share/autostart/konqy_preload.desktop
-usr/share/dbus-1/interfaces/org.kde.Konqueror.MainWindow.xml
usr/share/dbus-1/interfaces/org.kde.Konqueror.Main.xml
+usr/share/dbus-1/interfaces/org.kde.Konqueror.MainWindow.xml
usr/share/dbus-1/interfaces/org.kde.konqueror.Preloader.xml
usr/share/doc/kde4/HTML/en/konqueror/cmndline.png
usr/share/doc/kde4/HTML/en/konqueror/common
@@ -54,36 +54,28 @@
usr/share/kde4/apps/kconf_update/move_konqsidebartng_entries.sh
usr/share/kde4/apps/keditbookmarks/keditbookmarks-genui.rc
usr/share/kde4/apps/keditbookmarks/keditbookmarksui.rc
-usr/share/kde4/apps/konqiconview/kpartplugins/kremoteencodingplugin.desktop
-usr/share/kde4/apps/konqiconview/kpartplugins/kremoteencodingplugin.rc
-usr/share/kde4/apps/konqiconview/kpartplugins/kshellcmdplugin.desktop
-usr/share/kde4/apps/konqiconview/kpartplugins/kshellcmdplugin.rc
-usr/share/kde4/apps/konqlistview/kpartplugins/kremoteencodingplugin.desktop
-usr/share/kde4/apps/konqlistview/kpartplugins/kremoteencodingplugin.rc
-usr/share/kde4/apps/konqlistview/kpartplugins/kshellcmdplugin.desktop
-usr/share/kde4/apps/konqlistview/kpartplugins/kshellcmdplugin.rc
usr/share/kde4/apps/konqsidebartng/add/virtualfolderadd.desktop
usr/share/kde4/apps/konqsidebartng/add/webmodule_add.desktop
usr/share/kde4/apps/konqsidebartng/dirtree/bookmarks_module.desktop
usr/share/kde4/apps/konqsidebartng/dirtree/dirtree_module.desktop
usr/share/kde4/apps/konqsidebartng/dirtree/history_module.desktop
+usr/share/kde4/apps/konqsidebartng/entries/.version
usr/share/kde4/apps/konqsidebartng/entries/bookmarks.desktop
usr/share/kde4/apps/konqsidebartng/entries/history.desktop
usr/share/kde4/apps/konqsidebartng/entries/home.desktop
usr/share/kde4/apps/konqsidebartng/entries/remote.desktop
usr/share/kde4/apps/konqsidebartng/entries/root.desktop
usr/share/kde4/apps/konqsidebartng/entries/services.desktop
-usr/share/kde4/apps/konqsidebartng/entries/.version
usr/share/kde4/apps/konqsidebartng/virtual_folders/remote/.directory
usr/share/kde4/apps/konqsidebartng/virtual_folders/remote/ftp/.directory
usr/share/kde4/apps/konqsidebartng/virtual_folders/remote/ftp/kde_ftp.desktop
-usr/share/kde4/apps/konqsidebartng/virtual_folders/remote/web/apps_web.desktop
usr/share/kde4/apps/konqsidebartng/virtual_folders/remote/web/.directory
+usr/share/kde4/apps/konqsidebartng/virtual_folders/remote/web/apps_web.desktop
usr/share/kde4/apps/konqsidebartng/virtual_folders/remote/web/dot_web.desktop
usr/share/kde4/apps/konqsidebartng/virtual_folders/remote/web/kde_web.desktop
usr/share/kde4/apps/konqsidebartng/virtual_folders/remote/web/look_web.desktop
-usr/share/kde4/apps/konqsidebartng/virtual_folders/services/applications.desktop
usr/share/kde4/apps/konqsidebartng/virtual_folders/services/.directory
+usr/share/kde4/apps/konqsidebartng/virtual_folders/services/applications.desktop
usr/share/kde4/apps/konqsidebartng/websidebar/websidebar.html
usr/share/kde4/apps/konqueror/about/box-centre-konqueror.png
usr/share/kde4/apps/konqueror/about/intro.html
@@ -94,7 +86,7 @@
usr/share/kde4/apps/konqueror/about/plugins_rtl.html
usr/share/kde4/apps/konqueror/about/specs.html
usr/share/kde4/apps/konqueror/about/tips.html
-usr/share/kde4/apps/konqueror/about/top-right-konqueror.png
+usr/share/kde4/apps/konqueror/about/top-left-konqueror.png
usr/share/kde4/apps/konqueror/icons/crystalsvg/16x16/actions/kde1.png
usr/share/kde4/apps/konqueror/icons/crystalsvg/16x16/actions/kde2.png
usr/share/kde4/apps/konqueror/icons/crystalsvg/16x16/actions/kde3.png
@@ -102,8 +94,8 @@
usr/share/kde4/apps/konqueror/icons/crystalsvg/16x16/actions/kde5.png
usr/share/kde4/apps/konqueror/icons/crystalsvg/16x16/actions/kde6.png
usr/share/kde4/apps/konqueror/konq-filemanagement.rc
-usr/share/kde4/apps/konqueror/konqueror.rc
usr/share/kde4/apps/konqueror/konq-webbrowsing.rc
+usr/share/kde4/apps/konqueror/konqueror.rc
usr/share/kde4/apps/konqueror/pics/indicator_connect.png
usr/share/kde4/apps/konqueror/pics/indicator_empty.png
usr/share/kde4/apps/konqueror/pics/indicator_noconnect.png
Modified: branches/kde4/packages/kdebase/debian/konsole.install
===================================================================
--- branches/kde4/packages/kdebase/debian/konsole.install 2008-04-28 22:27:51 UTC (rev 10350)
+++ branches/kde4/packages/kdebase/debian/konsole.install 2008-04-28 22:32:14 UTC (rev 10351)
@@ -12,20 +12,21 @@
usr/share/kde4/apps/konsole/BlackOnLightYellow.schema
usr/share/kde4/apps/konsole/BlackOnRandomLight.colorscheme
usr/share/kde4/apps/konsole/BlackOnWhite.schema
+usr/share/kde4/apps/konsole/DarkPastels.colorscheme
+usr/share/kde4/apps/konsole/GreenOnBlack.colorscheme
+usr/share/kde4/apps/konsole/Linux.colorscheme
+usr/share/kde4/apps/konsole/README.KeyTab
+usr/share/kde4/apps/konsole/Shell.profile
+usr/share/kde4/apps/konsole/WhiteOnBlack.schema
usr/share/kde4/apps/konsole/default.keytab
-usr/share/kde4/apps/konsole/GreenOnBlack.colorscheme
usr/share/kde4/apps/konsole/konsole.notifyrc
usr/share/kde4/apps/konsole/konsoleui.rc
-usr/share/kde4/apps/konsole/Linux.colorscheme
usr/share/kde4/apps/konsole/linux.keytab
usr/share/kde4/apps/konsole/partui.rc
-usr/share/kde4/apps/konsole/README.KeyTab
usr/share/kde4/apps/konsole/sessionui.rc
-usr/share/kde4/apps/konsole/Shell.profile
usr/share/kde4/apps/konsole/solaris.keytab
usr/share/kde4/apps/konsole/vt420pc.keytab
-usr/share/kde4/apps/konsole/WhiteOnBlack.schema
+usr/share/kde4/services/ServiceMenus/konsolehere.desktop
usr/share/kde4/services/kded/kwrited.desktop
usr/share/kde4/services/konsolepart.desktop
-usr/share/kde4/services/ServiceMenus/konsolehere.desktop
usr/share/kde4/servicetypes/terminalemulator.desktop
Modified: branches/kde4/packages/kdebase/debian/libkonq5-dev.install
===================================================================
--- branches/kde4/packages/kdebase/debian/libkonq5-dev.install 2008-04-28 22:27:51 UTC (rev 10350)
+++ branches/kde4/packages/kdebase/debian/libkonq5-dev.install 2008-04-28 22:32:14 UTC (rev 10351)
@@ -1,10 +1,9 @@
usr/include/knewmenu.h
-usr/include/konq_defaults.h
usr/include/konq_events.h
usr/include/konq_fileundomanager.h
usr/include/konq_menuactions.h
-usr/include/konqmimedata.h
usr/include/konq_operations.h
usr/include/konq_popupmenu.h
+usr/include/konqmimedata.h
usr/include/libkonq_export.h
usr/lib/libkonq.so
Modified: branches/kde4/packages/kdebase/debian/libkonq5-templates.install
===================================================================
--- branches/kde4/packages/kdebase/debian/libkonq5-templates.install 2008-04-28 22:27:51 UTC (rev 10350)
+++ branches/kde4/packages/kdebase/debian/libkonq5-templates.install 2008-04-28 22:32:14 UTC (rev 10351)
@@ -1,16 +1,3 @@
-usr/share/templates/Directory.desktop
-usr/share/templates/HTMLFile.desktop
-usr/share/templates/linkCAMERA.desktop
-usr/share/templates/linkCDROM.desktop
-usr/share/templates/linkCDWRITER.desktop
-usr/share/templates/linkDVDROM.desktop
-usr/share/templates/linkFloppy.desktop
-usr/share/templates/linkHD.desktop
-usr/share/templates/linkMO.desktop
-usr/share/templates/linkNFS.desktop
-usr/share/templates/linkProgram.desktop
-usr/share/templates/linkURL.desktop
-usr/share/templates/linkZIP.desktop
usr/share/templates/.source/CAMERA-Device.desktop
usr/share/templates/.source/CDROM-Device.desktop
usr/share/templates/.source/CDWRITER-Device.desktop
@@ -24,4 +11,17 @@
usr/share/templates/.source/TextFile.txt
usr/share/templates/.source/URL.desktop
usr/share/templates/.source/ZIP-Device.desktop
+usr/share/templates/Directory.desktop
+usr/share/templates/HTMLFile.desktop
usr/share/templates/TextFile.desktop
+usr/share/templates/linkCAMERA.desktop
+usr/share/templates/linkCDROM.desktop
+usr/share/templates/linkCDWRITER.desktop
+usr/share/templates/linkDVDROM.desktop
+usr/share/templates/linkFloppy.desktop
+usr/share/templates/linkHD.desktop
+usr/share/templates/linkMO.desktop
+usr/share/templates/linkNFS.desktop
+usr/share/templates/linkProgram.desktop
+usr/share/templates/linkURL.desktop
+usr/share/templates/linkZIP.desktop
Added: branches/kde4/packages/kdebase/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- branches/kde4/packages/kdebase/debian/patches/97_fix_target_link_libraries.diff (rev 0)
+++ branches/kde4/packages/kdebase/debian/patches/97_fix_target_link_libraries.diff 2008-04-28 22:32:14 UTC (rev 10351)
@@ -0,0 +1,206 @@
+--- kdebase.orig/konqueror/src/CMakeLists.txt 2008-04-28 09:47:29.000000000 +0000
++++ kdebase/konqueror/src/CMakeLists.txt 2008-04-28 21:04:55.000000000 +0000
+@@ -13,6 +13,7 @@
+ configure_file(config-konqueror.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-konqueror.h )
+
+ # For crc32 in konqhistorymanager.cpp
++find_package(ZLIB REQUIRED)
+ include_directories( ${ZLIB_INCLUDE_DIR} )
+
+ ########### libkonquerorprivate, shared with sidebar modules ###############
+@@ -26,7 +27,7 @@
+ qt4_add_dbus_adaptor(konquerorprivate_SRCS org.kde.Konqueror.HistoryManager.xml konqhistorymanager.h KonqHistoryManager konqhistorymanageradaptor KonqHistoryManagerAdaptor)
+
+ kde4_add_library(konquerorprivate SHARED ${konquerorprivate_SRCS})
+-target_link_libraries(konquerorprivate ${KDE4_KPARTS_LIBS})
++target_link_libraries(konquerorprivate ${KDE4_KPARTS_LIBS} ${QT_QTDBUS_LIBRARY} ${ZLIB_LIBRARY})
+ set_target_properties(konquerorprivate PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS konquerorprivate ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+@@ -74,7 +75,7 @@
+ qt4_add_dbus_interface(konqueror_KDEINIT_SRCS org.kde.Konqueror.UndoManager.xml konqundomanager_interface)
+
+ kde4_add_kdeinit_executable(konqueror ${konqueror_KDEINIT_SRCS} konqmain.cpp)
+-target_link_libraries(kdeinit_konqueror konquerorprivate konq ${KDE4_KPARTS_LIBS} ${KDE4_KUTILS_LIBS})
++target_link_libraries(kdeinit_konqueror konquerorprivate konq ${KDE4_KPARTS_LIBS} ${KDE4_KUTILS_LIBS} ${X11_X11_LIB})
+
+ kde4_add_app_icon(konqueror_KDEINIT_SRCS "${KDE4_ICON_INSTALL_DIR}/oxygen/*/apps/konqueror.png")
+
+--- kdebase.orig/lib/konq/CMakeLists.txt 2008-04-28 09:48:17.000000000 +0000
++++ kdebase/lib/konq/CMakeLists.txt 2008-04-28 21:04:55.000000000 +0000
+@@ -23,7 +23,7 @@
+
+ kde4_add_library(konq SHARED ${konq_LIB_SRCS})
+
+-target_link_libraries(konq ${QT_QTXML_LIBRARY} ${KDE4_KPARTS_LIBS})
++target_link_libraries(konq ${QT_QTXML_LIBRARY} ${KDE4_KPARTS_LIBS} ${QT_QTDBUS_LIBRARY})
+
+ set_target_properties(konq PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION} SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION} )
+ install(TARGETS konq ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- kdebase.orig/lib/konq/favicons/CMakeLists.txt 2008-04-28 09:48:17.000000000 +0000
++++ kdebase/lib/konq/favicons/CMakeLists.txt 2008-04-28 21:04:55.000000000 +0000
+@@ -4,7 +4,7 @@
+
+ kde4_add_plugin(kded_favicons ${kded_favicons_SRCS})
+
+-target_link_libraries( kded_favicons ${KDE4_KIO_LIBS} )
++target_link_libraries( kded_favicons ${KDE4_KIO_LIBS} ${QT_QTDBUS_LIBRARY} )
+
+
+ install(TARGETS kded_favicons DESTINATION ${PLUGIN_INSTALL_DIR} )
+--- kdebase.orig/konqueror/client/CMakeLists.txt 2008-04-28 09:47:46.000000000 +0000
++++ kdebase/konqueror/client/CMakeLists.txt 2008-04-28 21:04:55.000000000 +0000
+@@ -16,7 +16,7 @@
+ target_link_libraries(kfmclient ${KDE4_KIO_LIBS} )
+ else (WIN32)
+ kde4_add_kdeinit_executable( kfmclient NOGUI ${kfmclient_SRCS})
+- target_link_libraries(kdeinit_kfmclient ${KDE4_KIO_LIBS} )
++target_link_libraries(kdeinit_kfmclient ${KDE4_KIO_LIBS} ${QT_QTDBUS_LIBRARY} ${X11_X11_LIB} )
+ install(TARGETS kdeinit_kfmclient ${INSTALL_TARGETS_DEFAULT_ARGS} )
+ endif (WIN32)
+
+--- kdebase.orig/konqueror/preloader/CMakeLists.txt 2008-04-28 09:47:46.000000000 +0000
++++ kdebase/konqueror/preloader/CMakeLists.txt 2008-04-28 21:04:55.000000000 +0000
+@@ -13,7 +13,7 @@
+
+ kde4_add_plugin(kded_konqy_preloader ${kded_konqy_preloader_PART_SRCS})
+
+-target_link_libraries(kded_konqy_preloader ${KDE4_KDEUI_LIBS})
++target_link_libraries(kded_konqy_preloader ${KDE4_KDEUI_LIBS} ${QT_QTDBUS_LIBRARY})
+
+ install(TARGETS kded_konqy_preloader DESTINATION ${PLUGIN_INSTALL_DIR})
+
+--- kdebase.orig/konqueror/settings/kio/CMakeLists.txt 2008-04-28 09:47:36.000000000 +0000
++++ kdebase/konqueror/settings/kio/CMakeLists.txt 2008-04-28 21:04:55.000000000 +0000
+@@ -31,7 +31,7 @@
+ kde4_add_plugin(kcm_kio ${kcm_kio_PART_SRCS})
+
+
+-target_link_libraries(kcm_kio ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KUTILS_LIBS} )
++target_link_libraries(kcm_kio ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KUTILS_LIBS} ${QT_QTDBUS_LIBRARY} )
+
+ install(TARGETS kcm_kio DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+--- kdebase.orig/konqueror/settings/konq/CMakeLists.txt 2008-04-28 09:47:39.000000000 +0000
++++ kdebase/konqueror/settings/konq/CMakeLists.txt 2008-04-28 21:04:55.000000000 +0000
+@@ -22,7 +22,7 @@
+ kde4_add_plugin(kcm_konq ${kcm_konq_PART_SRCS})
+
+
+-target_link_libraries(kcm_konq ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KUTILS_LIBS} )
++target_link_libraries(kcm_konq ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KUTILS_LIBS} ${QT_QTDBUS_LIBRARY} )
+
+ install(TARGETS kcm_konq DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+--- kdebase.orig/konqueror/settings/konqhtml/CMakeLists.txt 2008-04-28 09:47:40.000000000 +0000
++++ kdebase/konqueror/settings/konqhtml/CMakeLists.txt 2008-04-28 21:04:55.000000000 +0000
+@@ -22,7 +22,7 @@
+ kde4_add_plugin(kcm_konqhtml ${kcm_konqhtml_PART_SRCS})
+
+
+-target_link_libraries(kcm_konqhtml ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KHTML_LIBS})
++target_link_libraries(kcm_konqhtml ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KHTML_LIBS} ${QT_QTDBUS_LIBRARY})
+
+ install(TARGETS kcm_konqhtml DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+--- kdebase.orig/konqueror/settings/performance/CMakeLists.txt 2008-04-28 09:47:32.000000000 +0000
++++ kdebase/konqueror/settings/performance/CMakeLists.txt 2008-04-28 21:04:55.000000000 +0000
+@@ -11,7 +11,7 @@
+ kde4_add_plugin(kcm_performance ${kcm_performance_PART_SRCS})
+
+
+-target_link_libraries(kcm_performance ${KDE4_KDEUI_LIBS} )
++target_link_libraries(kcm_performance ${KDE4_KDEUI_LIBS} ${QT_QTDBUS_LIBRARY} )
+
+ install(TARGETS kcm_performance DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+--- kdebase.orig/kinfocenter/pci/CMakeLists.txt 2008-04-28 09:48:21.000000000 +0000
++++ kdebase/kinfocenter/pci/CMakeLists.txt 2008-04-28 21:04:55.000000000 +0000
+@@ -10,14 +10,14 @@
+
+ if(PCIUTILS_FOUND)
+ MESSAGE(STATUS "Enabling PCI module based on pciutils library")
+-
++
+ add_definitions( -DHAVE_PCIUTILS )
+
+ set(KCM_PCI_PART_SRCS kcm_pci.cpp ../base/os_current.cpp kpci.cpp )
+
+ kde4_add_plugin(kcm_pci ${KCM_PCI_PART_SRCS})
+
+- target_link_libraries(kcm_pci ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${PCIUTILS_LIBRARIES})
++ target_link_libraries(kcm_pci ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${X11_X11_LIB} ${ZLIB_LIBRARY} ${PCIUTILS_LIBRARIES})
+
+
+ else(PCIUTILS_FOUND)
+@@ -26,7 +26,7 @@
+
+ kde4_add_plugin(kcm_pci ${KCM_PCI_PART_SRCS})
+
+- target_link_libraries(kcm_pci ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} )
++ target_link_libraries(kcm_pci ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${X11_X11_LIB})
+ endif(PCIUTILS_FOUND)
+
+ install(TARGETS kcm_pci DESTINATION ${PLUGIN_INSTALL_DIR})
+--- kdebase.orig/konqueror/kttsplugin/CMakeLists.txt 2008-04-28 09:47:41.000000000 +0000
++++ kdebase/konqueror/kttsplugin/CMakeLists.txt 2008-04-28 21:04:55.000000000 +0000
+@@ -28,7 +28,7 @@
+
+ kde4_add_plugin(khtmlkttsdplugin ${khtmlkttsdplugin_PART_SRCS})
+
+-target_link_libraries(khtmlkttsdplugin ${KDE4_KHTML_LIBS} )
++target_link_libraries(khtmlkttsdplugin ${KDE4_KHTML_LIBS} ${QT_QTDBUS_LIBRARY} )
+
+ if( WEBKITKDE_FOUND)
+ target_link_libraries(khtmlkttsdplugin ${WEBKITKDE_LIBRARIES} ${QT_QTWEBKIT_LIBRARY} )
+--- kdebase.orig/konsole/src/CMakeLists.txt 2008-04-28 09:48:34.000000000 +0000
++++ kdebase/konsole/src/CMakeLists.txt 2008-04-28 21:04:55.000000000 +0000
+@@ -82,7 +82,7 @@
+
+ kde4_add_kdeinit_executable( konsole ${konsole_KDEINIT_SRCS})
+
+-target_link_libraries(kdeinit_konsole ${KDE4_KPTY_LIBRARY} ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_KNOTIFYCONFIG_LIBS} )
++target_link_libraries(kdeinit_konsole ${KDE4_KPTY_LIBRARY} ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_KNOTIFYCONFIG_LIBS} ${QT_QTDBUS_LIBRARY} ${X11_X11_LIB} )
+
+ # XRender library for true transparency support
+ if(X11_Xrender_FOUND)
+@@ -155,7 +155,7 @@
+
+ set_target_properties(konsolepart PROPERTIES DEFINE_SYMBOL KONSOLE_PART)
+
+-target_link_libraries(konsolepart ${KDE4_KPARTS_LIBS} ${KDE4_KPTY_LIBRARY} ${KDE4_KIO_LIBS} ${KDE4_KNOTIFYCONFIG_LIBS})
++target_link_libraries(konsolepart ${KDE4_KPARTS_LIBS} ${KDE4_KPTY_LIBRARY} ${KDE4_KIO_LIBS} ${KDE4_KNOTIFYCONFIG_LIBS} ${QT_QTDBUS_LIBRARY} ${X11_X11_LIB})
+ if(X11_Xrender_FOUND)
+ target_link_libraries(konsolepart ${X11_Xrender_LIB})
+ endif(X11_Xrender_FOUND)
+--- kdebase.orig/nsplugins/CMakeLists.txt 2008-04-28 09:47:05.000000000 +0000
++++ kdebase/nsplugins/CMakeLists.txt 2008-04-28 21:04:55.000000000 +0000
+@@ -26,7 +26,7 @@
+
+ kde4_add_plugin(libnsplugin ${nsplugins_PART_SRCS})
+
+- target_link_libraries(libnsplugin ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KPARTS_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${QT_QTGUI_LIBRARY} )
++target_link_libraries(libnsplugin ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KPARTS_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY} )
+
+ install(TARGETS libnsplugin DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+--- kdebase.orig/dolphin/src/CMakeLists.txt 2008-04-28 21:16:43.000000000 +0000
++++ kdebase/dolphin/src/CMakeLists.txt 2008-04-28 21:33:07.000000000 +0000
+@@ -52,7 +52,16 @@
+
+ configure_file(config-nepomuk.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-nepomuk.h )
+
+-target_link_libraries(dolphinprivate ${KDE4_KFILE_LIBS} konq ${BLITZ_LIBRARIES})
++target_link_libraries(dolphinprivate ${KDE4_KFILE_LIBS} konq ${BLITZ_LIBRARIES} )
++
++if (X11_FOUND)
++ target_link_libraries(dolphinprivate ${X11_X11_LIB})
++endif (X11_FOUND)
++if (X11_Xext_FOUND)
++ target_link_libraries(dolphinprivate ${X11_Xext_LIB})
++endif (X11_Xext_FOUND)
++
++
+ if(X11_Xrender_FOUND)
+ target_link_libraries(dolphinprivate ${X11_Xrender_LIB} )
+ endif(X11_Xrender_FOUND)
Added: branches/kde4/packages/kdebase/debian/patches/series
===================================================================
--- branches/kde4/packages/kdebase/debian/patches/series (rev 0)
+++ branches/kde4/packages/kdebase/debian/patches/series 2008-04-28 22:32:14 UTC (rev 10351)
@@ -0,0 +1 @@
+97_fix_target_link_libraries.diff
More information about the pkg-kde-commits
mailing list