r31205 - in /desktop/unstable/vino/debian: changelog patches/05_use-system-miniupnpc.patch patches/series

[jbicha-guest at users.alioth.debian.org]

Author: jbicha-guest
Date: Sat Nov  5 23:25:01 2011
New Revision: 31205

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31205
Log:
debian/patches/05_use-system-miniupnpc.patch:
Use system installed miniupnpc instead of bundled library

Added:
    desktop/unstable/vino/debian/patches/05_use-system-miniupnpc.patch
Modified:
    desktop/unstable/vino/debian/changelog
    desktop/unstable/vino/debian/patches/series

Modified: desktop/unstable/vino/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vino/debian/changelog?rev=31205&op=diff
==============================================================================
--- desktop/unstable/vino/debian/changelog [utf-8] (original)
+++ desktop/unstable/vino/debian/changelog [utf-8] Sat Nov  5 23:25:01 2011
@@ -1,3 +1,10 @@
+vino (3.2.1-2) UNRELEASED; urgency=low
+
+  * debian/patches/05_use-system-miniupnpc.patch:
+    Use system installed miniupnpc instead of bundled library
+
+ -- Jeremy Bicha <jbicha at ubuntu.com>  Sat, 05 Nov 2011 12:20:14 -0400
+
 vino (3.2.1-1) unstable; urgency=low
 
   * New upstream release.

Added: desktop/unstable/vino/debian/patches/05_use-system-miniupnpc.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vino/debian/patches/05_use-system-miniupnpc.patch?rev=31205&op=file
==============================================================================
--- desktop/unstable/vino/debian/patches/05_use-system-miniupnpc.patch (added)
+++ desktop/unstable/vino/debian/patches/05_use-system-miniupnpc.patch [utf-8] Sat Nov  5 23:25:01 2011
@@ -1,0 +1,95 @@
+Description: Use system-installed miniupnpc instead of bundled library
+ Needs to be made optional before forwarding upstream, see 
+ https://trac.transmissionbt.com/ticket/4323 for similar code
+Author: Jeremy Bicha <jbicha at ubuntu.com>
+Forwarded: no
+Index: vino-3.1.90/Makefile.am
+===================================================================
+--- vino-3.1.90.orig/Makefile.am	2011-07-08 06:25:56.000000000 -0400
++++ vino-3.1.90/Makefile.am	2011-08-30 01:38:24.770530769 -0400
+@@ -25,29 +25,6 @@
+ 	server/smclient/eggdesktopfile.c \
+ 	server/smclient/eggdesktopfile.h
+ 
+-VINO_MINIUPNP_cppflags = -DNDEBUG
+-
+-VINO_MINIUPNP_sources = \
+-	server/miniupnp/bsdqueue.h \
+-	server/miniupnp/codelength.h \
+-	server/miniupnp/declspec.h \
+-	server/miniupnp/igd_desc_parse.c \
+-	server/miniupnp/igd_desc_parse.h \
+-	server/miniupnp/minisoap.c \
+-	server/miniupnp/minisoap.h \
+-	server/miniupnp/minissdpc.c \
+-	server/miniupnp/minissdpc.h \
+-	server/miniupnp/miniupnpc.c \
+-	server/miniupnp/miniupnpc.h \
+-	server/miniupnp/miniwget.c \
+-	server/miniupnp/miniwget.h \
+-	server/miniupnp/minixml.c \
+-	server/miniupnp/minixml.h \
+-	server/miniupnp/upnpcommands.c \
+-	server/miniupnp/upnpcommands.h \
+-	server/miniupnp/upnpreplyparse.c \
+-	server/miniupnp/upnpreplyparse.h
+-
+ if VINO_HAVE_SELF_IFADDRS
+ VINO_IFADDRS_sources = \
+ 	server/libvncserver/ifaddr/getifaddrs.c \
+@@ -90,12 +67,10 @@
+ 	-I$(top_srcdir) \
+ 	-I$(top_srcdir)/common \
+ 	-I$(top_srcdir)/server/libvncserver \
+-	-I$(top_srcdir)/server/miniupnp \
+ 	-I$(top_srcdir)/server/smclient \
+ 	-I$(top_builddir) \
+ 	-I$(top_builddir)/server \
+ 	$(VINO_SERVER_CFLAGS) \
+-	$(VINO_MINIUPNP_cppflags) \
+ 	$(LIBGCRYPT_CFLAGS) \
+ 	$(WARN_CFLAGS) \
+ 	$(DISABLE_DEPRECATED) \
+@@ -111,6 +86,7 @@
+ 	$(VINO_SERVER_LIBS) \
+ 	$(LIBGCRYPT_LIBS) \
+ 	$(JPEG_LIBS) \
++	$(LIBUPNP_LIBS) \
+ 	$(X_LIBS) $(XTEST_LIBS) $(XSHM_LIBS) $(XDAMAGE_LIBS) $(ZLIB_LIBS)
+ 
+ if VINO_ENABLE_HTTP_SERVER
+@@ -163,7 +139,6 @@
+ 	server/vino-dbus-error.h \
+ 	server/vino-upnp.h \
+ 	server/vino-upnp.c \
+-	$(VINO_MINIUPNP_sources) \
+ 	$(VINO_IFADDR_sources) \
+ 	$(VINO_LIBVNCSERVER_sources) \
+ 	$(VINO_HTTP_sources) \
+@@ -336,8 +311,6 @@
+ 	server/libvncserver/tabletranstemplate.c \
+         server/libvncserver/tableinitcmtemplate.c \
+         server/libvncserver/zrleencodetemplate.c \
+-	server/miniupnp/README \
+-	server/miniupnp/LICENCE \
+ 	\
+ 	ChangeLog.pre-git \
+ 	intltool-extract.in \
+Index: vino-3.1.90/configure.ac
+===================================================================
+--- vino-3.1.90.orig/configure.ac	2011-08-15 13:53:38.000000000 -0400
++++ vino-3.1.90/configure.ac	2011-08-30 01:38:24.770530769 -0400
+@@ -321,6 +321,13 @@
+     [AC_MSG_ERROR([IPv6 support requested but not found])])])
+ AC_MSG_RESULT([$have_ipv6])
+ 
++dnl ----------------------------------------------------------------------------
++dnl
++dnl Allow use of system miniupnp library
++
++LIBUPNP_LIBS="-lminiupnpc"
++AC_SUBST(LIBUPNP_LIBS)
++
+ # GNOME libraries
+ GTK_VERSION=3.0.0
+ GLIB_VERSION=2.17.0

Modified: desktop/unstable/vino/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vino/debian/patches/series?rev=31205&op=diff
==============================================================================
--- desktop/unstable/vino/debian/patches/series [utf-8] (original)
+++ desktop/unstable/vino/debian/patches/series [utf-8] Sat Nov  5 23:25:01 2011
@@ -1,2 +1,3 @@
 02_server_sm-disable.patch
+05_use-system-miniupnpc.patch
 11_hurd_maxhostnamelen.patch