[SCM] muon packaging branch, kubuntu_unstable, updated. 96c9e974dedf9d5c777aece14faa7fb08499db9f

Thu Jan 8 18:26:44 UTC 2015

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/muon.git;a=commitdiff;h=c2a4825

The following commit has been merged in the kubuntu_unstable branch:
commit c2a4825acdebd6acbefc20596053d590a6d55625
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jan 8 19:05:25 2015 +0100

    wrap and sort
---
 debian/control                 | 67 ++++++++++++++++++++++++++++--------------
 debian/libmuonprivate2.install |  8 ++---
 debian/muon-updater.install    |  4 +--
 debian/muon.install            |  8 ++---
 4 files changed, 55 insertions(+), 32 deletions(-)

diff --git a/debian/control b/debian/control
index 3da9ff6..bb5ab34 100644
--- a/debian/control
+++ b/debian/control
@@ -3,16 +3,26 @@ Section: kde
 Priority: optional
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
 XSBC-Original-Maintainer: Jonathan Thomas <echidnaman at kubuntu.org>
-Build-Depends: debhelper (>= 9), pkg-kde-tools (>= 0.5.0), cmake,
- pkg-config, kdelibs5-dev, libqapt-dev (>= 2.1.70), libdebconf-kde-dev,
- libqjson-dev, libqoauth-dev, libattica-dev
+Build-Depends: cmake,
+               debhelper (>= 9),
+               kdelibs5-dev,
+               libattica-dev,
+               libdebconf-kde-dev,
+               libqapt-dev (>= 2.1.70),
+               libqjson-dev,
+               libqoauth-dev,
+               pkg-config,
+               pkg-kde-tools (>= 0.5.0)
 Standards-Version: 3.9.4
 Homepage: https://projects.kde.org/projects/extragear/sysadmin/muon/
 
 Package: muon
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqapt2-runtime,
- apt-xapian-index, libmuonprivate2 (= ${binary:Version})
+Depends: apt-xapian-index,
+         libmuonprivate2 (= ${binary:Version}),
+         libqapt2-runtime,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Recommends: muon-updater
 Description: package manager for KDE
  Muon is a graphical package manager for KDE.
@@ -45,8 +55,12 @@ Description: Muon package manager suite (common data files)
 
 Package: muon-installer
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqapt2-runtime,
- app-install-data, apt-xapian-index, libmuonprivate2 (= ${binary:Version})
+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
@@ -60,9 +74,13 @@ Description: Utility for browsing, installing, and removing applications
 
 Package: muon-discover
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, muon-common (= ${source:Version}),
- libqapt2-runtime,
- app-install-data, apt-xapian-index, libmuonprivate2 (= ${binary:Version})
+Depends: app-install-data,
+         apt-xapian-index,
+         libmuonprivate2 (= ${binary:Version}),
+         libqapt2-runtime,
+         muon-common (= ${source:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Recommends: app-install-data-partner, ubuntu-sso-client
 Description: Utility for browsing, installing, and removing applications
  Muon Discover will help you browse through the huge applications library you
@@ -73,8 +91,10 @@ Description: Utility for browsing, installing, and removing applications
 
 Package: muon-updater
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqapt2-runtime,
- libmuonprivate2 (= ${binary:Version})
+Depends: libmuonprivate2 (= ${binary:Version}),
+         libqapt2-runtime,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Recommends: muon-notifier
 Description: update manager for KDE
  Muon Updater is a graphical update manager for KDE. It is part of the Muon
@@ -82,9 +102,12 @@ Description: update manager for KDE
 
 Package: muon-notifier
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, muon-common (= ${source:Version}),
- muon-updater,
- ubuntu-release-upgrader-qt, update-notifier-common
+Depends: muon-common (= ${source:Version}),
+         muon-updater,
+         ubuntu-release-upgrader-qt,
+         update-notifier-common,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: update notifier for KDE
  The Muon Notifier is an update notification daemon for KDE. It uses the KDE
  Daemon frame (KDED) framework to present the user with update notifications,
@@ -93,9 +116,9 @@ Description: update notifier for KDE
 
 Package: libmuonprivate2
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, kdesudo, software-properties-kde
-Breaks: muon-installer (<< 1.3.65-0ubuntu2), libmuonprivate1
-Replaces: muon-installer (<< 1.3.65-0ubuntu2), libmuonprivate1
+Depends: kdesudo, software-properties-kde, ${misc:Depends}, ${shlibs:Depends}
+Breaks: libmuonprivate1, muon-installer (<< 1.3.65-0ubuntu2)
+Replaces: libmuonprivate1, muon-installer (<< 1.3.65-0ubuntu2)
 Description: Runtime files for the Muon package management suite
  The Muon package management suite is a collection of package management
  applications built on the KDE platform.
@@ -106,10 +129,10 @@ Package: muon-dbg
 Section: debug
 Architecture: any
 Priority: extra
-Depends: ${misc:Depends}, libmuonprivate2 (= ${binary:Version}),
- muon (= ${binary:Version}) | muon-updater (= ${binary:Version}) |
- muon-notifier (= ${binary:Version})
-Recommends: qapt-dbg, kdelibs5-dbg
+Depends: libmuonprivate2 (= ${binary:Version}),
+         muon (= ${binary:Version}) | muon-updater (= ${binary:Version}) | muon-notifier (= ${binary:Version}),
+         ${misc:Depends}
+Recommends: kdelibs5-dbg, qapt-dbg
 Description: Muon debugging symbols
  This package contains debugging symbols for Muon.
  When Muon crashes, in most cases this package is
diff --git a/debian/libmuonprivate2.install b/debian/libmuonprivate2.install
index c9b6426..0314c79 100644
--- a/debian/libmuonprivate2.install
+++ b/debian/libmuonprivate2.install
@@ -1,11 +1,11 @@
-usr/lib/libmuonprivate.so.2*
-usr/lib/libmuonapt.so
 usr/lib/kde4/muon-appsbackend.so
 usr/lib/kde4/muon-knsbackend.so
-usr/share/kde4/apps/libmuon/moo.ogg
+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-knsplasmoids-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-updater.install b/debian/muon-updater.install
index bdf4c9d..6afbe4e 100644
--- a/debian/muon-updater.install
+++ b/debian/muon-updater.install
@@ -1,4 +1,4 @@
 /usr/bin/muon-updater
-usr/share/applications/kde4/muon-updater.desktop
 /usr/share/kde4/apps/muon-updater/muon-updaterui.rc
-usr/share/locale/*/LC_MESSAGES/muon-updater.mo
\ No newline at end of file
+usr/share/applications/kde4/muon-updater.desktop
+usr/share/locale/*/LC_MESSAGES/muon-updater.mo
diff --git a/debian/muon.install b/debian/muon.install
index 5fb9813..399fdcd 100644
--- a/debian/muon.install
+++ b/debian/muon.install
@@ -1,12 +1,12 @@
 usr/bin/muon
 usr/share/applications/kde4/muon.desktop
-usr/share/icons/hicolor/22x22/apps/muon.png
 usr/share/icons/hicolor/128x128/apps/muon.png
-usr/share/icons/hicolor/32x32/apps/muon.png
 usr/share/icons/hicolor/16x16/apps/muon.png
-usr/share/icons/hicolor/64x64/apps/muon.png
-usr/share/icons/hicolor/48x48/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

-- 
muon packaging

