Commit 7e14b7c8 authored by Martin's avatar Martin

Merge tag 'debian/1.1.0_beta1-1' into debian/stretch-backports

parents b714691e 11d7cf70

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

[flake8]
ignore =
exclude = .git,__pycache__,.gitlab
max-complexity = 15
builtins=_
\ No newline at end of file
- master - Development branch
- gajim_1.0 - Stable Gajim 1.0.x branch
- gajim_0.16 - Stable Gajim 0.16.x branch
If you are not familiar with Git please read the [HowTo](https://dev.gajim.org/gajim/gajim/wikis/howtogit)
\ No newline at end of file
Gajim 1.0.99 (19 August 2018)
New
* Support for setting a MUC Avatar
* Support for PKIX over Secure HTTP (POSH)
* Support idle time for GNOME on Wayland
* New Emoji chooser
* Noto Emoji theme updated to Unicode 11
* Twitter Emoji theme added
* Gajim Theming reworked
* Design updates to many dialogs
- Join Groupchat
- Bookmarks
- Add new contact
- History
- Profile
- Accounts
Bug fixes
* 8658 Translation doesnt work on Windows
* 8750 Increase time frame for duplicate search in MUCs
* 9138 Translation in Flatpak does not work
* 9140 Error when clicking on the notification of an incoming message
* 9159 Wrong form type when responding to a voice request
* 9069 Send cancel IQ if muc configuration is aborted
* 9167 Flatpak fails to determine locale settings
* 9171 Gajim requests vcard multiple times
* 9198 Creating new MUCs with capital letters is not possible
* 9211 Punycode and Unicode with Internationalized Domain Names
Other changes
* Support http:upload:0
* Remove forward message adhoc commands
* Remove support for XEP-0090
* Remove RC4-SHA because it is insecure (Was not used with current OpenSSL versions)
* Improve speed when loading the roster
* Handle new MUC status code 333
* Switch to GDBus for Gajim remote
* Removed support for ESessions
* Improvements to the dark theme of Gajim
* New dependency: python3-cssutils >= 1.0.2
* New dependency: python3-keyring
* Removed dependency: python3-avahi
* Removed dependency: python3-pyasn1
Gajim 1.0.3 (20 May 2018)
Bugs fixed:
......
......@@ -9,20 +9,18 @@
- gir1.2-gtk-3.0 (>=3.22)
- python3-nbxmpp
- python3-openssl (>=0.14)
- python3-pyasn1
- python3-cssutils (>=1.0.2)
- python3-keyring
### Optional Runtime Requirements
- python3-keyring for saving your password to your system keyring
- python3-pil (pillow) for support of webp avatars
- python3-crypto to enable End to end encryption
- python3-gnupg to enable GPG encryption
- For zeroconf (bonjour) you need dbus-glib, python-avahi
- For zeroconf (bonjour) you need python3-dbus
- gir1.2-gspell-1 and hunspell-LANG where lang is your locale eg. en, fr etc
- gir1.2-secret-1 for GNOME Keyring or KDE support as password storage
- D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.80 is required.
- python3-dbus bindings (>=1.2.0)
- D-Bus running to have gajim-remote working
- gir1.2-farstream-0.2, gir1.2-gstreamer-1.0 and gir1.2-gst-plugins-base-1.0 for audio and video calls
- gir1.2-gupnpigd-1.0 for better NAT traversing
- gir1.2-networkmanager-1.0 for network lose detection
......@@ -60,9 +58,9 @@ see [Wiki](https://dev.gajim.org/gajim/gajim/wikis/help/gajimmacosx#python3brew)
#### Developing
For developing you dont have to install Gajim.
For developing you don't have to install Gajim.
After installing all dependencys execute
After installing all dependencies execute
``./launch.py``
......
......@@ -10,7 +10,7 @@ environment:
branches:
only:
- gajim_1.0
- gajim_1.1
clone_depth: 1
......@@ -19,6 +19,7 @@ clone_depth: 1
build_script:
- C:\msys64\usr\bin\pacman -Syu --needed --noconfirm --ask=20
- C:\msys64\usr\bin\pacman -Su --needed --noconfirm
- ps: |
$env:TIME_STRING=(get-date -UFormat "%Y-%m-%d").ToString()
$env:BUILDROOT="C:\msys64\home\appveyor\gajim\win\_build_root"
......@@ -30,8 +31,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.0.3-$($env:ARCH)-$($env:TIME_STRING).exe"
Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-1.0.3-$($env:ARCH)-$($env:TIME_STRING).exe"
Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim.exe" -FileName "Gajim-1.1.0-$($env:ARCH)-$($env:TIME_STRING).exe"
Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-1.1.0-$($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'))
......
......@@ -70,7 +70,7 @@ Shows or hides the roster window
.Sh EXAMPLES
Open a URI of group chat gajim
.Pp
.Dl $ gajim-remote handle_uri xmpp:gajim@conferenc.gajim.org?join
.Dl $ gajim-remote handle_uri xmpp:gajim@conference.gajim.org?join
.Pp
Send custom XML
.Pp
......
gajim (1.0.3-1~bpo9+1) stretch-backports; urgency=medium
gajim (1.1.0~beta1-1~bpo9+1) stretch-backports; urgency=medium
* Rebuild for stretch-backports.
-- W. Martin Borgert <debacle@debian.org> Sat, 26 May 2018 23:50:25 +0000
gajim (1.1.0~beta1-1) unstable; urgency=medium
* new upstream version
-- W. Martin Borgert <debacle@debian.org> Tue, 21 Aug 2018 09:29:13 +0000
gajim (1.0.3-1) unstable; urgency=medium
* new upstream version
......
......@@ -13,6 +13,7 @@ Build-Depends:
intltool (>= 0.40.1),
libglib2.0-dev,
python3,
python3-cssutils,
python3-gi,
python3-gi-cairo,
gir1.2-gtk-3.0,
......@@ -31,12 +32,12 @@ Depends:
${python3:Depends},
gir1.2-gtk-3.0 (>= 3.22),
python3 (>= 3.5),
python3-cssutils (>= 1.0.2),
python3-gi,
python3-gi-cairo,
python3-idna,
python3-nbxmpp (>= 0.6.6),
python3-nbxmpp (>= 0.6.7),
python3-openssl (>= 0.12),
python3-pyasn1,
Recommends:
aspell-en | aspell-dictionary,
ca-certificates,
......@@ -64,7 +65,6 @@ Suggests:
avahi-daemon,
libxss1,
nautilus-sendto,
python3-avahi,
python3-gconf,
python3-gnome2,
python3-kerberos (>= 1.1),
......
......@@ -2,64 +2,95 @@ Description: Remove unnecessary use of distutils
Author: W. Martin Borgert <debacle@debian.org>
Origin: vendor
Bug-Debian: https://bugs.debian.org/893694
Last-Update: 2018-04-01
Last-Update: 2018-08-21
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/gajim/gajim.py
+++ b/gajim/gajim.py
@@ -143,20 +143,6 @@
print('Gajim needs python-nbxmpp to run. Quitting…')
sys.exit(1)
@@ -24,7 +24,6 @@
import platform
from ctypes import CDLL, byref, create_string_buffer
from ctypes.util import find_library
-from distutils.version import LooseVersion as V
# Install _() in namespace
from gajim.common import i18n
@@ -33,20 +32,6 @@
_MIN_GTK_VER = "3.22.0"
- from distutils.version import LooseVersion as V
- if V(nbxmpp.__version__) < V(MIN_NBXMPP_VER):
- print('Gajim needs python-nbxmpp >= %s to run. '
- 'Quitting...' % MIN_NBXMPP_VER)
- sys.exit(1)
-def _check_required_deps():
- try:
- import nbxmpp
- except ImportError:
- print('Gajim needs python-nbxmpp to run. Quitting…')
- sys.exit(1)
-
- from distutils.version import LooseVersion as V
- if V(nbxmpp.__version__) < V(_MIN_NBXMPP_VER):
- print('Gajim needs python-nbxmpp >= %s to run. '
- 'Quitting...' % _MIN_NBXMPP_VER)
- sys.exit(1)
-
-
- gtk_ver = '%s.%s.%s' % (Gtk.get_major_version(),
- Gtk.get_minor_version(),
- Gtk.get_micro_version())
- if V(gtk_ver) < V(MIN_GTK_VER):
- print('Gajim needs GTK+ >= %s to run. '
- 'Quitting...' % MIN_GTK_VER)
- sys.exit(1)
def _init_gui(gui):
if gui == 'GTK':
_init_gtk()
@@ -61,15 +46,6 @@
gi.require_version('GObject', '2.0')
gi.require_version('Pango', '1.0')
- from gi.repository import Gtk
- gtk_ver = '%s.%s.%s' % (Gtk.get_major_version(),
- Gtk.get_minor_version(),
- Gtk.get_micro_version())
- if V(gtk_ver) < V(_MIN_GTK_VER):
- print('Gajim needs GTK+ >= %s to run. '
- 'Quitting...' % _MIN_GTK_VER)
- sys.exit(1)
-