[SCM] ktp-common-internals packaging branch, master, updated. debian/0.8.1-4-65-g0e003ae

Maximiliano Curia maxy at moszumanska.debian.org
Wed May 20 09:15:25 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=9013607

The following commit has been merged in the master branch:
commit 901360747ce77d4e16146a0f2990d0c2b43f10e7
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Apr 28 11:55:29 2015 +0200

    wrap-and-sorp
---
 debian/control                       | 53 ++++++++++++++++++++----------------
 debian/kde-telepathy-data.install    |  2 +-
 debian/kde-telepathy-kpeople.install |  8 +++---
 debian/libktploggerprivate8.install  |  2 +-
 debian/libktpmodelsprivate8.install  |  2 +-
 debian/libktpotrprivate8.install     |  7 ++---
 6 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/debian/control b/debian/control
index 5ccbe9e..76d7ff1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,20 @@
 Source: ktp-common-internals
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
-Uploaders: Diane Trout <diane at ghic.org>, Michał Zając <quintasan at kubuntu.org>, Mark Purcell <msp at debian.org>
-Build-Depends: debhelper (>= 9), cmake,
- libtelepathy-qt4-dev (>= 0.9.5),
- libtelepathy-logger-qt4-dev (>= 0.8.0),
- libtelepathy-logger-dev,
- pkg-kde-tools,
- kdelibs5-dev,
- libkpeople-dev (>= 0.3.0),
- kdepimlibs5-dev,
- libotr5-dev,
- libgcrypt11-dev,
+Uploaders: Diane Trout <diane at ghic.org>,
+           Michał Zając <quintasan at kubuntu.org>,
+           Mark Purcell <msp at debian.org>
+Build-Depends: cmake,
+               debhelper (>= 9),
+               kdelibs5-dev,
+               kdepimlibs5-dev,
+               libgcrypt11-dev,
+               libkpeople-dev (>= 0.3.0),
+               libotr5-dev,
+               libtelepathy-logger-dev,
+               libtelepathy-logger-qt4-dev (>= 0.8.0),
+               libtelepathy-qt4-dev (>= 0.9.5),
+               pkg-kde-tools
 Standards-Version: 3.9.6
 Section: libs
 Homepage: https://projects.kde.org/projects/extragear/network/telepathy/ktp-common-internals
@@ -22,10 +25,10 @@ Package: libktpcommoninternalsprivate-dev
 Section: libdevel
 Architecture: any
 Depends: libktpcommoninternalsprivate8 (= ${binary:Version}),
- libktpwidgetsprivate8 (= ${binary:Version}),
- libktploggerprivate8 (= ${binary:Version}),
- libktpotrprivate8 (= ${binary:Version}),
- ${misc:Depends}
+         libktploggerprivate8 (= ${binary:Version}),
+         libktpotrprivate8 (= ${binary:Version}),
+         libktpwidgetsprivate8 (= ${binary:Version}),
+         ${misc:Depends}
 Description: KDE Telepathy internal library - Development headers
  Internal library which consists of the most reused
  parts across KDE Telepathy.
@@ -41,8 +44,10 @@ Package: libktpcommoninternalsprivate8
 Replaces: libktpcommoninternalsprivate6 (<< 0.7.80)
 Breaks: libktpcommoninternalsprivate6 (<< 0.7.80)
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libkpeople4 (>= 0.3.0),
- libtelepathy-logger-qt4-1 (>= 0.8.0)
+Depends: libkpeople4 (>= 0.3.0),
+         libtelepathy-logger-qt4-1 (>= 0.8.0),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: KDE Telepathy common internal library
  Internal library which consists of the most reused
  parts across KDE Telepathy.
@@ -51,7 +56,7 @@ Description: KDE Telepathy common internal library
 
 Package: libktpmodelsprivate8
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: KDE Telepathy data models internal library
  Internal library which consists of the most reused
  parts across KDE Telepathy.
@@ -60,7 +65,7 @@ Description: KDE Telepathy data models internal library
 
 Package: libktpwidgetsprivate8
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: KDE Telepathy common internal widgets library
  Internal library which consists of the most reused
  parts across KDE Telepathy.
@@ -71,7 +76,7 @@ Package: libktploggerprivate8
 Breaks: libktploggerprivate7 (<< 0.8.80~)
 Replaces: libktploggerprivate7 (<< 0.8.80~)
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, telepathy-logger
+Depends: telepathy-logger, ${misc:Depends}, ${shlibs:Depends}
 Description: KDE Telepathy internal logger library
  Internal library which consists of the most reused
  parts across KDE Telepathy.
@@ -80,7 +85,7 @@ Description: KDE Telepathy internal logger library
 
 Package: libktpotrprivate8
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: KDE Telepathy internal OTR library
  Internal library which consists of the most reused
  parts across KDE Telepathy.
@@ -89,7 +94,7 @@ Description: KDE Telepathy internal OTR library
 
 Package: kde-telepathy-declarative
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: kde-telepathy QtDeclarative QML support
  Contains a plugin for QtDeclarative that provides
  support for using KDE-Telepathy to components written
@@ -118,7 +123,7 @@ Description: KDE Telepathy internal library - debug symbols
 
 Package: kde-telepathy-kpeople
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: kde-telepathy-data (<< 0.9.0)
 Replaces: kde-telepathy-data (<< 0.9.0)
 Description: kpeople plugins for kde-telepathy
@@ -129,7 +134,7 @@ Description: kpeople plugins for kde-telepathy
 Package: kde-telepathy-debugger
 Architecture: any
 Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Debugging tool for KDE Telepathy
  This package contains a GUI debugging tool which can be used to debug
  issues in Telepathy.
diff --git a/debian/kde-telepathy-data.install b/debian/kde-telepathy-data.install
index 233bb0a..1e27da9 100644
--- a/debian/kde-telepathy-data.install
+++ b/debian/kde-telepathy-data.install
@@ -1,6 +1,6 @@
 usr/share/icons/hicolor/*
-usr/share/kde4/apps/ktelepathy/*
 usr/share/kde4/apps/katepart/syntax/ktpdebugoutput.xml
+usr/share/kde4/apps/ktelepathy/*
 usr/share/kde4/services/ktploggerplugin_tplogger.desktop
 usr/share/kde4/servicetypes/ktp_logger_plugin.desktop
 usr/share/locale/*
diff --git a/debian/kde-telepathy-kpeople.install b/debian/kde-telepathy-kpeople.install
index f5cedd9..e8d2deb 100644
--- a/debian/kde-telepathy-kpeople.install
+++ b/debian/kde-telepathy-kpeople.install
@@ -1,8 +1,8 @@
-usr/lib/kde4/imdetailswidgetplugin.so
 usr/lib/kde4/im_persons_data_source_plugin.so
-usr/lib/kde4/ktp_kpeople_plugin.so
+usr/lib/kde4/imdetailswidgetplugin.so
 usr/lib/kde4/kpeople_chat_plugin.so
-usr/share/kde4/services/imdetailswidgetplugin.desktop
+usr/lib/kde4/ktp_kpeople_plugin.so
 usr/share/kde4/services/im_persons_data_source_plugin.desktop
-usr/share/kde4/services/ktp_kpeople_plugin.desktop
+usr/share/kde4/services/imdetailswidgetplugin.desktop
 usr/share/kde4/services/kpeople_chat_plugin.desktop
+usr/share/kde4/services/ktp_kpeople_plugin.desktop
diff --git a/debian/libktploggerprivate8.install b/debian/libktploggerprivate8.install
index 61c8b93..63b8d69 100644
--- a/debian/libktploggerprivate8.install
+++ b/debian/libktploggerprivate8.install
@@ -1,3 +1,3 @@
+usr/lib/kde4/ktploggerplugin_tplogger.so
 usr/lib/libktploggerprivate.so.0.9*
 usr/lib/libktploggerprivate.so.8
-usr/lib/kde4/ktploggerplugin_tplogger.so
diff --git a/debian/libktpmodelsprivate8.install b/debian/libktpmodelsprivate8.install
index 2a1efae..e350442 100644
--- a/debian/libktpmodelsprivate8.install
+++ b/debian/libktpmodelsprivate8.install
@@ -1,2 +1,2 @@
 usr/lib/libktpmodelsprivate.so.0.9*
-usr/lib/libktpmodelsprivate.so.8
\ No newline at end of file
+usr/lib/libktpmodelsprivate.so.8
diff --git a/debian/libktpotrprivate8.install b/debian/libktpotrprivate8.install
index e33929c..9bbe74a 100644
--- a/debian/libktpotrprivate8.install
+++ b/debian/libktpotrprivate8.install
@@ -1,7 +1,6 @@
-usr/lib/libktpotrprivate.so.8
-usr/lib/libktpotrprivate.so.0.9*
 usr/lib/kde4/libexec/ktp-proxy
-usr/share/kde4/config.kcfg/ktp-proxy-config.kcfg
+usr/lib/libktpotrprivate.so.0.9*
+usr/lib/libktpotrprivate.so.8
 usr/share/dbus-1/services/org.freedesktop.Telepathy.Client.KTp.Proxy.service
+usr/share/kde4/config.kcfg/ktp-proxy-config.kcfg
 usr/share/telepathy/clients/KTp.Proxy.client
-

-- 
ktp-common-internals packaging



More information about the pkg-kde-commits mailing list