From fd60403fca3284f533156660932eaa632d576269 Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Mon, 12 Feb 2024 11:40:19 +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 cb540ad..4f137c2 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.8 +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 fefb022..a733160 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.8 +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 8b35ab5..63b0f76 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.8 +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 bbe041e..734f9f5 100644 --- a/dist/deb/gnome/debian.changelog +++ b/dist/deb/gnome/debian.changelog @@ -1,4 +1,4 @@ -systray-x-gnome (0.9.8-0) unstable; urgency=low +systray-x-gnome (0.9.8-1) unstable; urgency=low * Update to 0.9.8 diff --git a/dist/deb/gnome/systray-x-gnome.dsc b/dist/deb/gnome/systray-x-gnome.dsc index be2642e..9a21e41 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.8-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 7649218..c870a3a 100644 --- a/dist/deb/kde/debian.changelog +++ b/dist/deb/kde/debian.changelog @@ -1,4 +1,4 @@ -systray-x (0.9.8-0) unstable; urgency=low +systray-x (0.9.8-1) unstable; urgency=low * Update to 0.9.8 diff --git a/dist/deb/kde/systray-x.dsc b/dist/deb/kde/systray-x.dsc index 820f28a..a33498e 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.8-1 Binary: SysTray-X Maintainer: Maxime Rijnders Architecture: any diff --git a/dist/deb/minimal/debian.changelog b/dist/deb/minimal/debian.changelog index 45d72af..26261f1 100644 --- a/dist/deb/minimal/debian.changelog +++ b/dist/deb/minimal/debian.changelog @@ -1,4 +1,4 @@ -systray-x-minimal (0.9.8-0) unstable; urgency=low +systray-x-minimal (0.9.8-1) unstable; urgency=low * Update to 0.9.8 diff --git a/dist/deb/minimal/systray-x-minimal.dsc b/dist/deb/minimal/systray-x-minimal.dsc index a4f58c8..efe1c10 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.8-1 Binary: systray-x-minimal Maintainer: Maxime Rijnders Architecture: any diff --git a/dist/rpm/VERSION b/dist/rpm/VERSION index 326a83b..9597f0e 100644 --- a/dist/rpm/VERSION +++ b/dist/rpm/VERSION @@ -1,4 +1,4 @@ VERSION=0.9.8 -BUILD_NUMBER=1064 -GIT_HASH=ac868b317d5348124db1a506b0a32a1c30ba7ea6 -GIT_BRANCH=develop +BUILD_NUMBER=1065 +GIT_HASH=75f5ddf45d98df37368f40fcfe572f799a823bd8 +GIT_BRANCH=release-0.9.8 diff --git a/dist/rpm/gnome/_service b/dist/rpm/gnome/_service index 92d4fd8..16cffd9 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 d046639..98f3604 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 88d3ed4..06605b0 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