From 079d8f9ac120b48355f31fc513aa0fa3e0cc916b Mon Sep 17 00:00:00 2001 From: Martin Dvorak Date: Wed, 3 Jan 2018 12:26:49 +0100 Subject: [PATCH] Fixing bug #237 by making build repeatable (removal of compiler generated build number) + 1.24 update. --- Changelog | 4 ++++ PKGBUILD | 2 +- configure.ac | 4 ++-- dist/debian-env.sh | 2 +- dist/github-env.sh | 2 +- dist/ubuntu-add-new-distro-base.sh | 2 +- dist/ubuntu-make-all-distros.sh | 8 ++++---- pad.xml | 6 +++--- src/hstr.c | 5 ++--- 9 files changed, 19 insertions(+), 16 deletions(-) diff --git a/Changelog b/Changelog index 2af39f8f..d0947a79 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,7 @@ +2018-01-03 Martin Dvorak + + * Released v1.24 - Reproducible build and stabilization. + 2017-09-30 Martin Dvorak * Released v1.23 - WLS (Bash on Ubuntu on Windows 10) support diff --git a/PKGBUILD b/PKGBUILD index fdd7f7c6..79165b02 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Filip Szymański pkgname=hstr -pkgver=1.23 +pkgver=1.24 pkgrel=1 pkgdesc="A command line utility that brings improved BASH command completion from the history. It aims to make completion easier and more efficient than Ctrl-r." arch=('any') diff --git a/configure.ac b/configure.ac index b90276ad..4a83ac19 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # configure.ac Autoconf configuration file # process this file with autoconf to produce a configure script # -# Copyright (C) 2014-2017 Martin Dvorak +# Copyright (C) 2014-2018 Martin Dvorak # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ AC_PREREQ([2.69]) -AC_INIT(hh, 1.23, martin.dvorak@mindforger.com) +AC_INIT(hh, 1.24, martin.dvorak@mindforger.com) AC_CONFIG_FILES([Makefile src/Makefile man/Makefile]) # Checks for src dir existence. diff --git a/dist/debian-env.sh b/dist/debian-env.sh index ae1cfb18..0dc4ea46 100755 --- a/dist/debian-env.sh +++ b/dist/debian-env.sh @@ -2,7 +2,7 @@ # Debian release: https://wiki.debian.org/IntroDebianPackaging -export HHVERSION="1.23.0" +export HHVERSION="1.24.0" #export HHFULLVERSION=${HHVERSION}-1.0 # NMU upload export HHFULLVERSION=${HHVERSION}-1 # mantainer upload export HH=hstr_${HHVERSION} diff --git a/dist/github-env.sh b/dist/github-env.sh index f2b1d6d1..87f919f5 100755 --- a/dist/github-env.sh +++ b/dist/github-env.sh @@ -4,6 +4,6 @@ export NOW=`date +%Y-%m-%d--%H-%M-%S` export GH_RELEASE_DIR=~/p/hstr/release export GH_DISTRO_DIR=${GH_RELEASE_DIR}/release-${NOW} -export HHVERSION="1.23" +export HHVERSION="1.24" # eof diff --git a/dist/ubuntu-add-new-distro-base.sh b/dist/ubuntu-add-new-distro-base.sh index eb81ce5c..6c5b6260 100755 --- a/dist/ubuntu-add-new-distro-base.sh +++ b/dist/ubuntu-add-new-distro-base.sh @@ -1,7 +1,7 @@ #!/bin/bash # boostrap new OR refresh distribution base for pbuilder -export DISTRO=zesty +export DISTRO=artful sudo pbuilder --create $DISTRO rm -vf ~/pbuilder/${DISTRO}-base.tgz diff --git a/dist/ubuntu-make-all-distros.sh b/dist/ubuntu-make-all-distros.sh index 193f4545..3d2421f4 100755 --- a/dist/ubuntu-make-all-distros.sh +++ b/dist/ubuntu-make-all-distros.sh @@ -16,11 +16,11 @@ then fi export HHBZRMSG="Top and bottom prompt." -export VERSION=1.23. -export MINOR=1 +export VERSION=1.24. +export MINOR=0 -# precise quantal saucy precise utopic vivid wily yakkety / trusty xenial -for DISTRO in zesty +# precise quantal saucy precise utopic vivid wily yakkety / trusty xenial zesty artful +for DISTRO in trustry xenial zesty artful do ./ubuntu-make-distro.sh ${DISTRO} ${VERSION}${MINOR} "${HHBZRMSG}" diff --git a/pad.xml b/pad.xml index e2f50771..03a053a4 100644 --- a/pad.xml +++ b/pad.xml @@ -2,7 +2,7 @@