From f4c4dcf426dfffb1bce4de3d34e58c30b4e9d51d Mon Sep 17 00:00:00 2001
From: Jeremy Katz <katzj@fedoraproject.org>
Date: Mon, 23 Oct 2006 19:33:14 +0000
Subject: [PATCH 1/4] Initialize branch FC-6 for xbindkeys

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

diff --git a/branch b/branch
new file mode 100644
index 0000000..d5b6362
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+FC-6

From d83f721442d75c49db0a68a086d5ae55e4796189 Mon Sep 17 00:00:00 2001
From: Aurelien Bompard <abompard@fedoraproject.org>
Date: Sun, 28 Jan 2007 13:40:10 +0000
Subject: [PATCH 2/4] version 1.8.0

---
 .cvsignore     | 2 +-
 sources        | 2 +-
 xbindkeys.spec | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index af38280..1668208 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xbindkeys-1.7.3.tar.gz
+xbindkeys-1.8.0.tar.gz
diff --git a/sources b/sources
index 77423ae..17902c2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eea2fe306e99274e8730e199b85706d5  xbindkeys-1.7.3.tar.gz
+71755c23faa113e891de6f2f871e0c76  xbindkeys-1.8.0.tar.gz
diff --git a/xbindkeys.spec b/xbindkeys.spec
index 6502dc3..519d126 100644
--- a/xbindkeys.spec
+++ b/xbindkeys.spec
@@ -1,6 +1,6 @@
 Name:           xbindkeys
-Version:        1.7.3
-Release:        4%{?dist}
+Version:        1.8.0
+Release:        1%{?dist}
 
 Summary:        Binds keys or mouse buttons to shell commands under X.
 License:        GPL
@@ -41,6 +41,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644, root, root) %{_mandir}/man?/*
 
 %changelog
+* Sat Jan 20 2007 Aurelien Bompard <abompard@fedoraproject.org> 1.8.0-1
+- version 1.8.0
+
 * Thu Aug 31 2006 Aurelien Bompard <abompard@fedoraproject.org> 1.7.3-4
 - rebuild
 

From 8febabed8434c864bd2ef72a0ab5c5c5f086a4e6 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Thu, 26 Nov 2009 01:29:21 +0000
Subject: [PATCH 3/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 9c45b83..6aff53a 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ NAME := xbindkeys
 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 4ac810bac40acc6cfc12ca5a04a310cdf2e6c501 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 15:33:23 +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 6aff53a..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xbindkeys
-# $Id$
-NAME := xbindkeys
-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 d5b6362..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-FC-6