diff -Nru xserver-xorg-video-vesa-2.3.0+git20100609.d82f2e6e/ChangeLog xserver-xorg-video-vesa-2.3.0+git20100706.fa1fcd48/ChangeLog --- xserver-xorg-video-vesa-2.3.0+git20100609.d82f2e6e/ChangeLog 2010-06-09 20:04:46.000000000 +0100 +++ xserver-xorg-video-vesa-2.3.0+git20100706.fa1fcd48/ChangeLog 2010-07-06 01:53:48.000000000 +0100 @@ -1,3 +1,17 @@ +commit 936aa087fb67d0912e6626c74e161f5923d4aae5 +Author: Robert Hooker +Date: Tue Jul 6 09:38:12 2010 +0845 + + Add debian tree from origin/debian-unstable + +commit fa1fcd483cc60b5f4e82e3f1fe1a84459cf0eaee +Author: Gaetan Nadon +Date: Sun Jun 13 13:04:25 2010 -0400 + + COPYING: update file with Copyright notices from source code. + + Signed-off-by: Gaetan Nadon + commit d82f2e6e52a7cac2f15a20ab91f50f06eaea7e6a Author: Gaetan Nadon Date: Mon Feb 15 13:39:02 2010 -0500 diff -Nru xserver-xorg-video-vesa-2.3.0+git20100609.d82f2e6e/COPYING xserver-xorg-video-vesa-2.3.0+git20100706.fa1fcd48/COPYING --- xserver-xorg-video-vesa-2.3.0+git20100609.d82f2e6e/COPYING 2010-06-09 20:04:07.000000000 +0100 +++ xserver-xorg-video-vesa-2.3.0+git20100706.fa1fcd48/COPYING 2010-07-06 01:53:12.000000000 +0100 @@ -1,4 +1,5 @@ Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com) +Copyright 2008 Red Hat, Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff -Nru xserver-xorg-video-vesa-2.3.0+git20100609.d82f2e6e/debian/changelog xserver-xorg-video-vesa-2.3.0+git20100706.fa1fcd48/debian/changelog --- xserver-xorg-video-vesa-2.3.0+git20100609.d82f2e6e/debian/changelog 2010-07-06 02:00:47.000000000 +0100 +++ xserver-xorg-video-vesa-2.3.0+git20100706.fa1fcd48/debian/changelog 2010-07-06 02:00:47.000000000 +0100 @@ -1,11 +1,11 @@ -xserver-xorg-video-vesa (1:2.3.0+git20100609.d82f2e6e-0ubuntu0sarvatt) maverick; urgency=low +xserver-xorg-video-vesa (1:2.3.0+git20100706.fa1fcd48-0ubuntu0sarvatt) maverick; urgency=low - * Checkout from git 20100609 (master branch) up to commit - d82f2e6e52a7cac2f15a20ab91f50f06eaea7e6a + * Checkout from git 20100706 (master branch) up to commit + fa1fcd483cc60b5f4e82e3f1fe1a84459cf0eaee * Only added debian/ tree from origin/debian-unstable * hook: Drop 001_ubuntu_bail_when_kms_active.patch (fails) - -- Robert Hooker Wed, 09 Jun 2010 15:04:50 -0400 + -- Robert Hooker Tue, 06 Jul 2010 09:38:52 +0845 xserver-xorg-video-vesa (1:2.3.0-3) unstable; urgency=low diff -Nru xserver-xorg-video-vesa-2.3.0+git20100609.d82f2e6e/.lastcommit xserver-xorg-video-vesa-2.3.0+git20100706.fa1fcd48/.lastcommit --- xserver-xorg-video-vesa-2.3.0+git20100609.d82f2e6e/.lastcommit 2010-06-09 20:04:09.000000000 +0100 +++ xserver-xorg-video-vesa-2.3.0+git20100706.fa1fcd48/.lastcommit 2010-07-06 01:53:12.000000000 +0100 @@ -1 +1 @@ -commit d82f2e6e52a7cac2f15a20ab91f50f06eaea7e6a +commit fa1fcd483cc60b5f4e82e3f1fe1a84459cf0eaee