[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force XOrg SVN commit: r77 - in xorg-lib-fs/trunk/debian: . patches



Author: fabbione
Date: 2004-10-22 00:20:17 -0500 (Fri, 22 Oct 2004)
New Revision: 77

Added:
   xorg-lib-fs/trunk/debian/patches/915_debian_fix_Imakefiles.diff
Removed:
   xorg-lib-fs/trunk/debian/patches/915_debian_X11R6_and_X11_various_fixups.diff
Modified:
   xorg-lib-fs/trunk/debian/CHANGESETS
Log:
* Rename 915_debian_X11R6_and_X11_various_fixups.diff to
  915_debian_fix_Imakefiles.diff for consistency and add
  proper header to the patch.



Modified: xorg-lib-fs/trunk/debian/CHANGESETS
===================================================================
--- xorg-lib-fs/trunk/debian/CHANGESETS	2004-10-22 04:19:50 UTC (rev 76)
+++ xorg-lib-fs/trunk/debian/CHANGESETS	2004-10-22 05:20:17 UTC (rev 77)
@@ -11,4 +11,9 @@
 * Import initial debian/* files
     76
 
+* Rename 915_debian_X11R6_and_X11_various_fixups.diff to
+  915_debian_fix_Imakefiles.diff for consistency and add
+  proper header to the patch.
+    77
+
 vim:set ai et sts=4 sw=4 tw=80:

Deleted: xorg-lib-fs/trunk/debian/patches/915_debian_X11R6_and_X11_various_fixups.diff
===================================================================
--- xorg-lib-fs/trunk/debian/patches/915_debian_X11R6_and_X11_various_fixups.diff	2004-10-22 04:19:50 UTC (rev 76)
+++ xorg-lib-fs/trunk/debian/patches/915_debian_X11R6_and_X11_various_fixups.diff	2004-10-22 05:20:17 UTC (rev 77)
@@ -1,12 +0,0 @@
-diff -ruN xc-old/lib/FS/Imakefile xc/lib/FS/Imakefile
---- xc-old/lib/FS/Imakefile	2004-08-27 22:47:45.000000000 +0000
-+++ xc/lib/FS/Imakefile	2004-10-21 12:59:26.210772584 +0000
-@@ -28,7 +28,7 @@
- 
- HEADERS = FSlib.h
- 
--INCLUDES = -I$(FONTINCSRC)
-+INCLUDES = -I$(FONTINCSRC) -I$(TOP)/include
- 
- SRCS =	FSClServ.c FSCloseFt.c FSConnServ.c FSErrDis.c FSErrHndlr.c \
- 	FSFlush.c FSFontInfo.c FSFtNames.c FSGetCats.c FSListCats.c \

Copied: xorg-lib-fs/trunk/debian/patches/915_debian_fix_Imakefiles.diff (from rev 76, xorg-lib-fs/trunk/debian/patches/915_debian_X11R6_and_X11_various_fixups.diff)
===================================================================
--- xorg-lib-fs/trunk/debian/patches/915_debian_X11R6_and_X11_various_fixups.diff	2004-10-22 04:19:50 UTC (rev 76)
+++ xorg-lib-fs/trunk/debian/patches/915_debian_fix_Imakefiles.diff	2004-10-22 05:20:17 UTC (rev 77)
@@ -0,0 +1,19 @@
+$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/FS/Imakefile xc/lib/FS/Imakefile
+--- xc-old/lib/FS/Imakefile	2004-08-27 22:47:45.000000000 +0000
++++ xc/lib/FS/Imakefile	2004-10-21 12:59:26.210772584 +0000
+@@ -28,7 +28,7 @@
+ 
+ HEADERS = FSlib.h
+ 
+-INCLUDES = -I$(FONTINCSRC)
++INCLUDES = -I$(FONTINCSRC) -I$(TOP)/include
+ 
+ SRCS =	FSClServ.c FSCloseFt.c FSConnServ.c FSErrDis.c FSErrHndlr.c \
+ 	FSFlush.c FSFontInfo.c FSFtNames.c FSGetCats.c FSListCats.c \



Reply to: