← Back to branch summary

~ubuntu-branches/ubuntu/raring/vino/raring-proposed

« back to all changes in this revision

Viewing changes to debian/patches/05_use-system-miniupnpc.patch

  • Committer: Package Import Robot
  • Author(s): Robert Ancell
  • Date: 2012-08-21 17:07:41 UTC
  • mfrom: (1.1.63)
  • Revision ID: package-import@ubuntu.com-20120821170741-zj374mk9p2ij8jvr
Tags: 3.5.90-0ubuntu1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/05_use-system-miniupnpc.patch
3
3
 https://trac.transmissionbt.com/ticket/4323 for similar code
4
4
Author: Jeremy Bicha <jbicha@ubuntu.com>
5
5
Forwarded: no
6
 
Index: vino-3.3.3/Makefile.am
 
6
Index: vino-3.5.90/Makefile.am
7
7
===================================================================
8
 
--- vino-3.3.3.orig/Makefile.am 2011-10-24 17:36:19.000000000 +0200
9
 
+++ vino-3.3.3/Makefile.am      2012-01-26 16:19:47.196307898 +0100
 
8
--- vino-3.5.90.orig/Makefile.am        2012-07-17 07:25:59.000000000 +1200
 
9
+++ vino-3.5.90/Makefile.am     2012-08-21 17:03:06.246171718 +1200
10
10
@@ -39,29 +39,6 @@
11
11
        server/smclient/eggdesktopfile.c \
12
12
        server/smclient/eggdesktopfile.h
66
66
        $(VINO_IFADDR_sources) \
67
67
        $(VINO_LIBVNCSERVER_sources) \
68
68
        $(VINO_HTTP_sources) \
69
 
@@ -350,8 +325,6 @@
 
69
@@ -347,8 +322,6 @@
70
70
        server/libvncserver/tabletranstemplate.c \
71
71
         server/libvncserver/tableinitcmtemplate.c \
72
72
         server/libvncserver/zrleencodetemplate.c \
75
75
        \
76
76
        ChangeLog.pre-git \
77
77
        intltool-extract.in \
78
 
Index: vino-3.3.3/configure.ac
 
78
Index: vino-3.5.90/configure.ac
79
79
===================================================================
80
 
--- vino-3.3.3.orig/configure.ac        2011-12-19 19:59:42.000000000 +0100
81
 
+++ vino-3.3.3/configure.ac     2012-01-26 16:19:47.200307898 +0100
 
80
--- vino-3.5.90.orig/configure.ac       2012-08-21 09:26:51.000000000 +1200
 
81
+++ vino-3.5.90/configure.ac    2012-08-21 17:03:06.246171718 +1200
82
82
@@ -322,6 +322,13 @@
83
83
     [AC_MSG_ERROR([IPv6 support requested but not found])])])
84
84
 AC_MSG_RESULT([$have_ipv6])
93
93
 # GNOME libraries
94
94
 GTK_VERSION=3.0.0
95
95
 GLIB_VERSION=2.17.0
96
 
Index: vino-3.3.3/server/vino-upnp.c
 
96
Index: vino-3.5.90/server/vino-upnp.c
97
97
===================================================================
98
 
--- vino-3.3.3.orig/server/vino-upnp.c  2011-10-24 17:36:19.000000000 +0200
99
 
+++ vino-3.3.3/server/vino-upnp.c       2012-01-26 16:19:47.200307898 +0100
 
98
--- vino-3.5.90.orig/server/vino-upnp.c 2011-09-08 06:20:42.000000000 +1200
 
99
+++ vino-3.5.90/server/vino-upnp.c      2012-08-21 17:03:06.246171718 +1200
100
100
@@ -27,8 +27,8 @@
101
101
 #endif
102
102