X Strike Force SVN commit: rev 92 - branches/4.3.0/sid/debian
Author: daniel
Date: 2003-05-29 04:40:21 -0500 (Thu, 29 May 2003)
New Revision: 92
Modified:
branches/4.3.0/sid/debian/MANIFEST.s390
branches/4.3.0/sid/debian/rules
Log:
New s390 MANIFEST from Bastian Blank, and a small change to always nuke
default/index.theme, not just on !NOT_BUILDING_XF86_SERVER. Someone else will
have to fix *.install.s390, I *really* don't have the time.
Modified: branches/4.3.0/sid/debian/MANIFEST.s390
==============================================================================
--- branches/4.3.0/sid/debian/MANIFEST.s390 2003-05-28 21:16:46 UTC (rev 91)
+++ branches/4.3.0/sid/debian/MANIFEST.s390 2003-05-29 09:40:21 UTC (rev 92)
@@ -1,3 +1,12 @@
+etc/X11/Xresources/xbase-clients
+etc/X11/Xresources/xfree86-common
+etc/X11/Xsession
+etc/X11/Xsession.d/20xfree86-common_process-args
+etc/X11/Xsession.d/30xfree86-common_xresources
+etc/X11/Xsession.d/50xfree86-common_determine-startup
+etc/X11/Xsession.d/90xfree86-common_ssh-agent
+etc/X11/Xsession.d/99xfree86-common_start
+etc/X11/Xsession.options
etc/X11/app-defaults/Beforelight
etc/X11/app-defaults/Bitmap
etc/X11/app-defaults/Bitmap-color
@@ -32,6 +41,7 @@
etc/X11/app-defaults/Xmh
etc/X11/app-defaults/Xvidtune
etc/X11/fs/config
+etc/X11/fs/xfs.options
etc/X11/lbxproxy/AtomControl
etc/X11/proxymngr/pmconfig
etc/X11/rgb.txt
@@ -47,18 +57,26 @@
etc/X11/rstart/contexts/x11r6
etc/X11/rstart/rstartd.real
etc/X11/twm/system.twmrc
+etc/X11/twm/system.twmrc-menu
etc/X11/xdm/GiveConsole
etc/X11/xdm/TakeConsole
etc/X11/xdm/Xaccess
+etc/X11/xdm/Xreset
etc/X11/xdm/Xresources
etc/X11/xdm/Xservers
etc/X11/xdm/Xsession
+etc/X11/xdm/Xsetup
etc/X11/xdm/Xsetup_0
+etc/X11/xdm/Xstartup
etc/X11/xdm/Xwilling
etc/X11/xdm/pixmaps/XFree86.xpm
etc/X11/xdm/pixmaps/XFree86bw.xpm
+etc/X11/xdm/pixmaps/debian.xpm
+etc/X11/xdm/pixmaps/debianbw.xpm
etc/X11/xdm/xdm-config
+etc/X11/xdm/xdm.options
etc/X11/xinit/xinitrc
+etc/X11/xinit/xserverrc
etc/X11/xkb/README
etc/X11/xkb/README.config
etc/X11/xkb/README.enhancing
@@ -398,6 +416,7 @@
etc/X11/xkb/xkbcomp
etc/X11/xserver/SecurityPolicy
etc/X11/xsm/system.xsm
+usr/X11R6/bin/X
usr/X11R6/bin/Xmark
usr/X11R6/bin/Xnest
usr/X11R6/bin/Xprt
@@ -1061,6 +1080,7 @@
usr/X11R6/lib/X11/doc/PostScript/icccm.ps
usr/X11R6/lib/X11/doc/PostScript/ice.ps
usr/X11R6/lib/X11/doc/PostScript/intrinsics.ps
+usr/X11R6/lib/X11/doc/PostScript/man.ps
usr/X11R6/lib/X11/doc/PostScript/mit-shm.ps
usr/X11R6/lib/X11/doc/PostScript/proto.ps
usr/X11R6/lib/X11/doc/PostScript/record.ps
@@ -1103,11 +1123,55 @@
usr/X11R6/lib/X11/doc/evi.txt
usr/X11R6/lib/X11/doc/fontlib.txt
usr/X11R6/lib/X11/doc/fsproto.txt
+usr/X11R6/lib/X11/doc/html/DPMS.html
+usr/X11R6/lib/X11/doc/html/DPMSLib.html
+usr/X11R6/lib/X11/doc/html/ICElib.html
+usr/X11R6/lib/X11/doc/html/LocaleDB.html
+usr/X11R6/lib/X11/doc/html/SMlib.html
+usr/X11R6/lib/X11/doc/html/XIMTransport.html
+usr/X11R6/lib/X11/doc/html/XiLib.html
+usr/X11R6/lib/X11/doc/html/XiPorting.html
+usr/X11R6/lib/X11/doc/html/XiProtocol.html
+usr/X11R6/lib/X11/doc/html/Xtrans.html
+usr/X11R6/lib/X11/doc/html/appgroup.html
+usr/X11R6/lib/X11/doc/html/bdf.html
+usr/X11R6/lib/X11/doc/html/bigreq.html
+usr/X11R6/lib/X11/doc/html/buffer.html
+usr/X11R6/lib/X11/doc/html/ctext.html
+usr/X11R6/lib/X11/doc/html/ctlseqs.html
+usr/X11R6/lib/X11/doc/html/ddx.html
+usr/X11R6/lib/X11/doc/html/evi.html
+usr/X11R6/lib/X11/doc/html/fontlib.html
+usr/X11R6/lib/X11/doc/html/fsproto.html
+usr/X11R6/lib/X11/doc/html/i18nFramework.html
+usr/X11R6/lib/X11/doc/html/icccm.html
+usr/X11R6/lib/X11/doc/html/ice.html
+usr/X11R6/lib/X11/doc/html/intrinsics.html
+usr/X11R6/lib/X11/doc/html/mit-shm.html
+usr/X11R6/lib/X11/doc/html/proto.html
+usr/X11R6/lib/X11/doc/html/record.html
+usr/X11R6/lib/X11/doc/html/recordlib.html
+usr/X11R6/lib/X11/doc/html/rstart.html
+usr/X11R6/lib/X11/doc/html/shape.html
+usr/X11R6/lib/X11/doc/html/shapelib.html
+usr/X11R6/lib/X11/doc/html/tog-cup.html
+usr/X11R6/lib/X11/doc/html/widgets.html
+usr/X11R6/lib/X11/doc/html/xc-misc.html
+usr/X11R6/lib/X11/doc/html/xdmcp.html
+usr/X11R6/lib/X11/doc/html/xfs-design.html
+usr/X11R6/lib/X11/doc/html/xim.html
+usr/X11R6/lib/X11/doc/html/xlfd.html
+usr/X11R6/lib/X11/doc/html/xlib.html
+usr/X11R6/lib/X11/doc/html/xmu.html
+usr/X11R6/lib/X11/doc/html/xsmp.html
+usr/X11R6/lib/X11/doc/html/xtest.html
+usr/X11R6/lib/X11/doc/html/xtestlib.html
usr/X11R6/lib/X11/doc/i18nFramework.txt
usr/X11R6/lib/X11/doc/icccm.txt
usr/X11R6/lib/X11/doc/ice.txt
usr/X11R6/lib/X11/doc/intrinsics.txt
usr/X11R6/lib/X11/doc/libGL.txt
+usr/X11R6/lib/X11/doc/man.txt
usr/X11R6/lib/X11/doc/mit-shm.txt
usr/X11R6/lib/X11/doc/proto.txt
usr/X11R6/lib/X11/doc/record.txt
@@ -5911,6 +5975,7 @@
usr/X11R6/man/man1/texteroids.1x
usr/X11R6/man/man1/twm.1x
usr/X11R6/man/man1/ucs2any.1x
+usr/X11R6/man/man1/uxterm.1x
usr/X11R6/man/man1/viewres.1x
usr/X11R6/man/man1/x11perf.1x
usr/X11R6/man/man1/x11perfcomp.1x
@@ -7490,9 +7555,26 @@
usr/X11R6/man/man7/XProjectTeam.7x
usr/X11R6/man/man7/XStandards.7x
usr/X11R6/man/man7/Xsecurity.7x
+usr/bin/dexconf
+usr/bin/xvfb-run
usr/sbin/update-fonts-alias
usr/sbin/update-fonts-dir
usr/sbin/update-fonts-scale
+usr/share/configlets/xserver-common/desktop.xpm
+usr/share/configlets/xserver-common/main.glade
+usr/share/configlets/xserver-common/main.py
+usr/share/configlets/xserver-common/monitor.xpm
+usr/share/configlets/xserver-common/pointer.xpm
+usr/share/configlets/xserver-common/videocard.xpm
+usr/share/configlets/xserver-common/xserver.xpm
+usr/share/man/man1/dexconf.1
+usr/share/man/man1/xvfb-run.1
+usr/share/man/man5/Xsession.5
+usr/share/man/man5/Xsession.options.5
+usr/share/man/man5/Xwrapper.config.5
+usr/share/man/man5/xdm.options.5
+usr/share/man/man5/xfs.options.5
+usr/share/man/man7/XF86Config.7
usr/share/man/man8/update-fonts-alias.8
usr/share/man/man8/update-fonts-dir.8
usr/share/man/man8/update-fonts-scale.8
Modified: branches/4.3.0/sid/debian/rules
==============================================================================
--- branches/4.3.0/sid/debian/rules 2003-05-28 21:16:46 UTC (rev 91)
+++ branches/4.3.0/sid/debian/rules 2003-05-29 09:40:21 UTC (rev 92)
@@ -276,7 +276,6 @@
debian/tmp/usr/X11R6/bin/XFree86-debug
mkdir -p $(DEBTREEDIR)/etc/X11/cursors
install -m 644 debian/local/cursors/*.theme $(DEBTREEDIR)/etc/X11/cursors
- rm -f $(DEBTREEDIR)/usr/X11R6/lib/X11/icons/default/index.theme
# Create the xlibmesa-drm-src package.
mkdir $(DEBTREEDIR)/usr/src
@@ -289,6 +288,7 @@
rm $(DRM_DST_DIR)/Makefile $(DRM_DST_DIR)/Imakefile $(DRM_DST_DIR)/Makefile.kernel
cd $(DRM_SRC_DIR) && tar -zcvf $(DEBTREEDIR)/usr/src/xlibmesa-drm.tar.gz modules/xlibmesa-drm
endif
+ rm -f $(DEBTREEDIR)/usr/X11R6/lib/X11/icons/default/index.theme
# remove the upstream symlink X -> XFree86
rm -f $(DEBTREEDIR)/usr/X11R6/bin/X
# install Debian's X server wrapper
Reply to: