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

Thu Nov 17 21:19:54 UTC 2011

The following commit has been merged in the master branch:
commit e66a2702d24a973f6558c22a0cf09d05e2c5f680
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Nov 17 08:55:21 2011 +0100

    Drop patch numbers

diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..0b62a62
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[gbp-pq]
+patch-numbers = False
diff --git a/debian/patches/0002-Look-for-generated-enums-in-srcdir.patch b/debian/patches/Look-for-generated-enums-in-srcdir.patch
similarity index 88%
rename from debian/patches/0002-Look-for-generated-enums-in-srcdir.patch
rename to debian/patches/Look-for-generated-enums-in-srcdir.patch
index dfc8249..7f032c0 100644
--- a/debian/patches/0002-Look-for-generated-enums-in-srcdir.patch
+++ b/debian/patches/Look-for-generated-enums-in-srcdir.patch
@@ -9,10 +9,10 @@ since this where they're being generated.
  2 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 37f8444..2f72fa6 100644
+index c5834cb..3dd6e0e 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -279,14 +279,14 @@ GVNC_INTROSPECTION_SRCS = \
+@@ -291,14 +291,14 @@ GVNC_INTROSPECTION_SRCS = \
  			$(srcdir)/vnccolormap.h $(srcdir)/vnccolormap.c \
  			$(srcdir)/vnccursor.h $(srcdir)/vnccursor.c \
  			$(srcdir)/vncconnection.h $(srcdir)/vncconnection.c \
@@ -30,10 +30,10 @@ index 37f8444..2f72fa6 100644
  if HAVE_GTK_2
  GTK_VNC_INTROSPECTION_SRCS += \
 diff --git a/src/Makefile.in b/src/Makefile.in
-index 5041290..aa91d4b 100644
+index 274dc98..1ced6c8 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -538,7 +538,7 @@ CLEANFILES = $(MARSHAL_FILES) $(ENUM_FILES) $(am__append_10) \
+@@ -548,7 +548,7 @@ CLEANFILES = $(MARSHAL_FILES) $(ENUM_FILES) $(am__append_11) \
  @WITH_GOBJECT_INTROSPECTION_TRUE@			$(srcdir)/vnccolormap.h $(srcdir)/vnccolormap.c \
  @WITH_GOBJECT_INTROSPECTION_TRUE@			$(srcdir)/vnccursor.h $(srcdir)/vnccursor.c \
  @WITH_GOBJECT_INTROSPECTION_TRUE@			$(srcdir)/vncconnection.h $(srcdir)/vncconnection.c \
@@ -42,7 +42,7 @@ index 5041290..aa91d4b 100644
  @WITH_GOBJECT_INTROSPECTION_TRUE@			$(srcdir)/vncutil.h $(srcdir)/vncutil.c
  
  @WITH_GOBJECT_INTROSPECTION_TRUE at GTK_VNC_INTROSPECTION_SRCS = $(srcdir)/vnccairoframebuffer.h \
-@@ -547,8 +547,8 @@ CLEANFILES = $(MARSHAL_FILES) $(ENUM_FILES) $(am__append_10) \
+@@ -557,8 +557,8 @@ CLEANFILES = $(MARSHAL_FILES) $(ENUM_FILES) $(am__append_11) \
  @WITH_GOBJECT_INTROSPECTION_TRUE@	$(srcdir)/vncdisplay.c \
  @WITH_GOBJECT_INTROSPECTION_TRUE@	$(srcdir)/vncgrabsequence.h \
  @WITH_GOBJECT_INTROSPECTION_TRUE@	$(srcdir)/vncgrabsequence.c \
@@ -50,7 +50,7 @@ index 5041290..aa91d4b 100644
 - at WITH_GOBJECT_INTROSPECTION_TRUE@	$(builddir)/vncdisplayenums.c \
 + at WITH_GOBJECT_INTROSPECTION_TRUE@	$(srcdir)/vncdisplayenums.h \
 + at WITH_GOBJECT_INTROSPECTION_TRUE@	$(srcdir)/vncdisplayenums.c \
- @WITH_GOBJECT_INTROSPECTION_TRUE@	$(am__append_13)
+ @WITH_GOBJECT_INTROSPECTION_TRUE@	$(am__append_14)
  @G_IR_SCANNER_SYMBOL_PREFIX_FALSE@@WITH_GOBJECT_INTROSPECTION_TRUE at PREFIX_ARGS = --strip-prefix=Vnc
  @G_IR_SCANNER_SYMBOL_PREFIX_TRUE@@WITH_GOBJECT_INTROSPECTION_TRUE at PREFIX_ARGS = --symbol-prefix=vnc --identifier-prefix=Vnc
 -- 
diff --git a/debian/patches/0003-Use-C99-int-types-instead-of-NSPR-ones.patch b/debian/patches/Use-C99-int-types-instead-of-NSPR-ones.patch
similarity index 70%
rename from debian/patches/0003-Use-C99-int-types-instead-of-NSPR-ones.patch
rename to debian/patches/Use-C99-int-types-instead-of-NSPR-ones.patch
index 10ab803..7bbf271 100644
--- a/debian/patches/0003-Use-C99-int-types-instead-of-NSPR-ones.patch
+++ b/debian/patches/Use-C99-int-types-instead-of-NSPR-ones.patch
@@ -1,10 +1,32 @@
 From: Mike Hommey <glandium at debian.org>
+Date: Thu, 17 Nov 2011 08:52:05 +0100
 Subject: Use C99 int types instead of NSPR ones
 
 Closes: #631033
+---
+ plugin/gtk-vnc-plugin.c |    2 +-
+ plugin/gtk-vnc-plugin.h |    8 ++++----
+ plugin/npshell.c        |   19 ++++++++++---------
+ plugin/npunix.c         |   10 +++++-----
+ 4 files changed, 20 insertions(+), 19 deletions(-)
 
---- gtk-vnc-0.4.3.orig/plugin/gtk-vnc-plugin.h
-+++ gtk-vnc-0.4.3/plugin/gtk-vnc-plugin.h
+diff --git a/plugin/gtk-vnc-plugin.c b/plugin/gtk-vnc-plugin.c
+index c5e5b53..8722ee5 100644
+--- a/plugin/gtk-vnc-plugin.c
++++ b/plugin/gtk-vnc-plugin.c
+@@ -275,7 +275,7 @@ GtkVNCDestroyWindow (NPP instance)
+ 
+ static NPWindow windowlessWindow;
+ 
+-int16
++int16_t
+ GtkVNCXHandleEvent(NPP instance, void *event)
+ {
+   XGraphicsExposeEvent exposeEvent;
+diff --git a/plugin/gtk-vnc-plugin.h b/plugin/gtk-vnc-plugin.h
+index e2113f6..9141853 100644
+--- a/plugin/gtk-vnc-plugin.h
++++ b/plugin/gtk-vnc-plugin.h
 @@ -45,10 +45,10 @@
  #define PLUGIN_DESCRIPTION  "VNC (remote desktop) viewer plugin"
  
@@ -28,20 +50,11 @@ Closes: #631033
  
  #ifdef ENABLE_DEBUG
  static inline void
---- gtk-vnc-0.4.3.orig/plugin/gtk-vnc-plugin.c
-+++ gtk-vnc-0.4.3/plugin/gtk-vnc-plugin.c
-@@ -275,7 +275,7 @@ GtkVNCDestroyWindow (NPP instance)
- 
- static NPWindow windowlessWindow;
- 
--int16
-+int16_t
- GtkVNCXHandleEvent(NPP instance, void *event)
- {
-   XGraphicsExposeEvent exposeEvent;
---- gtk-vnc-0.4.3.orig/plugin/npshell.c
-+++ gtk-vnc-0.4.3/plugin/npshell.c
-@@ -79,6 +79,7 @@ Contributor(s): Adobe Systems Incorporat
+diff --git a/plugin/npshell.c b/plugin/npshell.c
+index e1194aa..abdc338 100644
+--- a/plugin/npshell.c
++++ b/plugin/npshell.c
+@@ -79,6 +79,7 @@ Contributor(s): Adobe Systems Incorporated.
  
  #include <stdio.h>
  #include <string.h>
@@ -49,7 +62,7 @@ Closes: #631033
  
  #include <npapi.h>
  
-@@ -111,7 +112,7 @@ NPP_GetValue(NPP instance G_GNUC_UNUSED,
+@@ -111,7 +112,7 @@ NPP_GetValue(NPP instance G_GNUC_UNUSED, NPPVariable variable, void *value)
      *((const char **)value) = PLUGIN_DESCRIPTION;
      break;
    case NPPVpluginNeedsXEmbed:
@@ -77,7 +90,7 @@ Closes: #631033
    NPNToolkitType toolkit = 0;
    int i;
    char *key, *value;
-@@ -170,7 +171,7 @@ NPP_New(NPMIMEType pluginType G_GNUC_UNU
+@@ -170,7 +171,7 @@ NPP_New(NPMIMEType pluginType G_GNUC_UNUSED,
    err = NPN_GetValue (instance,
                        NPNVSupportsXEmbedBool,
                        (void *)&supportsXEmbed);
@@ -86,7 +99,7 @@ Closes: #631033
      return NPERR_INCOMPATIBLE_VERSION_ERROR;
  
  #if 1
-@@ -244,7 +245,7 @@ NPP_SetWindow(NPP instance, NPWindow* wi
+@@ -244,7 +245,7 @@ NPP_SetWindow(NPP instance, NPWindow* window)
    return GtkVNCXSetWindow(instance, window);
  }
  
@@ -95,7 +108,7 @@ Closes: #631033
  NPP_WriteReady(NPP instance, NPStream *stream)
  {
    /*printf("NPP_WriteReady()\n");*/
-@@ -258,9 +259,9 @@ NPP_WriteReady(NPP instance, NPStream *s
+@@ -258,9 +259,9 @@ NPP_WriteReady(NPP instance, NPStream *stream)
    return -1L;   /* don't accept any bytes in NPP_Write() */
  }
  
@@ -107,7 +120,7 @@ Closes: #631033
            void *buffer G_GNUC_UNUSED)
  {
    /*printf("NPP_Write()\n");*/
-@@ -377,7 +378,7 @@ NPP_Print(NPP instance, NPPrint* printIn
+@@ -377,7 +378,7 @@ NPP_Print(NPP instance, NPPrint* printInfo)
      }
  }
  
@@ -116,9 +129,11 @@ Closes: #631033
  {
    /*printf("NPP_HandleEvent()\n");*/
  
---- gtk-vnc-0.4.3.orig/plugin/npunix.c
-+++ gtk-vnc-0.4.3/plugin/npunix.c
-@@ -305,7 +305,7 @@ NPN_NewStream(NPP instance, NPMIMEType t
+diff --git a/plugin/npunix.c b/plugin/npunix.c
+index a9bdd88..703d020 100644
+--- a/plugin/npunix.c
++++ b/plugin/npunix.c
+@@ -305,7 +305,7 @@ NPN_NewStream(NPP instance, NPMIMEType type, const char *window,
                      type, window, stream_ptr);
  }
  
@@ -127,7 +142,7 @@ Closes: #631033
  NPN_Write(NPP instance, NPStream* stream, int32_t len, void* buffer)
  {
      return CallNPN_WriteProc(gNetscapeFuncs.write, instance,
-@@ -439,7 +439,7 @@ Private_SetWindow(NPP instance, NPWindow
+@@ -439,7 +439,7 @@ Private_SetWindow(NPP instance, NPWindow* window)
  static NPError
  Private_NewStream(NPP instance G_GNUC_UNUSED, NPMIMEType type G_GNUC_UNUSED,
                    NPStream* stream G_GNUC_UNUSED,
@@ -136,7 +151,7 @@ Closes: #631033
  {
      NPError err = NPERR_NO_ERROR;
      PLUGINDEBUGSTR("NewStream");
-@@ -447,7 +447,7 @@ Private_NewStream(NPP instance G_GNUC_UN
+@@ -447,7 +447,7 @@ Private_NewStream(NPP instance G_GNUC_UNUSED, NPMIMEType type G_GNUC_UNUSED,
      return err;
  }
  
@@ -145,7 +160,7 @@ Closes: #631033
  Private_WriteReady(NPP instance, NPStream* stream)
  {
      unsigned int result;
-@@ -456,7 +456,7 @@ Private_WriteReady(NPP instance, NPStrea
+@@ -456,7 +456,7 @@ Private_WriteReady(NPP instance, NPStream* stream)
      return result;
  }
  
@@ -163,3 +178,4 @@ Closes: #631033
  Private_HandleEvent(NPP instance, void* event)
  {
      return NPP_HandleEvent(instance, event);
+-- 
diff --git a/debian/patches/0001-fix-build-with-xulrunner-1.9.1.patch b/debian/patches/fix-build-with-xulrunner-1.9.1.patch
similarity index 100%
rename from debian/patches/0001-fix-build-with-xulrunner-1.9.1.patch
rename to debian/patches/fix-build-with-xulrunner-1.9.1.patch
diff --git a/debian/patches/series b/debian/patches/series
index afc2b6c..86e2af6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-0001-fix-build-with-xulrunner-1.9.1.patch
-0002-Look-for-generated-enums-in-srcdir.patch
-0003-Use-C99-int-types-instead-of-NSPR-ones.patch
+fix-build-with-xulrunner-1.9.1.patch
+Look-for-generated-enums-in-srcdir.patch
+Use-C99-int-types-instead-of-NSPR-ones.patch

-- 
libgtk-vnc Debian packaging

