summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2017-05-09 10:42:23 -0700
committerSean Whitton <spwhitton@spwhitton.name>2017-05-09 10:42:23 -0700
commit6f0f452d8c5b8406aac83dd64f6c108394e63177 (patch)
treeb066bf9bbfcd5dc68014f8e604fdfe8e6bdaa6e6
parent275b06d3b3fa02fe0e1f3f5103f391738478c715 (diff)
downloaddebug-me-6f0f452d8c5b8406aac83dd64f6c108394e63177.tar.gz
Commit Debian 3.0 (quilt) metadata
[dgit (4.0) quilt-fixup]
-rw-r--r--debian/patches/debian-changes13
1 files changed, 5 insertions, 8 deletions
diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes
index 1cdc46f..106c758 100644
--- a/debian/patches/debian-changes
+++ b/debian/patches/debian-changes
@@ -17,12 +17,13 @@ clone`.)
A single combined diff, containing all the changes, follows.
--- debug-me-1.20170505.orig/CHANGELOG
+++ debug-me-1.20170505/CHANGELOG
-@@ -1,3 +1,12 @@
+@@ -1,3 +1,13 @@
+debug-me (1.20170506) UNRELEASED; urgency=medium
+
+ * Server: Use "postmaster" as default --from-email address
+ rather than "unknown@server".
-+ * debug-me.default: Add an EMAIL configuration.
++ * debug-me.default: Include a --from-email setting,
++ to encourage it be configured.
+ Thanks, Sean Whitton.
+
+ -- Joey Hess <id@joeyh.name> Tue, 09 May 2017 11:45:41 -0400
@@ -43,14 +44,10 @@ A single combined diff, containing all the changes, follows.
isemail = "@" `T.isInfixOf` email
--- debug-me-1.20170505.orig/debug-me.default
+++ debug-me-1.20170505/debug-me.default
-@@ -1,2 +1,6 @@
-+# Address from which session logs will be sent to the user.
-+# This should be set to a real e-mail address.
-+EMAIL="postmaster"
-+
+@@ -1,2 +1,2 @@
# Parameters to pass to debug-me when it's started as a daemon.
-DAEMON_PARAMS="--server /var/log/debug-me/ --delete-old-logs"
-+DAEMON_PARAMS="--server /var/log/debug-me/ --delete-old-logs --from-email $EMAIL"
++DAEMON_PARAMS="--server /var/log/debug-me/ --delete-old-logs --from-email postmaster"
--- debug-me-1.20170505.orig/debug-me.init
+++ debug-me-1.20170505/debug-me.init
@@ -33,7 +33,7 @@ case "$1" in