From 2ad886314beffbc60d36fbce0b5d4b8bc6a2b1f7 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Mon, 21 May 2018 16:47:51 +0200 Subject: [PATCH] Version 0.6 --- Makefile | 6 ++---- debian/changelog | 8 ++++++++ debian/compat | 2 +- debian/control | 2 +- debian/copyright | 2 +- test/rapification/test.sh | 2 +- 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index b945323..bc6018f 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ %.c: %.y %.c: %.l -VERSION = 0.5.1 +VERSION = 0.6 DESTDIR = BIN = bin SRC = src @@ -85,10 +85,8 @@ docopt-completion: $(BIN)/armake mv _armake completions/_armake debian: clean - unexpand -t 4 Makefile | tail -c +3 > tmp - mv tmp Makefile tar -czf ../armake_$(VERSION).orig.tar.gz . - debuild -S -sa + debuild -S -d -sa dput ppa:koffeinflummi/armake ../armake_*_source.changes release: diff --git a/debian/changelog b/debian/changelog index 1ab02b9..b605a6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +armake (0.6-1) bionic; urgency=low + + * Rewrite config parse and preprocessor + * Various fixes + + -- Felix Wiegand Mon, 21 May 2018 16:48:00 +0200 + + armake (0.5launchpadisshit-1) precise; urgency=low * This version only has to exist because launchpad is shit. diff --git a/debian/compat b/debian/compat index 45a4fb7..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/debian/control b/debian/control index ed05bbb..973983b 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: armake Section: utils Priority: extra Maintainer: Felix Wiegand -Build-Depends: libssl-dev, debhelper +Build-Depends: bison, flex, libssl-dev, debhelper, imagemagick Standards-Version: 3.9.3 Vcs-Git: git@github.com:KoffeinFlummi/armake.git Vcs-Browser: http://github.com/KoffeinFlummi/armake diff --git a/debian/copyright b/debian/copyright index 3798246..98c746e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,7 +3,7 @@ Upstream-Name: armake Source: http://github.com/KoffeinFlummi/armake Files: * -Copyright: 2016 Felix "KoffeinFlummi" Wiegand +Copyright: 2018 Felix "KoffeinFlummi" Wiegand License: GPL-2+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/test/rapification/test.sh b/test/rapification/test.sh index d92b402..9a67c2c 100755 --- a/test/rapification/test.sh +++ b/test/rapification/test.sh @@ -6,7 +6,7 @@ mkdir -p /tmp/amktest || exit 1 ./bin/armake binarize -f -w unquoted-string test/rapification/config.cpp /tmp/amktest/config.bin ./bin/armake derapify -f /tmp/amktest/config.bin /tmp/amktest/config.cpp -git diff --no-index -- test/rapification/config_ref.cpp /tmp/amktest/config.cpp > /dev/null || { +diff -u test/rapification/config_ref.cpp /tmp/amktest/config.cpp > /dev/null || { rm -rf /tmp/amktest exit 1 }