From 5f15eea28172e2e78844ebe29c8ded29f21fe49c Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Sat, 20 Oct 2007 03:48:29 +0000
Subject: [PATCH 1/4] Initialize branch F-8 for aasaver

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

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

From eef75654fb9aa254d03acf28f6fdc141c5881f5b Mon Sep 17 00:00:00 2001
From: oddsocks <oddsocks@fedoraproject.org>
Date: Sun, 6 Jan 2008 22:54:34 +0000
Subject: [PATCH 2/4] *** empty log message ***

---
 aasaver.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/aasaver.spec b/aasaver.spec
index de29b38..22153d3 100644
--- a/aasaver.spec
+++ b/aasaver.spec
@@ -1,6 +1,6 @@
 Name:           aasaver
 Version:        0.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A screensaver for KDE which presents an ASCII aquarium
 Group:          Amusements/Graphics
 License:        GPLv2+
@@ -9,7 +9,7 @@ URL:            http://www.kde-apps.org/content/show.php/KDE+Asciiquarium?conten
 # http://www.kde-apps.org/content/download.php?content=29207
 Source0:        29207-%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  kdebase-devel
+BuildRequires:  kdelibs3-devel
 BuildRequires:  scons
 Requires:       xscreensaver-base
 
@@ -48,5 +48,8 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Jan 06 2008 Ian Chapman <packages[AT]amiga-hardware.com> 0.3.2-2
+- Use kdelibs3-devel now instead of kdelibs-devel
+
 * Sun Sep 30 2007 Ian Chapman <packages[AT]amiga-hardware.com> 0.3.2-1
-- Initial release
\ No newline at end of file
+- Initial release

From c0b1cbb3629156cbde1feacbd9392814606e6245 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Thu, 26 Nov 2009 01:24:06 +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 e1f947c..356a633 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ NAME := aasaver
 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 cf1e4f06572548b895f90cf60761a8d1d6b0aec9 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Wed, 28 Jul 2010 09:30:08 +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 356a633..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: aasaver
-# $Id$
-NAME := aasaver
-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 e9e7ccd..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-F-8