From 40e273b5cc5d7510aff54181072a5a8b1ef10b04 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Tue, 9 May 2017 09:31:12 -0700 Subject: Commit Debian 3.0 (quilt) metadata [dgit (4.0) quilt-fixup] --- debian/patches/debian-changes | 77 +++++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 78 insertions(+) create mode 100644 debian/patches/debian-changes create mode 100644 debian/patches/series diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes new file mode 100644 index 0000000..1cdc46f --- /dev/null +++ b/debian/patches/debian-changes @@ -0,0 +1,77 @@ +The Debian packaging of debug-me is maintained in git, using the +merging workflow described in dgit-maint-merge(7). There isn't a +patch queue that can be represented as a quilt series. + +A detailed breakdown of the changes is available from their canonical +representation - git commits in the packaging repository. For +example, to see the changes made by the Debian maintainer in the first +upload of upstream version 1.2.3, you could use: + + % git clone https://git.dgit.debian.org/debug-me + % cd debug-me + % git log --oneline 1.2.3..debian/1.2.3-1 -- . ':!debian' + +(If you have dgit, use `dgit clone debug-me`, rather than plain `git +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 @@ ++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. ++ Thanks, Sean Whitton. ++ ++ -- Joey Hess Tue, 09 May 2017 11:45:41 -0400 ++ + debug-me (1.20170505) unstable; urgency=medium + + * First release of debug-me. +--- debug-me-1.20170505.orig/Server.hs ++++ debug-me-1.20170505/Server.hs +@@ -262,7 +262,7 @@ emailSessionLog email o logfile + | otherwise = return () + where + to = Address Nothing email +- from = Address Nothing $ fromMaybe "unknown@server" (serverEmail o) ++ from = Address Nothing $ fromMaybe "postmaster" (serverEmail o) + subject = "Your recent debug-me session" + body = "Attached is the log from your recent debug-me session." + 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" ++ + # 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" +--- debug-me-1.20170505.orig/debug-me.init ++++ debug-me-1.20170505/debug-me.init +@@ -33,7 +33,7 @@ case "$1" in + start-stop-daemon --start --quiet --oknodo \ + --background --no-close \ + --pidfile "$PIDFILE" --make-pidfile \ +- --chuid debug-me:debug-me \ ++ --chuid _debug-me:_debug-me \ + --exec "$DAEMON" -- $DAEMON_PARAMS \ + > /var/log/debug-me.log + log_end_msg $? +--- debug-me-1.20170505.orig/debug-me.service ++++ debug-me-1.20170505/debug-me.service +@@ -8,8 +8,8 @@ EnvironmentFile=-/etc/default/debug-me + ExecStart=/usr/bin/debug-me $DAEMON_PARAMS + InaccessiblePaths=/home /etc + ReadWritePaths=/var/log/debug-me +-User=debug-me +-Group=debug-me ++User=_debug-me ++Group=_debug-me + StandardInput=null + StandardOutput=journal + StandardError=journal diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..7bb8252 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +debian-changes -- cgit v1.2.3