Author: fabbione
Date: 2004-10-24 22:34:00 -0500 (Sun, 24 Oct 2004)
New Revision: 109
Added:
xorg-lib-xext/trunk/debian/patches/916_debian_fix_includes.diff
Removed:
xorg-lib-xext/trunk/debian/patches/916_debian_fix_region.h.diff
Modified:
xorg-lib-xext/trunk/debian/CHANGESETS
xorg-lib-xext/trunk/debian/patches/915_debian_fix_Imakefiles.diff
Log:
* Rename 916_debian_fix_region.h.diff to 916_debian_fix_includes.diff and add
proper header to 915 and 916.
Modified: xorg-lib-xext/trunk/debian/CHANGESETS
===================================================================
--- xorg-lib-xext/trunk/debian/CHANGESETS 2004-10-24 06:49:06 UTC (rev
108)
+++ xorg-lib-xext/trunk/debian/CHANGESETS 2004-10-25 03:34:00 UTC (rev
109)
@@ -8,7 +8,11 @@
(It should always be safe to merge the latest version of TODO or CHANGESETS
files anywhere.)
-* Import initial debian/* files
+* Import initial debian/* files.
106
+* Rename 916_debian_fix_region.h.diff to 916_debian_fix_includes.diff and add
+ proper header to 915 and 916.
+ 108
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: xorg-lib-xext/trunk/debian/patches/915_debian_fix_Imakefiles.diff
===================================================================
--- xorg-lib-xext/trunk/debian/patches/915_debian_fix_Imakefiles.diff
2004-10-24 06:49:06 UTC (rev 108)
+++ xorg-lib-xext/trunk/debian/patches/915_debian_fix_Imakefiles.diff
2004-10-25 03:34:00 UTC (rev 109)
@@ -1,3 +1,10 @@
+$Id$
+
+This patch will collect all the bits required to fix up the changes
+introduced by splitting the tree.
+
+Patch by Fabio M. Di Nitto.
+
diff -ruN xc-old/lib/Xext/Imakefile xc/lib/Xext/Imakefile
--- xc-old/lib/Xext/Imakefile 2004-08-16 15:02:59.000000000 +0000
+++ xc/lib/Xext/Imakefile 2004-10-24 04:57:19.993836504 +0000
Copied: xorg-lib-xext/trunk/debian/patches/916_debian_fix_includes.diff (from
rev 108, xorg-lib-xext/trunk/debian/patches/916_debian_fix_region.h.diff)
===================================================================
--- xorg-lib-xext/trunk/debian/patches/916_debian_fix_region.h.diff
2004-10-24 06:49:06 UTC (rev 108)
+++ xorg-lib-xext/trunk/debian/patches/916_debian_fix_includes.diff
2004-10-25 03:34:00 UTC (rev 109)
@@ -0,0 +1,32 @@
+$Id$
+
+This patch fixes the search of two include files provided by libX11-dev,
+from the static location into the monolitich tree to the normal X11/
+path.
+
+This patch by Fabio M. Di Nitto.
+
+diff -ruN xc-old/lib/Xext/XShape.c xc/lib/Xext/XShape.c
+--- xc-old/lib/Xext/XShape.c 2004-04-23 18:43:41.000000000 +0000
++++ xc/lib/Xext/XShape.c 2004-10-24 05:12:02.977602568 +0000
+@@ -30,7 +30,7 @@
+ #define NEED_REPLIES
+ #include <X11/Xlibint.h>
+ #include <X11/Xutil.h>
+-#include "region.h" /* in Xlib sources */
++#include <X11/region.h>
+ #include <X11/extensions/Xext.h>
+ #include <X11/extensions/extutil.h>
+ #include <X11/extensions/shapestr.h>
+diff -ruN xc-old/lib/Xext/XShm.c xc/lib/Xext/XShm.c
+--- xc-old/lib/Xext/XShm.c 2004-04-23 18:43:41.000000000 +0000
++++ xc/lib/Xext/XShm.c 2004-10-24 05:16:50.688863808 +0000
+@@ -37,7 +37,7 @@
+ #include <X11/extensions/shmstr.h>
+ #include <X11/extensions/Xext.h>
+ #include <X11/extensions/extutil.h>
+-#include "ImUtil.h"
++#include <X11/ImUtil.h>
+
+ static XExtensionInfo _shm_info_data;
+ static XExtensionInfo *shm_info = &_shm_info_data;
Deleted: xorg-lib-xext/trunk/debian/patches/916_debian_fix_region.h.diff
===================================================================
--- xorg-lib-xext/trunk/debian/patches/916_debian_fix_region.h.diff
2004-10-24 06:49:06 UTC (rev 108)
+++ xorg-lib-xext/trunk/debian/patches/916_debian_fix_region.h.diff
2004-10-25 03:34:00 UTC (rev 109)
@@ -1,24 +0,0 @@
-diff -ruN xc-old/lib/Xext/XShape.c xc/lib/Xext/XShape.c
---- xc-old/lib/Xext/XShape.c 2004-04-23 18:43:41.000000000 +0000
-+++ xc/lib/Xext/XShape.c 2004-10-24 05:12:02.977602568 +0000
-@@ -30,7 +30,7 @@
- #define NEED_REPLIES
- #include <X11/Xlibint.h>
- #include <X11/Xutil.h>
--#include "region.h" /* in Xlib sources */
-+#include <X11/region.h>
- #include <X11/extensions/Xext.h>
- #include <X11/extensions/extutil.h>
- #include <X11/extensions/shapestr.h>
-diff -ruN xc-old/lib/Xext/XShm.c xc/lib/Xext/XShm.c
---- xc-old/lib/Xext/XShm.c 2004-04-23 18:43:41.000000000 +0000
-+++ xc/lib/Xext/XShm.c 2004-10-24 05:16:50.688863808 +0000
-@@ -37,7 +37,7 @@
- #include <X11/extensions/shmstr.h>
- #include <X11/extensions/Xext.h>
- #include <X11/extensions/extutil.h>
--#include "ImUtil.h"
-+#include <X11/ImUtil.h>
-
- static XExtensionInfo _shm_info_data;
- static XExtensionInfo *shm_info = &_shm_info_data;
