# HG changeset patch
# User Tomas Zeman <tzeman@volny.cz>
# Date 1329313758 -3600
# Node ID cf946cced868a786033142a294873f97047f9a20
# Parent  f2f331cc54658076fa0b738a7af6d360f6b19bc8
diet-daemontools.patch: folded w/ upgrade-0.9-diet-daemontools.patch

diff -r f2f331cc5465 -r cf946cced868 diet-daemontools.patch
--- a/diet-daemontools.patch	Wed Feb 15 14:48:24 2012 +0100
+++ b/diet-daemontools.patch	Wed Feb 15 14:49:18 2012 +0100
@@ -1,21 +1,11 @@
-From ebefdd0429b35e479073ee76d73f35ca55180d14 Mon Sep 17 00:00:00 2001
 From: Tomas Zeman <tzeman@volny.cz>
 Date: Fri, 26 Oct 2007 23:15:37 +0200
-Subject: [PATCH] diet-daemontools-0.76-1-i686.fpm
- * added
+
+diet-daemontools
 
----
- source/dietlibc/diet-daemontools/FrugalBuild       |   42 ++++++++++++++++++++
- .../dietlibc/diet-daemontools/daemontools.install  |   37 +++++++++++++++++
- 2 files changed, 79 insertions(+), 0 deletions(-)
- create mode 100644 source/dietlibc/diet-daemontools/FrugalBuild
- create mode 100644 source/dietlibc/diet-daemontools/daemontools.install
-
-diff --git a/source/dietlibc/diet-daemontools/FrugalBuild b/source/dietlibc/diet-daemontools/FrugalBuild
-new file mode 100644
-index 0000000..3322f94
---- /dev/null
-+++ b/source/dietlibc/diet-daemontools/FrugalBuild
+diff -r f0bdfccbdd22 source/dietlibc/diet-daemontools/FrugalBuild
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/source/dietlibc/diet-daemontools/FrugalBuild	Wed Feb 15 14:49:05 2012 +0100
 @@ -0,0 +1,42 @@
 +# Maintainer: Tomas Zeman <tzeman@volny.cz>
 +
@@ -23,7 +13,7 @@
 +pkgorig=daemontools
 +pkgname=$branch-$pkgorig
 +pkgver=0.76
-+pkgrel=1
++pkgrel=2
 +pkgdesc="A collection of tools for managing UNIX services."
 +makedepends=(dietlibc)
 +license="public domain"
@@ -59,11 +49,9 @@
 +	cd $Fdestdir/package/admin && ln -sf $pkgorig-$pkgver $pkgorig || Fdie
 +}
 +# vim: ft=sh
-diff --git a/source/dietlibc/diet-daemontools/daemontools.install b/source/dietlibc/diet-daemontools/daemontools.install
-new file mode 100644
-index 0000000..1e85fde
---- /dev/null
-+++ b/source/dietlibc/diet-daemontools/daemontools.install
+diff -r f0bdfccbdd22 source/dietlibc/diet-daemontools/daemontools.install
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/source/dietlibc/diet-daemontools/daemontools.install	Wed Feb 15 14:49:05 2012 +0100
 @@ -0,0 +1,37 @@
 +# arg 1:  the new package version
 +post_install() {
@@ -102,6 +90,3 @@
 +
 +$op $*
 +# vim: ts=2 sw=2 et ft=sh
--- 
-1.5.3.4
-
diff -r f2f331cc5465 -r cf946cced868 series
--- a/series	Wed Feb 15 14:48:24 2012 +0100
+++ b/series	Wed Feb 15 14:49:18 2012 +0100
@@ -5,7 +5,6 @@
 diet-bglibs.patch
 diet-cvm.patch
 diet-daemontools.patch
-upgrade-0.9-diet-daemontools.patch
 bglibs.patch
 upgrade-0.9-bglibs.patch
 cvm.patch
diff -r f2f331cc5465 -r cf946cced868 upgrade-0.9-diet-daemontools.patch
--- a/upgrade-0.9-diet-daemontools.patch	Wed Feb 15 14:48:24 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-diet-daemontools: Upgrade for Frugalware 0.9
-
-diff --git a/source/dietlibc/diet-daemontools/FrugalBuild b/source/dietlibc/diet-daemontools/FrugalBuild
-index 3322f94..6bfe8fd 100644
---- a/source/dietlibc/diet-daemontools/FrugalBuild
-+++ b/source/dietlibc/diet-daemontools/FrugalBuild
-@@ -4,7 +4,7 @@ branch=diet
- pkgorig=daemontools
- pkgname=$branch-$pkgorig
- pkgver=0.76
--pkgrel=1
-+pkgrel=2
- pkgdesc="A collection of tools for managing UNIX services."
- makedepends=(dietlibc)
- license="public domain"