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

Commits:

4 changed files:

Changes:

  • appveyor.yml
    ... ... @@ -41,8 +41,8 @@ build_script:
    41 41
     
    
    42 42
             bash "git clone C:/projects/gajim C:/msys64/home/appveyor/gajim"
    
    43 43
             bash "C:/msys64/home/appveyor/gajim/win/build.sh $($env:MSYS_ARCH)"
    
    44
    -        Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim.exe" -FileName "Gajim-1.2.1-$($env:ARCH)-$($env:TIME_STRING).exe"
    
    45
    -        Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-1.2.1-$($env:ARCH)-$($env:TIME_STRING).exe"
    
    44
    +        Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim.exe" -FileName "Gajim-1.2.2-$($env:ARCH)-$($env:TIME_STRING).exe"
    
    45
    +        Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-1.2.2-$($env:ARCH)-$($env:TIME_STRING).exe"
    
    46 46
     
    
    47 47
     # on_finish:
    
    48 48
     #   - 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 @@
    72 72
         <content_attribute id="social-audio">intense</content_attribute>
    
    73 73
       </content_rating>
    
    74 74
       <releases>
    
    75
    +    <release version="1.2.2" date="2020-08-16" />
    
    75 76
         <release version="1.2.1" date="2020-07-08" />
    
    76 77
         <release version="1.2.0" date="2020-06-21" />
    
    77 78
         <release version="1.1.3" date="2019-04-23" />
    

  • gajim/__init__.py
    1 1
     import os
    
    2 2
     import subprocess
    
    3 3
     
    
    4
    -__version__ = "1.2.1"
    
    4
    +__version__ = "1.2.2"
    
    5 5
     
    
    6 6
     IS_FLATPAK = False
    
    7 7
     if os.path.exists('/app/share/run-as-flatpak'):
    

  • setup.cfg
    ... ... @@ -22,7 +22,7 @@ test_suite = test
    22 22
     install_requires =
    
    23 23
         css-parser
    
    24 24
         keyring
    
    25
    -    nbxmpp>=1.0.1
    
    25
    +    nbxmpp>=1.0.2
    
    26 26
         packaging
    
    27 27
         precis-i18n>=1.0.0
    
    28 28
         pyOpenSSL>=16.2