# HG changeset patch
# User Tomas Zeman <tzeman@volny.cz>
# Date 1329316658 -3600
# Node ID 1616a6f8958b43f7da93fd6e0371a100286393f6
# Parent  276610bbaf9d204fcebf77ebaabbcf6b1a45ee0a
guilt.patch: folded w/ guilt-upgrade-1.0.patch

diff -r 276610bbaf9d -r 1616a6f8958b guilt-upgrade-1.0.patch
--- a/guilt-upgrade-1.0.patch	Wed Feb 15 15:37:04 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-Upgrade for Frugalware 1.0
-
-diff --git a/source/custom/guilt/FrugalBuild b/source/custom/guilt/FrugalBuild
-index a51a965..b75ab72 100644
---- a/source/custom/guilt/FrugalBuild
-+++ b/source/custom/guilt/FrugalBuild
-@@ -1,7 +1,7 @@
- # Maintainer: <tzeman@volny.cz>
- 
- pkgname=guilt
--pkgver=0.31.2
-+pkgver=0.32.1
- pkgrel=2
- pkgdesc="A Quilt-like interface on top of Git"
- url="http://www.kernel.org/pub/linux/kernel/people/jsipek/guilt/"
-@@ -11,7 +11,7 @@ groups=('custom')
- archs=('i686' 'x86_64')
- up2date="lynx -dump $url|Flasttar"
- source=($url/$pkgname-$pkgver.tar.gz)
--sha1sums=('b19f0a32c80e895dbb938fff1cb4520291eb52b5')
-+sha1sums=('d5d6b995100b239ca49d47fc4d40eb5a5c39ef73')
- 
- build() {
- 	Fcd
diff -r 276610bbaf9d -r 1616a6f8958b guilt.patch
--- a/guilt.patch	Wed Feb 15 15:37:04 2012 +0100
+++ b/guilt.patch	Wed Feb 15 15:37:38 2012 +0100
@@ -1,13 +1,13 @@
 guilt
 
-diff -r 306bb4da6e58 source/custom/guilt/FrugalBuild
+diff -r 1e0d2f1bac2e 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
++++ b/source/custom/guilt/FrugalBuild	Wed Feb 15 15:37:27 2012 +0100
 @@ -0,0 +1,20 @@
 +# Maintainer: <tzeman@volny.cz>
 +
 +pkgname=guilt
-+pkgver=0.31.2
++pkgver=0.32.1
 +pkgrel=2
 +pkgdesc="A Quilt-like interface on top of Git"
 +url="http://www.kernel.org/pub/linux/kernel/people/jsipek/guilt/"
@@ -17,7 +17,7 @@
 +archs=('i686' 'x86_64')
 +up2date="lynx -dump $url|Flasttar"
 +source=($url/$pkgname-$pkgver.tar.gz)
-+sha1sums=('b19f0a32c80e895dbb938fff1cb4520291eb52b5')
++sha1sums=('d5d6b995100b239ca49d47fc4d40eb5a5c39ef73')
 +
 +build() {
 +	Fcd
diff -r 276610bbaf9d -r 1616a6f8958b series
--- a/series	Wed Feb 15 15:37:04 2012 +0100
+++ b/series	Wed Feb 15 15:37:38 2012 +0100
@@ -1,5 +1,4 @@
 guilt.patch
-guilt-upgrade-1.0.patch
 vpnc.patch
 vpnc-upgrade-1.0.patch
 gitignore.patch