rev 10036 - in branches/kde4/packages/kdelibs/debian: . patches

Modestas Vainius modax-guest at alioth.debian.org
Sun Apr 6 19:17:50 UTC 2008


Author: modax-guest
Date: 2008-04-06 19:17:49 +0000 (Sun, 06 Apr 2008)
New Revision: 10036

Added:
   branches/kde4/packages/kdelibs/debian/libphonon-dev.installgen
   branches/kde4/packages/kdelibs/debian/libphonon4.installgen
   branches/kde4/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff
Removed:
   branches/kde4/packages/kdelibs/debian/patches/16_postgresql_include_path_fix.diff
Modified:
   branches/kde4/packages/kdelibs/debian/changelog
   branches/kde4/packages/kdelibs/debian/kdelibs-bin.install
   branches/kde4/packages/kdelibs/debian/kdelibs5-data.install
   branches/kde4/packages/kdelibs/debian/kdelibs5-data.installgen
   branches/kde4/packages/kdelibs/debian/kdelibs5-dev.install
   branches/kde4/packages/kdelibs/debian/kdelibs5.install
   branches/kde4/packages/kdelibs/debian/patches/series
Log:
* Sorted *.install files
* Remove patch, added a useless (in its current state) patch
* Tested with later kde trunk revision
* A few *.installgen files

Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdelibs/debian/changelog	2008-04-06 18:21:57 UTC (rev 10035)
+++ branches/kde4/packages/kdelibs/debian/changelog	2008-04-06 19:17:49 UTC (rev 10036)
@@ -1,3 +1,29 @@
+kde4libs (4:4.0.68+svn794096-1) UNRELEASED; urgency=low
+
+   * New upstream development snapshot:
+     - The latest upstream commit is r794096 by whiting
+     - Date: Sun, 06 Apr 2008 14:49:02 -0000
+
+   +++ Changes by Modestas Vainius:
+
+   * Sort *.install files
+   * Drop 16_postgresql_include_path_fix.diff - merged upstream.
+   * Add 17_findservicebydesktoppath_try_realfilepath.diff to improve
+     desktop file location by path on the systems where e.g. /usr is a
+     symlink. Please note this patch still does not fix what I developed
+     it for. So it's useless but it does not hurt. Work in progress.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 06 Apr 2008 22:12:02 +0300
+
+kde4libs (4:4.0.68-2~pre1) experimental; urgency=low
+
+  +++ Changes by Modestas Vainius:
+
+  * Add 17_findservicebydesktoppath_try_realfilepath.diff to fix service path
+    resolution for non-canonical paths.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 06 Apr 2008 13:40:21 +0300
+
 kde4libs (4:4.0.68-1) experimental; urgency=low
 
   * New upstream snapshot.

Modified: branches/kde4/packages/kdelibs/debian/kdelibs-bin.install
===================================================================
--- branches/kde4/packages/kdelibs/debian/kdelibs-bin.install	2008-04-06 18:21:57 UTC (rev 10035)
+++ branches/kde4/packages/kdelibs/debian/kdelibs-bin.install	2008-04-06 19:17:49 UTC (rev 10036)
@@ -1,7 +1,7 @@
 usr/bin/kbuildsycoca4
 usr/bin/kcookiejar4
+usr/bin/kde4-config
 usr/bin/kde4automoc
-usr/bin/kde4-config
 usr/bin/kded4
 usr/bin/kdeinit4
 usr/bin/kdeinit4_shutdown

Modified: branches/kde4/packages/kdelibs/debian/kdelibs5-data.install
===================================================================
--- branches/kde4/packages/kdelibs/debian/kdelibs5-data.install	2008-04-06 18:21:57 UTC (rev 10035)
+++ branches/kde4/packages/kdelibs/debian/kdelibs5-data.install	2008-04-06 19:17:49 UTC (rev 10036)
@@ -10,11 +10,9 @@
 etc/kde4/ksslcalist
 etc/kde4/ui/ui_standards.rc
 etc/xdg/menus/kde4-applications.menu
+usr/share/dbus-1/interfaces/org.kde.JobView.xml
 usr/share/dbus-1/interfaces/org.kde.JobViewServer.xml
-usr/share/dbus-1/interfaces/org.kde.JobView.xml
 usr/share/dbus-1/interfaces/org.kde.KCookieServer.xml
-usr/share/dbus-1/interfaces/org.kde.KdedGlobalAccel.xml
-usr/share/dbus-1/interfaces/org.kde.kded.xml
 usr/share/dbus-1/interfaces/org.kde.KDirNotify.xml
 usr/share/dbus-1/interfaces/org.kde.KHTMLPart.xml
 usr/share/dbus-1/interfaces/org.kde.KIMIface.xml
@@ -22,11 +20,13 @@
 usr/share/dbus-1/interfaces/org.kde.KMediaPlayer.xml
 usr/share/dbus-1/interfaces/org.kde.KSpeech.xml
 usr/share/dbus-1/interfaces/org.kde.KWallet.xml
+usr/share/dbus-1/interfaces/org.kde.KdedGlobalAccel.xml
 usr/share/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
 usr/share/dbus-1/interfaces/org.kde.Solid.Networking.Client.xml
+usr/share/dbus-1/interfaces/org.kde.kded.xml
 usr/share/doc/kde4/HTML/en/common
+usr/share/doc/kde4/HTML/en/common/1.png
 usr/share/doc/kde4/HTML/en/common/10.png
-usr/share/doc/kde4/HTML/en/common/1.png
 usr/share/doc/kde4/HTML/en/common/2.png
 usr/share/doc/kde4/HTML/en/common/3.png
 usr/share/doc/kde4/HTML/en/common/4.png
@@ -60,13 +60,13 @@
 usr/share/doc/kde4/HTML/en/common/mainheader.html
 usr/share/doc/kde4/HTML/en/common/qpl-license.html
 usr/share/doc/kde4/HTML/en/common/tabs.css
-usr/share/doc/kde4/HTML/en/common/top.jpg
 usr/share/doc/kde4/HTML/en/common/top-kde.jpg
 usr/share/doc/kde4/HTML/en/common/top-left.jpg
 usr/share/doc/kde4/HTML/en/common/top-left.png
 usr/share/doc/kde4/HTML/en/common/top-middle.png
+usr/share/doc/kde4/HTML/en/common/top-right-konqueror.png
 usr/share/doc/kde4/HTML/en/common/top-right.jpg
-usr/share/doc/kde4/HTML/en/common/top-right-konqueror.png
+usr/share/doc/kde4/HTML/en/common/top.jpg
 usr/share/doc/kde4/HTML/en/common/x11-license.html
 usr/share/doc/kde4/HTML/en/common/xml.dcl
 usr/share/doc/kde4/HTML/en/sonnet/common
@@ -83,6 +83,13 @@
 usr/share/icons/hicolor/48x48/actions/presence_away.png
 usr/share/icons/hicolor/48x48/actions/presence_offline.png
 usr/share/icons/hicolor/48x48/actions/presence_online.png
+usr/share/kde4/apps/LICENSES/ARTISTIC
+usr/share/kde4/apps/LICENSES/BSD
+usr/share/kde4/apps/LICENSES/GPL_V2
+usr/share/kde4/apps/LICENSES/GPL_V3
+usr/share/kde4/apps/LICENSES/LGPL_V2
+usr/share/kde4/apps/LICENSES/LGPL_V3
+usr/share/kde4/apps/LICENSES/QPL_V1.0
 usr/share/kde4/apps/katepart/jscript/indentation_c.js
 usr/share/kde4/apps/katepart/jscript/jstest.js
 usr/share/kde4/apps/katepart/jscript/lisp.js
@@ -100,16 +107,17 @@
 usr/share/kde4/apps/katepart/syntax/ansic89.xml
 usr/share/kde4/apps/katepart/syntax/ansys.xml
 usr/share/kde4/apps/katepart/syntax/apache.xml
+usr/share/kde4/apps/katepart/syntax/asm-avr.xml
 usr/share/kde4/apps/katepart/syntax/asm6502.xml
-usr/share/kde4/apps/katepart/syntax/asm-avr.xml
 usr/share/kde4/apps/katepart/syntax/asn1.xml
 usr/share/kde4/apps/katepart/syntax/asp.xml
 usr/share/kde4/apps/katepart/syntax/awk.xml
 usr/share/kde4/apps/katepart/syntax/bash.xml
 usr/share/kde4/apps/katepart/syntax/bibtex.xml
 usr/share/kde4/apps/katepart/syntax/bmethod.xml
+usr/share/kde4/apps/katepart/syntax/c.xml
+usr/share/kde4/apps/katepart/syntax/cg.xml
 usr/share/kde4/apps/katepart/syntax/cgis.xml
-usr/share/kde4/apps/katepart/syntax/cg.xml
 usr/share/kde4/apps/katepart/syntax/changelog.xml
 usr/share/kde4/apps/katepart/syntax/cisco.xml
 usr/share/kde4/apps/katepart/syntax/clipper.xml
@@ -118,11 +126,11 @@
 usr/share/kde4/apps/katepart/syntax/commonlisp.xml
 usr/share/kde4/apps/katepart/syntax/component-pascal.xml
 usr/share/kde4/apps/katepart/syntax/cpp.xml
+usr/share/kde4/apps/katepart/syntax/cs.xml
 usr/share/kde4/apps/katepart/syntax/css-php.xml
 usr/share/kde4/apps/katepart/syntax/css.xml
-usr/share/kde4/apps/katepart/syntax/cs.xml
 usr/share/kde4/apps/katepart/syntax/cue.xml
-usr/share/kde4/apps/katepart/syntax/c.xml
+usr/share/kde4/apps/katepart/syntax/d.xml
 usr/share/kde4/apps/katepart/syntax/debianchangelog.xml
 usr/share/kde4/apps/katepart/syntax/debiancontrol.xml
 usr/share/kde4/apps/katepart/syntax/desktop.xml
@@ -130,12 +138,11 @@
 usr/share/kde4/apps/katepart/syntax/djangotemplate.xml
 usr/share/kde4/apps/katepart/syntax/doxygen.xml
 usr/share/kde4/apps/katepart/syntax/dtd.xml
-usr/share/kde4/apps/katepart/syntax/d.xml
+usr/share/kde4/apps/katepart/syntax/e.xml
 usr/share/kde4/apps/katepart/syntax/eiffel.xml
 usr/share/kde4/apps/katepart/syntax/email.xml
 usr/share/kde4/apps/katepart/syntax/erlang.xml
 usr/share/kde4/apps/katepart/syntax/euphoria.xml
-usr/share/kde4/apps/katepart/syntax/e.xml
 usr/share/kde4/apps/katepart/syntax/ferite.xml
 usr/share/kde4/apps/katepart/syntax/fgl-4gl.xml
 usr/share/kde4/apps/katepart/syntax/fgl-per.xml
@@ -154,10 +161,10 @@
 usr/share/kde4/apps/katepart/syntax/ilerpg.xml
 usr/share/kde4/apps/katepart/syntax/inform.xml
 usr/share/kde4/apps/katepart/syntax/ini.xml
+usr/share/kde4/apps/katepart/syntax/java.xml
 usr/share/kde4/apps/katepart/syntax/javadoc.xml
 usr/share/kde4/apps/katepart/syntax/javascript-php.xml
 usr/share/kde4/apps/katepart/syntax/javascript.xml
-usr/share/kde4/apps/katepart/syntax/java.xml
 usr/share/kde4/apps/katepart/syntax/json.xml
 usr/share/kde4/apps/katepart/syntax/jsp.xml
 usr/share/kde4/apps/katepart/syntax/kbasic.xml
@@ -184,8 +191,8 @@
 usr/share/kde4/apps/katepart/syntax/nasm.xml
 usr/share/kde4/apps/katepart/syntax/nemerle.xml
 usr/share/kde4/apps/katepart/syntax/noweb.xml
+usr/share/kde4/apps/katepart/syntax/objectivec.xml
 usr/share/kde4/apps/katepart/syntax/objectivecpp.xml
-usr/share/kde4/apps/katepart/syntax/objectivec.xml
 usr/share/kde4/apps/katepart/syntax/ocaml.xml
 usr/share/kde4/apps/katepart/syntax/octave.xml
 usr/share/kde4/apps/katepart/syntax/opal.xml
@@ -201,6 +208,7 @@
 usr/share/kde4/apps/katepart/syntax/prolog.xml
 usr/share/kde4/apps/katepart/syntax/purebasic.xml
 usr/share/kde4/apps/katepart/syntax/python.xml
+usr/share/kde4/apps/katepart/syntax/r.xml
 usr/share/kde4/apps/katepart/syntax/rapidq.xml
 usr/share/kde4/apps/katepart/syntax/rexx.xml
 usr/share/kde4/apps/katepart/syntax/rib.xml
@@ -208,7 +216,6 @@
 usr/share/kde4/apps/katepart/syntax/rpmspec.xml
 usr/share/kde4/apps/katepart/syntax/rsiidl.xml
 usr/share/kde4/apps/katepart/syntax/ruby.xml
-usr/share/kde4/apps/katepart/syntax/r.xml
 usr/share/kde4/apps/katepart/syntax/sather.xml
 usr/share/kde4/apps/katepart/syntax/scala.xml
 usr/share/kde4/apps/katepart/syntax/scheme.xml
@@ -234,8 +241,8 @@
 usr/share/kde4/apps/katepart/syntax/vrml.xml
 usr/share/kde4/apps/katepart/syntax/winehq.xml
 usr/share/kde4/apps/katepart/syntax/xharbour.xml
+usr/share/kde4/apps/katepart/syntax/xml.xml
 usr/share/kde4/apps/katepart/syntax/xmldebug.xml
-usr/share/kde4/apps/katepart/syntax/xml.xml
 usr/share/kde4/apps/katepart/syntax/xorg.xml
 usr/share/kde4/apps/katepart/syntax/xslt.xml
 usr/share/kde4/apps/katepart/syntax/xul.xml
@@ -329,14 +336,14 @@
 usr/share/kde4/apps/khtml/icons/crystalsvg/22x22/actions/dbgrun.png
 usr/share/kde4/apps/khtml/icons/crystalsvg/22x22/actions/dbgrunto.png
 usr/share/kde4/apps/khtml/icons/crystalsvg/22x22/actions/dbgstep.png
+usr/share/kde4/apps/khtml/khtml.rc
 usr/share/kde4/apps/khtml/khtml_browser.rc
-usr/share/kde4/apps/khtml/khtml.rc
 usr/share/kde4/apps/kjava/kjava.jar
 usr/share/kde4/apps/kjava/kjava.policy
 usr/share/kde4/apps/kjava/pluginsinfo
 usr/share/kde4/apps/knewstuff/pics/ghns.png
+usr/share/kde4/apps/knewstuff/pics/ghns_star.png
 usr/share/kde4/apps/knewstuff/pics/ghns_star_gray.png
-usr/share/kde4/apps/knewstuff/pics/ghns_star.png
 usr/share/kde4/apps/ksgmltools2/customization/
 usr/share/kde4/apps/ksgmltools2/docbook/README.kde
 usr/share/kde4/apps/ksgmltools2/docbook/xml-dtd-4.1.2/40chg.txt
@@ -371,6 +378,7 @@
 usr/share/kde4/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-tech.ent
 usr/share/kde4/apps/ksgmltools2/docbook/xml-dtd-4.1.2/readme.txt
 usr/share/kde4/apps/ksgmltools2/docbook/xml-dtd-4.1.2/soextblx.dtd
+usr/share/kde4/apps/ksgmltools2/docbook/xml-dtd-4.2/README
 usr/share/kde4/apps/ksgmltools2/docbook/xml-dtd-4.2/calstblx.dtd
 usr/share/kde4/apps/ksgmltools2/docbook/xml-dtd-4.2/catalog.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xml-dtd-4.2/dbcentx.mod
@@ -399,8 +407,10 @@
 usr/share/kde4/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-num.ent
 usr/share/kde4/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-pub.ent
 usr/share/kde4/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-tech.ent
-usr/share/kde4/apps/ksgmltools2/docbook/xml-dtd-4.2/README
 usr/share/kde4/apps/ksgmltools2/docbook/xml-dtd-4.2/soextblx.dtd
+usr/share/kde4/apps/ksgmltools2/docbook/xsl/README
+usr/share/kde4/apps/ksgmltools2/docbook/xsl/VERSION
+usr/share/kde4/apps/ksgmltools2/docbook/xsl/WhatsNew
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/af.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/ar.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/autoidx-ng.xsl
@@ -431,8 +441,8 @@
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/l10n.dtd
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/l10n.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/l10n.xsl
+usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/la.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/labels.xsl
-usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/la.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/lt.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/nl.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/nn.xml
@@ -440,14 +450,14 @@
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/olink.xsl
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/pi.xsl
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/pl.xml
+usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/pt.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/pt_br.xml
-usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/pt.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/ro.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/ru.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/sk.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/sl.xml
+usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/sr.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/sr_latin.xml
-usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/sr.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/subtitles.xsl
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/sv.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/common/table.xsl
@@ -471,22 +481,22 @@
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/html/changebars.xsl
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/html/chunk-code.xsl
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/html/chunk-common.xsl
+usr/share/kde4/apps/ksgmltools2/docbook/xsl/html/chunk.xsl
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/html/chunker.xsl
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/html/chunkfast.xsl
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/html/chunktoc.xsl
-usr/share/kde4/apps/ksgmltools2/docbook/xsl/html/chunk.xsl
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/html/component.xsl
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/html/division.xsl
+usr/share/kde4/apps/ksgmltools2/docbook/xsl/html/docbook.xsl
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/html/docbookng.xsl
-usr/share/kde4/apps/ksgmltools2/docbook/xsl/html/docbook.xsl
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/html/ebnf.xsl
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/html/footnote.xsl
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/html/formal.xsl
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/html/glossary.xsl
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/html/graphics.xsl
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/html/html-rtf.xsl
+usr/share/kde4/apps/ksgmltools2/docbook/xsl/html/html.xsl
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/html/htmltbl.xsl
-usr/share/kde4/apps/ksgmltools2/docbook/xsl/html/html.xsl
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/html/index.xsl
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/html/info.xsl
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/html/inline.xsl
@@ -519,6 +529,8 @@
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/html/verbatim.xsl
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/html/xref.xsl
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/images/blank.png
+usr/share/kde4/apps/ksgmltools2/docbook/xsl/images/callouts/1.gif
+usr/share/kde4/apps/ksgmltools2/docbook/xsl/images/callouts/1.png
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/images/callouts/10.gif
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/images/callouts/10.png
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/images/callouts/11.gif
@@ -531,8 +543,6 @@
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/images/callouts/14.png
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/images/callouts/15.gif
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/images/callouts/15.png
-usr/share/kde4/apps/ksgmltools2/docbook/xsl/images/callouts/1.gif
-usr/share/kde4/apps/ksgmltools2/docbook/xsl/images/callouts/1.png
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/images/callouts/2.gif
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/images/callouts/2.png
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/images/callouts/3.gif
@@ -587,10 +597,10 @@
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/admon.graphics.extension.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/admon.graphics.path.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/admon.graphics.xml
+usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/admon.style.xml
+usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/admon.textlabel.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/admonition.properties.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/admonition.title.properties.xml
-usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/admon.style.xml
-usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/admon.textlabel.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/alignment.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/annotate.toc.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/appendix.autolabel.xml
@@ -616,12 +626,19 @@
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/callout.graphics.path.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/callout.graphics.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/callout.list.table.xml
-usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/callouts.extension.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/callout.unicode.font.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/callout.unicode.number.limit.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/callout.unicode.start.character.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/callout.unicode.xml
+usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/callouts.extension.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/chapter.autolabel.xml
+usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/chunk.first.sections.xml
+usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/chunk.quietly.xml
+usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/chunk.section.depth.xml
+usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/chunk.sections.xml
+usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/chunk.separate.lots.xml
+usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/chunk.toc.xml
+usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/chunk.tocs.and.lots.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/chunker.output.cdata-section-elements.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/chunker.output.doctype-public.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/chunker.output.doctype-system.xml
@@ -631,13 +648,6 @@
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/chunker.output.method.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/chunker.output.omit-xml-declaration.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/chunker.output.standalone.xml
-usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/chunk.first.sections.xml
-usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/chunk.quietly.xml
-usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/chunk.section.depth.xml
-usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/chunk.sections.xml
-usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/chunk.separate.lots.xml
-usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/chunk.tocs.and.lots.xml
-usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/chunk.toc.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/citerefentry.link.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/collect.xref.targets.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/column.count.back.xml
@@ -720,8 +730,12 @@
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/html.cellpadding.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/html.cellspacing.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/html.cleanup.xml
+usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/html.ext.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/html.extra.head.links.xml
-usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/html.ext.xml
+usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/html.longdesc.link.xml
+usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/html.longdesc.xml
+usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/html.stylesheet.type.xml
+usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/html.stylesheet.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/htmlhelp.alias.file.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/htmlhelp.autolabel.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.back.xml
@@ -758,8 +772,8 @@
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhc.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhk.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhp.tail.xml
+usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhp.window.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhp.windows.xml
-usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhp.window.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhp.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/htmlhelp.map.file.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/htmlhelp.only.xml
@@ -771,22 +785,18 @@
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/htmlhelp.title.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/htmlhelp.use.hhk.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/htmlhelp.window.geometry.xml
-usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/html.longdesc.link.xml
-usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/html.longdesc.xml
-usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/html.stylesheet.type.xml
-usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/html.stylesheet.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/hyphenate.verbatim.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/hyphenate.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/ignore.image.scaling.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/img.src.path.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/index.on.role.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/index.on.type.xml
+usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/index.prefer.titleabbrev.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/index.preferred.page.properties.xml
-usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/index.prefer.titleabbrev.xml
+usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/informal.object.properties.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/informalequation.properties.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/informalexample.properties.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/informalfigure.properties.xml
-usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/informal.object.properties.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/informaltable.properties.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/inherit.keywords.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/insert.olink.page.number.xml
@@ -864,8 +874,8 @@
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/profile.conformance.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/profile.lang.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/profile.os.xml
+usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/profile.revision.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/profile.revisionflag.xml
-usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/profile.revision.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/profile.role.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/profile.security.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/profile.separator.xml
@@ -874,7 +884,6 @@
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/profile.vendor.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/punct.honorific.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/qanda.defaultlabel.xml
-usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/qandadiv.autolabel.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/qanda.inherit.numeration.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/qanda.title.level1.properties.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/qanda.title.level2.properties.xml
@@ -883,6 +892,7 @@
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/qanda.title.level5.properties.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/qanda.title.level6.properties.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/qanda.title.properties.xml
+usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/qandadiv.autolabel.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/refentry.generate.name.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/refentry.generate.title.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/refentry.pagebreak.xml
@@ -892,8 +902,8 @@
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/region.after.extent.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/region.before.extent.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/root.filename.xml
+usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/root.properties.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/rootid.xml
-usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/root.properties.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/runinhead.default.title.end.punct.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/runinhead.title.end.punct.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/sans.font.family.xml
@@ -937,7 +947,6 @@
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/table.cell.border.style.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/table.cell.border.thickness.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/table.cell.padding.xml
-usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/tablecolumns.extension.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/table.entry.padding.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/table.footnote.number.format.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/table.footnote.number.symbols.xml
@@ -946,6 +955,7 @@
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/table.frame.border.thickness.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/table.properties.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/table.table.properties.xml
+usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/tablecolumns.extension.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/target.database.document.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/targets.filename.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/template.xml
@@ -986,21 +996,11 @@
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/xref.properties.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/xref.title-page.separator.xml
 usr/share/kde4/apps/ksgmltools2/docbook/xsl/params/xref.with.number.and.title.xml
-usr/share/kde4/apps/ksgmltools2/docbook/xsl/README
-usr/share/kde4/apps/ksgmltools2/docbook/xsl/VERSION
-usr/share/kde4/apps/ksgmltools2/docbook/xsl/WhatsNew
 usr/share/kde4/apps/kssl/ca-bundle.crt
 usr/share/kde4/apps/ktexteditor_docwordcompletion/docwordcompletionui.rc
 usr/share/kde4/apps/ktexteditor_insertfile/ktexteditor_insertfileui.rc
 usr/share/kde4/apps/ktexteditor_kdatatool/ktexteditor_kdatatoolui.rc
 usr/share/kde4/apps/libphonon/hardwaredatabase
-usr/share/kde4/apps/LICENSES/ARTISTIC
-usr/share/kde4/apps/LICENSES/BSD
-usr/share/kde4/apps/LICENSES/GPL_V2
-usr/share/kde4/apps/LICENSES/GPL_V3
-usr/share/kde4/apps/LICENSES/LGPL_V2
-usr/share/kde4/apps/LICENSES/LGPL_V3
-usr/share/kde4/apps/LICENSES/QPL_V1.0
 usr/share/kde4/apps/nepomuk/
 usr/share/kde4/apps/phonon/phonon.notifyrc
 usr/share/kde4/apps/proxyscout/proxyscout.notifyrc
@@ -1010,8 +1010,8 @@
 usr/share/kde4/services/ftp.protocol
 usr/share/kde4/services/ghelp.protocol
 usr/share/kde4/services/help.protocol
+usr/share/kde4/services/http.protocol
 usr/share/kde4/services/http_cache_cleaner.desktop
-usr/share/kde4/services/http.protocol
 usr/share/kde4/services/https.protocol
 usr/share/kde4/services/katepart.desktop
 usr/share/kde4/services/kcertpart.desktop
@@ -1021,8 +1021,8 @@
 usr/share/kde4/services/kded/kssld.desktop
 usr/share/kde4/services/kded/kwalletd.desktop
 usr/share/kde4/services/kded/proxyscout.desktop
+usr/share/kde4/services/khtml.desktop
 usr/share/kde4/services/khtmladaptorpart.desktop
-usr/share/kde4/services/khtml.desktop
 usr/share/kde4/services/khtmlimage.desktop
 usr/share/kde4/services/kjavaappletviewer.desktop
 usr/share/kde4/services/kmailservice.protocol
@@ -1030,8 +1030,8 @@
 usr/share/kde4/services/kspell_aspell.desktop
 usr/share/kde4/services/kspell_enchant.desktop
 usr/share/kde4/services/kspell_hspell.desktop
+usr/share/kde4/services/ktexteditor_docwordcompletion.desktop
 usr/share/kde4/services/ktexteditor_docwordcompletion_config.desktop
-usr/share/kde4/services/ktexteditor_docwordcompletion.desktop
 usr/share/kde4/services/ktexteditor_insertfile.desktop
 usr/share/kde4/services/ktexteditor_kdatatool.desktop
 usr/share/kde4/services/metainfo.protocol

Modified: branches/kde4/packages/kdelibs/debian/kdelibs5-data.installgen
===================================================================
--- branches/kde4/packages/kdelibs/debian/kdelibs5-data.installgen	2008-04-06 18:21:57 UTC (rev 10035)
+++ branches/kde4/packages/kdelibs/debian/kdelibs5-data.installgen	2008-04-06 19:17:49 UTC (rev 10036)
@@ -1,5 +1,9 @@
 depends last
+
+missing dst:usr/share/locale/all_languages$
+
 dst:usr/share/doc/kde4/HTML/
 mime:text/.*
 mime:image/.*
 mime:application/(?!(x-executable|x-sharedlib)).*
+

Modified: branches/kde4/packages/kdelibs/debian/kdelibs5-dev.install
===================================================================
--- branches/kde4/packages/kdelibs/debian/kdelibs5-dev.install	2008-04-06 18:21:57 UTC (rev 10035)
+++ branches/kde4/packages/kdelibs/debian/kdelibs5-dev.install	2008-04-06 19:17:49 UTC (rev 10036)
@@ -3,15 +3,15 @@
 usr/bin/kunittestmodrunner
 usr/bin/makekdewidgets
 usr/bin/preparetips
+usr/include/KDE/*
 usr/include/conversion_check.h
 usr/include/dnssd/*
 usr/include/dockmainwindow3.h
 usr/include/dom/*
 usr/include/fixx11h.h
-usr/include/KDE/*
+usr/include/k*.h
 usr/include/kdesu/*
 usr/include/kgenericfactory.tcc
-usr/include/k*.h
 usr/include/khexedit/*
 usr/include/kio/*
 usr/include/kmediaplayer/*
@@ -22,8 +22,8 @@
 usr/include/ktexteditor/*
 usr/include/kunittest/*
 usr/include/nepomuk/*
+usr/include/netwm.h
 usr/include/netwm_def.h
-usr/include/netwm.h
 usr/include/passdlg.h
 usr/include/predicateproperties.h
 usr/include/qtest_kde.h
@@ -43,8 +43,8 @@
 usr/lib/libkhtml.so
 usr/lib/libkimproxy.so
 usr/lib/libkio.so
+usr/lib/libkjs.so
 usr/lib/libkjsembed.so
-usr/lib/libkjs.so
 usr/lib/libkmediaplayer.so
 usr/lib/libknewstuff2.so
 usr/lib/libknotifyconfig.so
@@ -63,8 +63,6 @@
 usr/share/kde4/apps/cmake/modules/CheckPointerMember.cmake
 usr/share/kde4/apps/cmake/modules/CheckPrototypeExists.cmake
 usr/share/kde4/apps/cmake/modules/CheckStructMember.cmake
-usr/share/kde4/apps/cmake/modules/cmake-modules-styleguide.txt
-usr/share/kde4/apps/cmake/modules/config-alsa.h.cmake
 usr/share/kde4/apps/cmake/modules/FindACL.cmake
 usr/share/kde4/apps/cmake/modules/FindAGG.cmake
 usr/share/kde4/apps/cmake/modules/FindAkode.cmake
@@ -75,8 +73,8 @@
 usr/share/kde4/apps/cmake/modules/FindBlueZ.cmake
 usr/share/kde4/apps/cmake/modules/FindCarbon.cmake
 usr/share/kde4/apps/cmake/modules/FindDNSSD.cmake
+usr/share/kde4/apps/cmake/modules/FindENCHANT.cmake
 usr/share/kde4/apps/cmake/modules/FindEigen.cmake
-usr/share/kde4/apps/cmake/modules/FindENCHANT.cmake
 usr/share/kde4/apps/cmake/modules/FindExiv2.cmake
 usr/share/kde4/apps/cmake/modules/FindFAM.cmake
 usr/share/kde4/apps/cmake/modules/FindFFmpeg.cmake
@@ -84,34 +82,34 @@
 usr/share/kde4/apps/cmake/modules/FindFlex.cmake
 usr/share/kde4/apps/cmake/modules/FindFontconfig.cmake
 usr/share/kde4/apps/cmake/modules/FindFreetype.cmake
-usr/share/kde4/apps/cmake/modules/FindGettext.cmake
 usr/share/kde4/apps/cmake/modules/FindGIF.cmake
 usr/share/kde4/apps/cmake/modules/FindGLIB2.cmake
 usr/share/kde4/apps/cmake/modules/FindGMP.cmake
 usr/share/kde4/apps/cmake/modules/FindGObject.cmake
-usr/share/kde4/apps/cmake/modules/FindGphoto2.cmake
 usr/share/kde4/apps/cmake/modules/FindGSSAPI.cmake
 usr/share/kde4/apps/cmake/modules/FindGStreamer.cmake
+usr/share/kde4/apps/cmake/modules/FindGettext.cmake
+usr/share/kde4/apps/cmake/modules/FindGphoto2.cmake
+usr/share/kde4/apps/cmake/modules/FindKDE4Internal.cmake
+usr/share/kde4/apps/cmake/modules/FindKDEWIN.cmake
+usr/share/kde4/apps/cmake/modules/FindKDEWIN32.cmake
+usr/share/kde4/apps/cmake/modules/FindKDEWIN_Packager.cmake
+usr/share/kde4/apps/cmake/modules/FindKNepomuk.cmake
 usr/share/kde4/apps/cmake/modules/FindKdcraw.cmake
-usr/share/kde4/apps/cmake/modules/FindKDE4Internal.cmake
 usr/share/kde4/apps/cmake/modules/FindKdeMultimedia.cmake
 usr/share/kde4/apps/cmake/modules/FindKdepim.cmake
 usr/share/kde4/apps/cmake/modules/FindKdepimLibs.cmake
-usr/share/kde4/apps/cmake/modules/FindKDEWIN32.cmake
-usr/share/kde4/apps/cmake/modules/FindKDEWIN.cmake
-usr/share/kde4/apps/cmake/modules/FindKDEWIN_Packager.cmake
 usr/share/kde4/apps/cmake/modules/FindKexiv2.cmake
 usr/share/kde4/apps/cmake/modules/FindKipi.cmake
-usr/share/kde4/apps/cmake/modules/FindKNepomuk.cmake
 usr/share/kde4/apps/cmake/modules/FindKonto.cmake
 usr/share/kde4/apps/cmake/modules/FindKopete.cmake
 usr/share/kde4/apps/cmake/modules/FindKorundum.cmake
 usr/share/kde4/apps/cmake/modules/FindLCMS.cmake
 usr/share/kde4/apps/cmake/modules/FindLibArt.cmake
+usr/share/kde4/apps/cmake/modules/FindLibXml2.cmake
+usr/share/kde4/apps/cmake/modules/FindLibXslt.cmake
 usr/share/kde4/apps/cmake/modules/FindLibintl.cmake
 usr/share/kde4/apps/cmake/modules/FindLibraryWithDebug.cmake
-usr/share/kde4/apps/cmake/modules/FindLibXml2.cmake
-usr/share/kde4/apps/cmake/modules/FindLibXslt.cmake
 usr/share/kde4/apps/cmake/modules/FindLinuxWirelesstools.cmake
 usr/share/kde4/apps/cmake/modules/FindMsgfmt.cmake
 usr/share/kde4/apps/cmake/modules/FindMusicBrainz.cmake
@@ -121,11 +119,11 @@
 usr/share/kde4/apps/cmake/modules/FindOggVorbis.cmake
 usr/share/kde4/apps/cmake/modules/FindOpenEXR.cmake
 usr/share/kde4/apps/cmake/modules/FindOpenSSL.cmake
+usr/share/kde4/apps/cmake/modules/FindPCRE.cmake
+usr/share/kde4/apps/cmake/modules/FindPNG.cmake
 usr/share/kde4/apps/cmake/modules/FindPackageHandleStandardArgs.cmake
-usr/share/kde4/apps/cmake/modules/FindPCRE.cmake
 usr/share/kde4/apps/cmake/modules/FindPkgConfig.cmake
 usr/share/kde4/apps/cmake/modules/FindPlasma.cmake
-usr/share/kde4/apps/cmake/modules/FindPNG.cmake
 usr/share/kde4/apps/cmake/modules/FindPopplerQt4.cmake
 usr/share/kde4/apps/cmake/modules/FindPostgreSQL.cmake
 usr/share/kde4/apps/cmake/modules/FindQCA2.cmake
@@ -139,25 +137,20 @@
 usr/share/kde4/apps/cmake/modules/FindSoprano.cmake
 usr/share/kde4/apps/cmake/modules/FindSqlite.cmake
 usr/share/kde4/apps/cmake/modules/FindStrigi.cmake
+usr/share/kde4/apps/cmake/modules/FindTIFF.cmake
 usr/share/kde4/apps/cmake/modules/FindTaglib.cmake
-usr/share/kde4/apps/cmake/modules/FindTIFF.cmake
 usr/share/kde4/apps/cmake/modules/FindUSB.cmake
 usr/share/kde4/apps/cmake/modules/FindX11.cmake
+usr/share/kde4/apps/cmake/modules/FindXKB.cmake
 usr/share/kde4/apps/cmake/modules/FindXine.cmake
-usr/share/kde4/apps/cmake/modules/FindXKB.cmake
 usr/share/kde4/apps/cmake/modules/FindXmms.cmake
-usr/share/kde4/apps/cmake/modules/kde4automoc.files.in
-usr/share/kde4/apps/cmake/modules/kde4_cmake_uninstall.cmake.in
 usr/share/kde4/apps/cmake/modules/KDE4Defaults.cmake
-usr/share/kde4/apps/cmake/modules/kde4_exec_via_sh.cmake
-usr/share/kde4/apps/cmake/modules/kde4init_dummy.cpp.in
 usr/share/kde4/apps/cmake/modules/KDE4Macros.cmake
-usr/share/kde4/apps/cmake/modules/kde4uic.cmake
 usr/share/kde4/apps/cmake/modules/KDELibsDependencies.cmake
 usr/share/kde4/apps/cmake/modules/MacroAddCompileFlags.cmake
 usr/share/kde4/apps/cmake/modules/MacroAddFileDependencies.cmake
+usr/share/kde4/apps/cmake/modules/MacroAddLinkFlags.cmake
 usr/share/kde4/apps/cmake/modules/MacroAdditionalCleanFiles.cmake
-usr/share/kde4/apps/cmake/modules/MacroAddLinkFlags.cmake
 usr/share/kde4/apps/cmake/modules/MacroAppendIf.cmake
 usr/share/kde4/apps/cmake/modules/MacroBoolTo01.cmake
 usr/share/kde4/apps/cmake/modules/MacroEnsureOutOfSourceBuild.cmake
@@ -171,3 +164,10 @@
 usr/share/kde4/apps/cmake/modules/NepomukMacros.cmake
 usr/share/kde4/apps/cmake/modules/UsePkgConfig.cmake
 usr/share/kde4/apps/cmake/modules/Win32Macros.cmake
+usr/share/kde4/apps/cmake/modules/cmake-modules-styleguide.txt
+usr/share/kde4/apps/cmake/modules/config-alsa.h.cmake
+usr/share/kde4/apps/cmake/modules/kde4_cmake_uninstall.cmake.in
+usr/share/kde4/apps/cmake/modules/kde4_exec_via_sh.cmake
+usr/share/kde4/apps/cmake/modules/kde4automoc.files.in
+usr/share/kde4/apps/cmake/modules/kde4init_dummy.cpp.in
+usr/share/kde4/apps/cmake/modules/kde4uic.cmake

Modified: branches/kde4/packages/kdelibs/debian/kdelibs5.install
===================================================================
--- branches/kde4/packages/kdelibs/debian/kdelibs5.install	2008-04-06 18:21:57 UTC (rev 10035)
+++ branches/kde4/packages/kdelibs/debian/kdelibs5.install	2008-04-06 19:17:49 UTC (rev 10036)
@@ -81,10 +81,10 @@
 usr/lib/libkimproxy.so.4.1.0
 usr/lib/libkio.so.5
 usr/lib/libkio.so.5.1.0
+usr/lib/libkjs.so.4
+usr/lib/libkjs.so.4.1.0
 usr/lib/libkjsembed.so.4
 usr/lib/libkjsembed.so.4.1.0
-usr/lib/libkjs.so.4
-usr/lib/libkjs.so.4.1.0
 usr/lib/libkmediaplayer.so.4
 usr/lib/libkmediaplayer.so.4.1.0
 usr/lib/libknewstuff2.so.4

Added: branches/kde4/packages/kdelibs/debian/libphonon-dev.installgen
===================================================================
--- branches/kde4/packages/kdelibs/debian/libphonon-dev.installgen	                        (rev 0)
+++ branches/kde4/packages/kdelibs/debian/libphonon-dev.installgen	2008-04-06 19:17:49 UTC (rev 10036)
@@ -0,0 +1,2 @@
+dst:usr/include/phonon/.*
+dst:usr/lib/libphonon.*\.so$

Added: branches/kde4/packages/kdelibs/debian/libphonon4.installgen
===================================================================
--- branches/kde4/packages/kdelibs/debian/libphonon4.installgen	                        (rev 0)
+++ branches/kde4/packages/kdelibs/debian/libphonon4.installgen	2008-04-06 19:17:49 UTC (rev 10036)
@@ -0,0 +1 @@
+dst:usr/lib/libphonon.*\.so\..*

Deleted: branches/kde4/packages/kdelibs/debian/patches/16_postgresql_include_path_fix.diff

Added: branches/kde4/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff	                        (rev 0)
+++ branches/kde4/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff	2008-04-06 19:17:49 UTC (rev 10036)
@@ -0,0 +1,31 @@
+diff -uNr kde4libs-4.0.68.o/kdecore/services/kservicefactory.cpp kde4libs-4.0.68/kdecore/services/kservicefactory.cpp
+--- kde4libs-4.0.68.o/kdecore/services/kservicefactory.cpp	2008-04-06 13:18:10.000000000 +0300
++++ kde4libs-4.0.68/kdecore/services/kservicefactory.cpp	2008-04-06 13:27:36.000000000 +0300
+@@ -125,17 +125,24 @@
+     return newService;
+ }
+ 
+-KService::Ptr KServiceFactory::findServiceByDesktopPath(const QString &_name)
++KService::Ptr KServiceFactory::findServiceByDesktopPath(const QString &name)
+ {
+     if (!m_relNameDict) return KService::Ptr(); // Error!
+ 
+     // Warning : this assumes we're NOT building a database
+     // KBuildServiceFactory reimplements it for the case where we are building one
+ 
++    QString _name = name;
+     int offset = m_relNameDict->find_string( _name );
+     if (!offset) {
+-        qDebug( "findServiceByDesktopPath: %s not found", qPrintable( _name ) );
+-        return KService::Ptr(); // Not found
++        // We might have been given a symlink or non-canonical path of some sort.
++        // Therefore try looking up KStandardDirs::realFilePath'ed path too.
++        _name = KStandardDirs::realFilePath(_name);
++        offset = m_relNameDict->find_string(_name);
++        if (!offset) {
++            qDebug( "findServiceByDesktopPath: %s not found", qPrintable( name ) );
++            return KService::Ptr(); // Not found
++        }
+     }
+ 
+     KService::Ptr newService(createEntry(offset));

Modified: branches/kde4/packages/kdelibs/debian/patches/series
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/series	2008-04-06 18:21:57 UTC (rev 10035)
+++ branches/kde4/packages/kdelibs/debian/patches/series	2008-04-06 19:17:49 UTC (rev 10036)
@@ -6,4 +6,4 @@
 13_qt4_designer_plugins_path.diff
 14_hardcode_ptm_device.diff
 15_kfreebsd_support.diff
-16_postgresql_include_path_fix.diff
+17_findservicebydesktoppath_try_realfilepath.diff




More information about the pkg-kde-commits mailing list