Author: dnusinow
Date: 2005-11-26 12:56:39 -0500 (Sat, 26 Nov 2005)
New Revision: 906

Removed:
   branches/6.9/debian/patches/alpha/202_alpha_typedef_card32.diff
Modified:
   branches/6.9/debian/changelog
   branches/6.9/debian/patches/series
   branches/6.9/debian/scripts/mir-false-negatives
   branches/6.9/debian/xbase-clients.install
Log:
* Remove obsolete patch alpha/202_alpha_typedef_card32.diff
* Remove xdpr from xbase-clients to allow xprint to install. Thanks Martin
  Michlmayer.


Modified: branches/6.9/debian/changelog
===================================================================
--- branches/6.9/debian/changelog       2005-11-26 17:13:53 UTC (rev 905)
+++ branches/6.9/debian/changelog       2005-11-26 17:56:39 UTC (rev 906)
@@ -1,8 +1,10 @@
 xorg-x11 (6.8.99.902.dfsg.1-1+SVN) UNRELEASED; urgency=low
 
-  * 
+  * Remove obsolete patch alpha/202_alpha_typedef_card32.diff
+  * Remove xdpr from xbase-clients to allow xprint to install. Thanks Martin
+    Michlmayer.
 
- -- David Nusinow <[EMAIL PROTECTED]>  Mon, 14 Nov 2005 18:19:54 -0500
+ -- David Nusinow <[EMAIL PROTECTED]>  Sat, 26 Nov 2005 12:51:25 -0500
 
 xorg-x11 (6.8.99.902.dfsg.1-1) experimental; urgency=low
 

Deleted: branches/6.9/debian/patches/alpha/202_alpha_typedef_card32.diff
===================================================================
--- branches/6.9/debian/patches/alpha/202_alpha_typedef_card32.diff     
2005-11-26 17:13:53 UTC (rev 905)
+++ branches/6.9/debian/patches/alpha/202_alpha_typedef_card32.diff     
2005-11-26 17:56:39 UTC (rev 906)
@@ -1,13 +0,0 @@
-Index: xc/programs/Xserver/hw/xfree86/common/compiler.h
-===================================================================
---- xc/programs/Xserver/hw/xfree86/common/compiler.h.orig      2005-10-31 
11:09:39.000000000 -0500
-+++ xc/programs/Xserver/hw/xfree86/common/compiler.h   2005-10-31 
11:10:18.000000000 -0500
-@@ -62,6 +62,8 @@
- # define DO_PROTOTYPES
- #endif
- 
-+# include <X11/Xmd.h>
-+
- /* Allow drivers to use the GCC-supported __inline__ and/or __inline. */
- # ifndef __inline__
- #  if defined(__GNUC__)

Modified: branches/6.9/debian/patches/series
===================================================================
--- branches/6.9/debian/patches/series  2005-11-26 17:13:53 UTC (rev 905)
+++ branches/6.9/debian/patches/series  2005-11-26 17:56:39 UTC (rev 906)
@@ -77,7 +77,6 @@
 sparc/104_sparc_no_mv8_flag.diff -p0
 sparc/105_ffb_dac_typedef_bool.diff
 alpha/201_alpha_freetype_gcc_2.95_bugfix.diff -p0
-alpha/202_alpha_typedef_card32.diff -p0
 m68k/250_m68k_build_scanpci.diff -p0
 arm/300_riscpc_xkb_keycodes.diff -p0
 arm/303_arm_cache_flush.diff -p0

Modified: branches/6.9/debian/scripts/mir-false-negatives
===================================================================
--- branches/6.9/debian/scripts/mir-false-negatives     2005-11-26 17:13:53 UTC 
(rev 905)
+++ branches/6.9/debian/scripts/mir-false-negatives     2005-11-26 17:56:39 UTC 
(rev 906)
@@ -184,6 +184,7 @@
 etc/init.d/xprint      alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips 
mipsel powerpc s390 sparc
 etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh       alpha amd64 arm hppa 
hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 etc/X11/Xsession.d/92xprint-xpserverlist.sh    alpha amd64 arm hppa hurd-i386 
i386 ia64 m68k mips mipsel powerpc s390 sparc
+usr/X11R6/bin/xdpr     alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips 
mipsel powerpc s390 sparc
 usr/X11R6/bin/xplsprinters     alpha amd64 arm hppa hurd-i386 i386 ia64 m68k 
mips mipsel powerpc s390 sparc
 usr/X11R6/bin/xphelloworld     alpha amd64 arm hppa hurd-i386 i386 ia64 m68k 
mips mipsel powerpc s390 sparc
 usr/X11R6/bin/xpr      alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips 
mipsel powerpc s390 sparc
@@ -191,6 +192,7 @@
 usr/X11R6/bin/xpsimplehelloworld       alpha amd64 arm hppa hurd-i386 i386 
ia64 m68k mips mipsel powerpc s390 sparc
 usr/X11R6/bin/xpxthelloworld   alpha amd64 arm hppa hurd-i386 i386 ia64 m68k 
mips mipsel powerpc s390 sparc
 usr/X11R6/lib/X11/doc/Xprint_FAQ.txt   alpha amd64 arm hppa hurd-i386 i386 
ia64 m68k mips mipsel powerpc s390 sparc
+usr/X11R6/man/man1/xdpr.1x     alpha amd64 arm hppa hurd-i386 i386 ia64 m68k 
mips mipsel powerpc s390 sparc
 usr/X11R6/man/man3/XpCancelDoc.3x      alpha amd64 arm hppa hurd-i386 i386 
ia64 m68k mips mipsel powerpc s390 sparc
 usr/X11R6/man/man3/XpCancelJob.3x      alpha amd64 arm hppa hurd-i386 i386 
ia64 m68k mips mipsel powerpc s390 sparc
 usr/X11R6/man/man3/XpCancelPage.3x     alpha amd64 arm hppa hurd-i386 i386 
ia64 m68k mips mipsel powerpc s390 sparc

Modified: branches/6.9/debian/xbase-clients.install
===================================================================
--- branches/6.9/debian/xbase-clients.install   2005-11-26 17:13:53 UTC (rev 
905)
+++ branches/6.9/debian/xbase-clients.install   2005-11-26 17:56:39 UTC (rev 
906)
@@ -68,7 +68,6 @@
 usr/X11R6/bin/xcutsel
 usr/X11R6/bin/xdbedizzy
 usr/X11R6/bin/xditview
-usr/X11R6/bin/xdpr
 usr/X11R6/bin/xdpyinfo
 usr/X11R6/bin/xdriinfo
 usr/X11R6/bin/xedit
@@ -178,7 +177,6 @@
 usr/X11R6/man/man1/xcursorgen.1x
 usr/X11R6/man/man1/xcutsel.1x
 usr/X11R6/man/man1/xdbedizzy.1x
-usr/X11R6/man/man1/xdpr.1x
 usr/X11R6/man/man1/xditview.1x
 usr/X11R6/man/man1/xdpyinfo.1x
 usr/X11R6/man/man1/xdriinfo.1x


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

Reply via email to