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

Pino Toscano pino at alioth.debian.org
Tue Jun 4 14:06:37 UTC 2013 

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

The following commit has been merged in the master branch:
commit 41566b1485867622e022138eb0b1c36ca9d588bd
Author: Pino Toscano <pino at debian.org>
Date:   Tue Jun 4 16:05:58 2013 +0200

    stop building with OTR support (#711073)
    
    the kopete plugin does not support libotr >= 4.x:
    - drop the libotr2-dev build dependency
    - remove the kopete_otr files from kopete.install
---
 debian/changelog      |    4 ++++
 debian/control        |    2 +-
 debian/kopete.install |   17 -----------------
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3a37ad0..e59cbbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ kdenetwork (4:4.8.4-2) UNRELEASED; urgency=low
   [ 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
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 04 Jun 2013 15:39:10 +0200
 
diff --git a/debian/control b/debian/control
index b2881b1..d71a0e9 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends: kde-sc-dev-latest (>= 4:4.8.4),
  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 124fc4b..9cdf97e 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.8.0
-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.8.0
 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
@@ -188,14 +180,10 @@ usr/share/icons/oxygen/64x64/actions/webcamreceive.png
 usr/share/icons/oxygen/64x64/actions/webcamsend.png
 usr/share/icons/oxygen/scalable/actions/account_offline_overlay.svgz
 usr/share/icons/oxygen/scalable/actions/im-status-message-edit.svgz
-usr/share/icons/oxygen/scalable/actions/mail-encrypt.svgz
 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 +649,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 +662,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 +681,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 +706,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

-- 
KDE Network module packaging

More information about the pkg-kde-commits mailing list