diff -Nru xserver-xorg-video-ati-7.4.99+git20140805.fbf575cb/ChangeLog xserver-xorg-video-ati-7.4.99+git20140806.fbf575cb/ChangeLog --- xserver-xorg-video-ati-7.4.99+git20140805.fbf575cb/ChangeLog 2014-08-05 19:09:15.000000000 +0000 +++ xserver-xorg-video-ati-7.4.99+git20140806.fbf575cb/ChangeLog 2014-08-06 14:13:03.000000000 +0000 @@ -1,6 +1,6 @@ -commit 08dc2c4666785895f2baac7e17a4e1c6d71083ed +commit b279def4ffc360433c8b40f2a10fef36b9bb20d1 Author: Robert Hooker -Date: Tue Aug 5 15:09:08 2014 -0400 +Date: Wed Aug 6 10:12:56 2014 -0400 Add debian tree from origin/ubuntu diff -Nru xserver-xorg-video-ati-7.4.99+git20140805.fbf575cb/debian/changelog xserver-xorg-video-ati-7.4.99+git20140806.fbf575cb/debian/changelog --- xserver-xorg-video-ati-7.4.99+git20140805.fbf575cb/debian/changelog 2014-08-06 14:15:15.000000000 +0000 +++ xserver-xorg-video-ati-7.4.99+git20140806.fbf575cb/debian/changelog 2014-08-06 14:15:15.000000000 +0000 @@ -1,11 +1,11 @@ -xserver-xorg-video-ati (1:7.4.99+git20140805.fbf575cb-0ubuntu0sarvatt~trusty) trusty; urgency=high +xserver-xorg-video-ati (1:7.4.99+git20140806.fbf575cb-0ubuntu0sarvatt~trusty) trusty; urgency=high - * Checkout from git 20140805 (master branch) up to commit + * Checkout from git 20140806 (master branch) up to commit fbf575cb010e558a87fad0de45660738c8180896 * Only added debian/ tree from origin/ubuntu * hook: Drop xmir.patch (fails) - -- Robert Hooker Tue, 05 Aug 2014 15:09:15 -0400 + -- Robert Hooker Wed, 06 Aug 2014 10:13:04 -0400 xserver-xorg-video-ati (1:7.4.0-2ubuntu1) utopic; urgency=medium diff -Nru xserver-xorg-video-ati-7.4.99+git20140805.fbf575cb/Makefile.in xserver-xorg-video-ati-7.4.99+git20140806.fbf575cb/Makefile.in --- xserver-xorg-video-ati-7.4.99+git20140805.fbf575cb/Makefile.in 2014-08-05 19:09:15.000000000 +0000 +++ xserver-xorg-video-ati-7.4.99+git20140806.fbf575cb/Makefile.in 2014-08-06 14:13:03.000000000 +0000 @@ -101,7 +101,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ $(srcdir)/config.h.in COPYING ChangeLog INSTALL README compile \ - config.guess config.sub depcomp install-sh missing ltmain.sh + config.guess config.sub install-sh missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \