glamor-egl: Changes to 'ubuntu'
debian/changelog | 10 ++++++++--
debian/rules | 1 +
debian/xserver-xorg-glamoregl.dirs | 2 --
debian/xserver-xorg-glamoregl.postinst | 18 ------------------
debian/xserver-xorg-glamoregl.prerm | 16 ----------------
debian/xserver-xorg-video-glamoregl.install | 1 -
6 files changed, 9 insertions(+), 39 deletions(-)
New commits:
commit 5d840910685b63e31a88c096dff09e622ee379b9
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Mon Feb 24 10:44:22 2014 +0100
Drop xorg.conf snippet, no longer needed in 1.15.
diff --git a/debian/changelog b/debian/changelog
index 277e76b..330647a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+glamor-egl (0.6.0-0ubuntu4) trusty; urgency=low
+
+ * Drop xorg.conf snippet, no longer needed in 1.15.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Mon, 24 Feb 2014 10:43:55 +0100
+
glamor-egl (0.6.0-0ubuntu3) trusty; urgency=low
* Drop m-a same for xserver-xorg-video-glamoregl.
diff --git a/debian/rules b/debian/rules
index e32fb51..e0ad238 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,7 @@ override_dh_auto_install:
# Kill *.la files, and forget no-one:
override_dh_install:
find debian/tmp -name '*.la' -delete
+ rm -f debian/tmp/usr/share/X11/xorg.conf.d/glamor.conf
dh_install --fail-missing
%:
diff --git a/debian/xserver-xorg-glamoregl.dirs b/debian/xserver-xorg-glamoregl.dirs
deleted file mode 100644
index 8163880..0000000
--- a/debian/xserver-xorg-glamoregl.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/share/glamor
-/usr/share/X11/xorg.conf.d
diff --git a/debian/xserver-xorg-glamoregl.postinst b/debian/xserver-xorg-glamoregl.postinst
deleted file mode 100644
index 629f335..0000000
--- a/debian/xserver-xorg-glamoregl.postinst
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2013 Canonical Ltd
-# Authors: Alberto Milone <alberto.milone@canonical.com>
-
-set -e
-
-case "$1" in
- configure)
- # Use alternatives to make it easier for 3rd party modules to
- # override glamor
- update-alternatives --force \
- --install /usr/share/X11/xorg.conf.d/glamoregl.conf glamor_conf \
- /usr/share/glamor/glamor.conf 500
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/xserver-xorg-glamoregl.prerm b/debian/xserver-xorg-glamoregl.prerm
deleted file mode 100644
index 335bb52..0000000
--- a/debian/xserver-xorg-glamoregl.prerm
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2013 Canonical Ltd
-# Authors: Alberto Milone <alberto.milone@canonical.com>
-
-set -e
-
-case "$1" in
- remove)
- # Use alternatives to make it easier for 3rd party modules to
- # override glamor
- update-alternatives --remove glamor_conf /usr/share/glamor/glamor.conf
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/xserver-xorg-video-glamoregl.install b/debian/xserver-xorg-video-glamoregl.install
index cc3220d..a724ccd 100644
--- a/debian/xserver-xorg-video-glamoregl.install
+++ b/debian/xserver-xorg-video-glamoregl.install
@@ -1,2 +1 @@
usr/lib/*/xorg/modules/libglamoregl.so usr/lib/xorg/modules
-usr/share/X11/xorg.conf.d/glamor.conf usr/share/glamor
commit bb44fb2ce046f49cf2c0f109fbf965c9a7f0f1b3
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Mon Feb 24 10:43:44 2014 +0100
release to trusty
diff --git a/debian/changelog b/debian/changelog
index d291698..277e76b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-glamor-egl (0.6.0-0ubuntu3) UNRELEASED; urgency=low
+glamor-egl (0.6.0-0ubuntu3) trusty; urgency=low
* Drop m-a same for xserver-xorg-video-glamoregl.
- -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Tue, 28 Jan 2014 16:11:55 +0100
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Wed, 05 Feb 2014 09:17:43 +0000
glamor-egl (0.6.0-0ubuntu2) trusty; urgency=low
Reply to: