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

---
 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 2a838386283b419da225707a22054bd01b1b10cd Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Thu, 26 Nov 2009 01:16:38 +0000
Subject: [PATCH 2/4] Fix typo that causes a failure to update the common
 directory. (releng     #2781)

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 32f556b..ccf7583 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ NAME := util-vserver
 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 cbda28c2d94a3e47448b8f6b0faae481adbf0a55 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 14:50:29 +0000
Subject: [PATCH 3/4] dist-git conversion

---
 .cvsignore => .gitignore |  0
 Makefile                 | 20 --------------------
 branch                   |  1 -
 3 files changed, 21 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 ccf7583..0000000
--- a/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# Makefile for source rpm: util-vserver
-NAME := util-vserver
-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

From bab1d3607d4d6f4ba2bd253138fa4ea68b8ee51f Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Date: Mon, 16 Aug 2010 00:07:46 +0200
Subject: [PATCH 4/4] readded makefile

---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 Makefile

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..e5461e3
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,2 @@
+MAKEFILE_COMMON = $(HOME)/.fedora/common.mk
+-include $(MAKEFILE_COMMON)