diff options
| author | Andre Noll <maan@tuebingen.mpg.de> | 2026-05-05 14:40:05 +0000 |
|---|---|---|
| committer | Andre Noll <maan@tuebingen.mpg.de> | 2026-05-05 14:41:34 +0000 |
| commit | 64d7371b5b17b97708c72eacc04258b93206891e (patch) | |
| tree | 7fc4d2bf406315a87885ddd257697e26ea679925 /version-gen.sh | |
| parent | 06752e8fd1d0c0dea93e1d9675959404758b2fbe (diff) | |
| parent | 1f3164588b32b381e6b185418658daf2d68733dc (diff) | |
Merge branch 't/nmu' into t/nmu-debianpu
This brings in the commit which improves version-gen.sh to use $DEB_VERSION,
fixing an issue that was reported by Sebastian Ramacher in 2024 as bug #1086623.
This change was applied independently by Adrian Bunk, who then NMUed the
package to close the bug. Thus, this merge commit also modifies debian/changelog
and debian/rules to reflect these changes.
Diffstat (limited to 'version-gen.sh')
| -rwxr-xr-x | version-gen.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/version-gen.sh b/version-gen.sh index bdeeca2..3ec367f 100755 --- a/version-gen.sh +++ b/version-gen.sh @@ -2,7 +2,6 @@ version_file='version.c' ver='unnamed_version' -# First try git, then gitweb, then default. if [ -e '.git' -o -e '../.git' ]; then git_ver=$(git describe --abbrev=4 HEAD 2>/dev/null) [ -z "$git_ver" ] && git_ver="$ver" @@ -11,8 +10,8 @@ if [ -e '.git' -o -e '../.git' ]; then # if there are differences (exit code 1), the working tree is dirty git diff-index --quiet HEAD || git_ver=$git_ver-dirty ver=$git_ver -elif [ -f debian/changelog ]; then - ver="$(sed -ne '1s/.*(\(.*\)-.*/\1/1; tx; d; :x; p' debian/changelog)" +elif [ -n "$DEB_VERSION" ]; then + ver=$DEB_VERSION elif [ "${PWD%%-*}" = 'lopsub-' ]; then ver=${PWD##*/lopsub-} fi |