rev 15895 - in trunk/packages: kdemultimedia/debian kdemultimedia/debian/patches kdeutils/debian kdeutils/debian/patches

[Fathi Boudra]

Author: fabo
Date: 2009-09-02 09:51:24 +0000 (Wed, 02 Sep 2009)
New Revision: 15895

Added:
   trunk/packages/kdeutils/debian/patches/
   trunk/packages/kdeutils/debian/patches/01_fix_kscd.profile.xml.diff
   trunk/packages/kdeutils/debian/patches/series
Modified:
   trunk/packages/kdemultimedia/debian/changelog
   trunk/packages/kdemultimedia/debian/patches/97_fix_target_link_libraries.diff
   trunk/packages/kdeutils/debian/changelog
   trunk/packages/kdeutils/debian/kdelirc.install
Log:
Upload kdeutils and kdemultimedia.
kscd.profile.xml issue is clarified.


Modified: trunk/packages/kdemultimedia/debian/changelog
===================================================================
--- trunk/packages/kdemultimedia/debian/changelog	2009-09-02 08:33:36 UTC (rev 15894)
+++ trunk/packages/kdemultimedia/debian/changelog	2009-09-02 09:51:24 UTC (rev 15895)
@@ -1,4 +1,4 @@
-kdemultimedia (4:4.3.1-0r1) UNRELEASED; urgency=low
+kdemultimedia (4:4.3.1-1) unstable; urgency=low
 
   * New upstream release.
 

Modified: trunk/packages/kdemultimedia/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- trunk/packages/kdemultimedia/debian/patches/97_fix_target_link_libraries.diff	2009-09-02 08:33:36 UTC (rev 15894)
+++ trunk/packages/kdemultimedia/debian/patches/97_fix_target_link_libraries.diff	2009-09-02 09:51:24 UTC (rev 15895)
@@ -1,6 +1,6 @@
 --- a/libkcompactdisc/CMakeLists.txt
 +++ b/libkcompactdisc/CMakeLists.txt
-@@ -47,7 +47,7 @@
+@@ -47,7 +47,7 @@ endif (USE_WMLIB)
  
  kde4_add_library(kcompactdisc SHARED ${kcompactdisc_LIB_SRCS})
  

Modified: trunk/packages/kdeutils/debian/changelog
===================================================================
--- trunk/packages/kdeutils/debian/changelog	2009-09-02 08:33:36 UTC (rev 15894)
+++ trunk/packages/kdeutils/debian/changelog	2009-09-02 09:51:24 UTC (rev 15895)
@@ -1,4 +1,4 @@
-kdeutils (4:4.3.1-0r1) UNRELEASED; urgency=low
+kdeutils (4:4.3.1-1) unstable; urgency=low
 
   * New upstream release.
 

Modified: trunk/packages/kdeutils/debian/kdelirc.install
===================================================================
--- trunk/packages/kdeutils/debian/kdelirc.install	2009-09-02 08:33:36 UTC (rev 15894)
+++ trunk/packages/kdeutils/debian/kdelirc.install	2009-09-02 09:51:24 UTC (rev 15895)
@@ -32,7 +32,6 @@
 usr/share/kde4/apps/profiles/klauncher.profile.xml
 usr/share/kde4/apps/profiles/kmix.profile.xml
 usr/share/kde4/apps/profiles/konqueror.profile.xml
-usr/share/kde4/apps/profiles/kscd.profile.xml
 usr/share/kde4/apps/profiles/okular.profile.xml
 usr/share/kde4/apps/profiles/profile.dtd
 usr/share/kde4/apps/profiles/shutdown.profile.xml

Added: trunk/packages/kdeutils/debian/patches/01_fix_kscd.profile.xml.diff
===================================================================
--- trunk/packages/kdeutils/debian/patches/01_fix_kscd.profile.xml.diff	                        (rev 0)
+++ trunk/packages/kdeutils/debian/patches/01_fix_kscd.profile.xml.diff	2009-09-02 09:51:24 UTC (rev 15895)
@@ -0,0 +1,15 @@
+author: Fathi Boudra <fabo at debian.org>
+
+kscd.profile.xml should not be installed.
+it's an upstream mistake and is shipped by kdemultimedia/kscd.
+
+--- a/kdelirc/profiles/CMakeLists.txt
++++ b/kdelirc/profiles/CMakeLists.txt
+@@ -11,7 +11,6 @@ install( FILES 
+     konqueror.profile.xml 
+     suspend.profile.xml
+     shutdown.profile.xml
+-    kscd.profile.xml
+     DESTINATION ${DATA_INSTALL_DIR}/profiles)
+ 
+ 

Added: trunk/packages/kdeutils/debian/patches/series
===================================================================
--- trunk/packages/kdeutils/debian/patches/series	                        (rev 0)
+++ trunk/packages/kdeutils/debian/patches/series	2009-09-02 09:51:24 UTC (rev 15895)
@@ -0,0 +1 @@
+01_fix_kscd.profile.xml.diff