Bug#240889: Patch for bug 240889 (amd64 build) against current svn trunk/debian
tag 240889 + patch
The following patch works for me.
Regards
Andreas Jochens
diff -urN debian.trunk/control debian/control
--- debian.trunk/control 2004-04-15 11:47:16.000000000 +0200
+++ debian/control 2004-04-15 15:28:58.000000000 +0200
@@ -4,7 +4,7 @@
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Branden Robinson <branden@debian.org>, Fabio Massimo Di Nitto <fabbione@debian.org>
Standards-Version: 3.6.1
-Build-Depends: dpkg (>= 1.7.0), flex, bison, bsdmainutils, groff, zlib1g-dev | libz-dev, libncurses5-dev | libncurses-dev, libpam0g-dev | libpam-dev, libfreetype6-dev, libpaperg, libstdc++5-dev | libstdc++-dev, tetex-bin, po-debconf, debhelper (>= 4.1.16), html2text, libglide2-dev (>> 2001.01.26) [i386], libglide3-dev (>= 2002.04.10-3) [alpha i386], linux-kernel-headers [alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sh], linux-kernel-headers (>= 2.5.999-test7-bk-15) [sparc], libpng12-dev | libpng-dev, libexpat1-dev, libfontconfig1-dev, fontconfig, bzip2, libxft-dev (>= 2.1.2), libxrender-dev (>= 0.8.3), libxcursor-dev, dbs, m4
+Build-Depends: dpkg (>= 1.7.0), flex, bison, bsdmainutils, groff, zlib1g-dev | libz-dev, libncurses5-dev | libncurses-dev, libpam0g-dev | libpam-dev, libfreetype6-dev, libpaperg, libstdc++5-dev | libstdc++-dev, tetex-bin, po-debconf, debhelper (>= 4.1.16), html2text, libglide2-dev (>> 2001.01.26) [i386], libglide3-dev (>= 2002.04.10-3) [alpha i386], linux-kernel-headers [alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sh], linux-kernel-headers (>= 2.5.999-test7-bk-15) [sparc], libpng12-dev | libpng-dev, libexpat1-dev, libfontconfig1-dev, fontconfig, bzip2, libxft-dev (>= 2.1.2), libxrender-dev (>= 0.8.3), libxcursor-dev, dbs, m4
Build-Conflicts: cpp-3.3 (<< 1:3.3.3-0pre1)
Package: lbxproxy
@@ -1240,7 +1240,7 @@
Internet hosts will be allowed inbound access to local X servers.
Package: xlibmesa-dri
-Architecture: alpha i386 ia64 powerpc sparc
+Architecture: alpha amd64 i386 ia64 powerpc sparc
Depends: xlibmesa-gl
Conflicts: xlibmesa3 (<< 4.2.1-5), xlibmesa3-gl
Replaces: xlibmesa3 (<< 4.2.1-5), xlibmesa3-gl
@@ -1251,7 +1251,7 @@
not by the X server itself.)
Package: xlibmesa-dri-dbg
-Architecture: alpha i386 ia64 powerpc sparc
+Architecture: alpha amd64 i386 ia64 powerpc sparc
Depends: xlibmesa-dri (= ${Source-Version})
Conflicts: xlibmesa-gl-dbg (<< 4.3.0), xlibmesa3-gl-dbg (>= 4.2.1-13)
Replaces: xlibmesa-gl-dbg (<< 4.3.0), xlibmesa3-gl-dbg (>= 4.2.1-13)
@@ -1372,7 +1372,7 @@
Package: xlibosmesa4
Section: libs
-Architecture: alpha i386 ia64 powerpc sparc
+Architecture: alpha amd64 i386 ia64 powerpc sparc
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Mesa off-screen rendering library [XFree86]
Mesa is a 3D graphics library which presents an API intended to be compatible
@@ -1391,7 +1391,7 @@
Package: xlibosmesa4-dbg
Section: libdevel
Priority: extra
-Architecture: alpha i386 ia64 powerpc sparc
+Architecture: alpha amd64 i386 ia64 powerpc sparc
Depends: xlibosmesa4 (= ${Source-Version}), ${misc:Depends}
Description: Mesa off-screen rendering library (unstripped) [XFree86]
This package is useful to provide a backtrace with symbol names in a
@@ -1406,7 +1406,7 @@
Package: xlibosmesa-dev
Section: libdevel
-Architecture: alpha i386 ia64 powerpc sparc
+Architecture: alpha amd64 i386 ia64 powerpc sparc
Depends: xlibosmesa4 (= ${Source-Version}), libgl-dev, libc6-dev | libc-dev
Description: Mesa off-screen rendering library development files [XFree86]
xlibosmesa-dev provides static versions of the libraries provided in
@@ -1582,7 +1582,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 netbsd-i386 powerpc sh3 sh4 sparc
+Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel netbsd-i386 powerpc sh3 sh4 sparc
Depends: xserver-common (>= 4.2.1-10), ${shlibs:Depends}, ${misc:Depends}
Suggests: discover, mdetect, read-edid, libglide2 (>> 2001.01.26)
Conflicts: libxfont-xtt
@@ -1616,7 +1616,7 @@
Package: xserver-xfree86-dbg
Priority: extra
-Architecture: alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel netbsd-i386 powerpc sh3 sh4 sparc
+Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel netbsd-i386 powerpc sh3 sh4 sparc
Depends: xserver-common (>= 4.2.1-10), ${shlibs:Depends}, ${misc:Depends}
Recommends: xserver-xfree86
Suggests: discover, mdetect, read-edid
diff -urN debian.trunk/patches/899-amd64-XlcDL.diff debian/patches/899-amd64-XlcDL.diff
--- debian.trunk/patches/899-amd64-XlcDL.diff 1970-01-01 01:00:00.000000000 +0100
+++ debian/patches/899-amd64-XlcDL.diff 2004-04-15 12:23:29.000000000 +0200
@@ -0,0 +1,12 @@
+diff -urN xc-dist/lib/X11/XlcDL.c xc/lib/X11/XlcDL.c
+--- xc-dist/lib/X11/XlcDL.c 2002-11-25 08:04:53.000000000 -0600
++++ xc/lib/X11/XlcDL.c 2004-04-15 05:10:31.325361544 -0500
+@@ -58,7 +58,7 @@
+ #ifdef _LP64
+ # if defined(__sparcv9)
+ # define _MACH64_NAME "sparcv9"
+-# elif defined(__ia64__)
++# elif defined(__ia64__) || defined(__amd64__)
+ # undef MACH64_NAME
+ # else
+ # error "Unknown architecture"
diff -urN debian.trunk/scripts/vars.amd64 debian/scripts/vars.amd64
--- debian.trunk/scripts/vars.amd64 1970-01-01 01:00:00.000000000 +0100
+++ debian/scripts/vars.amd64 2004-04-15 11:52:27.000000000 +0200
@@ -0,0 +1,7 @@
+# This file is NOT a shell script.
+#
+# This file gets included by both debian/rules (make) AND the scripts in
+# debian/scripts (Bourne shell).
+XWSC_SPECIAL_DEPENDS="xserver-xfree86, xlibmesa-dri, "
+XWSD_SPECIAL_DEPENDS="xlibosmesa4-dbg, xlibosmesa-dev, "
+XLIBMESA_GL_SPECIAL_DEPENDS="xlibmesa-dri, "
Reply to: