[SCM] kopete packaging branch, master, updated. debian/4.11.3-2-10-g8ba068e

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kopete.git;a=commitdiff;h=41c486f

The following commit has been merged in the master branch:
commit 41c486f7cc1cb1af50a0c294e9750e8c6857c2d6
Author: Maximiliano Curia <maxy at debian.org>
Date:   Mon Feb 3 17:02:52 2014 +0100

    wrap-and-sort
---
 debian/control        | 69 +++++++++++++++++++++++++++------------------------
 debian/copyright      |  1 -
 debian/kopete.install |  4 +--
 3 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/debian/control b/debian/control
index 935b8d3..8c3fba4 100644
--- a/debian/control
+++ b/debian/control
@@ -8,35 +8,37 @@ Uploaders: Sune Vuorela <sune at debian.org>,
            George Kiagiadakis <kiagiadakis.george at gmail.com>,
            Eshat Cakar <info at eshat.de>,
            Maximiliano Curia <maxy at debian.org>
-Build-Depends: kde-sc-dev-latest (>= 4:4.11),
- cmake, debhelper (>= 9), pkg-kde-tools (>= 0.12),
- kdepimlibs5-dev (>= 4:4.11),
- nepomuk-core-dev (>= 4:4.11),
- pkg-config,
- libsqlite3-dev,
- libqimageblitz-dev (>= 1:0.0.4),
- libortp-dev (>= 0.13),
- libsrtp0-dev,
- libjsoncpp-dev,
- libqca2-dev (>= 2.0.0),
- libidn11-dev,
- libxml2-dev,
- libxslt1-dev,
- libmsn-dev (>= 4.1),
- libgif-dev,
- libmediastreamer-dev (>= 3.6),
- libmeanwhile-dev,
- libgadu-dev (>= 1.8.0),
- libexpat-dev,
- libssl-dev,
- libv4l-dev [linux-any],
- libjasper-dev,
- libasound2-dev (>= 1.0.14a) [linux-any],
- zlib1g-dev,
- libjpeg-dev,
- libboost-dev,
- libxdamage-dev,
- libgnutls-dev
+Build-Depends: cmake,
+               debhelper (>= 9),
+               kde-sc-dev-latest (>= 4:4.11),
+               kdepimlibs5-dev (>= 4:4.11),
+               libasound2-dev (>= 1.0.14a) [linux-any],
+               libboost-dev,
+               libexpat-dev,
+               libgadu-dev (>= 1.8.0),
+               libgif-dev,
+               libgnutls-dev,
+               libidn11-dev,
+               libjasper-dev,
+               libjpeg-dev,
+               libjsoncpp-dev,
+               libmeanwhile-dev,
+               libmediastreamer-dev (>= 3.6),
+               libmsn-dev (>= 4.1),
+               libortp-dev (>= 0.13),
+               libqca2-dev (>= 2.0.0),
+               libqimageblitz-dev (>= 1:0.0.4),
+               libsqlite3-dev,
+               libsrtp0-dev,
+               libssl-dev,
+               libv4l-dev [linux-any],
+               libxdamage-dev,
+               libxml2-dev,
+               libxslt1-dev,
+               nepomuk-core-dev (>= 4:4.11),
+               pkg-config,
+               pkg-kde-tools (>= 0.12),
+               zlib1g-dev
 Standards-Version: 3.9.5
 Homepage: http://www.kde.org/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/kopete.git
@@ -45,7 +47,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/kopete.git
 Package: libkopete4
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: kopete (= ${binary:Version})
 Description: main Kopete library
  Kopete is an instant messaging and chat application with support for a wide
@@ -60,7 +62,7 @@ Description: main Kopete library
 Package: kopete
 Section: net
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
+Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
 Recommends: libqca2-plugin-ossl, libqt4-sql-sqlite
 Suggests: kdeartwork-emoticons, khelpcenter4, texlive-latex-base
 Description: instant messaging and chat application
@@ -73,8 +75,9 @@ Description: instant messaging and chat application
 Package: libkopete-dev
 Section: libdevel
 Architecture: any
-Depends: libkopete4 (= ${binary:Version}), ${sameVersionDep:kdelibs5-dev:libkopete4},
- ${misc:Depends}
+Depends: libkopete4 (= ${binary:Version}),
+         ${misc:Depends},
+         ${sameVersionDep:kdelibs5-dev:libkopete4}
 Description: development files for the Kopete instant messaging and chat application
  Kopete is an instant messaging and chat application with support for a wide
  variety of services, such as AIM, Yahoo, ICQ, MSN, and Jabber. Advanced
diff --git a/debian/copyright b/debian/copyright
index 25f09fd..92ff436 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1076,4 +1076,3 @@ License: Zlib
  2. Altered source versions must be plainly marked as such, and must not be
     misrepresented as being the original software.
  3. This notice may not be removed or altered from any source distribution.
-
diff --git a/debian/kopete.install b/debian/kopete.install
index 5e3371e..cd76677 100644
--- a/debian/kopete.install
+++ b/debian/kopete.install
@@ -667,8 +667,8 @@ usr/share/kde4/apps/kopete_yahoo/yahoochatui.rc
 usr/share/kde4/apps/kopete_yahoo/yahooconferenceui.rc
 usr/share/kde4/apps/kopete_yahoo/yahooimui.rc
 usr/share/kde4/apps/kopeterichtexteditpart/kopeterichtexteditpartfull.rc
-usr/share/kde4/config.kcfg/historyconfig.kcfg
 usr/share/kde4/config.kcfg/history2config.kcfg
+usr/share/kde4/config.kcfg/historyconfig.kcfg
 usr/share/kde4/config.kcfg/kopeteappearancesettings.kcfg
 usr/share/kde4/config.kcfg/kopetebehaviorsettings.kcfg
 usr/share/kde4/config.kcfg/kopetestatussettings.kcfg
@@ -685,8 +685,8 @@ usr/share/kde4/services/emailwindow.desktop
 usr/share/kde4/services/kconfiguredialog/kopete_addbookmarks_config.desktop
 usr/share/kde4/services/kconfiguredialog/kopete_autoreplace_config.desktop
 usr/share/kde4/services/kconfiguredialog/kopete_highlight_config.desktop
-usr/share/kde4/services/kconfiguredialog/kopete_history_config.desktop
 usr/share/kde4/services/kconfiguredialog/kopete_history2_config.desktop
+usr/share/kde4/services/kconfiguredialog/kopete_history_config.desktop
 usr/share/kde4/services/kconfiguredialog/kopete_latex_config.desktop
 usr/share/kde4/services/kconfiguredialog/kopete_nowlistening_config.desktop
 usr/share/kde4/services/kconfiguredialog/kopete_pipes_config.desktop

-- 
kopete packaging