[SCM] qapt packaging branch, kubuntu_unstable, updated. debian/1.3.0-2-10-g7c77926

Harald Sitter apachelogger-guest at moszumanska.debian.org
Sun Dec 14 18:16:24 UTC 2014 

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

The following commit has been merged in the kubuntu_unstable branch:
commit 6df2330f5f44f78af1c6716f4389b33002ced2b1
Author: Harald Sitter <sitter at kde.org>
Date:   Sun Dec 14 19:13:10 2014 +0100

    wrap and sort
---
 debian/control                         | 58 +++++++++++++++++++++-------------
 debian/gstreamer-qapt.install          |  2 +-
 debian/libqapt-dev.install             |  6 ++--
 debian/plasma-runner-installer.install |  2 +-
 debian/qapt-batch.install              |  2 +-
 debian/qapt-deb-installer.install      |  2 +-
 6 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/debian/control b/debian/control
index f66169d..6f864ab 100644
--- a/debian/control
+++ b/debian/control
@@ -4,17 +4,28 @@ Priority: optional
 Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
 XSBC-Original-Maintainer: Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: José Manuel Santamaría Lema <panfaust at gmail.com>,
- Kai Wasserbäch <curan at debian.org>
-Build-Depends: debhelper (>= 9),
- pkg-kde-tools (>= 0.5.0),
- cmake (>= 2.8.4+dfsg.1-3),
- pkg-config,
- extra-cmake-modules, libkf5auth-dev, libkf5coreaddons-dev, libkf5i18n-dev, libkf5runner-dev, libkf5textwidgets-dev, libkf5widgetsaddons-dev, libkf5windowsystem-dev, kio-dev, plasma-framework-dev,
- libapt-pkg-dev (>= 0.8.0),
- libxapian-dev,
- libpolkit-qt5-1-dev,
- libgstreamer1.0-dev, libgstreamer-plugins-base1.0-dev, libglib2.0-dev,
- libdebconf-kde-dev
+           Kai Wasserbäch <curan at debian.org>
+Build-Depends: cmake (>= 2.8.4+dfsg.1-3),
+               debhelper (>= 9),
+               extra-cmake-modules,
+               kio-dev,
+               libapt-pkg-dev (>= 0.8.0),
+               libdebconf-kde-dev,
+               libglib2.0-dev,
+               libgstreamer-plugins-base1.0-dev,
+               libgstreamer1.0-dev,
+               libkf5auth-dev,
+               libkf5coreaddons-dev,
+               libkf5i18n-dev,
+               libkf5runner-dev,
+               libkf5textwidgets-dev,
+               libkf5widgetsaddons-dev,
+               libkf5windowsystem-dev,
+               libpolkit-qt5-1-dev,
+               libxapian-dev,
+               pkg-config,
+               pkg-kde-tools (>= 0.5.0),
+               plasma-framework-dev
 Standards-Version: 3.9.4
 Homepage: https://projects.kde.org/projects/extragear/sysadmin/libqapt/
 Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/qapt.git
@@ -22,7 +33,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-extras/qapt.git;a=s
 
 Package: libqapt3
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: libqapt2-runtime
 Description: QApt library package
  LibQApt is a Qt wrapper around the libapt-pkg library as well as an APT
@@ -35,7 +46,7 @@ Description: QApt library package
 Package: libqapt-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libqapt3 (= ${binary:Version}), libapt-pkg-dev
+Depends: libapt-pkg-dev, libqapt3 (= ${binary:Version}), ${misc:Depends}
 Description: Development headers for the QApt library
  LibQApt is a Qt wrapper around the libapt-pkg library as well as an APT
  implementation using libapt-pkg. The aim is to provide a sane API for
@@ -46,7 +57,7 @@ Description: Development headers for the QApt library
 
 Package: libqapt2-runtime
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, polkit-kde-1 | policykit-1-gnome
+Depends: polkit-kde-1 | policykit-1-gnome, ${misc:Depends}, ${shlibs:Depends}
 Description: Runtime components for the QApt library
  LibQApt is a Qt wrapper around the libapt-pkg library as well as an APT
  implementation using libapt-pkg. The aim is to provide a sane API for
@@ -58,8 +69,11 @@ Description: Runtime components for the QApt library
 
 Package: qapt-utils
 Architecture: any
-Depends: ${misc:Depends}, qapt-batch, qapt-deb-installer,
- plasma-runner-installer, kde-thumbnailer-deb
+Depends: kde-thumbnailer-deb,
+         plasma-runner-installer,
+         qapt-batch,
+         qapt-deb-installer,
+         ${misc:Depends}
 Recommends: gstreamer-qapt
 Description: complete collection of QApt package management utilities
  QApt is a collection of tools and a library providing a wrapper around
@@ -70,7 +84,7 @@ Description: complete collection of QApt package management utilities
 
 Package: qapt-batch
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqapt2-runtime
+Depends: libqapt2-runtime, ${misc:Depends}, ${shlibs:Depends}
 Description: Batch package manager for KDE
  QApt is a collection of tools and a library providing a wrapper around
  APT. The intention is to ease the use of APT in Qt-based programs.
@@ -83,7 +97,7 @@ Description: Batch package manager for KDE
 
 Package: qapt-deb-installer
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqapt2-runtime
+Depends: libqapt2-runtime, ${misc:Depends}, ${shlibs:Depends}
 Description: tool for installing deb files
  QApt is a collection of tools and a library providing a wrapper around
  APT. The intention is to ease the use of APT in Qt-based programs.
@@ -94,7 +108,7 @@ Description: tool for installing deb files
 
 Package: plasma-runner-installer
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, command-not-found, qapt-batch
+Depends: command-not-found, qapt-batch, ${misc:Depends}, ${shlibs:Depends}
 Description: KRunner plugin for installing packages
  QApt is a collection of tools and a library providing a wrapper around
  APT. The intention is to ease the use of APT in Qt-based programs.
@@ -105,7 +119,7 @@ Description: KRunner plugin for installing packages
 
 Package: kde-thumbnailer-deb
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Enhances: dolphin, konqueror
 Description: KDE plugin to show thumbnails of Debian package files
  QApt is a collection of tools and a library providing a wrapper around
@@ -116,7 +130,7 @@ Description: KDE plugin to show thumbnails of Debian package files
 
 Package: gstreamer-qapt
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqapt2-runtime
+Depends: libqapt2-runtime, ${misc:Depends}, ${shlibs:Depends}
 Replaces: gstreamer0.10-qapt (<< 2.1.70-0ubuntu5~)
 Breaks: gstreamer0.10-qapt (<< 2.1.70-0ubuntu5~)
 Description: GStreamer plugin to install codecs using QApt
@@ -137,7 +151,7 @@ Package: qapt-dbg
 Section: debug
 Architecture: any
 Priority: extra
-Depends: ${misc:Depends}, libqapt3 (= ${binary:Version})
+Depends: libqapt3 (= ${binary:Version}), ${misc:Depends}
 Recommends: kdelibs5-dbg
 Description: QApt debugging symbols
  QApt is a collection of tools and a library providing a wrapper around
diff --git a/debian/gstreamer-qapt.install b/debian/gstreamer-qapt.install
index a23a952..75f2816 100644
--- a/debian/gstreamer-qapt.install
+++ b/debian/gstreamer-qapt.install
@@ -1,2 +1,2 @@
-usr/lib/*/libexec/qapt-gst-helper
 #usr/share/locale/*/LC_MESSAGES/qapt-gst-helper.mo
+usr/lib/*/libexec/qapt-gst-helper
diff --git a/debian/libqapt-dev.install b/debian/libqapt-dev.install
index 87d8801..c36d475 100644
--- a/debian/libqapt-dev.install
+++ b/debian/libqapt-dev.install
@@ -8,8 +8,8 @@ usr/include/QApt/Globals
 usr/include/QApt/History
 usr/include/QApt/MarkingErrorInfo
 usr/include/QApt/Package
-usr/include/QApt/SourcesList
 usr/include/QApt/SourceEntry
+usr/include/QApt/SourcesList
 usr/include/QApt/Transaction
 usr/include/qapt/backend.h
 usr/include/qapt/changelog.h
@@ -21,10 +21,10 @@ usr/include/qapt/globals.h
 usr/include/qapt/history.h
 usr/include/qapt/markingerrorinfo.h
 usr/include/qapt/package.h
-usr/include/qapt/sourceslist.h
+usr/include/qapt/qaptversion.h
 usr/include/qapt/sourceentry.h
+usr/include/qapt/sourceslist.h
 usr/include/qapt/transaction.h
-usr/include/qapt/qaptversion.h
 usr/lib/*/cmake/QApt/*
 usr/lib/*/libQApt.so
 usr/lib/*/pkgconfig/libqapt.pc
diff --git a/debian/plasma-runner-installer.install b/debian/plasma-runner-installer.install
index b57e402..b0025d1 100644
--- a/debian/plasma-runner-installer.install
+++ b/debian/plasma-runner-installer.install
@@ -1,3 +1,3 @@
+#usr/share/locale/*/LC_MESSAGES/plasma_runner_installer.mo
 usr/lib/*/qt5/plugins/krunner_installer.so
 usr/share/kservices5/plasma-runner-installer.desktop
-#usr/share/locale/*/LC_MESSAGES/plasma_runner_installer.mo
diff --git a/debian/qapt-batch.install b/debian/qapt-batch.install
index f714fff..627120d 100644
--- a/debian/qapt-batch.install
+++ b/debian/qapt-batch.install
@@ -1,2 +1,2 @@
-usr/bin/qapt-batch
 #usr/share/locale/*/LC_MESSAGES/qaptbatch.mo
+usr/bin/qapt-batch
diff --git a/debian/qapt-deb-installer.install b/debian/qapt-deb-installer.install
index aa11484..1dd9016 100644
--- a/debian/qapt-deb-installer.install
+++ b/debian/qapt-deb-installer.install
@@ -1,3 +1,3 @@
+#usr/share/locale/*/LC_MESSAGES/qapt-deb-installer.mo
 usr/bin/qapt-deb-installer
 usr/share/applications/qapt-deb-installer.desktop
-#usr/share/locale/*/LC_MESSAGES/qapt-deb-installer.mo

-- 
qapt packaging

More information about the pkg-kde-commits mailing list