From 82d37731c0bb1b42e5ed5dc417ba4d6e103f6e03 Mon Sep 17 00:00:00 2001 From: Vasilis Tsiligiannis Date: Thu, 5 Sep 2019 17:53:30 +0300 Subject: [PATCH] Do not remove Git maintainer version on untagged versions Signed-off-by: Vasilis Tsiligiannis --- .gitlab-ci.yml | 2 ++ debian/patches/0001-remove-git-maint-version.patch | 13 +++++++++++++ debian/patches/series | 1 + 3 files changed, 16 insertions(+) create mode 100644 debian/patches/0001-remove-git-maint-version.patch create mode 100644 debian/patches/series diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 436c80c..3efcf4e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,6 +16,8 @@ debian: dch -b -M -v "${PACKAGE_VERSION}-1" "Bump to version '${PACKAGE_VERSION}-1'" dch -r -m "" } + - | + [ -n "CI_COMMIT_TAG" ] || sed -i '/0001-remove-git-maint-version.patch/ d' debian/patches/series - gbp buildpackage -us -uc --git-upstream-tag='HEAD' --git-ignore-branch --git-ignore-new - mkdir artifacts - cp -a ../*.{deb,debian.tar.xz,dsc,build,buildinfo,changes,orig.tar.gz} artifacts/ diff --git a/debian/patches/0001-remove-git-maint-version.patch b/debian/patches/0001-remove-git-maint-version.patch new file mode 100644 index 0000000..51c9924 --- /dev/null +++ b/debian/patches/0001-remove-git-maint-version.patch @@ -0,0 +1,13 @@ +Index: gr-satnogs-1.5.1/CMakeLists.txt +=================================================================== +--- gr-satnogs-1.5.1.orig/CMakeLists.txt ++++ gr-satnogs-1.5.1/CMakeLists.txt +@@ -49,7 +49,7 @@ list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_ + set(VERSION_INFO_MAJOR_VERSION 1) + set(VERSION_INFO_API_COMPAT 5) + set(VERSION_INFO_MINOR_VERSION 1) +-set(VERSION_INFO_MAINT_VERSION git) ++set(VERSION_INFO_MAINT_VERSION 0) + + + ######################################################################## diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..43134ad --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-remove-git-maint-version.patch