[SCM] oxygen packaging branch, kubuntu_stable, updated. 2c599192398b9ef2d35693871fa73dec054a32b9

Harald Sitter apachelogger-guest at moszumanska.debian.org
Fri Apr 10 08:08:00 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/oxygen.git;a=commitdiff;h=02b04be

The following commit has been merged in the kubuntu_stable branch:
commit 02b04be0e9d71c4dd0e890ff46ff21f4ac7baacc
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Mar 26 13:11:28 2015 +0100

    Revert "Remove missing file."
    
    This reverts commit eaf0f3c632b55d026f15be1ca8fd8bf0927447a4.
    
    Conflicts:
    	debian/changelog
---
 debian/kde-style-oxygen-qt5.install | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/kde-style-oxygen-qt5.install b/debian/kde-style-oxygen-qt5.install
index 110bae5..62243f9 100644
--- a/debian/kde-style-oxygen-qt5.install
+++ b/debian/kde-style-oxygen-qt5.install
@@ -1,5 +1,6 @@
 usr/lib/*/qt5/plugins/kstyle_oxygen_config.so
 usr/lib/*/qt5/plugins/styles/oxygen.so
+usr/share/kservices5/oxygenstyleconfig.desktop
 usr/share/kstyle/themes/oxygen.themerc
 usr/share/locale/*/LC_MESSAGES/oxygen_style_config.mo
 usr/share/locale/*/LC_MESSAGES/oxygen_style_demo.mo

-- 
oxygen packaging



More information about the pkg-kde-commits mailing list