[Pkg-voip-commits] [ring] 01/01: create use-debian-pmp.patch

[Alexandre Viau]

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

aviau pushed a commit to branch master
in repository ring.

commit b3e0e0d8711fb77d44b6b61bf3852cfc09e1687b
Author: aviau <alexandre at alexandreviau.net>
Date:   Wed Jul 13 11:45:22 2016 -0400

    create use-debian-pmp.patch
---
 debian/changelog                    |  1 +
 debian/patches/series               |  1 +
 debian/patches/use-debian-pmp.patch | 18 ++++++++++++++++++
 3 files changed, 20 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6fbed5b..790bd22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ ring (20160712.1.66bea8b~dfsg1-1) unstable; urgency=medium
   * d/coptright: exclude client-ios.
   * d/copyright: exclude libnatpmp.
   * build depend on libnatpmp-dev.
+  * create use-debian-pmp.patch.
 
  -- Alexandre Viau <aviau at debian.org>  Fri, 01 Jul 2016 19:06:06 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 42f61dd..1f4fd27 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+use-debian-pmp.patch
 jsoncpp-rename.patch
 check-for-gsm.patch
diff --git a/debian/patches/use-debian-pmp.patch b/debian/patches/use-debian-pmp.patch
new file mode 100644
index 0000000..484b151
--- /dev/null
+++ b/debian/patches/use-debian-pmp.patch
@@ -0,0 +1,18 @@
+Description: Use Debian's libnatpmp
+Author: Alexandre Viau <aviau at debian.org>
+Last-Update: 2016-07-13
+
+--- a/daemon/contrib/src/natpmp/rules.mak
++++ b/daemon/contrib/src/natpmp/rules.mak
+@@ -3,9 +3,9 @@
+ NATPMP_URL := http://miniupnp.free.fr/files/download.php?file=libnatpmp-$(NATPMP_VERSION).tar.gz
+ 
+ PKGS += natpmp
+-ifeq ($(call need_pkg,'libnatpmp'),)
++#ifeq ($(call need_pkg,'libnatpmp'),)
+ PKGS_FOUND += natpmp
+-endif
++#endif
+ 
+ $(TARBALLS)/libnatpmp-$(NATPMP_VERSION).tar.gz:
+ 	$(call download,$(NATPMP_URL))

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