[SCM] muon packaging branch, kubuntu_stable, updated. c1b2b0b0a9eea8932dd26916fabec7f43f6a3d6a
Harald Sitter
apachelogger-guest at moszumanska.debian.org
Fri Apr 10 08:07:54 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/muon.git;a=commitdiff;h=d457e76
The following commit has been merged in the kubuntu_stable branch:
commit d457e7640f0ebcef6696c7d3f0af0ccb02705c75
Merge: c669ad1778deefbb4eb5851c196ed714837b7b9a 615df672e46d6fdfeed26c0d8253fbd79472314b
Author: Harald Sitter <sitter at kde.org>
Date: Wed Apr 1 09:14:58 2015 +0200
Merge branch 'kubuntu_stable' into kubuntu_unstable
Conflicts:
debian/muon.install
debian/changelog | 11 +++++++++++
debian/muon.install | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --cc debian/muon.install
index 5164cf4,ef6c9b3..2bced6f
--- a/debian/muon.install
+++ b/debian/muon.install
@@@ -2,5 -2,6 +2,5 @@@ usr/bin/muo
usr/share/applications/muon.desktop
usr/share/config.kcfg/muon.kcfg
usr/share/icons/hicolor/*/apps/muon.*
+ usr/share/kxmlgui5/muon/muonui.rc
-usr/share/locale/*/LC_MESSAGES/muon-installer.mo
usr/share/locale/*/LC_MESSAGES/muon.mo
- usr/share/muon/muonui.rc
--
muon packaging
More information about the pkg-kde-commits
mailing list