From 56fd8879227f4240e37c83edcbe3f13fdbea6cb1 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Tue, 29 Sep 2009 07:14:48 +0000
Subject: [PATCH 1/4] Initialize branch F-12 for vbetool

---
 branch | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 branch

diff --git a/branch b/branch
new file mode 100644
index 0000000..06de2d2
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+F-12

From f5e81f5c1723f07949eda7e7f2b2d652400b8ec6 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@fedoraproject.org>
Date: Fri, 2 Oct 2009 01:05:09 +0000
Subject: [PATCH 2/4] - update to 1.2.2 - fixes infinte loops on s/r (#516694)

---
 .cvsignore   | 2 +-
 sources      | 2 +-
 vbetool.spec | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 540b319..a71fb97 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-vbetool-1.2.1.tar.bz2
+vbetool-1.2.2.tar.bz2
diff --git a/sources b/sources
index a12ffb0..f85baa4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6a94f1c69c348de65e14a4ad9acbf795  vbetool-1.2.1.tar.bz2
+6d7ffb0c059b1a0d187ca7201efc3a73  vbetool-1.2.2.tar.bz2
diff --git a/vbetool.spec b/vbetool.spec
index 5c0ee8b..f6b7216 100644
--- a/vbetool.spec
+++ b/vbetool.spec
@@ -1,5 +1,5 @@
 Name:           vbetool
-Version:        1.2.1
+Version:        1.2.2
 Release:        1%{?dist}
 Summary:        Run real-mode video BIOS code to alter hardware state
 
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/udev/rules.d/92-video-post.rules
 
 %changelog
+* Fri Oct 02 2009 Dave Airlie <airlied@redhat.com> 1.2.2-1
+- update to 1.2.2 - fixes infinte loops on s/r (#516694)
+
 * Wed Aug 05 2009 Dave Airlie <airlied@redhat.com> 1.2.1-1
 - rebase to 1.2.1 and install the udev rules
 

From 3f193d4f2e81930559d0768733153c45f1011926 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Thu, 26 Nov 2009 01:12:00 +0000
Subject: [PATCH 3/4] Fix typo that causes a failure to update the common
 directory. (releng     #2781)

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 9310e25..efaed09 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 # Makefile for source rpm: vbetool
-# $Id$
+# $Id: Makefile,v 1.1 2007/09/09 22:33:51 kevin Exp $
 NAME := vbetool
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON := $(shell $(find-makefile-common))

From abd5e9ff0753ba5f2344c6d014f3127cb2ac1939 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 14:54:24 +0000
Subject: [PATCH 4/4] dist-git conversion

---
 .cvsignore => .gitignore |  0
 Makefile                 | 21 ---------------------
 branch                   |  1 -
 3 files changed, 22 deletions(-)
 rename .cvsignore => .gitignore (100%)
 delete mode 100644 Makefile
 delete mode 100644 branch

diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index efaed09..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: vbetool
-# $Id: Makefile,v 1.1 2007/09/09 22:33:51 kevin Exp $
-NAME := vbetool
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/branch b/branch
deleted file mode 100644
index 06de2d2..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-F-12