summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCyril Brulebois <kibi@debian.org>2011-01-08 20:47:07 +0100
committerCyril Brulebois <kibi@debian.org>2011-01-08 20:47:07 +0100
commit9986e87ed777c112598673df140202cd67288d1c (patch)
tree4b5e4be6439769c63ecd08add2a5e7a289ddcf50
parent948eda0ac3b8a06471ace655b65c4e586c3f57e9 (diff)
downloadxutils-dev-9986e87ed777c112598673df140202cd67288d1c.tar.gz
Refresh 04_xutils-dev-debian.diff
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/04_xutils-dev-debian.diff23
2 files changed, 1 insertions, 23 deletions
diff --git a/debian/changelog b/debian/changelog
index f5e5cb4..78fbe84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xutils-dev (1:7.6+1) UNRELEASED; urgency=low
* xorg-cf-files 1.0.4.
* Update debian/copyright with xorg-cf-files/COPYING.
+ * Refresh 04_xutils-dev-debian.diff
-- Cyril Brulebois <kibi@debian.org> Sat, 08 Jan 2011 20:39:39 +0100
diff --git a/debian/patches/04_xutils-dev-debian.diff b/debian/patches/04_xutils-dev-debian.diff
index f387c4f..71ff208 100644
--- a/debian/patches/04_xutils-dev-debian.diff
+++ b/debian/patches/04_xutils-dev-debian.diff
@@ -2083,15 +2083,6 @@ Index: xutils-dev/xorg-cf-files/X11.tmpl
===================================================================
--- xutils-dev.orig/xorg-cf-files/X11.tmpl
+++ xutils-dev/xorg-cf-files/X11.tmpl
-@@ -45,7 +45,7 @@
- # if defined XorgVersionString
- # define XOrgReleaseString Release XorgVersionString
- # else
--# define XOrgReleaseString Release 6.8
-+# define XOrgReleaseString Release 6.9
- # endif
- #endif
-
@@ -614,23 +614,29 @@
#ifndef BuildRender
#define BuildRender YES
@@ -2651,17 +2642,3 @@ Index: xutils-dev/xorg-cf-files/xorg.cf
# endif
#endif
-Index: xutils-dev/xorg-cf-files/xorgversion.def
-===================================================================
---- xutils-dev.orig/xorg-cf-files/xorgversion.def
-+++ xutils-dev/xorg-cf-files/xorgversion.def
-@@ -1,5 +1,5 @@
- #define XORG_VERSION_MAJOR 6
--#define XORG_VERSION_MINOR 8
--#define XORG_VERSION_PATCH 99
--#define XORG_VERSION_SNAP 903
--#define XORG_DATE "03 December 2005 + cvs"
-+#define XORG_VERSION_MINOR 9
-+#define XORG_VERSION_PATCH 0
-+#define XORG_VERSION_SNAP 0
-+#define XORG_DATE "21 December 2005"