[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

glamor-egl: Changes to 'ubuntu'



 debian/changelog                       |    8 ++++++++
 debian/xserver-xorg-glamoregl.dirs     |    2 ++
 debian/xserver-xorg-glamoregl.install  |    2 +-
 debian/xserver-xorg-glamoregl.postinst |   18 ++++++++++++++++++
 debian/xserver-xorg-glamoregl.prerm    |   16 ++++++++++++++++
 5 files changed, 45 insertions(+), 1 deletion(-)

New commits:
commit 0079af736116b7c26190959238bcdc36a0b6663c
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Tue Nov 26 16:44:56 2013 +0100

    Release 0.5.1-0ubuntu7

diff --git a/debian/changelog b/debian/changelog
index dc67099..5f437fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-glamor-egl (0.5.1-0ubuntu7) UNRELEASED; urgency=low
+glamor-egl (0.5.1-0ubuntu7) trusty; urgency=low
 
-  * 
+  * Create an alternative for the glamor.conf xorg snippet.
+    This makes it possible for other drivers to override
+    the xorg.conf.d snippet.
 
- -- Alberto Milone <alberto.milone@canonical.com>  Tue, 26 Nov 2013 16:11:15 +0100
+ -- Alberto Milone <alberto.milone@canonical.com>  Tue, 26 Nov 2013 16:44:19 +0100
 
 glamor-egl (0.5.1-0ubuntu6) trusty; urgency=low
 

commit 70a9d93e9e784f3da386c348316a83d533237762
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Mon Nov 25 17:24:18 2013 +0100

    Create an alternative for the glamor.conf xorg snippet
    
    This makes it possible for other drivers to override
    the xorg.conf.d snippet.

diff --git a/debian/xserver-xorg-glamoregl.dirs b/debian/xserver-xorg-glamoregl.dirs
new file mode 100644
index 0000000..8163880
--- /dev/null
+++ b/debian/xserver-xorg-glamoregl.dirs
@@ -0,0 +1,2 @@
+/usr/share/glamor
+/usr/share/X11/xorg.conf.d
diff --git a/debian/xserver-xorg-glamoregl.install b/debian/xserver-xorg-glamoregl.install
index 24f274f..cc3220d 100644
--- a/debian/xserver-xorg-glamoregl.install
+++ b/debian/xserver-xorg-glamoregl.install
@@ -1,2 +1,2 @@
 usr/lib/*/xorg/modules/libglamoregl.so	usr/lib/xorg/modules
-usr/share/X11/xorg.conf.d/glamor.conf
+usr/share/X11/xorg.conf.d/glamor.conf	usr/share/glamor
diff --git a/debian/xserver-xorg-glamoregl.postinst b/debian/xserver-xorg-glamoregl.postinst
new file mode 100644
index 0000000..629f335
--- /dev/null
+++ b/debian/xserver-xorg-glamoregl.postinst
@@ -0,0 +1,18 @@
+#!/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
new file mode 100644
index 0000000..335bb52
--- /dev/null
+++ b/debian/xserver-xorg-glamoregl.prerm
@@ -0,0 +1,16 @@
+#!/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

commit f1c1bab8ce1ce52e3e7439347c5b678e6552d9cb
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Tue Nov 26 16:11:19 2013 +0100

    Start work on 0.5.1-0ubuntu7

diff --git a/debian/changelog b/debian/changelog
index 6456753..dc67099 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+glamor-egl (0.5.1-0ubuntu7) UNRELEASED; urgency=low
+
+  * 
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Tue, 26 Nov 2013 16:11:15 +0100
+
 glamor-egl (0.5.1-0ubuntu6) trusty; urgency=low
 
   * Add a hook to SetWindowPixmap to fix recordmydesktop crashing. (LP: #1244324)


Reply to: