X Strike Force XOrg SVN commit: r40 - in xorg-config/trunk/debian: . patches
Author: fabbione
Date: 2004-10-14 04:44:33 -0500 (Thu, 14 Oct 2004)
New Revision: 40
Modified:
xorg-config/trunk/debian/CHANGESETS
xorg-config/trunk/debian/patches/901_kill_X11R6
xorg-config/trunk/debian/rules
Log:
Fix FTBFS on a clean chroot:
+ remove the need of external includes.
+ update patch 901_kill_X11R6 to fix Imakefile's for pswrap and util/.
+ update debian/rules to create a fake X11 symlink to not break
all include location.
+ make the package able to really bootstrap on its own Build-deps.
Modified: xorg-config/trunk/debian/CHANGESETS
===================================================================
--- xorg-config/trunk/debian/CHANGESETS 2004-10-07 20:44:47 UTC (rev 39)
+++ xorg-config/trunk/debian/CHANGESETS 2004-10-14 09:44:33 UTC (rev 40)
@@ -41,4 +41,12 @@
(Note: the other lintian warnings will disappear naturally)
39
+* Fix FTBFS on a clean chroot:
+ + remove the need of external includes.
+ + update patch 901_kill_X11R6 to fix Imakefile's for pswrap and util/.
+ + update debian/rules to create a fake X11 symlink to not break
+ all include location.
+ + make the package able to really bootstrap on its own Build-deps.
+ 40
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: xorg-config/trunk/debian/patches/901_kill_X11R6
===================================================================
--- xorg-config/trunk/debian/patches/901_kill_X11R6 2004-10-07 20:44:47 UTC (rev 39)
+++ xorg-config/trunk/debian/patches/901_kill_X11R6 2004-10-14 09:44:33 UTC (rev 40)
@@ -1,6 +1,6 @@
diff -ruN xc-old/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl
---- xc-old/config/cf/Imake.tmpl 2004-10-07 21:32:21.565220000 +0200
-+++ xc/config/cf/Imake.tmpl 2004-10-07 21:32:21.660205936 +0200
+--- xc-old/config/cf/Imake.tmpl 2004-10-14 11:26:16.258040000 +0200
++++ xc/config/cf/Imake.tmpl 2004-10-14 11:26:16.350026392 +0200
@@ -871,7 +871,7 @@
#endif
#ifndef ManDirectoryRoot
@@ -12,7 +12,7 @@
#endif
diff -ruN xc-old/config/cf/site.def xc/config/cf/site.def
--- xc-old/config/cf/site.def 2004-05-06 17:08:25.000000000 +0200
-+++ xc/config/cf/site.def 2004-10-07 21:32:21.661205784 +0200
++++ xc/config/cf/site.def 2004-10-14 11:26:16.350026392 +0200
@@ -72,7 +72,7 @@
#ifdef AfterVendorCF
@@ -24,7 +24,25 @@
/*
diff -ruN xc-old/config/cf/X11.tmpl xc/config/cf/X11.tmpl
--- xc-old/config/cf/X11.tmpl 2004-09-03 18:18:18.000000000 +0200
-+++ xc/config/cf/X11.tmpl 2004-10-07 21:51:46.418135816 +0200
++++ xc/config/cf/X11.tmpl 2004-10-14 11:30:26.045066976 +0200
+@@ -1420,7 +1420,7 @@
+ #endif
+ #ifndef XTop
+ # if ImportX11
+-# define XTop $(TOP)/imports/x11
++# define XTop $(TOP)/imports/
+ # else
+ # define XTop $(TOP)
+ # endif
+@@ -1433,7 +1433,7 @@
+ # endif
+ #endif
+ #ifndef XBuildIncDir
+-# define XBuildIncDir $(XBUILDINCROOT)/include/X11
++# define XBuildIncDir $(XBUILDINCROOT)/include
+ #endif
+ #ifndef XBuildIncTop
+ # define XBuildIncTop ../../..
@@ -1464,9 +1464,9 @@
#endif
#ifndef LibDir
@@ -50,3 +68,27 @@
#endif
#ifndef DocHtmlDir
#define DocHtmlDir $(DOCDIR)/html
+diff -ruN xc-old/config/pswrap/Imakefile xc/config/pswrap/Imakefile
+--- xc-old/config/pswrap/Imakefile 2004-04-23 20:42:00.000000000 +0200
++++ xc/config/pswrap/Imakefile 2004-10-14 11:36:40.242180368 +0200
+@@ -6,6 +6,8 @@
+ YFLAGS = -d
+ EXTRA_LIBRARIES = LexLib
+
++INCLUDES = -I$(TOP)/include
++
+ SRCS = main.c pswdict.c pswfile.c \
+ systemnames.c psw.c pswstring.c pswsemantics.c
+
+diff -ruN xc-old/config/util/Imakefile xc/config/util/Imakefile
+--- xc-old/config/util/Imakefile 2004-06-26 14:50:32.000000000 +0200
++++ xc/config/util/Imakefile 2004-10-14 11:35:01.983118016 +0200
+@@ -6,6 +6,8 @@
+
+ CCMDEP_PROG = ccmakedep
+
++INCLUDES = -I$(TOP)/include
++
+ #ifdef ExportListGenSource
+ EXPORTLISTGEN = exportlistgen
+ #endif
Modified: xorg-config/trunk/debian/rules
===================================================================
--- xorg-config/trunk/debian/rules 2004-10-07 20:44:47 UTC (rev 39)
+++ xorg-config/trunk/debian/rules 2004-10-14 09:44:33 UTC (rev 40)
@@ -27,6 +27,9 @@
dh_testdir
echo "" > $(SOURCE_TREE)/config/cf/date.def
echo "" > $(SOURCE_TREE)/config/cf/host.def
+ # create symlink to not depend on X11
+ cd $(SOURCE_TREE)/include && \
+ ln -sf . X11
touch $@
build: $(STAMP_DIR)/build
Reply to: