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

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Tue Nov 15 20:50:35 UTC 2011


Author: biebl
Date: Tue Nov 15 20:50:35 2011
New Revision: 31406

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31406
Log:
Refresh debian/patches/05_use-system-miniupnpc.patch.

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

Modified: desktop/unstable/vino/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vino/debian/changelog?rev=31406&op=diff
==============================================================================
--- desktop/unstable/vino/debian/changelog [utf-8] (original)
+++ desktop/unstable/vino/debian/changelog [utf-8] Tue Nov 15 20:50:35 2011
@@ -6,6 +6,7 @@
 
   [ Michael Biebl ]
   * New upstream release.
+  * Refresh debian/patches/05_use-system-miniupnpc.patch.
 
  -- Michael Biebl <biebl at debian.org>  Tue, 15 Nov 2011 21:48:51 +0100
 

Modified: 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=31406&op=diff
==============================================================================
--- desktop/unstable/vino/debian/patches/05_use-system-miniupnpc.patch [utf-8] (original)
+++ desktop/unstable/vino/debian/patches/05_use-system-miniupnpc.patch [utf-8] Tue Nov 15 20:50:35 2011
@@ -3,11 +3,11 @@
  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
+Index: vino-3.2.2/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 @@
+--- vino-3.2.2.orig/Makefile.am	2011-10-24 17:36:19.000000000 +0200
++++ vino-3.2.2/Makefile.am	2011-11-15 21:50:01.974331566 +0100
+@@ -39,29 +39,6 @@
  	server/smclient/eggdesktopfile.c \
  	server/smclient/eggdesktopfile.h
  
@@ -37,7 +37,7 @@
  if VINO_HAVE_SELF_IFADDRS
  VINO_IFADDRS_sources = \
  	server/libvncserver/ifaddr/getifaddrs.c \
-@@ -90,12 +67,10 @@
+@@ -104,12 +81,10 @@
  	-I$(top_srcdir) \
  	-I$(top_srcdir)/common \
  	-I$(top_srcdir)/server/libvncserver \
@@ -50,7 +50,7 @@
  	$(LIBGCRYPT_CFLAGS) \
  	$(WARN_CFLAGS) \
  	$(DISABLE_DEPRECATED) \
-@@ -111,6 +86,7 @@
+@@ -125,6 +100,7 @@
  	$(VINO_SERVER_LIBS) \
  	$(LIBGCRYPT_LIBS) \
  	$(JPEG_LIBS) \
@@ -58,7 +58,7 @@
  	$(X_LIBS) $(XTEST_LIBS) $(XSHM_LIBS) $(XDAMAGE_LIBS) $(ZLIB_LIBS)
  
  if VINO_ENABLE_HTTP_SERVER
-@@ -163,7 +139,6 @@
+@@ -177,7 +153,6 @@
  	server/vino-dbus-error.h \
  	server/vino-upnp.h \
  	server/vino-upnp.c \
@@ -66,7 +66,7 @@
  	$(VINO_IFADDR_sources) \
  	$(VINO_LIBVNCSERVER_sources) \
  	$(VINO_HTTP_sources) \
-@@ -336,8 +311,6 @@
+@@ -350,8 +325,6 @@
  	server/libvncserver/tabletranstemplate.c \
          server/libvncserver/tableinitcmtemplate.c \
          server/libvncserver/zrleencodetemplate.c \
@@ -75,11 +75,11 @@
  	\
  	ChangeLog.pre-git \
  	intltool-extract.in \
-Index: vino-3.1.90/configure.ac
+Index: vino-3.2.2/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 @@
+--- vino-3.2.2.orig/configure.ac	2011-11-14 18:31:38.000000000 +0100
++++ vino-3.2.2/configure.ac	2011-11-15 21:50:01.978331565 +0100
+@@ -322,6 +322,13 @@
      [AC_MSG_ERROR([IPv6 support requested but not found])])])
  AC_MSG_RESULT([$have_ipv6])
  




More information about the pkg-gnome-commits mailing list