Merge branch 'ubuntu'
[glsdk/xserver.git] / debian / changelog
index c6733480fde422dd19695767af75234a0a65f34f..6ca7701b558e4ba165ad8e23d875414a927ec0fb 100644 (file)
@@ -1,21 +1,11 @@
-xorg-server (2:1.11.4-0ubuntu10.7+ti2.0) precise; urgency=low
+xorg-server (2:1.11.4-0ubuntu10.8) precise-proposed; urgency=low
 
-  [Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>]
-  * debian/patches/111_armel-drv-fallbacks.patch:
-     - Refresh patch to also include the omap driver together with pvr
   * Add upstream patches to avoid seg fault in case the user is running with
     multiple screens and xrandr is only enabled at one (LP: #1015292):
-    - 516-randr-first-check-pScrPriv-before-using-the-pointer.patch
-    - 517-randr-Catch-two-more-potential-unset-rrScrPriv-uses.patch
-
- -- Xavier Boudet <x-boudet@ti.com>  Tue, 21 Aug 2012 16:51:11 +0200
-
-xorg-server (2:1.11.4-0ubuntu10.7+ti1.0) precise; urgency=low
-
-  * Rebased dri2video support on 0ubuntu10.7
-  * Add patches for driver to handle the transform 
+    - 229_randr_first_check_pScrPriv_before_using_the_pointer.patch
+    - 230_randr_catch_two_more_potential_unset_rrScrPriv_uses.patch
 
- -- Xavier Boudet <x-boudet@ti.com>  Tue, 07 Aug 2012 11:06:32 +0200
+ -- Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>  Thu, 19 Jul 2012 22:57:12 -0300
 
 xorg-server (2:1.11.4-0ubuntu10.7) precise-proposed; urgency=low