Author: ender
Date: 2005-08-02 12:51:04 -0500 (Tue, 02 Aug 2005)
New Revision: 473

Modified:
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/patches/series
Log:
- patches/general/030_libvgahw_gcc4_volatile_fix.diff: Disabled by now in
  order to test if the gcc 4.0.1-3 workaround is enough.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog      2005-08-02 15:28:32 UTC (rev 472)
+++ trunk/debian/changelog      2005-08-02 17:51:04 UTC (rev 473)
@@ -75,6 +75,8 @@
        the list of mouse devices dynamically.
      - Fixed reference to migrated items in xserver.xorg.config.in. Thanks,
        Joey Hess (closes: #318276).
+     - patches/general/030_libvgahw_gcc4_volatile_fix.diff: Disabled by now in
+       order to test if the gcc 4.0.1-3 workaround is enough.
 
   Changes by Eugene Konev and David Nusinow:
      - Switch from dbs to quilt
@@ -84,7 +86,7 @@
        - Add general/022_disable_xmh.diff to not build it
        - Remove xmh from MANIFEST files and xlibs-data.installs
 
- -- David Martínez Moreno <[EMAIL PROTECTED]>  Mon,  1 Aug 2005 16:28:59 +0200
+ -- David Martínez Moreno <[EMAIL PROTECTED]>  Mon,  1 Aug 2005 20:32:19 +0200
 
 xorg-x11 (6.8.2.dfsg.1-4) unstable; urgency=low
 

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control        2005-08-02 15:28:32 UTC (rev 472)
+++ trunk/debian/control        2005-08-02 17:51:04 UTC (rev 473)
@@ -4,7 +4,7 @@
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL 
PROTECTED]>, Fabio M. Di Nitto <[EMAIL PROTECTED]>
 Standards-Version: 3.6.1
-Build-Depends: bison, bsdmainutils, flex, fontconfig, groff, tetex-bin, 
libexpat1-dev | libexpat-dev, libfreetype6-dev, libglide2-dev (>> 2001.01.26) 
[i386], libglide3-dev (>= 2002.04.10-7) [alpha amd64 i386 ia64], 
libncurses5-dev | libncurses-dev, libselinux1-dev [!kfreebsd-i386 !hurd-i386], 
libpam0g-dev | libpam-dev, libpng12-dev | libpng-dev, libxcursor-dev, 
libxft-dev (>> 2.1.2), libxrender-dev (>> 1:0.9.0), render-dev (>> 1:0.9), 
zlib1g-dev | libz-dev, debhelper (>= 4.1.16), dpkg-dev (>= 1.10.14), lynx, 
po-debconf, quilt
+Build-Depends: bison, bsdmainutils, flex, fontconfig, groff, tetex-bin, 
libexpat1-dev | libexpat-dev, libfreetype6-dev, libglide2-dev (>> 2001.01.26) 
[i386], libglide3-dev (>= 2002.04.10-7) [alpha amd64 i386 ia64], 
libncurses5-dev | libncurses-dev, libselinux1-dev [!kfreebsd-i386 !hurd-i386], 
libpam0g-dev | libpam-dev, libpng12-dev | libpng-dev, libxcursor-dev, 
libxft-dev (>> 2.1.2), libxrender-dev (>> 1:0.9.0), render-dev (>> 1:0.9), 
zlib1g-dev | libz-dev, debhelper (>= 4.1.16), dpkg-dev (>= 1.10.14), lynx, 
po-debconf, quilt, gcc-4.0 (>= 4.0.1-3)
 Build-Conflicts: cpp-3.3 (<< 1:3.3.3-0pre1), linux-kernel-headers (<< 
2.5.999-test7-bk-15) [sparc]
 
 # Reasons for Build-Depends:
@@ -279,6 +279,8 @@
 #   lynx                            generates plain-text version of Debian X 
FAQ
 #   po-debconf                      debconf template translation support
 #   quilt                           patch management system
+#   gcc-4.0 (>= 4.0.1-3)            GCC 4.0 versions in Debian prior to 
4.0.1-3 did not
+#                                   a patch to correctly compile volatile 
types (see #318218).
 # Reasons for Build-Conflicts:
 #   cpp-3.3 (<< 1:3.3.3-0pre1)
 #       Previous versions of cpp 3.3 had broken support for the -traditional

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2005-08-02 15:28:32 UTC (rev 472)
+++ trunk/debian/patches/series 2005-08-02 17:51:04 UTC (rev 473)
@@ -41,7 +41,6 @@
 general/027_fix_weak_deps_in_libGL.diff -p0
 general/028_loader_speed_hack.diff -p0
 general/029_only_open_proc_bus_pci_devices_once.diff -p0
-general/030_libvgahw_gcc4_volatile_fix.diff -p0
 general/031_disable_libXft1.diff
 general/032_fix_html_specs_generation.diff
 general/035_tdfx_disable_dri_on_16mb_with_highres.diff -p0


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to