xorg: Changes to 'debian-unstable'
debian/changelog | 10 ++++++++
debian/control | 23 --------------------
debian/x11-common.install | 1
debian/xserver-xorg.install | 1
debian/xserver-xorg.preinst.in | 24 ++++++++++++++++++++
debian/xutils.preinst.in | 47 +++++++++++++++++++++++++++++++++++++++++
6 files changed, 83 insertions(+), 23 deletions(-)
New commits:
commit 1135bd64f64e17f20a8b3c14322673940cc41821
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Apr 25 03:04:21 2008 +0200
Drop the xlibs-data and xlibs-static-dev transitional packages.
These were kept around for the sarge->etch upgrade, so it's past
time they went away (closes: #477547, #477550).
Keeping xlibmesa-* for now, because a *lot* of packages are still
build-depending on those.
diff --git a/debian/changelog b/debian/changelog
index fa50b79..e658a5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,9 @@ xorg (1:7.3+11) UNRELEASED; urgency=low
* Add Kurdish debconf translation from Erdal Ronahi (closes: #477492).
* Move dexconf from x11-common to xserver-xorg.
* Remove pre-dependency on x11-common from xserver-xorg.
+ * Drop the xlibs-data and xlibs-static-dev transitional packages. These
+ were kept around for the sarge->etch upgrade, so it's past time they went
+ away (closes: #477547, #477550).
[ Christian Perrier ]
* Debconf translations:
diff --git a/debian/control b/debian/control
index 3b2a4c5..3ba2280 100644
--- a/debian/control
+++ b/debian/control
@@ -139,26 +139,6 @@ Description: the X.Org X Window System development libraries
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
-Architecture: all
-Section: libs
-Depends: xbitmaps, xcursor-themes, libx11-6 (>= 2:1.0.0-2)
-Description: transitional package for X11 client data
- This package is provided to ease upgrades from Debian 3.1 ("sarge"). It
- may be safely removed from your system.
-
-Package: xlibs-static-dev
-Architecture: all
-Section: oldlibs
-Depends: libxfont-dev, libfontenc-dev
-Description: transitional metapackage
- This package depends on the individual libraries that used to be contained
- within the package of this name. These libraries used to be static
- libraries, but have since become shared libraries with their own packages
- and can be depended on by themselves. This package is for transitional
- purposes to prevent disruptions during automated package builds, and my be
- safely removed from your system.
-
Package: xlibmesa-gl
Section: libs
Architecture: all
commit 6ab46799943fc7b87fd747c2648f1c67b839331c
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Mar 24 17:00:58 2008 +0100
Add xutils preinst to drop obsolete /etc/X11/rstart/ files
diff --git a/debian/changelog b/debian/changelog
index 2dd0641..fa50b79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ xorg (1:7.3+11) UNRELEASED; urgency=low
* Remove the dependency of xutils against xutils-dev, it was only useful
for transitional purpose in Etch, closes: #418123.
* Remove the obsolete /etc/init.d/xserver-xorg, closes: #459507.
+ * Add xutils preinst to drop obsolete /etc/X11/rstart/ files,
+ closes: #382360.
[ David Nusinow ]
* Ship the X server wrapper in xserver-xorg rather than x11-common. This
diff --git a/debian/xutils.preinst.in b/debian/xutils.preinst.in
new file mode 100644
index 0000000..2c0cc29
--- /dev/null
+++ b/debian/xutils.preinst.in
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+set -e
+
+rm_conffile() {
+ PKGNAME="$1"
+ CONFFILE="$2"
+ if [ -e "$CONFFILE" ]; then
+ md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
+ old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`"
+ if [ "$md5sum" != "$old_md5sum" ]; then
+ echo "Obsolete conffile $CONFFILE has been modified by you."
+ echo "Saving as $CONFFILE.dpkg-bak ..."
+ mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
+ else
+ echo "Removing obsolete conffile $CONFFILE ..."
+ rm -f "$CONFFILE"
+ fi
+ fi
+}
+
+case "$1" in
+install|upgrade)
+ if dpkg --compare-versions "$2" lt "1:7.4~1"; then
+ rm_conffile xutils "/etc/X11/rstart/commands/x11r6/@List"
+ rm_conffile xutils "/etc/X11/rstart/commands/x11r6/LoadMonitor"
+ rm_conffile xutils "/etc/X11/rstart/commands/x11r6/Terminal"
+ rm_conffile xutils "/etc/X11/rstart/commands/@List"
+ rm_conffile xutils "/etc/X11/rstart/commands/ListContexts"
+ rm_conffile xutils "/etc/X11/rstart/commands/ListGenericCommands"
+ rm_conffile xutils "/etc/X11/rstart/contexts/@List"
+ rm_conffile xutils "/etc/X11/rstart/contexts/default"
+ rm_conffile xutils "/etc/X11/rstart/contexts/x11r6"
+ rm_conffile xutils "/etc/X11/rstart/config"
+ rm_conffile xutils "/etc/X11/rstart/rstartd.real"
+ rmdir /etc/X11/rstart/commands/x11r6/ || true
+ rmdir /etc/X11/rstart/commands/ || true
+ rmdir /etc/X11/rstart/contexts/ || true
+ rmdir /etc/X11/rstart/ || true
+ fi
+esac
+
+#DEBHELPER#
+
+exit 0
+
+# vim:set ai et sts=2 sw=2 tw=0:
commit 17c95653ddf7dd078fbee4cd51a2c74cc2d1acab
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Mar 24 16:36:22 2008 +0100
Fix typo in previous commit
diff --git a/debian/xserver-xorg.preinst.in b/debian/xserver-xorg.preinst.in
index e535ef5..c1a0c7f 100644
--- a/debian/xserver-xorg.preinst.in
+++ b/debian/xserver-xorg.preinst.in
@@ -114,7 +114,7 @@ rm_conffile() {
case "$1" in
install|upgrade)
if dpkg --compare-versions "$2" lt "1:7.4~1"; then
- rm_conffile mypackage "/etc/init.d/xserver-xorg"
+ rm_conffile xserver-xorg "/etc/init.d/xserver-xorg"
fi
esac
commit f88856ea5be14eea666fcc7631e83907b8d8b13c
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Mar 23 14:02:50 2008 +0100
Remove the obsolete /etc/init.d/xserver-xorg
diff --git a/debian/changelog b/debian/changelog
index d3f2192..2dd0641 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ xorg (1:7.3+11) UNRELEASED; urgency=low
the x11-common init script, closes: #470940.
* Remove the dependency of xutils against xutils-dev, it was only useful
for transitional purpose in Etch, closes: #418123.
+ * Remove the obsolete /etc/init.d/xserver-xorg, closes: #459507.
[ David Nusinow ]
* Ship the X server wrapper in xserver-xorg rather than x11-common. This
diff --git a/debian/xserver-xorg.preinst.in b/debian/xserver-xorg.preinst.in
index 9dc06d0..e535ef5 100644
--- a/debian/xserver-xorg.preinst.in
+++ b/debian/xserver-xorg.preinst.in
@@ -94,6 +94,30 @@ if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
fi
fi
+rm_conffile() {
+ PKGNAME="$1"
+ CONFFILE="$2"
+ if [ -e "$CONFFILE" ]; then
+ md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
+ old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`"
+ if [ "$md5sum" != "$old_md5sum" ]; then
+ echo "Obsolete conffile $CONFFILE has been modified by you."
+ echo "Saving as $CONFFILE.dpkg-bak ..."
+ mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
+ else
+ echo "Removing obsolete conffile $CONFFILE ..."
+ rm -f "$CONFFILE"
+ fi
+ fi
+}
+
+case "$1" in
+install|upgrade)
+ if dpkg --compare-versions "$2" lt "1:7.4~1"; then
+ rm_conffile mypackage "/etc/init.d/xserver-xorg"
+ fi
+esac
+
#DEBHELPER#
exit 0
commit ce3b127437e176e0fea8ec6ab9725aad0de01182
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Mar 23 11:43:43 2008 +0100
Remove the dependency of xutils against xutils-dev
diff --git a/debian/changelog b/debian/changelog
index 7246d93..d3f2192 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ xorg (1:7.3+11) UNRELEASED; urgency=low
x11-common init script, closes: #463630.
* Remove $remote_fs from Required-Start/Stop LSB dependency info of
the x11-common init script, closes: #470940.
+ * Remove the dependency of xutils against xutils-dev, it was only useful
+ for transitional purpose in Etch, closes: #418123.
[ David Nusinow ]
* Ship the X server wrapper in xserver-xorg rather than x11-common. This
diff --git a/debian/control b/debian/control
index bffbd00..3b2a4c5 100644
--- a/debian/control
+++ b/debian/control
@@ -219,7 +219,7 @@ Description: miscellaneous X clients - metapackage
Package: xutils
Section: x11
Architecture: all
-Depends: x11-xfs-utils, x11-utils, x11-xserver-utils, x11-session-utils, xfonts-utils, xutils-dev
+Depends: x11-xfs-utils, x11-utils, x11-xserver-utils, x11-session-utils, xfonts-utils
Description: X Window System utility programs metapackage
xutils provides a set of utility programs shipped with the X Window System.
Many of these programs are useful even on a system that does not have any X
commit f06a70c7df1924d0697a6cf9db832a1bd23f6115
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Mar 18 14:35:27 2008 +0100
Move dexconf from x11-common to xserver-xorg.
* Move dexconf from x11-common to xserver-xorg.
* Remove pre-dependency on x11-common from xserver-xorg.
diff --git a/debian/changelog b/debian/changelog
index a174d50..7246d93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ xorg (1:7.3+11) UNRELEASED; urgency=low
This should prevent remote nss lookups and timeouts in some environments.
Closes: #407788.
* Add Kurdish debconf translation from Erdal Ronahi (closes: #477492).
+ * Move dexconf from x11-common to xserver-xorg.
+ * Remove pre-dependency on x11-common from xserver-xorg.
[ Christian Perrier ]
* Debconf translations:
diff --git a/debian/control b/debian/control
index c606f46..bffbd00 100644
--- a/debian/control
+++ b/debian/control
@@ -81,7 +81,6 @@ Package: xserver-xorg
Architecture: any
Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1), xserver-common, x11-common (<< 1:7.3+11)
Replaces: xserver-common, x11-common (<< 1:7.3+11)
-Pre-Depends: x11-common (>= 1:7.3+3)
Depends: xserver-xorg-core (>= 2:1.4-3), xserver-xorg-video-all | xserver-xorg-video-2, xserver-xorg-input-all | xserver-xorg-input-2, ${shlibs:Depends}, ${misc:Depends}, xkb-data | xkb-data-legacy, x11-xkb-utils
Recommends: libgl1-mesa-dri, udev, ${F:XServer-Xorg-Detect-Depends}
Description: the X.Org X server
diff --git a/debian/x11-common.install b/debian/x11-common.install
index c217fa1..c52e550 100644
--- a/debian/x11-common.install
+++ b/debian/x11-common.install
@@ -1,4 +1,3 @@
-debian/local/dexconf usr/bin
debian/local/rgb.txt etc/X11
debian/local/Xsession etc/X11
debian/local/Xsession.d/* etc/X11/Xsession.d
diff --git a/debian/xserver-xorg.install b/debian/xserver-xorg.install
index 3e06580..6b050ed 100644
--- a/debian/xserver-xorg.install
+++ b/debian/xserver-xorg.install
@@ -1 +1,2 @@
debian/local/X usr/bin
+debian/local/dexconf usr/bin
Reply to: