[SCM] muon packaging branch, kubuntu_stable, updated. 54cac92ad26567c17e0fcae1662b3b5a8402fca1
Harald Sitter
apachelogger-guest at moszumanska.debian.org
Tue Jan 13 17:35:32 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/muon.git;a=commitdiff;h=96c9e97
The following commit has been merged in the kubuntu_stable branch:
commit 96c9e974dedf9d5c777aece14faa7fb08499db9f
Author: Harald Sitter <sitter at kde.org>
Date: Thu Jan 8 19:26:42 2015 +0100
New upstream release based on KDE Frameworks 5
* New upstream release based on KDE Frameworks 5
* muon-installer is no more remove binary package and all references
---
debian/changelog | 7 +++++
debian/control | 61 +++++++++++++++++-------------------------
debian/libmuon.install | 13 +++++++++
debian/libmuonprivate2.install | 11 --------
debian/muon-common.install | 2 +-
debian/muon-discover.install | 9 ++++---
debian/muon-installer.install | 7 -----
debian/muon-installer.postinst | 11 --------
debian/muon-notifier.install | 11 ++++----
debian/muon-updater.install | 6 ++---
debian/muon.install | 16 ++++-------
11 files changed, 65 insertions(+), 89 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index bfe6486..a0fd2e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+muon (5.1.50-0ubuntu1) UNRELEASED; urgency=medium
+
+ * New upstream release based on KDE Frameworks 5
+ * muon-installer is no more remove binary package and all references
+
+ -- Harald Sitter <sitter at kde.org> Thu, 08 Jan 2015 18:36:20 +0100
+
muon (2.2.0-0ubuntu5) utopic; urgency=medium
* Add new package muon-common to contain shared data files.
diff --git a/debian/control b/debian/control
index bb5ab34..e9a54c6 100644
--- a/debian/control
+++ b/debian/control
@@ -4,13 +4,23 @@ Priority: optional
Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
XSBC-Original-Maintainer: Jonathan Thomas <echidnaman at kubuntu.org>
Build-Depends: cmake,
- debhelper (>= 9),
- kdelibs5-dev,
- libattica-dev,
- libdebconf-kde-dev,
- libqapt-dev (>= 2.1.70),
- libqjson-dev,
- libqoauth-dev,
+ debhelper (>= 9.0.0~),
+ extra-cmake-modules,
+ libkf5attica-dev,
+ libkf5config-dev,
+ libkf5configwidgets-dev,
+ libkf5coreaddons-dev,
+ libkf5dbusaddons-dev,
+ libkf5declarative-dev,
+ libkf5i18n-dev,
+ libkf5newstuff-dev,
+ libkf5notifications-dev,
+ libkf5solid-dev,
+ libkf5wallet-dev,
+ libkf5widgetsaddons-dev,
+ libphonon4qt5-dev,
+ libphonon4qt5experimental-dev,
+ libqca-qt5-2-dev,
pkg-config,
pkg-kde-tools (>= 0.5.0)
Standards-Version: 3.9.4
@@ -19,8 +29,8 @@ Homepage: https://projects.kde.org/projects/extragear/sysadmin/muon/
Package: muon
Architecture: any
Depends: apt-xapian-index,
- libmuonprivate2 (= ${binary:Version}),
- libqapt2-runtime,
+ libmuon (= ${binary:Version}),
+ libqapt3-runtime,
${misc:Depends},
${shlibs:Depends}
Recommends: muon-updater
@@ -46,38 +56,17 @@ Description: package manager for KDE
Package: muon-common
Architecture: all
Depends: ${misc:Depends}
-Breaks: muon-discover (<< 2.2.0-0ubuntu5~)
-Replaces: muon-discover (<< 2.2.0-0ubuntu5~)
Description: Muon package manager suite (common data files)
Muon is a graphical package manager for the Plasma workspace.
.
This package contains data files shared by various parts of the Muon suite.
-Package: muon-installer
-Architecture: any
-Depends: app-install-data,
- apt-xapian-index,
- libmuonprivate2 (= ${binary:Version}),
- libqapt2-runtime,
- ${misc:Depends},
- ${shlibs:Depends}
-Recommends: app-install-data-partner
-Description: Utility for browsing, installing, and removing applications
- The Muon Software Center lets you browse and install thousands of
- applications available for Ubuntu. You can view available
- applications by category, or search quickly by name or description.
- You can also examine the applications already installed, and remove
- those you no longer need.
- .
- To install or remove software using the Center, you need administrator
- access on the computer.
-
Package: muon-discover
Architecture: any
Depends: app-install-data,
apt-xapian-index,
- libmuonprivate2 (= ${binary:Version}),
- libqapt2-runtime,
+ libmuon (= ${binary:Version}),
+ libqapt3-runtime,
muon-common (= ${source:Version}),
${misc:Depends},
${shlibs:Depends}
@@ -91,8 +80,8 @@ Description: Utility for browsing, installing, and removing applications
Package: muon-updater
Architecture: any
-Depends: libmuonprivate2 (= ${binary:Version}),
- libqapt2-runtime,
+Depends: libmuon (= ${binary:Version}),
+ libqapt3-runtime,
${misc:Depends},
${shlibs:Depends}
Recommends: muon-notifier
@@ -114,7 +103,7 @@ Description: update notifier for KDE
providing an opportunity to launch the Muon Updater to deal with these
updates.
-Package: libmuonprivate2
+Package: libmuon
Architecture: any
Depends: kdesudo, software-properties-kde, ${misc:Depends}, ${shlibs:Depends}
Breaks: libmuonprivate1, muon-installer (<< 1.3.65-0ubuntu2)
@@ -129,7 +118,7 @@ Package: muon-dbg
Section: debug
Architecture: any
Priority: extra
-Depends: libmuonprivate2 (= ${binary:Version}),
+Depends: libmuon (= ${binary:Version}),
muon (= ${binary:Version}) | muon-updater (= ${binary:Version}) | muon-notifier (= ${binary:Version}),
${misc:Depends}
Recommends: kdelibs5-dbg, qapt-dbg
diff --git a/debian/libmuon.install b/debian/libmuon.install
new file mode 100644
index 0000000..772a822
--- /dev/null
+++ b/debian/libmuon.install
@@ -0,0 +1,13 @@
+usr/lib/*/libMuonApt.so
+usr/lib/*/libMuonNotifiers.so
+usr/lib/*/libexec/muon_repo_helper
+usr/lib/*/libmuonprivate.so.5
+usr/lib/*/libmuonprivate.so.5.*
+usr/lib/*/qt5/plugins/muon-notifier/
+usr/lib/*/qt5/plugins/muon/
+usr/lib/*/qt5/qml/org/kde/muon
+usr/share/libmuon/
+usr/share/locale/*/LC_MESSAGES/libmuon.mo
+usr/share/polkit-1/actions/org.kde.muon.repo.policy
+etc/dbus-1/system.d/org.kde.muon.repo.conf
+usr/share/dbus-1/system-services/org.kde.muon.repo.service
diff --git a/debian/libmuonprivate2.install b/debian/libmuonprivate2.install
deleted file mode 100644
index 0314c79..0000000
--- a/debian/libmuonprivate2.install
+++ /dev/null
@@ -1,11 +0,0 @@
-usr/lib/kde4/muon-appsbackend.so
-usr/lib/kde4/muon-knsbackend.so
-usr/lib/libmuonapt.so
-usr/lib/libmuonprivate.so.2*
-usr/share/kde4/apps/libmuon/categories/*
-usr/share/kde4/apps/libmuon/moo.ogg
-usr/share/kde4/services/muon-applications-backend.desktop
-usr/share/kde4/services/muon-knscomics-backend.desktop
-usr/share/kde4/services/muon-knsplasmoids-backend.desktop
-usr/share/kde4/servicetypes/muonbackendplugin.desktop
-usr/share/locale/*/LC_MESSAGES/libmuon.mo
diff --git a/debian/muon-common.install b/debian/muon-common.install
index 384d1de..a32f7d5 100644
--- a/debian/muon-common.install
+++ b/debian/muon-common.install
@@ -1 +1 @@
-usr/share/icons/hicolor/*/apps/muondiscover.png
+usr/share/icons/hicolor/*/apps/muondiscover.*
diff --git a/debian/muon-discover.install b/debian/muon-discover.install
index eaa520f..cad4d2a 100644
--- a/debian/muon-discover.install
+++ b/debian/muon-discover.install
@@ -1,6 +1,7 @@
usr/bin/muon-discover
-usr/lib/kde4/imports/*
-usr/share/applications/kde4/muon-discover*
-usr/share/kde4/apps/desktoptheme/muon-contenttheme/
-usr/share/kde4/apps/muon-discover/*
+usr/share/applications/muon-discover-category.desktop
+usr/share/applications/muon-discover.desktop
+usr/share/desktoptheme/muon-contenttheme/
+usr/share/kxmlgui5/muondiscover/
usr/share/locale/*/LC_MESSAGES/muon-discover.mo
+usr/share/muondiscover/
diff --git a/debian/muon-installer.install b/debian/muon-installer.install
deleted file mode 100644
index 449f620..0000000
--- a/debian/muon-installer.install
+++ /dev/null
@@ -1,7 +0,0 @@
-usr/bin/muon-installer
-usr/share/applications/kde4/muon-installer.desktop
-usr/share/kde4/apps/muon-installer/ClickableImage.qml
-usr/share/kde4/apps/muon-installer/ThumbnailView.qml
-usr/share/kde4/apps/muon-installer/muon-installerui.rc
-usr/share/kde4/config.kcfg/muon-installer.kcfg
-usr/share/locale/*/LC_MESSAGES/muon-installer.mo
diff --git a/debian/muon-installer.postinst b/debian/muon-installer.postinst
deleted file mode 100644
index d535e7b..0000000
--- a/debian/muon-installer.postinst
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#DEBHELPER#
-
-# make sure we update the index so that on first install
-# we have something to show (LP: #617397)
-if [ "$1" = "configure" ];then
- update-apt-xapian-index -u || true
-fi
diff --git a/debian/muon-notifier.install b/debian/muon-notifier.install
index c8d037c..1d89de5 100644
--- a/debian/muon-notifier.install
+++ b/debian/muon-notifier.install
@@ -1,5 +1,6 @@
-/usr/lib/kde4/kded_muonapplicationnotifier.so
-/usr/share/kde4/apps/muonabstractnotifier/muonabstractnotifier.notifyrc
-/usr/share/kde4/apps/muonapplicationnotifier/muonapplicationnotifier.notifyrc
-/usr/share/kde4/apps/muonapplicationnotifier/releasechecker
-/usr/share/kde4/services/kded/muonapplicationnotifier.desktop
+usr/share/locale/*/LC_MESSAGES/muon-notifier.mo
+usr/lib/*/qt5/qml/org/kde/muonnotifier/
+usr/share/kservices5/plasma-applet-org.kde.muonnotifier.desktop
+usr/share/muonabstractnotifier
+usr/share/muonapplicationnotifier/
+usr/share/plasma/plasmoids/org.kde.muonnotifier/
diff --git a/debian/muon-updater.install b/debian/muon-updater.install
index 6afbe4e..83f2bd2 100644
--- a/debian/muon-updater.install
+++ b/debian/muon-updater.install
@@ -1,4 +1,4 @@
-/usr/bin/muon-updater
-/usr/share/kde4/apps/muon-updater/muon-updaterui.rc
-usr/share/applications/kde4/muon-updater.desktop
+usr/bin/muon-updater
+usr/share/applications/muon-updater.desktop
+usr/share/kxmlgui5/muonupdater/
usr/share/locale/*/LC_MESSAGES/muon-updater.mo
diff --git a/debian/muon.install b/debian/muon.install
index 399fdcd..143a0d1 100644
--- a/debian/muon.install
+++ b/debian/muon.install
@@ -1,12 +1,6 @@
-usr/bin/muon
-usr/share/applications/kde4/muon.desktop
-usr/share/icons/hicolor/128x128/apps/muon.png
-usr/share/icons/hicolor/16x16/apps/muon.png
-usr/share/icons/hicolor/22x22/apps/muon.png
-usr/share/icons/hicolor/256x256/apps/muon.png
-usr/share/icons/hicolor/32x32/apps/muon.png
-usr/share/icons/hicolor/48x48/apps/muon.png
-usr/share/icons/hicolor/64x64/apps/muon.png
-usr/share/kde4/apps/muon/muonui.rc
-usr/share/kde4/config.kcfg/muon.kcfg
usr/share/locale/*/LC_MESSAGES/muon.mo
+usr/bin/muon
+usr/share/applications/muon.desktop
+usr/share/config.kcfg/muon.kcfg
+usr/share/icons/hicolor/*/apps/muon.*
+usr/share/muon/muonui.rc
--
muon packaging
More information about the pkg-kde-commits
mailing list