[Pkg-voip-commits] [libre] 01/01: debian/*: add a patch to get the correct multiarch triplet

[Ramakrishnan Muthukrishnan]

This is an automated email from the git hooks/post-receive script.

rkrishnan pushed a commit to branch master
in repository libre.

commit 806dd20bc1777f268c8c6f3fb5d7b70aade64888
Author: Ramakrishnan Muthukrishnan <ram at rkrishnan.org>
Date:   Wed Jan 20 14:05:31 2016 +0530

    debian/*: add a patch to get the correct multiarch triplet
---
 debian/changelog                                   |  9 +++++++-
 debian/control                                     |  2 +-
 .../0001-get-correct-multiarch-triplet.patch       | 27 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 66e4195..4dcbe1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,14 @@
-libre (0.4.14-4) UNRELEASED; urgency=medium
+libre (0.4.14-4) unstable; urgency=medium
 
+  * Team upload.
+  
+  [ Vasudev Kamath ]
   * Use pkg-kde-tools to generate symbol files.  Fixes FTBFS on i386
     architecture due to missing symbols.
+  
+  [ Ramakrishnan Muthukrishnan ]
+  * debian/patch/0001-get-correct-multiarch-triplet.patch: patch the
+  upstream makefile to set the right multiarch triplet.
 
  -- Vasudev Kamath <kamathvasudev at gmail.com>  Wed, 02 Dec 2015 23:10:40 +0530
 
diff --git a/debian/control b/debian/control
index c0135e9..13b3065 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libre
 Section: comm
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
-Uploaders: Simon Josefsson <simon at josefsson.org>, Vasudev Kamath <vasudev at copyninja.info>
+Uploaders: Simon Josefsson <simon at josefsson.org>, Vasudev Kamath <vasudev at copyninja.info>, Ramakrishnan Muthukrishnan <rkrishnan at debian.org>
 Standards-Version: 3.9.6
 Build-Depends: debhelper (>= 9), libssl-dev, pkg-kde-tools
 Homepage: http://www.creytiv.com/re
diff --git a/debian/patches/0001-get-correct-multiarch-triplet.patch b/debian/patches/0001-get-correct-multiarch-triplet.patch
new file mode 100644
index 0000000..82eadf4
--- /dev/null
+++ b/debian/patches/0001-get-correct-multiarch-triplet.patch
@@ -0,0 +1,27 @@
+Description: get the correct multi-arch triplet
+On certain architectures, epoll is not correctly picked
+up because of incorrect multi-arch triplet. This patch
+fixes it.
+.
+Author: Vasudev Kamath <kamathvasudev at gmail.com>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Forwarded: no
+Reviewed-By: Ramakrishnan Muthukrishnan <rkrishnan at debian.org>
+Last-Update: 2016-01-20
+
+--- libre-0.4.14.orig/mk/re.mk
++++ libre-0.4.14/mk/re.mk
+@@ -197,7 +197,7 @@ endif
+ # OS section
+ #
+ 
+-MACHINE   := $(shell $(CC) -dumpmachine)
++MACHINE   := $(shell $(CC) --print-multiarch)
+ 
+ ifeq ($(CROSS_COMPILE),)
+ OS        := $(shell uname -s | sed -e s/SunOS/solaris/ | tr "[A-Z]" "[a-z]")
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d19bb6b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-get-correct-multiarch-triplet.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/libre.git