[Pkg-libvirt-commits] [SCM] libgtk-vnc Debian packaging branch, master, updated. debian/0.5.0-3-8-gd7567f1

[Laurent Léonard]

The following commit has been merged in the master branch:
commit 7fde78d3863aa101c2c156facb7e428da040c3f1
Author: Laurent Léonard <laurent at open-minds.org>
Date:   Mon Jul 23 23:34:36 2012 +0200

    Drop patch
    
    Look-for-generated-enums-in-srcdir.patch

diff --git a/debian/patches/Look-for-generated-enums-in-srcdir.patch b/debian/patches/Look-for-generated-enums-in-srcdir.patch
deleted file mode 100644
index 1734597..0000000
--- a/debian/patches/Look-for-generated-enums-in-srcdir.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-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 102a2e9..04050ce 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -350,7 +350,7 @@ 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
- 
- GVNCPULSE_INTROSPECTION_SRCS = \
-@@ -360,7 +360,7 @@ 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 e2d9857..7b271ed 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -675,7 +675,7 @@ CLEANFILES = $(MARSHAL_FILES) $(ENUM_FILES) $(am__append_12) \
- @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 GVNCPULSE_INTROSPECTION_SRCS = \
-@@ -687,8 +687,8 @@ CLEANFILES = $(MARSHAL_FILES) $(ENUM_FILES) $(am__append_12) \
- @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_15)
- @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 252c851..1389ede 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 fix-build-with-xulrunner-1.9.1.patch
-Look-for-generated-enums-in-srcdir.patch
 Use-C99-int-types-instead-of-NSPR-ones.patch
 Fix-build-with-xulrunner-8.0.patch
 Remove-GNUmakefile-links.patch

-- 
libgtk-vnc Debian packaging