# HG changeset patch
# User Tomas Zeman <tzeman@volny.cz>
# Date 1213096889 -7200
# Node ID e6a29d7bc91947fd70644079613ea46743606d42
# Parent  2eac1b7c39976c228429bba88b39b62cfa5baeca
omail-admin: merged w/ omail-admin-htaccess

diff -r 2eac1b7c3997 -r e6a29d7bc919 omail-admin-htaccess.patch
--- a/omail-admin-htaccess.patch	Tue Jun 10 12:36:43 2008 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-From 980cbaca550c893c9afb8142df03281ae70c3533 Mon Sep 17 00:00:00 2001
-From: Tomas Zeman <tzeman@volny.cz>
-Date: Fri, 21 Dec 2007 22:51:07 +0100
-Subject: [PATCH] omail-admin: add .htaccess
-
----
- source/custom/omail-admin/.htaccess |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
- create mode 100644 source/custom/omail-admin/.htaccess
-
-diff --git a/source/custom/omail-admin/.htaccess b/source/custom/omail-admin/.htaccess
-new file mode 100644
-index 0000000..978961b
---- /dev/null
-+++ b/source/custom/omail-admin/.htaccess
-@@ -0,0 +1,4 @@
-+php_value session.bug_compat_42 1
-+php_value session.bug_compat_warn 0
-+php_value session.use_cookies 0
-+php_value register_globals 1
--- 
-1.5.3.4
-
diff -r 2eac1b7c3997 -r e6a29d7bc919 omail-admin.patch
--- a/omail-admin.patch	Tue Jun 10 12:36:43 2008 +0200
+++ b/omail-admin.patch	Tue Jun 10 13:21:29 2008 +0200
@@ -1,14 +1,15 @@
-From 8ca5ccf45da1875cc595a3adec0a841fa5063828 Mon Sep 17 00:00:00 2001
-From: Tomas Zeman <tzeman@volny.cz>
-Date: Fri, 21 Dec 2007 10:49:47 +0100
-Subject: [PATCH] omail-admin-1.2rc1-1-i686.fpm:
- *added
+omail-admin
 
----
- source/custom/omail-admin/FrugalBuild |   29 +++++++++++++++++++++++++++++
- 1 files changed, 29 insertions(+), 0 deletions(-)
- create mode 100644 source/custom/omail-admin/FrugalBuild
-
+diff --git a/source/custom/omail-admin/.htaccess b/source/custom/omail-admin/.htaccess
+new file mode 100644
+index 0000000..978961b
+--- /dev/null
++++ b/source/custom/omail-admin/.htaccess
+@@ -0,0 +1,4 @@
++php_value session.bug_compat_42 1
++php_value session.bug_compat_warn 0
++php_value session.use_cookies 0
++php_value register_globals 1
 diff --git a/source/custom/omail-admin/FrugalBuild b/source/custom/omail-admin/FrugalBuild
 new file mode 100644
 index 0000000..5f08d43
@@ -44,6 +45,3 @@
 +	Fsed '^$vmailmgrquota_file .*' "\$vmailmgrquota_file = '/etc/$pkgname/vmailmgrquotas';" $Fdestdir/etc/$pkgname/config.php
 +	Fln /etc/$pkgname/config.php $www/$pkgname/config.php
 +}
--- 
-1.5.3.4
-
diff -r 2eac1b7c3997 -r e6a29d7bc919 series
--- a/series	Tue Jun 10 12:36:43 2008 +0200
+++ b/series	Tue Jun 10 13:21:29 2008 +0200
@@ -40,7 +40,6 @@
 diet-pure-ftpd.patch
 vegadns.patch
 omail-admin.patch
-omail-admin-htaccess.patch
 perl-appconfig.patch
 perl-template-toolkit.patch
 getmail.patch