Mercurial Mercurial > frugalware-patches.mq / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
guilt.patch: folded w/ upgrade-0.9-guilt.patch
authorTomas Zeman <tzeman@volny.cz>
Wed, 15 Feb 2012 14:42:47 +0100
changeset 83 2c303256044a
parent 82 bab8dfd2ccf3
child 84 df315870634b
guilt.patch: folded w/ upgrade-0.9-guilt.patch
guilt.patch file | annotate | diff | comparison | revisions
series file | annotate | diff | comparison | revisions
upgrade-0.9-guilt.patch file | annotate | diff | comparison | revisions 
--- 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')
--- 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
--- 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')
frugalware-patches.mq