summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpaul <paul@7b491191-dbf0-0310-aff6-d879d4d69008>2007-03-11 10:09:58 +0000
committerpaul <paul@7b491191-dbf0-0310-aff6-d879d4d69008>2007-03-11 10:09:58 +0000
commit32cfba9a278aa3f100b534ecc1efb1b391aabfb9 (patch)
tree64d70a0f35e49b22fdb6b2d4cf2376d9bbfd2d64
parentaebb27dd2aed4896b5b42971460b5c6e721a0387 (diff)
merging git tree
git-svn-id: https://svn.ic-s.nl/svn/dbmail/branches/dbmail_2_2_branch@2458 7b491191-dbf0-0310-aff6-d879d4d69008
-rw-r--r--ChangeLog7
-rw-r--r--debian/changelog6
-rw-r--r--debian/dbmail.postinst2
3 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 594e0132..96346bb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-03-11 Paul J Stevens <paul@nfg.nl>
+
+ * debian/dbmail.postinst:
+ fix sed error
+ * debian/changelog:
+ 2.2.4 rc2 packages
+
2007-03-10 Paul J Stevens <paul@nfg.nl>
* debian/dbmail.postinst:
diff --git a/debian/changelog b/debian/changelog
index 943421ef..3a271298 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-dbmail (2.2.4-0rc1) unstable; urgency=low
+dbmail (2.2.4-0rc2) unstable; urgency=low
- * rc package
+ * rc-2 package
- -- Paul J Stevens <paul@nfg.nl> Sat, 10 Mar 2007 12:27:21 +0100
+ -- Paul J Stevens <paul@nfg.nl> Sun, 11 Mar 2007 11:05:04 +0100
dbmail (2.2.3-1) unstable; urgency=low
diff --git a/debian/dbmail.postinst b/debian/dbmail.postinst
index 2f7551f2..b73a3cd8 100644
--- a/debian/dbmail.postinst
+++ b/debian/dbmail.postinst
@@ -139,7 +139,7 @@ case "$1" in
-e "s/\(^authdriver\W*=\)\(.*\$\)/\1 ldap/" \
$CONFIG
else
- sed -i -re "s/\(^authdriver\W*=\)\(.*\$\)/\1 sql/" \
+ sed -i -e "s/\(^authdriver\W*=\)\(.*\$\)/\1 sql/" \
$CONFIG
fi