From 5144dedbb2d28052e415bd91b655b49e46d28bbc Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Mon, 12 Feb 2024 12:18:59 +0100 Subject: [PATCH] Update version handling --- dist/arch/gnome/PKGBUILD | 4 +-- dist/arch/kde/PKGBUILD | 4 +-- dist/arch/minimal/PKGBUILD | 4 +-- dist/deb/gnome/debian.changelog | 2 +- dist/deb/gnome/systray-x-gnome.dsc | 2 +- dist/deb/kde/debian.changelog | 2 +- dist/deb/kde/systray-x.dsc | 2 +- dist/deb/minimal/debian.changelog | 2 +- dist/deb/minimal/systray-x-minimal.dsc | 2 +- dist/rpm/VERSION | 6 ++-- dist/rpm/gnome/_service | 4 ++- dist/rpm/kde/_service | 4 ++- dist/rpm/minimal/_service | 5 ++-- update_version.sh | 38 ++++++++++++++++++++++++++ 14 files changed, 62 insertions(+), 19 deletions(-) diff --git a/dist/arch/gnome/PKGBUILD b/dist/arch/gnome/PKGBUILD index 8b11c0d..04e5ccd 100644 --- a/dist/arch/gnome/PKGBUILD +++ b/dist/arch/gnome/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Maxime Rijnders pkgname=systray-x-gnome -pkgver=0 -pkgrel=0 +pkgver=0.9.7 +pkgrel=1 epoch=1 pkgdesc='A system tray extension for Thunderbird (GNOME)' arch=(x86_64) diff --git a/dist/arch/kde/PKGBUILD b/dist/arch/kde/PKGBUILD index 8ad01c9..ef6bb78 100644 --- a/dist/arch/kde/PKGBUILD +++ b/dist/arch/kde/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Maxime Rijnders pkgname=systray-x -pkgver=0 -pkgrel=0 +pkgver=0.9.7 +pkgrel=1 epoch=1 pkgdesc='A system tray extension for Thunderbird (KDE)' arch=(x86_64) diff --git a/dist/arch/minimal/PKGBUILD b/dist/arch/minimal/PKGBUILD index 7896115..751d99a 100644 --- a/dist/arch/minimal/PKGBUILD +++ b/dist/arch/minimal/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Maxime Rijnders pkgname=systray-x-minimal -pkgver=0 -pkgrel=0 +pkgver=0.9.7 +pkgrel=1 epoch=1 pkgdesc='A system tray extension for Thunderbird (Unity/XFCE/other)' arch=(x86_64) diff --git a/dist/deb/gnome/debian.changelog b/dist/deb/gnome/debian.changelog index 544f189..4373008 100644 --- a/dist/deb/gnome/debian.changelog +++ b/dist/deb/gnome/debian.changelog @@ -1,4 +1,4 @@ -systray-x-gnome (0.9.7-0) unstable; urgency=low +systray-x-gnome (0.9.7-1) unstable; urgency=low * Update to 0.9.7 diff --git a/dist/deb/gnome/systray-x-gnome.dsc b/dist/deb/gnome/systray-x-gnome.dsc index 4e305ff..4414704 100644 --- a/dist/deb/gnome/systray-x-gnome.dsc +++ b/dist/deb/gnome/systray-x-gnome.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: systray-x-gnome -Version: 0-0 +Version: 0.9.7-1 Binary: systray-x-gnome Maintainer: Maxime Rijnders Architecture: any diff --git a/dist/deb/kde/debian.changelog b/dist/deb/kde/debian.changelog index 94256ab..9dd0e0b 100644 --- a/dist/deb/kde/debian.changelog +++ b/dist/deb/kde/debian.changelog @@ -1,4 +1,4 @@ -systray-x (0.9.7-0) unstable; urgency=low +systray-x (0.9.7-1) unstable; urgency=low * Update to 0.9.7 diff --git a/dist/deb/kde/systray-x.dsc b/dist/deb/kde/systray-x.dsc index 8ed7726..1bd5893 100644 --- a/dist/deb/kde/systray-x.dsc +++ b/dist/deb/kde/systray-x.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: systray-x -Version: 0-0 +Version: 0.9.7-1 Binary: SysTray-X Maintainer: Maxime Rijnders Architecture: any diff --git a/dist/deb/minimal/debian.changelog b/dist/deb/minimal/debian.changelog index 165a0fa..99153a3 100644 --- a/dist/deb/minimal/debian.changelog +++ b/dist/deb/minimal/debian.changelog @@ -1,4 +1,4 @@ -systray-x-minimal (0.9.7-0) unstable; urgency=low +systray-x-minimal (0.9.7-1) unstable; urgency=low * Update to 0.9.7 diff --git a/dist/deb/minimal/systray-x-minimal.dsc b/dist/deb/minimal/systray-x-minimal.dsc index 5de7c88..cf7701b 100644 --- a/dist/deb/minimal/systray-x-minimal.dsc +++ b/dist/deb/minimal/systray-x-minimal.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: systray-x-minimal -Version: 0-0 +Version: 0.9.7-1 Binary: systray-x-minimal Maintainer: Maxime Rijnders Architecture: any diff --git a/dist/rpm/VERSION b/dist/rpm/VERSION index 29f65d0..afbfb7b 100644 --- a/dist/rpm/VERSION +++ b/dist/rpm/VERSION @@ -1,4 +1,4 @@ VERSION=0.9.7 -BUILD_NUMBER=1032 -GIT_HASH=311dacc37cb8101a4b17e44550a92ace0f885715 -GIT_BRANCH=develop +BUILD_NUMBER=1033 +GIT_HASH=c5e6e17bbf911628570c24b1f99c65d800168c84 +GIT_BRANCH=release-0.9.7 diff --git a/dist/rpm/gnome/_service b/dist/rpm/gnome/_service index 49d1004..c0fcc67 100644 --- a/dist/rpm/gnome/_service +++ b/dist/rpm/gnome/_service @@ -22,5 +22,7 @@ *.tar xz - + + systray-x-gnome.spec + diff --git a/dist/rpm/kde/_service b/dist/rpm/kde/_service index 6a3f871..1848f29 100644 --- a/dist/rpm/kde/_service +++ b/dist/rpm/kde/_service @@ -19,5 +19,7 @@ *.tar xz - + + systray-x.spec + diff --git a/dist/rpm/minimal/_service b/dist/rpm/minimal/_service index d9d1666..2013773 100644 --- a/dist/rpm/minimal/_service +++ b/dist/rpm/minimal/_service @@ -12,7 +12,6 @@ dist/deb/minimal/debian.compat dist/deb/minimal/debian.control dist/deb/minimal/debian.rules - dist/deb/minimal/debian.postinst dist/deb/minimal/systray-x-minimal.dsc dist/arch/minimal/PKGBUILD @@ -21,5 +20,7 @@ *.tar xz - + + systray-x-minimal.spec + diff --git a/update_version.sh b/update_version.sh index a542ad5..c079ce6 100755 --- a/update_version.sh +++ b/update_version.sh @@ -1,7 +1,15 @@ #!/bin/bash +if [[ -z $2 ]] ; then + RELEASE=1 +else + RELEASE=$2 +fi + VERSION=$1 +echo $VERSION-$RELEASE + VERSION_AR=(${VERSION//./ }) VERSION_MAJOR=${VERSION_AR[0]} VERSION_MINOR=${VERSION_AR[1]} @@ -19,6 +27,36 @@ SERVICE_FILE="./dist/rpm/minimal/_service" sed -i -e "s?\(^.*\"revision\">\).*\(\)?\1$VERSION\2?" $SERVICE_FILE sed -i -e "s?\(^.*\"versionformat\">\).*\(\)?\1$VERSION\2?" $SERVICE_FILE + +SERVICE_FILE="./dist/deb/kde/debian.changelog" +sed -i -e "0,/systray-x/{s?\(^systray-x \).*\( unstable.*\)?\1($VERSION-$RELEASE)\2?}" $SERVICE_FILE +SERVICE_FILE="./dist/deb/kde/systray-x.dsc" +sed -i -e "s?\(^Version: \).*?\1$VERSION-$RELEASE?" $SERVICE_FILE + +SERVICE_FILE="./dist/deb/gnome/debian.changelog" +sed -i -e "0,/systray-x/{s?\(^systray-x-gnome \).*\( unstable.*\)?\1($VERSION-$RELEASE)\2?}" $SERVICE_FILE +SERVICE_FILE="./dist/deb/gnome/systray-x-gnome.dsc" +sed -i -e "s?\(^Version: \).*?\1$VERSION-$RELEASE?" $SERVICE_FILE + +SERVICE_FILE="./dist/deb/minimal/debian.changelog" +sed -i -e "0,/systray-x/{s?\(^systray-x-minimal \).*\( unstable.*\)?\1($VERSION-$RELEASE)\2?}" $SERVICE_FILE +SERVICE_FILE="./dist/deb/minimal/systray-x-minimal.dsc" +sed -i -e "s?\(^Version: \).*?\1$VERSION-$RELEASE?" $SERVICE_FILE + + +SERVICE_FILE="./dist/arch/kde/PKGBUILD" +sed -i -e "s?\(^pkgver=\).*?\1$VERSION?" $SERVICE_FILE +sed -i -e "s?\(^pkgrel=\).*?\1$RELEASE?" $SERVICE_FILE + +SERVICE_FILE="./dist/arch/gnome/PKGBUILD" +sed -i -e "s?\(^pkgver=\).*?\1$VERSION?" $SERVICE_FILE +sed -i -e "s?\(^pkgrel=\).*?\1$RELEASE?" $SERVICE_FILE + +SERVICE_FILE="./dist/arch/minimal/PKGBUILD" +sed -i -e "s?\(^pkgver=\).*?\1$VERSION?" $SERVICE_FILE +sed -i -e "s?\(^pkgrel=\).*?\1$RELEASE?" $SERVICE_FILE + + MANIFEST_FILE="./webext/manifest.json" sed -i -e "s?\(^.*\"version\": \"\).*\(\",\)?\1$VERSION\2?" $MANIFEST_FILE