X Strike Force X.Org X11 SVN commit: r1222 - in branches/modular: . debian/xorg/debian xserver/xorg-server-X11R7.0-1.0.1/debian
Author: dnusinow
Date: 2006-02-18 16:26:55 -0500 (Sat, 18 Feb 2006)
New Revision: 1222
Modified:
branches/modular/TODO
branches/modular/debian/xorg/debian/changelog
branches/modular/debian/xorg/debian/control
branches/modular/debian/xorg/debian/rules
branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/changelog
branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/rules
Log:
* Put setuid fix in xorg source package where it belongs rather than
xorg-server
* TODO update while I'm at it
Modified: branches/modular/TODO
===================================================================
--- branches/modular/TODO 2006-02-18 21:04:41 UTC (rev 1221)
+++ branches/modular/TODO 2006-02-18 21:26:55 UTC (rev 1222)
@@ -1,10 +1,8 @@
-6) Package the apps. This involves deciding on the organization and
- layout of the packages. Daniel has done a lot of this work already,
- so we should look over what's in Ubuntu. As I understand it, Eugene
- has also been thinking in this direction.
-
7) By this point we should be able to do a full, working install of the
X Window System. Make sure this is true, more or less.
+ * xlibs and xlibs-data transitional packages need filling out
+ * Find out where the pixmaps (part of xserver) and locales (part of
+ libx11) went
8) Get smooth upgrades working from both unstable and sarge. We can
steal liberally from the monolithic packages for this, since many of
Modified: branches/modular/debian/xorg/debian/changelog
===================================================================
--- branches/modular/debian/xorg/debian/changelog 2006-02-18 21:04:41 UTC (rev 1221)
+++ branches/modular/debian/xorg/debian/changelog 2006-02-18 21:26:55 UTC (rev 1222)
@@ -14,8 +14,9 @@
include in the metapackage as well to match these names
* Remove extra depends on x11-common from xserver-xorg
* Add debconf dependency for xserver-xorg
+ * setuid for /usr/bin/X (stolen from monolith's debian/rules)
- -- David Nusinow <dnusinow@debian.org> Sun, 12 Feb 2006 19:15:11 -0500
+ -- David Nusinow <dnusinow@debian.org> Sat, 18 Feb 2006 16:09:09 -0500
xorg (7.0.0-0ubuntu14) dapper; urgency=low
Modified: branches/modular/debian/xorg/debian/control
===================================================================
--- branches/modular/debian/xorg/debian/control 2006-02-18 21:04:41 UTC (rev 1221)
+++ branches/modular/debian/xorg/debian/control 2006-02-18 21:26:55 UTC (rev 1222)
@@ -25,6 +25,7 @@
Package: xserver-xorg
Architecture: all
+Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1)
Pre-Depends: x11-common (>= 7.0.0-0ubuntu3)
Depends: xserver-xorg-core, xserver-xorg-video-all | xserver-xorg-video, xserver-xorg-input-all | xserver-xorg-input, laptop-detect, xresprobe, mdetect, discover1, debconf
Description: the X.Org X server
@@ -33,6 +34,13 @@
xorg.conf. It does not provide the actual server itself, but removing it
is strongly discouraged.
+
+Package: xserver-xfree86
+Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 kfreebsd-i386 m68k mips mipsel netbsd-i386 powerpc sparc
+Depends: xserver-xorg
+Description: transitional package for moving from xfree86 to X.Org
+ This package smooths upgrades from Debian 3.1 by depending on xserver-xorg.
+
Package: xserver-xorg-video-all
Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc sparc
Depends: ${F:XServer-Xorg-Video-Depends}
@@ -63,3 +71,12 @@
It should be noted that a package providing x-window-manager and a package
providing x-terminal-emulator should also be installed to ensure a
comfortable X experience.
+
+Package: xlibs
+Architecture: any
+Depends: xkb-data | xkb-data-legacy
+Description: transitional package
+
+Package: xlibs-data
+Architecture:any
+Depends: xbitmaps, xcursor-themes
Modified: branches/modular/debian/xorg/debian/rules
===================================================================
--- branches/modular/debian/xorg/debian/rules 2006-02-18 21:04:41 UTC (rev 1221)
+++ branches/modular/debian/xorg/debian/rules 2006-02-18 21:26:55 UTC (rev 1222)
@@ -105,6 +105,8 @@
dh_link
dh_compress
dh_fixperms
+ chown root:root debian/x11-common/usr/bin/X
+ chmod ug+s debian/x11-common/usr/bin/X
dh_installdeb
dh_shlibdeps
dh_gencontrol -- -VF:XServer-Xorg-Video-Depends=$(XSERVER_XORG_VIDEO_DEPENDS) \
Modified: branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/changelog
===================================================================
--- branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/changelog 2006-02-18 21:04:41 UTC (rev 1221)
+++ branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/changelog 2006-02-18 21:26:55 UTC (rev 1222)
@@ -15,8 +15,6 @@
* Change xserver-core depends to be on x11-common rather than xorg-common
* Have xserver-xorg-dev install the files in /usr/share/aclocal so we get
xorg-server.m4
- * Use debian/rules to setuid for /usr/bin/X. This is stolen from the
- monolith.
-- David Nusinow <dnusinow@debian.org> Sat, 18 Feb 2006 14:45:46 -0500
Modified: branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/rules
===================================================================
--- branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/rules 2006-02-18 21:04:41 UTC (rev 1221)
+++ branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/rules 2006-02-18 21:26:55 UTC (rev 1222)
@@ -102,8 +102,6 @@
strip --strip-debug --remove-section=.note --remove-section=.comment
dh_compress
dh_fixperms
- chown root:root debian/xserver-common/usr/bin/X
- chmod ug+s debian/xserver-common/usr/bin/X
dh_installdeb
dh_shlibdeps
dh_gencontrol
Reply to: