From 7d55a983be2c7299bf1e8cf470df844f8de0c213 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= Date: Sat, 13 Jan 2024 23:01:37 -0800 Subject: [PATCH] WIP: Temporary manual 1.3.0 version --- debian/changelog | 2 +- debian/rules | 13 ------------- debian/substvars | 1 - 3 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 debian/substvars diff --git a/debian/changelog b/debian/changelog index 5c35c3a..522ee24 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -btop (1.x.y) UNRELEASED; urgency=low +btop (1.3.0) UNRELEASED; urgency=low * Initial release for native upstream builds. diff --git a/debian/rules b/debian/rules index ea73ef5..d660ddb 100755 --- a/debian/rules +++ b/debian/rules @@ -24,19 +24,6 @@ export PREFIX := /usr # @TODO: Does not seem to take effect as local include/fmt is found first export CXXFLAGS=-I/usr/include/fmt -# Automatic version from sources -VERSION := $(shell head -n100 src/btop.cpp 2>/dev/null | grep "Version =" | cut -f2 -d"\"") - -# This will affect the built .deb package but modifying debian/changelog during -# build is too late for many tools and e.g. the .changes files will be using the -# original version -override_dh_auto_clean: - # Too complex, depends on devscripts - #dch --force-bad-version --newversion $(VERSION) "Automatic build" - # Simple sed on changelog (extra substvars does not seem to have effect) - sed "s/1.x.y/$(VERSION)/" -i debian/changelog debian/substvars - dh_auto_clean - # From Debhelper 15 onwards this will be automatic, but until then # dh_auto_install defaults in a single package build in installing everything to # debian/btop which is undesired in this case, as we want to control the files diff --git a/debian/substvars b/debian/substvars deleted file mode 100644 index 7deaab0..0000000 --- a/debian/substvars +++ /dev/null @@ -1 +0,0 @@ -source:Version=1.x.y