[SCM] kopete packaging branch, master, updated. debian/4.13.1-1-61-gdb6961a

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit db6961af49ef8792fb37d5fc5ce8051b72560209
Author: Maximiliano Curia <maxy at debian.org>
Date:   Thu Jul 31 16:13:29 2014 +0200

    Remove upstream applied patch: libjingle_unknown_architecture.diff
---
 debian/changelog                                   |  1 +
 debian/patches/libjingle_unknown_architecture.diff | 37 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 38 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6bd0006..24013a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ kopete (4:4.13.3-1) unstable; urgency=medium
   * New upstream release.
   * Suggest imagemagick, needed by the latex plugin. (Closes: 753322)
     Thanks to Jonathan Riddell.
+  * Remove upstream applied patch: libjingle_unknown_architecture.diff
 
  -- Maximiliano Curia <maxy at debian.org>  Thu, 31 Jul 2014 16:02:49 +0200
 
diff --git a/debian/patches/libjingle_unknown_architecture.diff b/debian/patches/libjingle_unknown_architecture.diff
deleted file mode 100644
index a061f8a..0000000
--- a/debian/patches/libjingle_unknown_architecture.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-Author: mallinath at google.com
-Description: Allow unknown architectures
- Derived from part of libjingle r305:
- http://code.google.com/p/libjingle/source/detail?r=305
-
---- a/protocols/jabber/googletalk/libjingle/talk/base/systeminfo.cc
-+++ b/protocols/jabber/googletalk/libjingle/talk/base/systeminfo.cc
-@@ -102,7 +102,7 @@ SystemInfo::SystemInfo()
- #elif defined(CPU_X86)
-   cpu_arch_ = SI_ARCH_X86;
- #else
--#error "Unknown architecture."
-+  cpu_arch_ = SI_ARCH_UNKNOWN;
- #endif
- 
- #ifdef WIN32
-@@ -144,8 +144,8 @@ SystemInfo::SystemInfo()
-     proc_info.GetNumCpus(&logical_cpus_);
-     proc_info.GetNumPhysicalCpus(&physical_cpus_);
-     proc_info.GetCpuFamily(&cpu_family_);
--#if !defined(__arm__)
--    // These values aren't found on ARM systems.
-+#if defined(CPU_X86)
-+    // These values only apply to x86 systems.
-     proc_info.GetSectionIntValue(0, "model", &cpu_model_);
-     proc_info.GetSectionIntValue(0, "stepping", &cpu_stepping_);
-     proc_info.GetSectionIntValue(0, "cpu MHz", &cpu_speed_);
---- a/protocols/jabber/googletalk/libjingle/talk/base/systeminfo.h
-+++ b/protocols/jabber/googletalk/libjingle/talk/base/systeminfo.h
-@@ -37,6 +37,7 @@ namespace talk_base {
- class SystemInfo {
-  public:
-   enum Architecture {
-+    SI_ARCH_UNKNOWN = -1,
-     SI_ARCH_X86 = 0,
-     SI_ARCH_X64 = 1,
-     SI_ARCH_ARM = 2
diff --git a/debian/patches/series b/debian/patches/series
index 1ddc1ce..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-libjingle_unknown_architecture.diff

-- 
kopete packaging