[SCM] KDE Network module packaging branch, master, updated. debian/4.10.5-1

Sat Jul 13 13:15:53 UTC 2013

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

The following commit has been merged in the master branch:
commit bb3ac0bd640df53800eec76e84535ba330ae7a04
Author: Maximiliano Curia <maxy at debian.org>
Date:   Sat Jun 15 08:48:38 2013 +0200

    Sync with sid version.
---
 debian/changelog                |   22 ++++++++++++++++++++++
 debian/control                  |    2 +-
 debian/kopete.install           |   16 ----------------
 debian/kopete.lintian-overrides |    2 +-
 debian/krfb.lintian-overrides   |    2 +-
 5 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 691bd6c..feeb6fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kdenetwork (4:4.10.4-2) UNRELEASED; urgency=low
+
+  * Sync with sid version.
+
+ -- Maximiliano Curia <maxy at debian.org>  Sat, 15 Jun 2013 08:48:17 +0200
+
 kdenetwork (4:4.10.4-1) experimental; urgency=low
 
   * New upstream release.
@@ -19,6 +25,22 @@ kdenetwork (4:4.10.2-1) experimental; urgency=low
 
  -- Sune Vuorela <sune at debian.org>  Fri, 12 Apr 2013 21:32:12 +0000
 
+kdenetwork (4:4.8.4-2) unstable; urgency=low
+
+  * Team upload.
+
+  [ Pino Toscano ]
+  * Backport upstream r1353735 to fix building with Linux kernels >= 3.9;
+    patch upstream_r1353735.diff.
+  * Stop building with OTR support, since the kopete plugin does not support
+    libotr >= 4.x: (Closes: #711073)
+    - drop the libotr2-dev build dependency
+    - remove the kopete_otr files from kopete.install
+  * Fix Vcs-* headers.
+  * Update lintian overrides.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Tue, 04 Jun 2013 12:10:57 -0300
+
 kdenetwork (4:4.8.4-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 4142751..f061aaa 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends: kde-sc-dev-latest (>= 4:4.10.2),
  libxdamage-dev, libxss-dev, libslp-dev, libidn11-dev, libxtst-dev,
  libvncserver-dev (>= 0.9.8.1), libqca2-dev (>= 2.0.0),
  libsqlite3-dev, libqimageblitz-dev (>= 1:0.0.4),
- libotr2-dev, libboost-dev,
+ libboost-dev,
  libavahi-compat-libdnssd-dev, libmeanwhile-dev, libmsn-dev (>= 4.1),
  libortp-dev, libspeex-dev, libasound2-dev (>= 1.0.14a) [linux-any],
  libstreamanalyzer-dev, libgadu-dev, libmediastreamer-dev,
diff --git a/debian/kopete.install b/debian/kopete.install
index 9fb75ce..c93c892 100644
--- a/debian/kopete.install
+++ b/debian/kopete.install
@@ -14,7 +14,6 @@ usr/lib/kde4/kcm_kopete_highlight.so
 usr/lib/kde4/kcm_kopete_history.so
 usr/lib/kde4/kcm_kopete_latex.so
 usr/lib/kde4/kcm_kopete_nowlistening.so
-usr/lib/kde4/kcm_kopete_otr.so
 usr/lib/kde4/kcm_kopete_pipes.so
 usr/lib/kde4/kcm_kopete_pluginconfig.so
 usr/lib/kde4/kcm_kopete_privacy.so
@@ -39,7 +38,6 @@ usr/lib/kde4/kopete_jabber.so
 usr/lib/kde4/kopete_latex.so
 usr/lib/kde4/kopete_meanwhile.so
 usr/lib/kde4/kopete_nowlistening.so
-usr/lib/kde4/kopete_otr.so
 usr/lib/kde4/kopete_pipes.so
 usr/lib/kde4/kopete_privacy.so
 usr/lib/kde4/kopete_qq.so
@@ -58,8 +56,6 @@ usr/lib/kde4/libchattexteditpart.so
 usr/lib/kde4/plugins/accessible/chatwindowaccessiblewidgetfactory.so
 usr/lib/libkopete_oscar.so.4
 usr/lib/libkopete_oscar.so.4.*.*
-usr/lib/libkopete_otr_shared.so.1
-usr/lib/libkopete_otr_shared.so.1.0.0
 usr/lib/libkopete_videodevice.so.4
 usr/lib/libkopete_videodevice.so.4.*.*
 usr/lib/libkopeteaddaccountwizard.so.1
@@ -166,9 +162,6 @@ usr/share/icons/oxygen/22x22/actions/view-user-offline-kopete.png
 usr/share/icons/oxygen/22x22/actions/voicecall.png
 usr/share/icons/oxygen/22x22/actions/webcamreceive.png
 usr/share/icons/oxygen/22x22/actions/webcamsend.png
-usr/share/icons/oxygen/22x22/status/object-locked-finished.png
-usr/share/icons/oxygen/22x22/status/object-locked-unverified.png
-usr/share/icons/oxygen/22x22/status/object-locked-verified.png
 usr/share/icons/oxygen/32x32/actions/account_offline_overlay.png
 usr/share/icons/oxygen/32x32/actions/im-status-message-edit.png
 usr/share/icons/oxygen/32x32/actions/metacontact_unknown.png
@@ -178,7 +171,6 @@ usr/share/icons/oxygen/32x32/actions/voicecall.png
 usr/share/icons/oxygen/32x32/actions/webcamreceive.png
 usr/share/icons/oxygen/32x32/actions/webcamsend.png
 usr/share/icons/oxygen/48x48/actions/im-status-message-edit.png
-usr/share/icons/oxygen/48x48/actions/mail-encrypt.png
 usr/share/icons/oxygen/48x48/actions/view-user-offline-kopete.png
 usr/share/icons/oxygen/48x48/actions/voicecall.png
 usr/share/icons/oxygen/48x48/actions/webcamreceive.png
@@ -193,9 +185,6 @@ usr/share/icons/oxygen/scalable/actions/view-user-offline-kopete.svgz
 usr/share/icons/oxygen/scalable/actions/voicecall.svgz
 usr/share/icons/oxygen/scalable/actions/webcamreceive.svgz
 usr/share/icons/oxygen/scalable/actions/webcamsend.svgz
-usr/share/icons/oxygen/scalable/status/object-locked-finished.svgz
-usr/share/icons/oxygen/scalable/status/object-locked-unverified.svgz
-usr/share/icons/oxygen/scalable/status/object-locked-verified.svgz
 usr/share/kde4/apps/kconf_update/kopete-account-0.10.pl
 usr/share/kde4/apps/kconf_update/kopete-account-kconf_update.sh
 usr/share/kde4/apps/kconf_update/kopete-account-kconf_update.upd
@@ -661,8 +650,6 @@ usr/share/kde4/apps/kopete_history/historychatui.rc
 usr/share/kde4/apps/kopete_history/historyui.rc
 usr/share/kde4/apps/kopete_jabber/jabberchatui.rc
 usr/share/kde4/apps/kopete_latex/latexchatui.rc
-usr/share/kde4/apps/kopete_otr/otrchatui.rc
-usr/share/kde4/apps/kopete_otr/otrui.rc
 usr/share/kde4/apps/kopete_privacy/privacychatui.rc
 usr/share/kde4/apps/kopete_privacy/privacyui.rc
 usr/share/kde4/apps/kopete_skype/skypechatui.rc
@@ -676,7 +663,6 @@ 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/kopete_otr.kcfg
 usr/share/kde4/config.kcfg/kopeteappearancesettings.kcfg
 usr/share/kde4/config.kcfg/kopetebehaviorsettings.kcfg
 usr/share/kde4/config.kcfg/kopetestatussettings.kcfg
@@ -696,7 +682,6 @@ usr/share/kde4/services/kconfiguredialog/kopete_highlight_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_otr_config.desktop
 usr/share/kde4/services/kconfiguredialog/kopete_pipes_config.desktop
 usr/share/kde4/services/kconfiguredialog/kopete_privacy_config.desktop
 usr/share/kde4/services/kconfiguredialog/kopete_texteffect_config.desktop
@@ -722,7 +707,6 @@ usr/share/kde4/services/kopete_jabber.desktop
 usr/share/kde4/services/kopete_latex.desktop
 usr/share/kde4/services/kopete_meanwhile.desktop
 usr/share/kde4/services/kopete_nowlistening.desktop
-usr/share/kde4/services/kopete_otr.desktop
 usr/share/kde4/services/kopete_pipes.desktop
 usr/share/kde4/services/kopete_pluginconfig.desktop
 usr/share/kde4/services/kopete_privacy.desktop
diff --git a/debian/kopete.lintian-overrides b/debian/kopete.lintian-overrides
index e40e17e..02d58cf 100644
--- a/debian/kopete.lintian-overrides
+++ b/debian/kopete.lintian-overrides
@@ -1,2 +1,2 @@
-kopete: package-name-doesnt-match-sonames libkopete-oscar4 libkopete-otr-shared1 libkopete-videodevice4 libkopeteaddaccountwizard1 libkopetechatwindow-shared1 libkopetecontactlist1 libkopeteidentity1 libkopeteprivacy1 libkopetestatusmenu1 libkyahoo1 liboscar1 libqgroupwise
+kopete: package-name-doesnt-match-sonames libkopete-oscar4 libkopete-videodevice4 libkopeteaddaccountwizard1 libkopetechatwindow-shared1 libkopetecontactlist1 libkopeteidentity1 libkopeteprivacy1 libkopetestatusmenu1 libkyahoo1 liboscar1 libqgroupwise
 kopete: shlib-without-versioned-soname usr/lib/libqgroupwise.so libqgroupwise.so
diff --git a/debian/krfb.lintian-overrides b/debian/krfb.lintian-overrides
index 51869fc..54e1490 100644
--- a/debian/krfb.lintian-overrides
+++ b/debian/krfb.lintian-overrides
@@ -1 +1 @@
-krfb: package-name-doesnt-match-sonames libkrfbprivate4.6.0
+krfb: package-name-doesnt-match-sonames libkrfbprivate4*

-- 
KDE Network module packaging

