From a5c6b2653ecaf55a293a3eb93bb7bb8db4afec7b Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 3 Jun 2016 17:28:43 +0200
Subject: [PATCH 1/3] add CONTRIBUTING.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

…so that people know we don’t want to extend i3lock’s image handling.

related to #81, #68, #31
---
 .github/CONTRIBUTING.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .github/CONTRIBUTING.md

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
new file mode 100644
index 0000000..ab0456b
--- /dev/null
+++ b/.github/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+Please do not send/request features related to image manipulation. i3lock’s
+support for background images is intentionally kept minimal, you should do all
+pre-processing in external tools.

From ce1c5cecc04140091ed5691d326e357b79764341 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 3 Jun 2016 17:46:29 +0200
Subject: [PATCH 2/3] clang-format-3.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Not sure why travis didn’t warn about this on the PR. The only reference
to the PR I can find is https://travis-ci.org/i3/i3lock/builds/130470377
---
 i3lock.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/i3lock.c b/i3lock.c
index 524463f..0383ebe 100644
--- a/i3lock.c
+++ b/i3lock.c
@@ -636,10 +636,10 @@ static void maybe_close_sleep_lock_fd(void) {
     const char *sleep_lock_fd = getenv("XSS_SLEEP_LOCK_FD");
     char *endptr;
     if (sleep_lock_fd && *sleep_lock_fd != 0) {
-         long int fd = strtol(sleep_lock_fd, &endptr, 10);
-         if (*endptr == 0) {
-             close(fd);
-         }
+        long int fd = strtol(sleep_lock_fd, &endptr, 10);
+        if (*endptr == 0) {
+            close(fd);
+        }
     }
 }
 

From 619c791a202f550c0f7ea46cff0677fc5a0235da Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 4 Jun 2016 19:26:57 +0200
Subject: [PATCH 3/3] update CHANGELOG

---
 CHANGELOG | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index c01a8b4..48286a1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,15 @@
+2016-06-04 i3lock 2.8
+
+ • Remove DPMS support in favor of a wrapper script and xset(1).
+ • Indicate that the --inactivity-timeout option takes an argument. (Thanks
+   Kenneth Lyons)
+ • fix pam_securetty: set PAM_TTY to getenv("DISPLAY")
+ • Eat XKB_KEY_Delete and XKB_KEY_KP_Delete (Thanks bebehei)
+ • Show unlock indicator if password was entered during PAM verification
+ • Allow CTRL+J as enter and CTRL+H as backspace (Thanks Karl Tarbe)
+ • Flush xcb connection after opening fullscreen window (Thanks martin)
+ • Add support for `xss-lock --transfer-sleep-lock'
+
 2015-05-20 i3lock 2.7
 
  • Die when the X11 connection breaks during runtime (Thanks Eduan)