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

[Modestas Vainius]

Author: modax-guest
Date: 2008-11-17 11:08:06 +0000 (Mon, 17 Nov 2008)
New Revision: 12651

Modified:
   branches/kde4.2/packages/kdelibs/debian/changelog
   branches/kde4.2/packages/kdelibs/debian/kdelibs5-data.install
   branches/kde4.2/packages/kdelibs/debian/kdelibs5.install
   branches/kde4.2/packages/kdelibs/debian/libplasma-dev.install
   branches/kde4.2/packages/kdelibs/debian/patches/11_kde4_applications_menu.diff
Log:
Some kde4libs fixes

Modified: branches/kde4.2/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/changelog	2008-11-17 02:59:02 UTC (rev 12650)
+++ branches/kde4.2/packages/kdelibs/debian/changelog	2008-11-17 11:08:06 UTC (rev 12651)
@@ -1,8 +1,12 @@
-kde4libs (4:4.1.73+svn885249-0r1) UNRELEASED; urgency=low
+kde4libs (4:4.1.73+svn885397-0r1) UNRELEASED; urgency=low
 
   * New upstream development snapshot.
 
   TODO: check where new upstream man pages belong.
+  TODO: sort out kdelibs-bin <=> kdelibs5 for:
+    - libkdeinit4_klauncher.so
+    - libkdeinit4_kio_http_cache_cleaner.so
+    - libkdeinit4_kconf_update.so
 
   +++ Changes by Modestas Vainius:
 
@@ -34,7 +38,7 @@
   * Make kdelibs5 recommend kdebase-runtime >= 4:4.1.73 because some
     stuff does not work (e.g. kwallet) with previous versions.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 17 Nov 2008 04:51:34 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 17 Nov 2008 12:54:08 +0200
 
 kde4libs (4:4.1.3-2) experimental; urgency=low
 

Modified: branches/kde4.2/packages/kdelibs/debian/kdelibs5-data.install
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/kdelibs5-data.install	2008-11-17 02:59:02 UTC (rev 12650)
+++ branches/kde4.2/packages/kdelibs/debian/kdelibs5-data.install	2008-11-17 11:08:06 UTC (rev 12651)
@@ -1,4 +1,5 @@
-etc/xdg/menus/applications.menu
+../config.README usr/share/kde4/config
+etc/xdg/menus/kde4-applications.menu
 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/2.png

Modified: branches/kde4.2/packages/kdelibs/debian/kdelibs5.install
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/kdelibs5.install	2008-11-17 02:59:02 UTC (rev 12650)
+++ branches/kde4.2/packages/kdelibs/debian/kdelibs5.install	2008-11-17 11:08:06 UTC (rev 12651)
@@ -47,7 +47,6 @@
 usr/lib/kde4/libkmultipart.so
 usr/lib/kde4/notepadpart.so
 usr/lib/kde4/plugins/designer/kde3supportwidgets.so
-usr/lib/kde4/plugins/designer/kdewidgets.so
 usr/lib/kde4/plugins/designer/kformulawidgets.so
 usr/lib/kde4/plugins/imageformats/kimg_dds.so
 usr/lib/kde4/plugins/imageformats/kimg_eps.so
@@ -118,3 +117,4 @@
 usr/lib/libsolid.so.4.2.0
 usr/lib/libthreadweaver.so.4
 usr/lib/libthreadweaver.so.4.2.0
+usr/lib/qt4/plugins/designer/kdewidgets.so

Modified: branches/kde4.2/packages/kdelibs/debian/libplasma-dev.install
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/libplasma-dev.install	2008-11-17 02:59:02 UTC (rev 12650)
+++ branches/kde4.2/packages/kdelibs/debian/libplasma-dev.install	2008-11-17 11:08:06 UTC (rev 12651)
@@ -21,6 +21,7 @@
 usr/include/KDE/Plasma/FlashingLabel
 usr/include/KDE/Plasma/Frame
 usr/include/KDE/Plasma/FrameSvg
+usr/include/KDE/Plasma/GLApplet
 usr/include/KDE/Plasma/GroupBox
 usr/include/KDE/Plasma/IconWidget
 usr/include/KDE/Plasma/Label
@@ -73,6 +74,7 @@
 usr/include/plasma/extender.h
 usr/include/plasma/extenderitem.h
 usr/include/plasma/framesvg.h
+usr/include/plasma/glapplet.h
 usr/include/plasma/package.h
 usr/include/plasma/packagemetadata.h
 usr/include/plasma/packagestructure.h

Modified: branches/kde4.2/packages/kdelibs/debian/patches/11_kde4_applications_menu.diff
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/patches/11_kde4_applications_menu.diff	2008-11-17 02:59:02 UTC (rev 12650)
+++ branches/kde4.2/packages/kdelibs/debian/patches/11_kde4_applications_menu.diff	2008-11-17 11:08:06 UTC (rev 12651)
@@ -21,7 +21,7 @@
  ########### install files ###############
  
 -install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus )
-+install( FILES applications.menu  DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde4-applications.menu)
++install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde4-applications.menu)
  install( FILES kdedmodule.desktop DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
  install( FILES kded.upd           DESTINATION  ${DATA_INSTALL_DIR}/kconf_update )