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

[Guido Günther]

The following commit has been merged in the master branch:
commit 3b4ad1f2ecc2e8b11719e7c3a986a4bd2f9eb97b
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Apr 28 15:34:55 2011 +0200

    New patch 0002-Look-for-generated-enums-in-srcdir.patch
    
    Look for generated enums in $(srcdir)

diff --git a/debian/patches/0002-Look-for-generated-enums-in-srcdir.patch b/debian/patches/0002-Look-for-generated-enums-in-srcdir.patch
new file mode 100644
index 0000000..dfc8249
--- /dev/null
+++ b/debian/patches/0002-Look-for-generated-enums-in-srcdir.patch
@@ -0,0 +1,56 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Thu, 28 Apr 2011 15:34:17 +0200
+Subject: Look for generated enums in $(srcdir)
+
+since this where they're being generated.
+---
+ src/Makefile.am |    4 ++--
+ src/Makefile.in |    6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 37f8444..2f72fa6 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -279,14 +279,14 @@ GVNC_INTROSPECTION_SRCS = \
+ 			$(srcdir)/vnccolormap.h $(srcdir)/vnccolormap.c \
+ 			$(srcdir)/vnccursor.h $(srcdir)/vnccursor.c \
+ 			$(srcdir)/vncconnection.h $(srcdir)/vncconnection.c \
+-			$(builddir)/vncconnectionenums.h $(builddir)/vncconnectionenums.c \
++			$(srcdir)/vncconnectionenums.h $(srcdir)/vncconnectionenums.c \
+ 			$(srcdir)/vncutil.h $(srcdir)/vncutil.c
+ 
+ GTK_VNC_INTROSPECTION_SRCS = \
+ 			$(srcdir)/vnccairoframebuffer.h $(srcdir)/vnccairoframebuffer.c \
+ 			$(srcdir)/vncdisplay.h $(srcdir)/vncdisplay.c \
+ 			$(srcdir)/vncgrabsequence.h $(srcdir)/vncgrabsequence.c \
+-			$(builddir)/vncdisplayenums.h $(builddir)/vncdisplayenums.c
++			$(srcdir)/vncdisplayenums.h $(srcdir)/vncdisplayenums.c
+ 
+ if HAVE_GTK_2
+ GTK_VNC_INTROSPECTION_SRCS += \
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 5041290..aa91d4b 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -538,7 +538,7 @@ CLEANFILES = $(MARSHAL_FILES) $(ENUM_FILES) $(am__append_10) \
+ @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 \
+- at WITH_GOBJECT_INTROSPECTION_TRUE@			$(builddir)/vncconnectionenums.h $(builddir)/vncconnectionenums.c \
++ at WITH_GOBJECT_INTROSPECTION_TRUE@			$(srcdir)/vncconnectionenums.h $(srcdir)/vncconnectionenums.c \
+ @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) \
+ @WITH_GOBJECT_INTROSPECTION_TRUE@	$(srcdir)/vncdisplay.c \
+ @WITH_GOBJECT_INTROSPECTION_TRUE@	$(srcdir)/vncgrabsequence.h \
+ @WITH_GOBJECT_INTROSPECTION_TRUE@	$(srcdir)/vncgrabsequence.c \
+- at WITH_GOBJECT_INTROSPECTION_TRUE@	$(builddir)/vncdisplayenums.h \
+- 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)
+ @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/series b/debian/patches/series
index 843b232..717053c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-fix-build-with-xulrunner-1.9.1.patch
+0002-Look-for-generated-enums-in-srcdir.patch

-- 
libgtk-vnc Debian packaging