X Strike Force X.Org X11 SVN commit: r3264 - trunk/debian/xorg/debian
Author: dparsons
Date: 2006-09-18 08:10:30 -0400 (Mon, 18 Sep 2006)
New Revision: 3264
Modified:
trunk/debian/xorg/debian/changelog
trunk/debian/xorg/debian/control
trunk/debian/xorg/debian/rules
trunk/debian/xorg/debian/x11-common.install
trunk/debian/xorg/debian/x11-common.manpages
Log:
* Sync experimental version to unstable for X11R7.1 transition.
Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog 2006-09-18 12:06:29 UTC (rev 3263)
+++ trunk/debian/xorg/debian/changelog 2006-09-18 12:10:30 UTC (rev 3264)
@@ -1,9 +1,9 @@
-xorg (1:7.0.24) UNRELEASED; urgency=low
+xorg (1:7.1.0-1) UNRELEASED; urgency=low
[ Christian Perrier ]
* Fix lspci command line recommendation in templates
Fix translations accordingly. Closes: #387563
-
+
[ Denis Barbier ]
* Translations of "Generic Video Card" were hardcoded into
xserver-xorg.config, move them into debian/po/*.po files.
@@ -41,7 +41,7 @@
* Update xsfbs with patch from ubuntu to support ARCHITECTURE, LAPTOP,
RECONFIGURE, FIRSTINST, and UPGRADE variables for use in the xserver-xorg
config scripting
- * Remove test for upgrade from xserver-xorg.postinst
+ * Remove test for upgrade from xserver-xorg.postinst
* Pull patch from Ubuntu to xserver-xorg postinst to correctly update the
config file on upgrades (closes: #375689)
* Steal patch from Ubuntu to update non-latin keymaps by Colin Watson
@@ -53,8 +53,20 @@
[ David Martínez Moreno ]
* Update Spanish debconf translation.
- -- David Martínez Moreno <ender@debian.org> Sun, 10 Sep 2006 01:21:16 +0200
+ [ Drew Parsons ]
+ * Sync experimental version to unstable for X11R7.1 transition.
+ * Use dh_installman to install man pages. Closes: #368316, #375391, #376764.
+ -- Drew Parsons <dparsons@debian.org> Mon, 18 Sep 2006 22:00:54 +1000
+
+xorg (1:7.1.0~1) experimental; urgency=low
+
+ [ Drew Parsons ]
+ * Tighten dependencies between X11R7.1 server and video drivers.
+ xserver-xorg Depends: xserver-xorg-video-all | xserver-xorg-video-1.0.
+
+ -- Drew Parsons <dparsons@debian.org> Fri, 25 Aug 2006 20:23:25 +1000
+
xorg (1:7.0.23) unstable; urgency=low
[ Denis Barbier ]
Modified: trunk/debian/xorg/debian/control
===================================================================
--- trunk/debian/xorg/debian/control 2006-09-18 12:06:29 UTC (rev 3263)
+++ trunk/debian/xorg/debian/control 2006-09-18 12:10:30 UTC (rev 3264)
@@ -2,7 +2,7 @@
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
+Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>, Drew Parsons <dparsons@debian.org>
Standards-Version: 3.7.2.0
Build-Depends: dpkg (>= 1.7.0), po-debconf, debhelper (>= 4.1.16)
@@ -29,7 +29,7 @@
Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1), xserver-common
Replaces: xserver-common
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, debconf, xkb-data | xkb-data-legacy, xbase-clients
+Depends: xserver-xorg-core, xserver-xorg-video-all | xserver-xorg-video-1.0, xserver-xorg-input-all | xserver-xorg-input, debconf, xkb-data | xkb-data-legacy, xbase-clients
Recommends: laptop-detect, xresprobe, mdetect, discover1 | discover
Description: the X.Org X server
This package depends on the full suite of the server and drivers for the
@@ -88,7 +88,7 @@
(with and without PIC symbols included) are supplied by the packages
depended on by this metapackage.
.
- Note that this is a convinience package for users and is not a package for
+ Note that this is a convenience package for users and is not a package for
Debian developers to have their package depend on.
Package: xlibs-data
Modified: trunk/debian/xorg/debian/rules
===================================================================
--- trunk/debian/xorg/debian/rules 2006-09-18 12:06:29 UTC (rev 3263)
+++ trunk/debian/xorg/debian/rules 2006-09-18 12:10:30 UTC (rev 3264)
@@ -103,6 +103,7 @@
dh_installdebconf
dh_installdirs
dh_installdocs
+ dh_installman
dh_installinit
dh_installchangelogs
dh_link
Modified: trunk/debian/xorg/debian/x11-common.install
===================================================================
--- trunk/debian/xorg/debian/x11-common.install 2006-09-18 12:06:29 UTC (rev 3263)
+++ trunk/debian/xorg/debian/x11-common.install 2006-09-18 12:10:30 UTC (rev 3264)
@@ -2,8 +2,6 @@
debian/local/dexconf usr/bin
debian/local/rgb.txt etc/X11
debian/local/Xsession etc/X11
-debian/local/Xsession.5 usr/share/man/man5
debian/local/Xsession.d/* etc/X11/Xsession.d
debian/local/Xsession.options etc/X11
-debian/local/Xsession.options.5 usr/share/man/man5
debian/changelog.Debian.old usr/share/doc/x11-common
Modified: trunk/debian/xorg/debian/x11-common.manpages
===================================================================
--- trunk/debian/xorg/debian/x11-common.manpages 2006-09-18 12:06:29 UTC (rev 3263)
+++ trunk/debian/xorg/debian/x11-common.manpages 2006-09-18 12:10:30 UTC (rev 3264)
@@ -1,2 +1,4 @@
debian/local/dexconf.1
debian/local/Xwrapper.config.5
+debian/local/Xsession.5
+debian/local/Xsession.options.5
Reply to: