[SCM] oxygen packaging branch, kubuntu_vivid_backports, updated. ubuntu/4%5.4.2-0ubuntu1
Scarlett Clark
sgclark-guest at moszumanska.debian.org
Mon Oct 5 18:03:17 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/oxygen.git;a=commitdiff;h=df15e62
The following commit has been merged in the kubuntu_vivid_backports branch:
commit df15e62ae5dd8176c585f5d46afba67a6716b7e3
Merge: 356ae7bd2a0f0cd7348ea329e9659236acee252b 66959ebbb30254c8240bf27026863366bc40b5f7
Author: Jonathan Riddell <jr at jriddell.org>
Date: Thu Jul 2 09:27:31 2015 +0000
fix merge
debian/.gitattributes | 1 +
debian/changelog | 27 ++
debian/control | 54 ++--
debian/copyright | 412 +++++++++++-------------
debian/kde-style-oxygen-qt4.install | 9 +
debian/kde-style-oxygen-qt5.install | 4 +-
debian/kwin-decoration-oxygen.install | 6 +-
debian/kwin-decoration-oxygen.lintian-overrides | 1 -
debian/liboxygenstyle5-5.install | 3 +-
debian/liboxygenstyleconfig5-5.install | 6 +-
debian/not-installed | 2 +
debian/oxygen-sounds.install | 2 +-
debian/plasma-theme-oxygen.install | 10 +-
debian/rules | 16 +
debian/source/lintian-overrides | 1 -
debian/watch | 5 +-
16 files changed, 286 insertions(+), 273 deletions(-)
diff --cc debian/kde-style-oxygen-qt5.install
index f46fe21,66bd552..0da4fe3
--- a/debian/kde-style-oxygen-qt5.install
+++ b/debian/kde-style-oxygen-qt5.install
@@@ -1,8 -1,8 +1,8 @@@
usr/bin/oxygen-settings5
usr/lib/*/qt5/plugins/kstyle_oxygen_config.so
usr/lib/*/qt5/plugins/styles/oxygen.so
-usr/share/kservices5/oxygenstyleconfig.desktop
+usr/share/icons/hicolor/256x256/apps/oxygen-settings.png
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
+ usr/share/locale/*/*/oxygen_style_config.mo
+ usr/share/locale/*/*/oxygen_style_demo.mo
--
oxygen packaging
More information about the pkg-kde-commits
mailing list