Author: ender
Date: 2005-08-30 04:18:46 -0500 (Tue, 30 Aug 2005)
New Revision: 566
Modified:
trunk/debian/changelog
trunk/debian/control
Log:
Added in xserver-xorg{,-dbg} a conflict on xlibs (<< 6.8.2.dfsg.1-5) and
added recommends xlibs; if /etc/X11/xkb/rules/xorg.lst does if not
exist, people lose XKB on reboot. Thanks, James Ballantine and Daniel
Stone (closes: #325509).
Also summarized the debconf translations.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-08-30 03:04:47 UTC (rev 565)
+++ trunk/debian/changelog 2005-08-30 09:18:46 UTC (rev 566)
@@ -81,22 +81,22 @@
#324275).
- libxres-dev should depend on libxres1 and x-dev. Thanks, Michael Olbrich
(closes: #324474).
- - Add in xserver-xorg a dependency on xlibs (>= 6.8.2.dfsg.1-5); if it
- does if not exist, people lose XKB on reboot. Thanks, James Ballantine
- (closes: #325509).
+ - Add in xserver-xorg{,-dbg} a conflict on xlibs (<< 6.8.2.dfsg.1-5) and
+ added recommends xlibs; if /etc/X11/xkb/rules/xorg.lst does if not
+ exist, people lose XKB on reboot. Thanks, James Ballantine and Daniel
+ Stone (closes: #325509).
* patches/general/000_stolen_from_unichrome.sf.net.diff: Fixed a
cut-and-paste error when checking mode->Flags for sync polarity in
via_mode.c.
- * Updated Brazilian portuguese debconf translation. Thanks, Andre Luis Lopes
- (closes: #325150).
- * Updated Danish debconf translation. Thanks, Claus Hindsgaul (closes:
- #325583).
+ * Updated debconf translations:
+ - Brazilian portuguese, thanks to André Luís Lopes (closes: #325150).
+ - Danish, thanks to Claus Hindsgaul (closes #325583).
* debian/shell-lib.sh: It seems that a copy-paste type slipped in
6.8.2.dfsg.1-5, and the function replace_conffile_with_symlink_rollback
was not really included. xlibs upgrades from sarge were affected. Fixed
(closes: #322920, #323954).
- -- David Martínez Moreno <[EMAIL PROTECTED]> Mon, 29 Aug 2005 19:13:08 +0200
+ -- David Martínez Moreno <[EMAIL PROTECTED]> Tue, 30 Aug 2005 11:07:02 +0200
xorg-x11 (6.8.2.dfsg.1-5) unstable; urgency=low
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2005-08-30 03:04:47 UTC (rev 565)
+++ trunk/debian/control 2005-08-30 09:18:46 UTC (rev 566)
@@ -2520,10 +2520,10 @@
Package: xserver-xorg
Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 kfreebsd-i386 m68k mips
mipsel netbsd-i386 powerpc sh3 sh4 sparc
-Depends: xserver-common (>= ${Source-Version}), xlibs (>= 6.8.2.dfsg.1-5),
(${shlibs:Depends}, ${misc:Depends}
-Recommends: discover1, mdetect, xresprobe (>= 0.4.13), laptop-detect
+Depends: xserver-common (>= ${Source-Version}), ${shlibs:Depends},
${misc:Depends}
+Recommends: xlibs, discover1, mdetect, xresprobe (>= 0.4.13), laptop-detect
Suggests: libglide2 (>> 2001.01.26)
-Conflicts: libxfont-xtt, xserver-xfree86
+Conflicts: xlibs (<< 6.8.2.dfsg.1-5), libxfont-xtt, xserver-xfree86
Replaces: xserver-common (<< 4.0), libxfont-xtt, xserver-xfree86
Provides: xserver, xserver-xfree86
Description: the X.Org X server
@@ -2547,8 +2547,8 @@
Priority: extra
Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 kfreebsd-i386 m68k mips
mipsel netbsd-i386 powerpc sh3 sh4 sparc
Depends: xserver-common (>= ${Source-Version}), ${shlibs:Depends},
${misc:Depends}
-Recommends: xserver-xorg, discover1, mdetect, xresprobe, laptop-detect
-Conflicts: libxfont-xtt
+Recommends: xlibs, xserver-xorg, discover1, mdetect, xresprobe, laptop-detect
+Conflicts: xlibs (<< 6.8.2.dfsg.1-5), libxfont-xtt
Replaces: xserver-common (<< 4.0), libxfont-xtt
Provides: xserver, xserver-xorg
Description: the X.Org X server (static version with debugging symbols)
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
