X Strike Force XFree86 SVN commit: rev 667 - in branches/4.3.0/sid/debian: . patches
Author: branden
Date: 2003-10-16 17:58:35 -0500 (Thu, 16 Oct 2003)
New Revision: 667
Added:
branches/4.3.0/sid/debian/patches/250_m68k_build_scanpci.diff
Removed:
branches/4.3.0/sid/debian/xutils.install.m68k
Modified:
branches/4.3.0/sid/debian/MANIFEST.m68k
branches/4.3.0/sid/debian/TODO
branches/4.3.0/sid/debian/changelog
Log:
Enable building of scanpci utility for m68k architecture, and ship the
executable and its manual page in the xutils package for m68k.
- debian/patches/250_m68k_build_scanpci.diff: patch xfree86.cf to not
exclude scanpci from building if Mc68020Architecture is defined
- debian/MANIFEST.m68k: add scanpci and its manpage
- debian/xutils.install.m68k: deleted; m68k can now use the generic
xutils.install file
- debian/TODO: delete corresponding TODO item
Modified: branches/4.3.0/sid/debian/MANIFEST.m68k
===================================================================
--- branches/4.3.0/sid/debian/MANIFEST.m68k 2003-10-16 18:53:32 UTC (rev 666)
+++ branches/4.3.0/sid/debian/MANIFEST.m68k 2003-10-16 22:58:35 UTC (rev 667)
@@ -474,6 +474,7 @@
usr/X11R6/bin/revpath
usr/X11R6/bin/rstart
usr/X11R6/bin/rstartd
+usr/X11R6/bin/scanpci
usr/X11R6/bin/sessreg
usr/X11R6/bin/setxkbmap
usr/X11R6/bin/showfont
@@ -6158,6 +6159,7 @@
usr/X11R6/man/man1/revpath.1x
usr/X11R6/man/man1/rstart.1x
usr/X11R6/man/man1/rstartd.1x
+usr/X11R6/man/man1/scanpci.1x
usr/X11R6/man/man1/sessreg.1x
usr/X11R6/man/man1/setxkbmap.1x
usr/X11R6/man/man1/showfont.1x
Modified: branches/4.3.0/sid/debian/TODO
===================================================================
--- branches/4.3.0/sid/debian/TODO 2003-10-16 18:53:32 UTC (rev 666)
+++ branches/4.3.0/sid/debian/TODO 2003-10-16 22:58:35 UTC (rev 667)
@@ -3,9 +3,6 @@
0pre1v4
-------
-* Enable scanpci build for m68k. No sense building pcitweak but not
- scanpci. And there are one or two PCI-equipped m68k boxes in the world,
- in the form of Medusa Hades machines.
* Go over manifest-install-reconcile output again and do sanity checks.
* Bug #215997: xserver-xfree86: [nv] stripes when using XVideo in
full-screen mode with TFT display at high resolution on NV17 [GeForce4
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2003-10-16 18:53:32 UTC (rev 666)
+++ branches/4.3.0/sid/debian/changelog 2003-10-16 22:58:35 UTC (rev 667)
@@ -103,8 +103,16 @@
- debian/patches/000_stolen_from_HEAD_xterm.diff: renamed from
debian/patches/000_stolen_from_HEAD_xterm_177.diff
- -- Branden Robinson <branden@debian.org> Thu, 16 Oct 2003 13:47:44 -0500
+ * Enable building of scanpci utility for m68k architecture, and ship the
+ executable and its manual page in the xutils package for m68k.
+ - debian/patches/250_m68k_build_scanpci.diff: patch xfree86.cf to not
+ exclude scanpci from building if Mc68020Architecture is defined
+ - debian/MANIFEST.m68k: add scanpci and its manpage
+ - debian/xutils.install.m68k: deleted; m68k can now use the generic
+ xutils.install file
+ -- Branden Robinson <branden@debian.org> Thu, 16 Oct 2003 17:51:03 -0500
+
xfree86 (4.3.0-0pre1v3) experimental; urgency=high
* Update pam_setcred() security fix to xdm to use pam_error and
Added: branches/4.3.0/sid/debian/patches/250_m68k_build_scanpci.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/250_m68k_build_scanpci.diff 2003-10-16 18:53:32 UTC (rev 666)
+++ branches/4.3.0/sid/debian/patches/250_m68k_build_scanpci.diff 2003-10-16 22:58:35 UTC (rev 667)
@@ -0,0 +1,19 @@
+$Id$
+
+There do exist PCI m68k machines in the world; the Medusa Hades is one
+example. Anyway, pcitweak was getting built for m68k, so there's
+really no point leaving this utility disabled for the architecture.
+
+This patch by Branden Robinson. Not submitted upstream yet.
+
+--- xc/config/cf/xfree86.cf~ 2003-10-16 17:39:37.000000000 -0500
++++ xc/config/cf/xfree86.cf 2003-10-16 17:40:17.000000000 -0500
+@@ -1693,7 +1693,7 @@
+ #endif
+ #ifndef BuildScanpci
+ # if SystemV || SystemV4 || \
+- (defined(LinuxArchitecture) && !defined(Mc68020Architecture)) || \
++ defined(LinuxArchitecture) || \
+ defined(i386BsdArchitecture) || defined(LynxOSArchitecture) || \
+ defined(OS2Architecture) || defined(GNUMachArchitecture)
+ # define BuildScanpci YES
Property changes on: branches/4.3.0/sid/debian/patches/250_m68k_build_scanpci.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Deleted: branches/4.3.0/sid/debian/xutils.install.m68k
===================================================================
--- branches/4.3.0/sid/debian/xutils.install.m68k 2003-10-16 18:53:32 UTC (rev 666)
+++ branches/4.3.0/sid/debian/xutils.install.m68k 2003-10-16 22:58:35 UTC (rev 667)
@@ -1,186 +0,0 @@
-etc/X11/rstart/commands/@List
-etc/X11/rstart/commands/ListContexts
-etc/X11/rstart/commands/ListGenericCommands
-etc/X11/rstart/commands/x11r6/@List
-etc/X11/rstart/commands/x11r6/LoadMonitor
-etc/X11/rstart/commands/x11r6/Terminal
-etc/X11/rstart/config
-etc/X11/rstart/contexts/@List
-etc/X11/rstart/contexts/default
-etc/X11/rstart/contexts/x11r6
-etc/X11/rstart/rstartd.real
-usr/X11R6/bin/atobm
-usr/X11R6/bin/bdftopcf
-usr/X11R6/bin/bdftruncate
-usr/X11R6/bin/ccmakedep
-usr/X11R6/bin/cleanlinks
-usr/X11R6/bin/fslsfonts
-usr/X11R6/bin/gccmakedep
-usr/X11R6/bin/imake
-usr/X11R6/bin/lndir
-usr/X11R6/bin/luit
-usr/X11R6/bin/makedepend
-usr/X11R6/bin/makeg
-usr/X11R6/bin/makepsres
-usr/X11R6/bin/makestrs
-usr/X11R6/bin/mergelib
-usr/X11R6/bin/mkcfm
-usr/X11R6/bin/mkdirhier
-usr/X11R6/bin/mkfontdir
-usr/X11R6/bin/mkhtmlindex
-usr/X11R6/bin/pcitweak
-usr/X11R6/bin/pswrap
-usr/X11R6/bin/resize
-usr/X11R6/bin/revpath
-usr/X11R6/bin/rstart
-usr/X11R6/bin/rstartd
-usr/X11R6/bin/sessreg
-usr/X11R6/bin/showfont
-usr/X11R6/bin/showrgb
-usr/X11R6/bin/ucs2any
-usr/X11R6/bin/xfsinfo
-usr/X11R6/bin/xmkmf
-usr/X11R6/bin/xon
-usr/X11R6/lib/X11/config/Amoeba.cf
-usr/X11R6/lib/X11/config/DGUX.cf
-usr/X11R6/lib/X11/config/FreeBSD.cf
-usr/X11R6/lib/X11/config/Imake.cf
-usr/X11R6/lib/X11/config/Imake.rules
-usr/X11R6/lib/X11/config/Imake.tmpl
-usr/X11R6/lib/X11/config/Library.tmpl
-usr/X11R6/lib/X11/config/Mips.cf
-usr/X11R6/lib/X11/config/Motif.rules
-usr/X11R6/lib/X11/config/Motif.tmpl
-usr/X11R6/lib/X11/config/NetBSD.cf
-usr/X11R6/lib/X11/config/Oki.cf
-usr/X11R6/lib/X11/config/OpenBSD.cf
-usr/X11R6/lib/X11/config/QNX4.cf
-usr/X11R6/lib/X11/config/QNX4.rules
-usr/X11R6/lib/X11/config/Server.tmpl
-usr/X11R6/lib/X11/config/ServerLib.tmpl
-usr/X11R6/lib/X11/config/Threads.tmpl
-usr/X11R6/lib/X11/config/Win32.cf
-usr/X11R6/lib/X11/config/Win32.rules
-usr/X11R6/lib/X11/config/WinLib.tmpl
-usr/X11R6/lib/X11/config/X11.rules
-usr/X11R6/lib/X11/config/X11.tmpl
-usr/X11R6/lib/X11/config/apollo.cf
-usr/X11R6/lib/X11/config/bsd.cf
-usr/X11R6/lib/X11/config/bsdLib.rules
-usr/X11R6/lib/X11/config/bsdLib.tmpl
-usr/X11R6/lib/X11/config/bsdi.cf
-usr/X11R6/lib/X11/config/cde.rules
-usr/X11R6/lib/X11/config/cde.tmpl
-usr/X11R6/lib/X11/config/convex.cf
-usr/X11R6/lib/X11/config/cray.cf
-usr/X11R6/lib/X11/config/cygwin.cf
-usr/X11R6/lib/X11/config/cygwin.rules
-usr/X11R6/lib/X11/config/cygwin.tmpl
-usr/X11R6/lib/X11/config/darwin.cf
-usr/X11R6/lib/X11/config/darwinLib.rules
-usr/X11R6/lib/X11/config/darwinLib.tmpl
-usr/X11R6/lib/X11/config/date.def
-usr/X11R6/lib/X11/config/fujitsu.cf
-usr/X11R6/lib/X11/config/generic.cf
-usr/X11R6/lib/X11/config/gnu.cf
-usr/X11R6/lib/X11/config/gnuLib.rules
-usr/X11R6/lib/X11/config/gnuLib.tmpl
-usr/X11R6/lib/X11/config/host.def
-usr/X11R6/lib/X11/config/hp.cf
-usr/X11R6/lib/X11/config/hpLib.rules
-usr/X11R6/lib/X11/config/hpLib.tmpl
-usr/X11R6/lib/X11/config/ibm.cf
-usr/X11R6/lib/X11/config/ibmLib.rules
-usr/X11R6/lib/X11/config/ibmLib.tmpl
-usr/X11R6/lib/X11/config/isc.cf
-usr/X11R6/lib/X11/config/linux.cf
-usr/X11R6/lib/X11/config/lnxLib.rules
-usr/X11R6/lib/X11/config/lnxLib.tmpl
-usr/X11R6/lib/X11/config/lnxdoc.rules
-usr/X11R6/lib/X11/config/lnxdoc.tmpl
-usr/X11R6/lib/X11/config/luna.cf
-usr/X11R6/lib/X11/config/lynx.cf
-usr/X11R6/lib/X11/config/macII.cf
-usr/X11R6/lib/X11/config/mach.cf
-usr/X11R6/lib/X11/config/minix.cf
-usr/X11R6/lib/X11/config/moto.cf
-usr/X11R6/lib/X11/config/ncr.cf
-usr/X11R6/lib/X11/config/nec.cf
-usr/X11R6/lib/X11/config/necLib.rules
-usr/X11R6/lib/X11/config/necLib.tmpl
-usr/X11R6/lib/X11/config/noop.rules
-usr/X11R6/lib/X11/config/nto.cf
-usr/X11R6/lib/X11/config/nto.rules
-usr/X11R6/lib/X11/config/oldlib.rules
-usr/X11R6/lib/X11/config/os2.cf
-usr/X11R6/lib/X11/config/os2.rules
-usr/X11R6/lib/X11/config/os2Lib.rules
-usr/X11R6/lib/X11/config/os2Lib.tmpl
-usr/X11R6/lib/X11/config/osf1.cf
-usr/X11R6/lib/X11/config/osfLib.rules
-usr/X11R6/lib/X11/config/osfLib.tmpl
-usr/X11R6/lib/X11/config/pegasus.cf
-usr/X11R6/lib/X11/config/sco.cf
-usr/X11R6/lib/X11/config/sco5.cf
-usr/X11R6/lib/X11/config/scoLib.rules
-usr/X11R6/lib/X11/config/sequent.cf
-usr/X11R6/lib/X11/config/sgi.cf
-usr/X11R6/lib/X11/config/sgiLib.rules
-usr/X11R6/lib/X11/config/sgiLib.tmpl
-usr/X11R6/lib/X11/config/site.def
-usr/X11R6/lib/X11/config/sony.cf
-usr/X11R6/lib/X11/config/sun.cf
-usr/X11R6/lib/X11/config/sunLib.rules
-usr/X11R6/lib/X11/config/sunLib.tmpl
-usr/X11R6/lib/X11/config/sv3Lib.rules
-usr/X11R6/lib/X11/config/sv3Lib.tmpl
-usr/X11R6/lib/X11/config/sv4Lib.rules
-usr/X11R6/lib/X11/config/sv4Lib.tmpl
-usr/X11R6/lib/X11/config/svr3.cf
-usr/X11R6/lib/X11/config/svr4.cf
-usr/X11R6/lib/X11/config/ultrix.cf
-usr/X11R6/lib/X11/config/usl.cf
-usr/X11R6/lib/X11/config/version.def
-usr/X11R6/lib/X11/config/x386.cf
-usr/X11R6/lib/X11/config/xf86.rules
-usr/X11R6/lib/X11/config/xf86.tmpl
-usr/X11R6/lib/X11/config/xf86site.def
-usr/X11R6/lib/X11/config/xfree86.cf
-usr/X11R6/man/man1/atobm.1x
-usr/X11R6/man/man1/bdftopcf.1x
-usr/X11R6/man/man1/bdftruncate.1x
-usr/X11R6/man/man1/ccmakedep.1x
-usr/X11R6/man/man1/cleanlinks.1x
-usr/X11R6/man/man1/fslsfonts.1x
-usr/X11R6/man/man1/gccmakedep.1x
-usr/X11R6/man/man1/imake.1x
-usr/X11R6/man/man1/lndir.1x
-usr/X11R6/man/man1/luit.1x
-usr/X11R6/man/man1/makedepend.1x
-usr/X11R6/man/man1/makeg.1x
-usr/X11R6/man/man1/makepsres.1x
-usr/X11R6/man/man1/makestrs.1x
-usr/X11R6/man/man1/mergelib.1x
-usr/X11R6/man/man1/mkcfm.1x
-usr/X11R6/man/man1/mkdirhier.1x
-usr/X11R6/man/man1/mkfontdir.1x
-usr/X11R6/man/man1/mkhtmlindex.1x
-usr/X11R6/man/man1/pcitweak.1x
-usr/X11R6/man/man1/pswrap.1x
-usr/X11R6/man/man1/resize.1x
-usr/X11R6/man/man1/revpath.1x
-usr/X11R6/man/man1/rstart.1x
-usr/X11R6/man/man1/rstartd.1x
-usr/X11R6/man/man1/sessreg.1x
-usr/X11R6/man/man1/showfont.1x
-usr/X11R6/man/man1/showrgb.1x
-usr/X11R6/man/man1/ucs2any.1x
-usr/X11R6/man/man1/xfsinfo.1x
-usr/X11R6/man/man1/xmkmf.1x
-usr/X11R6/man/man1/xon.1x
-usr/sbin/update-fonts-alias
-usr/sbin/update-fonts-dir
-usr/sbin/update-fonts-scale
-usr/share/man/man8/update-fonts-alias.8
-usr/share/man/man8/update-fonts-dir.8
-usr/share/man/man8/update-fonts-scale.8
Reply to: