Philipp Hörist pushed to branch gajim_1.2 at gajim / gajim

Commits: 4edc2c0d by lovetox at 2020-08-16T09:07:43+02:00 Update setup.cfg

- - - - - 8079c2d6 by lovetox at 2020-08-16T09:08:12+02:00 1.2.2

- - - - -

4 changed files:

- appveyor.yml - data/org.gajim.Gajim.appdata.xml.in - gajim/__init__.py - setup.cfg

Changes:

===================================== appveyor.yml ===================================== @@ -41,8 +41,8 @@ build_script:

bash "git clone C:/projects/gajim C:/msys64/home/appveyor/gajim" bash "C:/msys64/home/appveyor/gajim/win/build.sh $($env:MSYS_ARCH)" - Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim.exe" -FileName "Gajim-1.2.1-$($env:ARCH)-$($env:TIME_STRING).exe" - Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-1.2.1-$($env:ARCH)-$($env:TIME_STRING).exe" + Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim.exe" -FileName "Gajim-1.2.2-$($env:ARCH)-$($env:TIME_STRING).exe" + Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-1.2.2-$($env:ARCH)-$($env:TIME_STRING).exe"

# on_finish: # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

===================================== data/org.gajim.Gajim.appdata.xml.in ===================================== @@ -72,6 +72,7 @@ <content_attribute id="social-audio">intense</content_attribute> </content_rating> <releases> + <release version="1.2.2" date="2020-08-16" /> <release version="1.2.1" date="2020-07-08" /> <release version="1.2.0" date="2020-06-21" /> <release version="1.1.3" date="2019-04-23" />

===================================== gajim/__init__.py ===================================== @@ -1,7 +1,7 @@ import os import subprocess

-__version__ = "1.2.1" +__version__ = "1.2.2"

IS_FLATPAK = False if os.path.exists('/app/share/run-as-flatpak'):

===================================== setup.cfg ===================================== @@ -22,7 +22,7 @@ test_suite = test install_requires = css-parser keyring - nbxmpp>=1.0.1 + nbxmpp>=1.0.2 packaging precis-i18n>=1.0.0 pyOpenSSL>=16.2

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f82fd5ae81edee5f41764a684ba74a19...