X Strike Force XFree86 SVN commit: r1062 - branches/4.3.0/woody/debian
Author: branden
Date: 2004-02-18 17:50:39 -0500 (Wed, 18 Feb 2004)
New Revision: 1062
Modified:
branches/4.3.0/woody/debian/NEWS
branches/4.3.0/woody/debian/changelog
branches/4.3.0/woody/debian/control
branches/4.3.0/woody/debian/xutils.preinst.in
Log:
Merge changes from 1044 to 1049 on the trunk.
Modified: branches/4.3.0/woody/debian/NEWS
===================================================================
--- branches/4.3.0/woody/debian/NEWS 2004-02-18 22:44:32 UTC (rev 1061)
+++ branches/4.3.0/woody/debian/NEWS 2004-02-18 22:50:39 UTC (rev 1062)
@@ -1,4 +1,4 @@
-xfree86 (4.3.0-0pre1v6) unstable; urgency=low
+xfree86 (4.3.0-1) unstable; urgency=low
* The rstartd.real file, previously in /etc/X11/rstart, has been moved to
/usr/X11R6/bin. Because rstartd.real was previously what is known to the
Modified: branches/4.3.0/woody/debian/changelog
===================================================================
--- branches/4.3.0/woody/debian/changelog 2004-02-18 22:44:32 UTC (rev 1061)
+++ branches/4.3.0/woody/debian/changelog 2004-02-18 22:50:39 UTC (rev 1062)
@@ -1,4 +1,4 @@
-xfree86 (4.3.0-0pre1v6) experimental; urgency=low
+xfree86 (4.3.0-1) experimental; urgency=low
* Grab fixes to upstream CVS xf-4_3-branch since last pull.
- debian/patches/000_post430.diff:
@@ -224,8 +224,16 @@
* Update Danish debconf template translations (thanks, Claus Hindsgaul).
- debian/po/da.po
- -- Branden Robinson <branden@debian.org> Mon, 16 Feb 2004 01:54:23 -0500
+ * Make xlibmesa-dri-dbg conflict with and replace xlibmesa3-gl-dbg (>=
+ 4.2.1-13) due to file overlaps with unstripped DRI modules.
+ - debian/control
+ * Make libxv-dev conflict with and replace xlibs-dev (<< 4.3.0) due to file
+ overlap with Xv header files, static library, and manpages.
+ - debian/control
+
+ -- Branden Robinson <branden@debian.org> Tue, 17 Feb 2004 12:58:28 -0500
+
xfree86 (4.3.0-0pre1v5) experimental; urgency=low
* Grab fixes to upstream CVS xf-4_3-branch since last pull.
Modified: branches/4.3.0/woody/debian/control
===================================================================
--- branches/4.3.0/woody/debian/control 2004-02-18 22:44:32 UTC (rev 1061)
+++ branches/4.3.0/woody/debian/control 2004-02-18 22:50:39 UTC (rev 1062)
@@ -823,6 +823,8 @@
Package: libxv-dev
Section: libdevel
Architecture: any
+Conflicts: xlibs-dev (<< 4.3.0)
+Replaces: xlibs-dev (<< 4.3.0)
Depends: libxv1 (= ${Source-Version}), x-dev, libxext-dev, libx11-dev, libc6-dev | libc-dev
Description: X Window System video extension library development files
Header files and a static version of the Xv library are provided by this
@@ -1250,8 +1252,8 @@
Package: xlibmesa-dri-dbg
Architecture: alpha i386 ia64 powerpc sparc
Depends: xlibmesa-dri (= ${Source-Version})
-Conflicts: xlibmesa-gl-dbg (<< 4.3.0)
-Replaces: xlibmesa-gl-dbg (<< 4.3.0)
+Conflicts: xlibmesa-gl-dbg (<< 4.3.0), xlibmesa3-gl-dbg (>= 4.2.1-13)
+Replaces: xlibmesa-gl-dbg (<< 4.3.0), xlibmesa3-gl-dbg (>= 4.2.1-13)
Description: Mesa 3D graphics library modules (unstripped) [XFree86]
Debugging versions of chipset-specific DRI modules are provided by this
package. They are installed in /usr/X11R6/lib/modules/dri/debug and can be
Modified: branches/4.3.0/woody/debian/xutils.preinst.in
===================================================================
--- branches/4.3.0/woody/debian/xutils.preinst.in 2004-02-18 22:44:32 UTC (rev 1061)
+++ branches/4.3.0/woody/debian/xutils.preinst.in 2004-02-18 22:50:39 UTC (rev 1062)
@@ -33,9 +33,11 @@
# priests are correct, no one will have taken this file's claims of
# configurability seriously.
if dpkg --compare-versions "$2" lt "4.3.0-1"; then
- observe "preparing to remove obsolete conffile" \
- "/etc/X11/rstart/rstartd.real"
- mv /etc/X11/rstart/rstartd.real /etc/X11/rstart/rstartd.real.dpkg-tmp
+ if [ -e /etc/X11/rstart/rstartd.real ] ; then
+ observe "preparing to remove obsolete conffile" \
+ "/etc/X11/rstart/rstartd.real"
+ mv /etc/X11/rstart/rstartd.real /etc/X11/rstart/rstartd.real.dpkg-tmp
+ fi
fi
check_symlinks_and_warn /usr/X11R6/lib/X11/rstart /usr/bin/rstartd
Reply to: