X Strike Force X.Org X11 SVN commit: r1985 - in trunk: app/xbase-clients-7.0.0/debian app/xbase-clients-7.0.0/debian/local xserver/xorg-server-1.0.2/debian xserver/xorg-server-1.0.2/debian/local
Author: dnusinow
Date: 2006-04-27 22:06:25 -0400 (Thu, 27 Apr 2006)
New Revision: 1985
Added:
trunk/app/xbase-clients-7.0.0/debian/local/
trunk/app/xbase-clients-7.0.0/debian/local/xserverrc
Removed:
trunk/xserver/xorg-server-1.0.2/debian/local/xserverrc
Modified:
trunk/app/xbase-clients-7.0.0/debian/changelog
trunk/app/xbase-clients-7.0.0/debian/rules
trunk/app/xbase-clients-7.0.0/debian/xbase-clients.install
trunk/xserver/xorg-server-1.0.2/debian/changelog
trunk/xserver/xorg-server-1.0.2/debian/rules
trunk/xserver/xorg-server-1.0.2/debian/xserver-xorg-core.install
Log:
Move xserverrc back to xbase-clients. Thanks Benjamin Mesing.
Modified: trunk/app/xbase-clients-7.0.0/debian/changelog
===================================================================
--- trunk/app/xbase-clients-7.0.0/debian/changelog 2006-04-26 07:51:03 UTC (rev 1984)
+++ trunk/app/xbase-clients-7.0.0/debian/changelog 2006-04-28 02:06:25 UTC (rev 1985)
@@ -1,3 +1,10 @@
+xbase-clients (1:7.0.0-6) UNRELEASED; urgency=low
+
+ * Move xserverrc back to this package from xserver-xorg-core. Thanks
+ Benjamin Mesing. (closes: #365022)
+
+ -- David Nusinow <dnusinow@debian.org> Thu, 27 Apr 2006 22:04:03 -0400
+
xbase-clients (1:7.0.0-5) unstable; urgency=low
* Patch startx so that it points to /etc/X11/xinit for xserverrc and
Copied: trunk/app/xbase-clients-7.0.0/debian/local/xserverrc (from rev 1984, trunk/xserver/xorg-server-1.0.2/debian/local/xserverrc)
Modified: trunk/app/xbase-clients-7.0.0/debian/rules
===================================================================
--- trunk/app/xbase-clients-7.0.0/debian/rules 2006-04-26 07:51:03 UTC (rev 1984)
+++ trunk/app/xbase-clients-7.0.0/debian/rules 2006-04-28 02:06:25 UTC (rev 1985)
@@ -99,6 +99,8 @@
cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install ; \
cd ..; \
done
+ install -d debian/tmp/etc/X11/xinit
+ install -m 755 debian/local/xserverrc debian/tmp/etc/X11/xinit
# Build architecture-dependent files here.
binary-arch: build install
Modified: trunk/app/xbase-clients-7.0.0/debian/xbase-clients.install
===================================================================
--- trunk/app/xbase-clients-7.0.0/debian/xbase-clients.install 2006-04-26 07:51:03 UTC (rev 1984)
+++ trunk/app/xbase-clients-7.0.0/debian/xbase-clients.install 2006-04-28 02:06:25 UTC (rev 1985)
@@ -7,3 +7,4 @@
usr/lib/X11/xinit/xinitrc etc/X11/xinit
usr/lib/X11/xsm/system.xsm
etc/X11/app-defaults/*
+etc/X11/xinit/xserverrc
Modified: trunk/xserver/xorg-server-1.0.2/debian/changelog
===================================================================
--- trunk/xserver/xorg-server-1.0.2/debian/changelog 2006-04-26 07:51:03 UTC (rev 1984)
+++ trunk/xserver/xorg-server-1.0.2/debian/changelog 2006-04-28 02:06:25 UTC (rev 1985)
@@ -1,3 +1,9 @@
+xorg-server (1:1.0.2-8) UNRELEASED; urgency=low
+
+ * Move xserverrc back to xbase-clients. Thanks Benjamin Mesing.
+
+ -- David Nusinow <dnusinow@debian.org> Thu, 27 Apr 2006 22:04:16 -0400
+
xorg-server (1:1.0.2-7) unstable; urgency=low
* Ship xserverrc again in /etc/X11/xinit. Thanks Bastian Kleineidam and
Deleted: trunk/xserver/xorg-server-1.0.2/debian/local/xserverrc
===================================================================
--- trunk/xserver/xorg-server-1.0.2/debian/local/xserverrc 2006-04-26 07:51:03 UTC (rev 1984)
+++ trunk/xserver/xorg-server-1.0.2/debian/local/xserverrc 2006-04-28 02:06:25 UTC (rev 1985)
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-# $Id: xserverrc 189 2005-06-11 00:04:27Z branden $
-
-exec /usr/bin/X11/X -dpi 100 -nolisten tcp
Modified: trunk/xserver/xorg-server-1.0.2/debian/rules
===================================================================
--- trunk/xserver/xorg-server-1.0.2/debian/rules 2006-04-26 07:51:03 UTC (rev 1984)
+++ trunk/xserver/xorg-server-1.0.2/debian/rules 2006-04-28 02:06:25 UTC (rev 1985)
@@ -92,8 +92,6 @@
install -m 755 debian/local/xvfb-run debian/tmp/usr/bin
install debian/local/xvfb-run.1 debian/tmp/usr/share/man/man1
- install -d debian/tmp/etc/X11/xinit
- install -m 755 debian/local/xserverrc debian/tmp/etc/X11/xinit
# Build architecture-dependent files here.
binary-arch: build install
Modified: trunk/xserver/xorg-server-1.0.2/debian/xserver-xorg-core.install
===================================================================
--- trunk/xserver/xorg-server-1.0.2/debian/xserver-xorg-core.install 2006-04-26 07:51:03 UTC (rev 1984)
+++ trunk/xserver/xorg-server-1.0.2/debian/xserver-xorg-core.install 2006-04-28 02:06:25 UTC (rev 1985)
@@ -7,4 +7,3 @@
usr/share/man/man1/Xserver.1x
usr/share/man/man1/Xorg.1x
usr/share/man/man5/xorg.conf.5x
-etc/X11/xinit/xserverrc
Reply to: