Skip to content
Snippets Groups Projects
Commit f3754403 authored by inso's avatar inso
Browse files

Merge branch 'master' into dev

parents 34365d34 4ec6b87f
No related branches found
No related tags found
No related merge requests found
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#error "Unable to find MyAppExe" #error "Unable to find MyAppExe"
#endif #endif
#define MyAppVerStr "0.20.2" #define MyAppVerStr "0.20.4"
[Setup] [Setup]
AppName={#MyAppName} AppName={#MyAppName}
......
Package: sakia Package: sakia
Version: 0.20.2 Version: 0.20.4
Section: misc Section: misc
Priority: optional Priority: optional
Architecture: all Architecture: all
......
[Desktop Entry] [Desktop Entry]
Version=0.20.4
Name=Sakia Name=Sakia
Comment=Duniter Qt Client
Exec=sakia Exec=sakia
Icon=/opt/sakia/sakia.png Icon=/opt/sakia/sakia.png
Terminal=false
Type=Application Type=Application
Categories=Utility Categories=Utility;Application;
...@@ -9,7 +9,8 @@ if [[ $1 =~ ^[0-9]+.[0-9]+.[0-9]+[0-9a-z]*$ ]]; then ...@@ -9,7 +9,8 @@ if [[ $1 =~ ^[0-9]+.[0-9]+.[0-9]+[0-9a-z]*$ ]]; then
sed -i "s/__version_info__\ = ($current)/__version_info__ = ('${array[0]}', '${array[1]}', '${array[2]}')/g" src/sakia/__init__.py sed -i "s/__version_info__\ = ($current)/__version_info__ = ('${array[0]}', '${array[1]}', '${array[2]}')/g" src/sakia/__init__.py
sed -i "s/#define MyAppVerStr .*/#define MyAppVerStr \"$1\"/g" ci/appveyor/sakia.iss sed -i "s/#define MyAppVerStr .*/#define MyAppVerStr \"$1\"/g" ci/appveyor/sakia.iss
sed -i "s/Version: .*/Version: $1/g" ci/travis/debian/DEBIAN/control sed -i "s/Version: .*/Version: $1/g" ci/travis/debian/DEBIAN/control
git commit src/sakia/__init__.py ci/appveyor/sakia.iss ci/travis/debian/DEBIAN/control -m "$1" sed -i "s/Version=.*/Version=$1/g" ci/travis/debian/usr/share/applications/sakia.desktop
git commit src/sakia/__init__.py ci/appveyor/sakia.iss ci/travis/debian/DEBIAN/control ci/travis/debian/usr/share/applications/sakia.desktop -m "$1"
git tag "$1" -a -m "$1" git tag "$1" -a -m "$1"
else else
echo "Wrong version format" echo "Wrong version format"
......
__version_info__ = ('0', '20', '2') __version_info__ = ('0', '20', '4')
__version__ = '.'.join(__version_info__) __version__ = '.'.join(__version_info__)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment