[Pkg-libvirt-commits] [SCM] libgtk-vnc Debian packaging branch, master, updated. debian/0.3.9-1-15-g67dc3ec

[Guido Günther]

The following commit has been merged in the master branch:
commit 5f1532b5d6ae4f60e7cd119e660c6738c6937f37
Author: Guido Günther <agx at sigxcpu.org>
Date:   Fri Oct 23 20:49:32 2009 +0200

    redo patches

diff --git a/debian/patches/0001-use-xulrunner-not-mozilla.patch b/debian/patches/0001-use-xulrunner-not-mozilla.patch
index 5f0d4c5..68fca43 100644
--- a/debian/patches/0001-use-xulrunner-not-mozilla.patch
+++ b/debian/patches/0001-use-xulrunner-not-mozilla.patch
@@ -1,5 +1,4 @@
-From fbe6e6d81d41c547a20eac4f1580f45b0e6653ad Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
 Date: Sat, 3 Jan 2009 18:25:03 +0100
 Subject: [PATCH] use xulrunner not mozilla
 
@@ -8,19 +7,19 @@ Subject: [PATCH] use xulrunner not mozilla
  1 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index b37a251..6f6c09e 100644
+index 2131706..78b554b 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -15,7 +15,7 @@ PYTHON_REQUIRED=2.4
+@@ -30,7 +30,7 @@ PYTHON_REQUIRED=2.4
  
  NSPR_REQUIRED=4.0.0
  FIREFOX_PLUGIN_REQUIRED=2.0.0
 -MOZILLA_PLUGIN_REQUIRED=1.8
 +MOZILLA_PLUGIN_REQUIRED=1.0
  
- 
- AC_CONFIG_HEADERS([config.h:config.hin])
-@@ -219,7 +219,7 @@ if test "x$enable_plugin" = "xyes"; then
+ dnl *******************************************************************************
+ dnl Setup GNULIB - must be before anything else in this file
+@@ -266,7 +266,7 @@ if test "x$enable_plugin" = "xyes"; then
      PKG_CHECK_MODULES(FIREFOX_PLUGIN,
                       firefox-plugin >= $FIREFOX_PLUGIN_REQUIRED, ,[
          PKG_CHECK_MODULES(MOZILLA_PLUGIN,
@@ -30,5 +29,3 @@ index b37a251..6f6c09e 100644
          FIREFOX_PLUGIN_LIBS="$MOZILLA_PLUGIN_LIBS"
      ])
 -- 
-1.6.0.3
-
diff --git a/debian/patches/0002-say-disconnected-from-server-only-once-connected.patch b/debian/patches/0002-say-disconnected-from-server-only-once-connected.patch
index dc51225..9c49347 100644
--- a/debian/patches/0002-say-disconnected-from-server-only-once-connected.patch
+++ b/debian/patches/0002-say-disconnected-from-server-only-once-connected.patch
@@ -8,7 +8,7 @@ Closes: #540435
  1 files changed, 7 insertions(+), 1 deletions(-)
 
 diff --git a/examples/gvncviewer.c b/examples/gvncviewer.c
-index 6373564..777b8c8 100644
+index 28b0fb8..c3fbd74 100644
 --- a/examples/gvncviewer.c
 +++ b/examples/gvncviewer.c
 @@ -84,9 +84,12 @@ static void vnc_ungrab(GtkWidget *vncdisplay, GtkWidget *window)
diff --git a/debian/patches/0003-allow-connecting-to-local-server-by-display-number.patch b/debian/patches/0003-allow-connecting-to-local-server-by-display-number.patch
deleted file mode 100644
index e3b2908..0000000
--- a/debian/patches/0003-allow-connecting-to-local-server-by-display-number.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Michal Suchanek <hramrach at centrum.cz>
-Date: Tue, 18 Aug 2009 18:23:00 +0200
-Subject: [PATCH] allow connecting to local server by display number
-
-Closes: #540434
----
- examples/gvncviewer.c |    6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/examples/gvncviewer.c b/examples/gvncviewer.c
-index 777b8c8..b2cc30c 100644
---- a/examples/gvncviewer.c
-+++ b/examples/gvncviewer.c
-@@ -36,7 +36,7 @@ static const GOptionEntry options [] =
- {
-   {
-     G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_STRING_ARRAY, &args,
--    NULL, "hostname[:display]" },
-+    NULL, "[hostname][:display]" },
-   { NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, 0 }
- };
- 
-@@ -383,7 +383,7 @@ int main(int argc, char **argv)
- 		return 1;
- 	}
- 	if (!args || (g_strv_length(args) != 1)) {
--		fprintf(stderr, "Usage: gvncviewer hostname[:display]\n%s\n", help_msg);
-+		fprintf(stderr, "Usage: gvncviewer [hostname][:display]\n%s\n", help_msg);
- 		return 1;
- 	}
- 
-@@ -461,6 +461,8 @@ int main(int argc, char **argv)
- 	} else
- 		snprintf(port, sizeof(port), "%d", 5900);
- 
-+	if(! *hostname)
-+		snprintf(hostname, sizeof(hostname), "%s", "127.0.0.1");
- 	vnc_display_open_host(VNC_DISPLAY(vnc), hostname, port);
- 	vnc_display_set_keyboard_grab(VNC_DISPLAY(vnc), TRUE);
- 	vnc_display_set_pointer_grab(VNC_DISPLAY(vnc), TRUE);
--- 
diff --git a/debian/patches/series b/debian/patches/series
index a3e8fe0..781715f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 0001-use-xulrunner-not-mozilla.patch
 0002-say-disconnected-from-server-only-once-connected.patch
-0003-allow-connecting-to-local-server-by-display-number.patch

-- 
libgtk-vnc Debian packaging