X Strike Force X.Org X11 SVN commit: r596 - branches/6.9/debian
Author: dnusinow
Date: 2005-09-09 18:03:58 -0500 (Fri, 09 Sep 2005)
New Revision: 596
Modified:
branches/6.9/debian/changelog
branches/6.9/debian/control
Log:
* Merge missed portions on patch target in debian/rules
* Remove 000k_Xvfb_re-enable_backing_store.diff, as it is obsolete
* Fix NONDBG_PACKAGES assignment in debian/rules
* Re-do build-depend versions for render and xrender. They were set to my
previous, goofed upload.
Modified: branches/6.9/debian/changelog
===================================================================
--- branches/6.9/debian/changelog 2005-09-08 09:28:22 UTC (rev 595)
+++ branches/6.9/debian/changelog 2005-09-09 23:03:58 UTC (rev 596)
@@ -1,4 +1,4 @@
-xorg-x11 (6.9.0.dfsg.1-0pre1+SVN) UNRELEASED; urgency=low
+xorg-x11 (6.8.99.900.dfsg.1-0pre1) UNRELEASED; urgency=low
[ David Nusinow ]
* Remove xterm references. Upstream is no longer shipping it in the monolith
Modified: branches/6.9/debian/control
===================================================================
--- branches/6.9/debian/control 2005-09-08 09:28:22 UTC (rev 595)
+++ branches/6.9/debian/control 2005-09-09 23:03:58 UTC (rev 596)
@@ -4,7 +4,7 @@
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
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+CVS), render-dev (>> 1:0.9+CVS), zlib1g-dev | libz-dev, debhelper (>= 4.1.16), dpkg-dev (>= 1.10.14), linux-kernel-headers (>= 2.6.13+0rc3-1.1) [!hurd-i386 !netbsd-i386 !kfreebsd-i386], lynx, po-debconf, quilt, gcc-4.0 (>= 4.0.1-3)
+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+CVS20050905), render-dev (>> 1:0.9+CVS20050905), zlib1g-dev | libz-dev, debhelper (>= 4.1.16), dpkg-dev (>= 1.10.14), linux-kernel-headers (>= 2.6.13+0rc3-1.1) [!hurd-i386 !netbsd-i386 !kfreebsd-i386], 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.6.13+0rc3-1.1)
# Reasons for Build-Depends:
#
@@ -227,7 +227,7 @@
# xc/programs/xterm/aclocal.m4:#include <X11/Xft/Xft.h>],[
# xc/programs/xterm/configure:#include <X11/Xft/Xft.h>
# xc/programs/xterm/ptyx.h:#include <X11/Xft/Xft.h>
-# libxrender-dev (>= 1:0.9.0+CVS)
+# libxrender-dev (>= 1:0.9.0+CVS20050905)
# R xc/lib/Xft/Xft.h:#include <X11/extensions/Xrender.h>
# R xc/lib/Xft1/Xft.h:#include <X11/extensions/Xrender.h>
# R xc/lib/Xrandr/Xrandr.c:#include <X11/extensions/Xrender.h>
@@ -243,7 +243,7 @@
# xc/programs/xrandr/xrandr.c:#include <X11/extensions/Xrender.h> /* we share subpixel information */
# xc/programs/xterm/aclocal.m4:#include <X11/extensions/Xrender.h>
# xc/programs/xterm/configure:#include <X11/extensions/Xrender.h>
-# render-dev (>= 1:0.9+CVS)
+# render-dev (>= 1:0.9+CVS20050905)
# xc/programs/Xserver/hw/dmx/dmxpict.c:#include "render.h"
# xc/programs/Xserver/hw/dmx/dmxpict.c:#include "renderproto.h"
# xc/programs/Xserver/render/render.c:#include "render.h"
Reply to: