Re: testers wanted for xfree86 4.1.0-14pre15v3
On Monday 11 March 2002 23:55, Branden Robinson wrote:
> > <crass bribe>The sooner I can put this release to bed, the sooner I can
> work on 4.2.0.</crass bribe>
>
> Experimental versions of the X packages are available at my repository.
>
> Please test these so that 4.1.0-15 can be a solid release, worthy of the
> woody release. Please direct feedback to the debian-x list.
>
Here is a MANIFEST patch. I don't know why the README files are not
installed. The MANIFEST check fails, if I add them. We could introduce
a NOT_BUILDING_XF86_SERVER define and install the two files in debian/rules
if the define is set as it is currently done with NOT_BUILDING_X_SERVER.
Everything else builds fine on s390.
Btw., the xserver-xfree86 package builds as well. If you are interested, a
patch is attached.
-- debian/MANIFEST.s390 Tue Mar 12 07:04:26 2002
+++ debian/MANIFEST.s390.new Tue Mar 12 08:47:15 2002
@@ -960,2 +959,0 @@
-usr/X11R6/lib/X11/doc/README
-usr/X11R6/lib/X11/doc/README.fonts
@@ -6668,0 +6667,7 @@
+usr/share/configlets/xserver-common/desktop.xpm
+usr/share/configlets/xserver-common/main.glade
+usr/share/configlets/xserver-common/main.py
+usr/share/configlets/xserver-common/monitor.xpm
+usr/share/configlets/xserver-common/pointer.xpm
+usr/share/configlets/xserver-common/videocard.xpm
+usr/share/configlets/xserver-common/xserver.xpm
Regards,
Gerhard
diff -urN debian/control debian-s390/control
--- debian/control Tue Mar 12 07:04:26 2002
+++ debian-s390/control Tue Mar 12 09:23:09 2002
@@ -802,7 +802,7 @@
xfonts-base, xfonts-100dpi or xfonts-75dpi, and xfonts-scalable packages.
Package: xserver-xfree86
-Architecture: alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc sparc
+Architecture: any
Depends: debconf (>> 0.5), xserver-common (>= 4.1.0-10), ${shlibs:Depends}
Suggests: mdetect, read-edid
Conflicts: libxfont-xtt
diff -urN debian/patches/500_s390_support.diff debian-s390/patches/500_s390_support.diff
--- debian/patches/500_s390_support.diff Tue Mar 12 09:03:38 2002
+++ debian-s390/patches/500_s390_support.diff Tue Mar 12 09:25:56 2002
@@ -12,25 +12,6 @@
#include <lnxLib.rules>
#ifdef KDriveXServer
# include <kdrive.cf>
-diff -urN xc/config/cf/xfree86.cf xc-s390/config/cf/xfree86.cf
---- xc/config/cf/xfree86.cf Mon Mar 11 07:47:38 2002
-+++ xc-s390/config/cf/xfree86.cf Mon Mar 11 07:54:26 2002
-@@ -676,6 +676,15 @@
- # endif
- #endif
-
-+/*
-+ * No XF86Server for the S/390 platform.
-+ */
-+#ifdef s390Architecture
-+# ifndef XF86Server
-+# define XF86Server NO
-+# endif
-+#endif
-+
- #if BuildDebug
- # define DebugDefines -DBUILDDEBUG
- #else
diff -urN xc/programs/Xserver/include/servermd.h xc-s390/programs/Xserver/include/servermd.h
--- xc/programs/Xserver/include/servermd.h Mon Mar 11 07:47:38 2002
+++ xc-s390/programs/Xserver/include/servermd.h Mon Mar 11 08:02:38 2002
diff -urN debian/xserver-xfree86.files.s390 debian-s390/xserver-xfree86.files.s390
--- debian/xserver-xfree86.files.s390 Thu Jan 1 00:00:00 1970
+++ debian-s390/xserver-xfree86.files.s390 Tue Mar 12 09:22:40 2002
@@ -0,0 +1,45 @@
+usr/X11R6/lib/modules/codeconv/libARABIC.a
+usr/X11R6/lib/modules/codeconv/libARMSCII8.a
+usr/X11R6/lib/modules/codeconv/libBIG5.a
+usr/X11R6/lib/modules/codeconv/libBIG5HKSCS.a
+usr/X11R6/lib/modules/codeconv/libDOSENCODING.a
+usr/X11R6/lib/modules/codeconv/libGB2312.a
+usr/X11R6/lib/modules/codeconv/libGBK.a
+usr/X11R6/lib/modules/codeconv/libGEORGIAN.a
+usr/X11R6/lib/modules/codeconv/libISO8859_1.a
+usr/X11R6/lib/modules/codeconv/libISO8859_10.a
+usr/X11R6/lib/modules/codeconv/libISO8859_11.a
+usr/X11R6/lib/modules/codeconv/libISO8859_14.a
+usr/X11R6/lib/modules/codeconv/libISO8859_15.a
+usr/X11R6/lib/modules/codeconv/libISO8859_2.a
+usr/X11R6/lib/modules/codeconv/libISO8859_3.a
+usr/X11R6/lib/modules/codeconv/libISO8859_4.a
+usr/X11R6/lib/modules/codeconv/libISO8859_5.a
+usr/X11R6/lib/modules/codeconv/libISO8859_6.a
+usr/X11R6/lib/modules/codeconv/libISO8859_7.a
+usr/X11R6/lib/modules/codeconv/libISO8859_8.a
+usr/X11R6/lib/modules/codeconv/libISO8859_9.a
+usr/X11R6/lib/modules/codeconv/libJISX0201.a
+usr/X11R6/lib/modules/codeconv/libJISX0208.a
+usr/X11R6/lib/modules/codeconv/libJISX0212.a
+usr/X11R6/lib/modules/codeconv/libKOI8.a
+usr/X11R6/lib/modules/codeconv/libKSC5601.a
+usr/X11R6/lib/modules/codeconv/libKSCJOHAB.a
+usr/X11R6/lib/modules/codeconv/libMULEENCODING.a
+usr/X11R6/lib/modules/codeconv/libTCVN.a
+usr/X11R6/lib/modules/codeconv/libVISCII.a
+usr/X11R6/lib/modules/extensions/libGLcore.a
+usr/X11R6/lib/modules/extensions/libdbe.a
+usr/X11R6/lib/modules/extensions/libextmod.a
+usr/X11R6/lib/modules/extensions/libglx.a
+usr/X11R6/lib/modules/extensions/librecord.a
+usr/X11R6/lib/modules/extensions/libxie.a
+usr/X11R6/lib/modules/fonts/libbitmap.a
+usr/X11R6/lib/modules/fonts/libfreetype.a
+usr/X11R6/lib/modules/fonts/libspeedo.a
+usr/X11R6/lib/modules/fonts/libtype1.a
+usr/X11R6/lib/modules/fonts/libxtt.a
+usr/X11R6/lib/modules/libcfb.a
+usr/X11R6/lib/modules/libcfb32.a
+usr/X11R6/lib/modules/libfb.a
+usr/X11R6/lib/modules/libmfb.a
Reply to: