# HG changeset patch
# User Tomas Zeman <tzeman@volny.cz>
# Date 1329313367 -3600
# Node ID 2c303256044abcc85cee44dd8ec385833f652908
# Parent  bab8dfd2ccf3f38f1b4e4ec6cd0c5f2d6fd2b271
guilt.patch: folded w/ upgrade-0.9-guilt.patch

diff -r bab8dfd2ccf3 -r 2c303256044a guilt.patch
--- a/guilt.patch	Wed Feb 15 14:40:18 2012 +0100
+++ b/guilt.patch	Wed Feb 15 14:42:47 2012 +0100
@@ -1,16 +1,14 @@
 guilt
 
-diff --git a/source/custom/guilt/FrugalBuild b/source/custom/guilt/FrugalBuild
-new file mode 100644
-index 0000000..1778ba0
---- /dev/null
-+++ b/source/custom/guilt/FrugalBuild
+diff -r 306bb4da6e58 source/custom/guilt/FrugalBuild
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/source/custom/guilt/FrugalBuild	Wed Feb 15 14:42:26 2012 +0100
 @@ -0,0 +1,20 @@
 +# Maintainer: <tzeman@volny.cz>
 +
 +pkgname=guilt
 +pkgver=0.31.2
-+pkgrel=1
++pkgrel=2
 +pkgdesc="A Quilt-like interface on top of Git"
 +url="http://www.kernel.org/pub/linux/kernel/people/jsipek/guilt/"
 +depends=('git')
diff -r bab8dfd2ccf3 -r 2c303256044a series
--- a/series	Wed Feb 15 14:40:18 2012 +0100
+++ b/series	Wed Feb 15 14:42:47 2012 +0100
@@ -1,5 +1,4 @@
 guilt.patch
-upgrade-0.9-guilt.patch
 vpnc.patch
 gitignore.patch
 vmailmgr.patch
diff -r bab8dfd2ccf3 -r 2c303256044a upgrade-0.9-guilt.patch
--- a/upgrade-0.9-guilt.patch	Wed Feb 15 14:40:18 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-guilt: Upgrade for Frugalware 0.9
-
-diff --git a/source/custom/guilt/FrugalBuild b/source/custom/guilt/FrugalBuild
-index 8566da1..a51a965 100644
---- a/source/custom/guilt/FrugalBuild
-+++ b/source/custom/guilt/FrugalBuild
-@@ -2,7 +2,7 @@
- 
- pkgname=guilt
- pkgver=0.31.2
--pkgrel=1
-+pkgrel=2
- pkgdesc="A Quilt-like interface on top of Git"
- url="http://www.kernel.org/pub/linux/kernel/people/jsipek/guilt/"
- depends=('git')