diff --git a/Makefile b/Makefile index 5ba279d..9f266e4 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 2017-2022 Fredrik Öhrström (gpl-3.0-or-later) +# Copyright (C) 2017-2023 Fredrik Öhrström (gpl-3.0-or-later) # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -188,27 +188,7 @@ DRIVER_OBJS:=$(patsubst src/%.cc,$(BUILD)/%.o,$(DRIVER_OBJS)) all: $(BUILD)/wmbusmeters $(BUILD)/wmbusmetersd $(BUILD)/wmbusmeters.g $(BUILD)/testinternals -deb_release: - @if [ "$(RELEASE)" = "" ] ; then echo "Usage: make deb RELEASE=1.2.3" ; exit 1 ; fi - @if [ "$$(cat deb/changelog | grep wmbusmeters\ \( | grep -o $(RELEASE))" != "$(RELEASE)" ]; then \ - echo "Changelog not updated with this release! It says:" ; \ - head -n 1 deb/changelog ; \ - exit 1 ; \ - fi - @rm -rf packaging - @mkdir -p packaging - @echo "Checking out tag $(RELEASE)..." - @(cd packaging ; git clone $(PWD) wmbusmeters-$(RELEASE) ; cd wmbusmeters-$(RELEASE) ; git -c advice.detachedHead=false checkout tags/$(RELEASE) ) - @(cd packaging/wmbusmeters-$(RELEASE) ; git show -s --format=%ct > ../release_date ) - @echo "Removing git history..." - @(cd packaging ; rm -rf wmbusmeters-$(RELEASE)/.git ) - @echo "Setting file timestamps to commit date..." - @(cd packaging ; export UT=$$(cat ./release_date) ; find . -exec touch -d "@$$UT" \{\} \; ) - @echo "Creating orig archive..." - @(cd packaging ; tar czf ./wmbusmeters_$(RELEASE).orig.tar.gz wmbusmeters-$(RELEASE) ) - @echo "Running debbuild..." - @(cd packaging/wmbusmeters-$(RELEASE) ; cp -a deb debian; debuild ) - +# Create a local binary only package. deb_local: @rm -rf packaging @mkdir -p packaging diff --git a/deb/changelog b/deb/changelog index d1ec9b0..4578bd4 100644 --- a/deb/changelog +++ b/deb/changelog @@ -1,6 +1,5 @@ -wmbusmeters (1.10.2-1) unstable; urgency=medium +wmbusmeters (0.0.0-1) unstable; urgency=medium - * First package upload (Closes: #998721). - * Upload sponsored by Petter Reinholdtsen. + * Test build - -- Fredrik Öhrström Sat, 26 Jun 2021 12:39:00 +0100 +-- No User Sat, 26 Jun 2021 12:39:00 +0100 diff --git a/deb/rules b/deb/rules index ae0cf04..195be6f 100755 --- a/deb/rules +++ b/deb/rules @@ -15,3 +15,10 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed %: dh $@ + +LPAR=( +RPAR=) +CHANGELOG_RELEASE=$(shell cat debian/changelog | head -n 1 | grep -o '$(LPAR).*$(RPAR)' | tr -d '$(LPAR)$(RPAR)' ) + +override_dh_auto_build: + $(MAKE) COMMIT_HASH= TAG=$(CHANGELOG_RELEASE) BRANCH= CHANGES=