xorg-server: Changes to 'ubuntu+1'
debian/patches/dix-fixup-build-failure.patch | 12 ------------
debian/patches/series | 1 -
2 files changed, 13 deletions(-)
New commits:
commit 9d42d525f61ce6a07a9824a42e08c853d9a72499
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Sun Jul 14 00:26:42 2013 +0200
remove dix-fixup-build-failure.patch, upstreamed
diff --git a/debian/patches/dix-fixup-build-failure.patch b/debian/patches/dix-fixup-build-failure.patch
deleted file mode 100644
index 6cd9b23..0000000
--- a/debian/patches/dix-fixup-build-failure.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/include/registry.h b/include/registry.h
-index e298ab6..96be87a 100644
---- a/include/registry.h
-+++ b/include/registry.h
-@@ -60,6 +60,7 @@ extern _X_EXPORT void dixFreeRegistry(void);
- #define LookupResourceName(a) XREGISTRY_UNKNOWN
-
- #define dixResetRegistry() { ; }
-+#define dixFreeRegistry() { ; }
-
- #endif /* XREGISTRY */
- #endif /* DIX_REGISTRY_H */
diff --git a/debian/patches/series b/debian/patches/series
index 5c231ad..4ab4f5b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -35,7 +35,6 @@ no-nv.patch
# https://bugs.freedesktop.org/show_bug.cgi?id=24181
# Probably is just papering over issue; needs further analysis
include-selection-h.patch
-dix-fixup-build-failure.patch
## upstream patches
Reply to: