xorg: Changes to 'ubuntu'
debian/changelog | 23 +++++++++++++++
debian/control | 8 ++---
debian/local/xserver-wrapper.c | 38 ++++++++++++++-----------
debian/scripts/vars.amd64 | 1
debian/scripts/vars.arm64 | 1
debian/scripts/vars.armhf | 2 -
debian/scripts/vars.i386 | 1
debian/scripts/vars.ppc64el | 1
debian/x11-common.init | 2 +
debian/xserver-xorg.postinst.in | 60 ----------------------------------------
debian/xserver-xorg.preinst.in | 32 ---------------------
debian/xserver-xorg.prerm.in | 33 ----------------------
12 files changed, 50 insertions(+), 152 deletions(-)
New commits:
commit 9a9063f58e9117ed3d72a909b57d5abdeaa281a7
Author: Maarten Lankhorst <maarten.lankhorst@ubuntu.com>
Date: Thu Mar 12 13:27:51 2015 +0100
release to vivid
diff --git a/debian/changelog b/debian/changelog
index 1f518ef..da633b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg (1:7.7+7ubuntu3) UNRELEASED; urgency=medium
+xorg (1:7.7+7ubuntu3) vivid; urgency=medium
* Modesetting has been removed, remove from vars.
* Do not require vesa on armhf, only fbdev is useful.
- -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Mon, 09 Mar 2015 11:46:22 +0100
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Mon, 09 Mar 2015 11:51:24 +0100
xorg (1:7.7+8) UNRELEASED; urgency=medium
commit 999f9dbce073dc385000d7ecdd723235654a4b74
Author: Maarten Lankhorst <maarten.lankhorst@ubuntu.com>
Date: Mon Mar 9 11:48:25 2015 +0100
Remove modesetting driver from all archs, and only require fbdev on armhf.
Modesetting has been moved to xorg-server now.
diff --git a/debian/changelog b/debian/changelog
index 5ba80df..1f518ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.7+7ubuntu3) UNRELEASED; urgency=medium
+
+ * Modesetting has been removed, remove from vars.
+ * Do not require vesa on armhf, only fbdev is useful.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Mon, 09 Mar 2015 11:46:22 +0100
+
xorg (1:7.7+8) UNRELEASED; urgency=medium
[ Laurent Bigonville ]
diff --git a/debian/control b/debian/control
index ca7cae8..88b3807 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,7 @@ Package: xserver-xorg
Architecture: any
Depends:
xserver-xorg-core (>= 2:1.15.0.901),
- xserver-xorg-video-all | xorg-driver-video,
+ xserver-xorg-video-all | xserver-xorg-core (>= 2:1.17) | xorg-driver-video,
xserver-xorg-input-all | xorg-driver-input,
xserver-xorg-input-evdev [linux-any],
${shlibs:Depends},
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index 1d86e89..f6c115c 100644
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -9,7 +9,6 @@ XSERVER_XORG_VIDEO_DEPENDS=" \
xserver-xorg-video-fbdev, \
xserver-xorg-video-intel, \
xserver-xorg-video-mga, \
- xserver-xorg-video-modesetting, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nouveau, \
xserver-xorg-video-openchrome, \
diff --git a/debian/scripts/vars.arm64 b/debian/scripts/vars.arm64
index 3a9a86e..8ce095a 100644
--- a/debian/scripts/vars.arm64
+++ b/debian/scripts/vars.arm64
@@ -1,6 +1,5 @@
XSERVER_XORG_VIDEO_DEPENDS="\
xserver-xorg-video-fbdev, \
- xserver-xorg-video-modesetting, \
"
XSERVER_XORG_INPUT_DEPENDS="\
diff --git a/debian/scripts/vars.armhf b/debian/scripts/vars.armhf
index cb63601..e281045 100644
--- a/debian/scripts/vars.armhf
+++ b/debian/scripts/vars.armhf
@@ -5,8 +5,6 @@
# debian/scripts (Bourne shell).
XSERVER_XORG_VIDEO_DEPENDS="\
xserver-xorg-video-fbdev, \
- xserver-xorg-video-modesetting, \
- xserver-xorg-video-vesa, \
"
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index 922e152..3938700 100644
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -9,7 +9,6 @@ XSERVER_XORG_VIDEO_DEPENDS=" \
xserver-xorg-video-fbdev, \
xserver-xorg-video-intel, \
xserver-xorg-video-mga, \
- xserver-xorg-video-modesetting, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nouveau, \
xserver-xorg-video-openchrome, \
diff --git a/debian/scripts/vars.ppc64el b/debian/scripts/vars.ppc64el
index 54348df..e963f06 100644
--- a/debian/scripts/vars.ppc64el
+++ b/debian/scripts/vars.ppc64el
@@ -1,6 +1,5 @@
XSERVER_XORG_VIDEO_DEPENDS="\
xserver-xorg-video-fbdev, \
- xserver-xorg-video-modesetting, \
"
XSERVER_XORG_INPUT_DEPENDS="\
commit 92e0aab7088619401247107911e2ecb4804a47d7
Author: Maarten Lankhorst <maarten.lankhorst@ubuntu.com>
Date: Mon Feb 9 10:48:56 2015 +0100
Cope with /etc/X11/X not existing.
Default to /usr/bin/Xorg if no /etc/X11/X symlink is found.
Remove creation of /etc/X11/X symlink, but keep existing.
Do not chdir to /etc/X11 if the symlink has an absolute path.
diff --git a/debian/changelog b/debian/changelog
index b09fa77..8692a77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,17 @@
xorg (1:7.7+8) UNRELEASED; urgency=medium
+ [ Laurent Bigonville ]
* debian/x11-common.init: Add Short-Description field (Closes: #510087)
* debian/x11-common.init: Call restorecon after creating the socket
directories to ensure the SELinux context if properly set (Closes: #677831)
* debian/control: Bump Standards-Version to 3.9.5 (no further changes)
* debian/control: Use canonical Vcs-* URL
+ [ Maarten Lankhorst ]
+ * Default to /usr/bin/Xorg if no /etc/X11/X symlink is found.
+ * Remove creation of /etc/X11/X symlink, but keep existing.
+ * Do not chdir to /etc/X11 if the symlink has an absolute path.
+
-- Laurent Bigonville <bigon@debian.org> Wed, 24 Sep 2014 12:57:17 +0200
xorg (1:7.7+7) unstable; urgency=medium
diff --git a/debian/local/xserver-wrapper.c b/debian/local/xserver-wrapper.c
index d4a6ab8..08e02e3 100644
--- a/debian/local/xserver-wrapper.c
+++ b/debian/local/xserver-wrapper.c
@@ -251,32 +251,36 @@ main(int argc, char **argv)
X_WRAPPER_CONFIG_FILE); */
}
- if (lstat(X_SERVER_SYMLINK, &statbuf)) {
+ i = lstat(X_SERVER_SYMLINK, &statbuf);
+ if (i < 0 && errno != ENOENT) {
(void) fprintf(stderr, "X: cannot stat %s (%s), aborting.\n",
X_SERVER_SYMLINK, strerror(errno));
exit(1);
}
- i = readlink(X_SERVER_SYMLINK, xserver, 1024);
-
if (i < 0) {
- (void) fprintf(stderr, "X: cannot read %s symbolic link (%s), aborting.\n",
- X_SERVER_SYMLINK, strerror(errno));
- exit(1);
- }
+ strcpy(xserver, "/usr/bin/Xorg");
+ } else {
+ i = readlink(X_SERVER_SYMLINK, xserver, 1024);
- xserver[i] = '\0'; /* readlink() does not null-terminate the string */
+ if (i < 0) {
+ (void) fprintf(stderr, "X: cannot read %s symbolic link (%s), aborting.\n",
+ X_SERVER_SYMLINK, strerror(errno));
+ exit(1);
+ }
+ xserver[i] = '\0'; /* readlink() does not null-terminate the string */
- if ((strcmp(xserver, "/usr/bin/X11/X") == 0) ||
- (strcmp(xserver, "/usr/X11R6/bin/X") == 0) ||
- (strcmp(xserver, "/usr/bin/X") == 0)) {
- (void) fprintf(stderr, "X: %s points back to X wrapper executable, "
- "aborting.\n", X_SERVER_SYMLINK);
- exit(1);
+ if ((strcmp(xserver, "/usr/bin/X11/X") == 0) ||
+ (strcmp(xserver, "/usr/X11R6/bin/X") == 0) ||
+ (strcmp(xserver, "/usr/bin/X") == 0)) {
+ (void) fprintf(stderr, "X: %s points back to X wrapper executable, "
+ "aborting.\n", X_SERVER_SYMLINK);
+ exit(1);
+ }
}
- if (access(X_SERVER_SYMLINK, X_OK)) { /* access() uses real uid */
- (void) fprintf(stderr, "%s is not executable\n", X_SERVER_SYMLINK);
+ if (access(xserver, X_OK)) { /* access() uses real uid */
+ (void) fprintf(stderr, "%s is not executable\n", val);
exit(1);
}
@@ -333,7 +337,7 @@ main(int argc, char **argv)
* change to the directory where the X server symlink is so that a relative
* symlink will work and execute the X server
*/
- if (chdir(X_SERVER_SYMLINK_DIR)) {
+ if (xserver[0] != '/' && chdir(X_SERVER_SYMLINK_DIR)) {
(void) fprintf(stderr, "X: cannot chdir() to %s (%s), aborting.\n",
X_SERVER_SYMLINK_DIR, strerror(errno));
exit(1);
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
deleted file mode 100644
index 3cc91c0..0000000
--- a/debian/xserver-xorg.postinst.in
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-# Debian xserver-xorg package post-installation script
-# Copyright 1998-2004 Branden Robinson.
-# Copyright 2004-2005 Canonical Ltd.
-# Licensed under the GNU General Public License, version 2. See the file
-# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
-
-set -e
-
-THIS_PACKAGE=xserver-xorg
-THIS_SCRIPT=postinst
-
-#INCLUDE_SHELL_LIB#
-
-if [ -e /etc/default/xorg ]; then
- . /etc/default/xorg
-fi
-
-debug_echo () {
- # Syntax: debug_echo message ...
- if [ -n "$DEBUG_XORG_DEBCONF" ] || [ "$DEBCONF_DEBUG" = "user" ] \
- || [ "$DEBCONF_DEBUG" = '.*' ]; then
- DEBUG_XORG_PACKAGE="yes" observe "$*"
- fi
-}
-
-CONFIG_DIR="/etc/X11"
-CONFIG_AUX_DIR=/var/lib/x11
-SERVER_SYMLINK="$CONFIG_DIR/X"
-XORGCONFIG="$CONFIG_DIR/xorg.conf"
-CONFIG_AUX_DIR="/var/lib/x11"
-SERVER_SYMLINK_CHECKSUM="$CONFIG_AUX_DIR/${SERVER_SYMLINK##*/}.md5sum"
-SERVER_SYMLINK_ROSTER="$CONFIG_AUX_DIR/${SERVER_SYMLINK##*/}.roster"
-XORGCONFIG_CHECKSUM="$CONFIG_AUX_DIR/${XORGCONFIG##*/}.md5sum"
-XORGCONFIG_ROSTER="$CONFIG_AUX_DIR/${XORGCONFIG##*/}.roster"
-THIS_SERVER=/usr/bin/Xorg
-
-debug_report_status () {
- # Syntax: debug_report_status command exit_status
- debug_echo "$1 exited with status $2"
-}
-
-debug_echo "Configuring $THIS_PACKAGE."
-
-#DEBHELPER#
-
-# only mess with the server symlink file if it does not exist. otherwise,
-# assume that's the way the user wants it.
-if ! [ -e "$SERVER_SYMLINK" ]; then
- ln -s "$THIS_SERVER" "$SERVER_SYMLINK"
-# recover from an old bug
-elif [ `readlink "$SERVER_SYMLINK"` = "/bin/true" ]; then
- rm -f "$SERVER_SYMLINK"
- ln -s "$THIS_SERVER" "$SERVER_SYMLINK"
-fi
-
-exit 0
-
-# vim:set ai et sts=2 sw=2 tw=0:
diff --git a/debian/xserver-xorg.preinst.in b/debian/xserver-xorg.preinst.in
deleted file mode 100644
index d507b68..0000000
--- a/debian/xserver-xorg.preinst.in
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-# Debian xserver-xorg package pre-installation script
-# Copyright 2003, 2004 Branden Robinson.
-# Licensed under the GNU General Public License, version 2. See the file
-# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-
-
-set -e
-
-THIS_PACKAGE=xserver-xorg
-THIS_SCRIPT=preinst
-
-#INCLUDE_SHELL_LIB#
-
-CONFIG_DIR=/etc/X11
-SERVER_SYMLINK="$CONFIG_DIR/X"
-CONFIG_AUX_DIR=/var/lib/x11
-THIS_SERVER=/usr/bin/Xorg
-
-if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
- # create the configuration files directory if it doesn't exist
- if ! [ -e "$CONFIG_DIR" ]; then
- observe "creating $CONFIG_DIR"
- mkdir --mode=755 --parents "$CONFIG_DIR"
- fi
-fi
-
-#DEBHELPER#
-
-exit 0
-
-# vim:set ai et sts=2 sw=2 tw=0:
diff --git a/debian/xserver-xorg.prerm.in b/debian/xserver-xorg.prerm.in
deleted file mode 100644
index f45708d..0000000
--- a/debian/xserver-xorg.prerm.in
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-# Debian xserver-xorg package pre-removal script
-# Copyright 1998--2001, 2003, 2004 Branden Robinson.
-# Licensed under the GNU General Public License, version 2. See the file
-# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
-
-
-set -e
-
-# debconf may not be available if some massive purging is going on
-HAVE_DEBCONF=
-if [ -e /usr/share/debconf/confmodule ]; then
- . /usr/share/debconf/confmodule
- HAVE_DEBCONF=yes
-fi
-
-THIS_PACKAGE=xserver-xorg
-THIS_SCRIPT=prerm
-
-#INCLUDE_SHELL_LIB#
-
-CONFIG_DIR=/etc/X11
-SERVER_SYMLINK="$CONFIG_DIR/X"
-CONFIG_AUX_DIR=/var/lib/x11
-SERVER_SYMLINK_CHECKSUM="$CONFIG_AUX_DIR/${SERVER_SYMLINK##*/}.md5sum"
-UNCONFIGURED_LINK_TARGET=$(which true)
-
-#DEBHELPER#
-
-exit 0
-
-# vim:set ai et sts=2 sw=2 tw=0:
commit 984f5646d0a505341a47a7f134cb0d014fd3ab0b
Author: Laurent Bigonville <bigon@bigon.be>
Date: Wed Sep 24 12:57:37 2014 +0200
debian/control: Use canonical Vcs-* URL
diff --git a/debian/changelog b/debian/changelog
index 457d18a..b09fa77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ xorg (1:7.7+8) UNRELEASED; urgency=medium
* debian/x11-common.init: Call restorecon after creating the socket
directories to ensure the SELinux context if properly set (Closes: #677831)
* debian/control: Bump Standards-Version to 3.9.5 (no further changes)
+ * debian/control: Use canonical Vcs-* URL
- -- Laurent Bigonville <bigon@debian.org> Wed, 24 Sep 2014 12:55:09 +0200
+ -- Laurent Bigonville <bigon@debian.org> Wed, 24 Sep 2014 12:57:17 +0200
xorg (1:7.7+7) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 0784201..b1e1ff7 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,8 @@ Build-Depends:
po-debconf,
# xsf-docs:
asciidoc,
-Vcs-Git: git://git.debian.org/git/pkg-xorg/debian/xorg
-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/debian/xorg.git
+Vcs-Git: git://anonscm.debian.org/pkg-xorg/debian/xorg
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/debian/xorg.git
Package: x11-common
Architecture: all
commit 84cf2439ba2da1bcdf8eabd4f621ccd4092fb392
Author: Laurent Bigonville <bigon@bigon.be>
Date: Wed Sep 24 12:55:31 2014 +0200
debian/control: Bump Standards-Version to 3.9.5 (no further changes)
diff --git a/debian/changelog b/debian/changelog
index e232aec..457d18a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ xorg (1:7.7+8) UNRELEASED; urgency=medium
* debian/x11-common.init: Add Short-Description field (Closes: #510087)
* debian/x11-common.init: Call restorecon after creating the socket
directories to ensure the SELinux context if properly set (Closes: #677831)
+ * debian/control: Bump Standards-Version to 3.9.5 (no further changes)
- -- Laurent Bigonville <bigon@debian.org> Wed, 24 Sep 2014 12:18:09 +0200
+ -- Laurent Bigonville <bigon@debian.org> Wed, 24 Sep 2014 12:55:09 +0200
xorg (1:7.7+7) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index dfc2b55..0784201 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Drew Parsons <dparsons@debian.org>, Cyril Brulebois <kibi@debian.org>
-Standards-Version: 3.9.2
+Standards-Version: 3.9.5
Build-Depends:
dpkg (>= 1.16.1),
debhelper (>= 7),
commit 91794aec60f978a149e81e070139f0532ca24df3
Author: Laurent Bigonville <bigon@bigon.be>
Date: Wed Sep 24 12:35:17 2014 +0200
Move the call to restorecon after the loop
Move the call to restorecon after the loop so we are sure this is always
executed
diff --git a/debian/x11-common.init b/debian/x11-common.init
index 102fd22..63c3c30 100644
--- a/debian/x11-common.init
+++ b/debian/x11-common.init
@@ -62,7 +62,6 @@ set_up_dir () {
"0 0 "*" directory")
# as it is owned by root, cannot be replaced with a symlink:
chmod 01777 "$DIR"
- do_restorecon "$DIR"
break
;;
*" directory")
@@ -76,6 +75,7 @@ set_up_dir () {
;;
esac
done
+ do_restorecon "$DIR"
return 0
}
commit 9c66995099d6dbb10b81030cddc78e3f85605c5c
Author: Laurent Bigonville <bigon@bigon.be>
Date: Wed Sep 24 12:25:38 2014 +0200
debian/x11-common.init: Call restorecon after creating the socket directories to ensure the SELinux context if properly set (Closes: #677831)
diff --git a/debian/changelog b/debian/changelog
index 74add54..e232aec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
xorg (1:7.7+8) UNRELEASED; urgency=medium
* debian/x11-common.init: Add Short-Description field (Closes: #510087)
+ * debian/x11-common.init: Call restorecon after creating the socket
+ directories to ensure the SELinux context if properly set (Closes: #677831)
- -- Laurent Bigonville <bigon@debian.org> Wed, 24 Sep 2014 10:52:41 +0200
+ -- Laurent Bigonville <bigon@debian.org> Wed, 24 Sep 2014 12:18:09 +0200
xorg (1:7.7+7) unstable; urgency=medium
diff --git a/debian/x11-common.init b/debian/x11-common.init
index e8394e8..102fd22 100644
--- a/debian/x11-common.init
+++ b/debian/x11-common.init
@@ -62,6 +62,7 @@ set_up_dir () {
"0 0 "*" directory")
# as it is owned by root, cannot be replaced with a symlink:
chmod 01777 "$DIR"
+ do_restorecon "$DIR"
break
;;
*" directory")
commit c0bac80bf2a637ea08fc82878998987648fe925d
Author: Laurent Bigonville <bigon@bigon.be>
Date: Wed Sep 24 10:53:10 2014 +0200
debian/x11-common.init: Add Short-Description field (Closes: #510087)
diff --git a/debian/changelog b/debian/changelog
index 34162f6..74add54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.7+8) UNRELEASED; urgency=medium
+
+ * debian/x11-common.init: Add Short-Description field (Closes: #510087)
+
+ -- Laurent Bigonville <bigon@debian.org> Wed, 24 Sep 2014 10:52:41 +0200
+
xorg (1:7.7+7) unstable; urgency=medium
* Add minimal ppc64el support (closes: #742731). Thanks, Breno Leitao!
diff --git a/debian/x11-common.init b/debian/x11-common.init
index 014594b..e8394e8 100644
--- a/debian/x11-common.init
+++ b/debian/x11-common.init
@@ -6,6 +6,7 @@
# Required-Stop: $remote_fs
# Default-Start: S
# Default-Stop:
+# Short-Description: set up the X server and ICE socket directories
### END INIT INFO
set -e
Reply to: