From 0852bf6c3124377df2b86f2c72225fe4ad43d612 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Tue, 29 Sep 2009 08:15:45 +0000
Subject: [PATCH 1/4] Initialize branch F-12 for acpi

---
 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 cd77bff990af6c7dd8be3be5280a5ab1579d2139 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Thu, 26 Nov 2009 01:24:49 +0000
Subject: [PATCH 2/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 5358c5f..a00b4db 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 # Makefile for source rpm: acpi
-# $Id$
+# $Id: Makefile,v 1.1 2006/03/17 21:43:22 pertusus Exp $
 NAME := acpi
 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 cde025a7321aa39881c2e5bd9f629fa807a0c22b Mon Sep 17 00:00:00 2001
From: "Steven M. Parrish" <tuxbrewr@fedoraproject.org>
Date: Mon, 28 Jun 2010 14:32:26 +0000
Subject: [PATCH 3/4] New upstream release

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

diff --git a/.cvsignore b/.cvsignore
index 52b8e53..53d201f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-acpi-1.4.tar.gz
+acpi-1.5.tar.gz
diff --git a/acpi.spec b/acpi.spec
index 188d831..fa54f0d 100644
--- a/acpi.spec
+++ b/acpi.spec
@@ -1,7 +1,7 @@
 Summary:        Command-line ACPI client
 Summary(pl):    Klient ACPI działający z linii poleceń
 Name:           acpi
-Version:        1.4
+Version:        1.5
 Release:        1%{?dist}
 License:        GPLv2+
 Group:          Applications/System
@@ -39,7 +39,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS ChangeLog README COPYING
 %{_bindir}/acpi
 %{_datadir}/man/man1/acpi.1.gz
+
 %changelog
+* Mon Jun 28 2010 Steven M. Parrish <smparrish@gmail.com> - 1.5-1
+- New upstream release
+
 * Wed Aug 26 2009 Steven M. Parrish <smparrish@gmail.com> - 1.4-1
 - fixed state information for thermal zones
 - added output of all trip points
diff --git a/sources b/sources
index 13fac73..803d96f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ea2a285957a36bad2ec099413bd330a5  acpi-1.4.tar.gz
+ccfee3d53eba9c9947adafbcc1387611  acpi-1.5.tar.gz

From 3782c4f86ccf68ff0c31770e20ddc12f5fc5893c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Wed, 28 Jul 2010 09:34:55 +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 a00b4db..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: acpi
-# $Id: Makefile,v 1.1 2006/03/17 21:43:22 pertusus Exp $
-NAME := acpi
-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