From 90c24c3a2862534d583b4d7a03326f1df22e8bf4 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sun, 18 Jun 2017 17:55:56 +0200 Subject: [PATCH 1/2] update I3LOCK_VERSION (forgotten at release time) --- I3LOCK_VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/I3LOCK_VERSION b/I3LOCK_VERSION index 4d97839..5ed7db2 100644 --- a/I3LOCK_VERSION +++ b/I3LOCK_VERSION @@ -1 +1 @@ -2.8-non-git +2.9-non-git From a0abccf8f362c864b4e46251684bf9c2c33ce168 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sun, 18 Jun 2017 17:56:05 +0200 Subject: [PATCH 2/2] Makefile: fix I3LOCK_VERSION replacement fixes #129 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3acb272..0173ea7 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ FILES:=$(FILES:.c=.o) ifeq ($(wildcard .git),) # not in git repository VERSION := $(shell [ -f $(TOPDIR)/I3LOCK_VERSION ] && cat $(TOPDIR)/I3LOCK_VERSION | cut -d '-' -f 1) - I3LOCK_VERSION := '$(shell [ -f $(TOPDIR)/I3LOCK_VERSION ] && cat $(TOPDIR)/I3LOCK_VERSION)' + I3LOCK_VERSION:='$(shell [ -f $(TOPDIR)/I3LOCK_VERSION ] && cat $(TOPDIR)/I3LOCK_VERSION)' else VERSION:=$(shell git describe --tags --abbrev=0) I3LOCK_VERSION:="$(shell git describe --tags --always) ($(shell git log --pretty=format:%cd --date=short -n1))" @@ -62,6 +62,6 @@ dist: clean [ ! -e i3lock-${VERSION}.tar.bz2 ] || rm i3lock-${VERSION}.tar.bz2 mkdir i3lock-${VERSION} cp *.c *.h i3lock.1 i3lock.pam Makefile LICENSE README.md CHANGELOG i3lock-${VERSION} - sed -e 's/^I3LOCK_VERSION:=\(.*\)/I3LOCK_VERSION:=$(shell /bin/echo '${I3LOCK_VERSION}' | sed 's/\\/\\\\/g')/g;s/^VERSION:=\(.*\)/VERSION:=${VERSION}/g' Makefile > i3lock-${VERSION}/Makefile + sed -e 's/^\s*I3LOCK_VERSION:=\(.*\)/I3LOCK_VERSION:=$(shell /bin/echo '${I3LOCK_VERSION}' | sed 's/\\/\\\\/g')/g;s/^VERSION:=\(.*\)/VERSION:=${VERSION}/g' Makefile > i3lock-${VERSION}/Makefile tar cfj i3lock-${VERSION}.tar.bz2 i3lock-${VERSION} rm -rf i3lock-${VERSION}