Re-enable upnp support in contrib/debian

Github-Pull: #10328 Rebased-From: 91700aa
bitcoin · 6ad45b8f8bd1f33842160d109d391deae0d615e7 · TheBlueMatt committed with luke-jr May 5, 2017 · May 5, 2017 · 6ad45b8
1 parent e9a0d89
commit 6ad45b8f8bd1f33842160d109d391deae0d615e7
Unified Split

Showing with 8 additions and 1 deletion.

+6 −0 contrib/debian/changelog

+1 −0 contrib/debian/control

+1 −1 contrib/debian/rules
diff --git a/contrib/debian/changelog b/contrib/debian/changelog
@@ -1,3 +1,9 @@
+bitcoin (0.14.1-trusty4) trusty; urgency=medium
+
+  * Re-enable UPnP support.
+
+ -- Matt Corallo (BlueMatt) <matt@mattcorallo.com>  Fri, 05 May 2017 13:28:00 -0400
+
 bitcoin (0.14.1-trusty3) trusty; urgency=medium
 
   * Build with qt5 if we are on a non-Ubuntu (ie non-Unity) distro.
diff --git a/contrib/debian/control b/contrib/debian/control
@@ -18,6 +18,7 @@ Build-Depends: debhelper,
  libboost-thread1.48-dev | libboost-thread-dev (>> 1.47),
  libboost-test1.48-dev | libboost-test-dev (>> 1.47),
  libboost-chrono1.48-dev | libboost-chrono-dev (>> 1.47),
+ libminiupnpc8-dev | libminiupnpc-dev,
  qt4-qmake, libqt4-dev,
  qttools5-dev-tools, qttools5-dev,
  libqrencode-dev,
diff --git a/contrib/debian/rules b/contrib/debian/rules
@@ -17,7 +17,7 @@ QT=$(shell dpkg-vendor --derives-from Ubuntu && echo qt4 || echo qt5)
 # Yea, autogen should be run on the source archive, but I like doing git archive
 override_dh_auto_configure:
 	./autogen.sh
-	./configure --without-miniupnpc --with-gui=$(QT)
+	./configure --with-gui=$(QT)
 
 override_dh_auto_test:
 	make check