meta-openembedded: subtree update:64224b92e5..18506b797b

Alistair Francis (3):
      python3-pako: Initial commit of version 0.2.3
      python3-msm: Initial commit of version 0.8.3
      mycroft: Fixup remaining issues

Andreas Müller (11):
      gtkmm3: upgrade 3.24.1 -> 3.24.2
      geany: upgrade 1.34.1 -> 1.36
      geany-plugins: upgrade 1.34 -> 1.36
      libstemmer: initial add 2.0.0
      appstream-glib: initial add 0.7.16
      yelp-xsl: initial add 3.34.0
      yelp-tools: initial add 3.32.2
      yelp: initial add 3.34.0
      glibmm: upgrade 2.60.0 -> 2.62.0
      libsigc++-3: initial add 3.0.0
      libgusb: initial add 0.3.0+

Ankit Navik (1):
      glfw: Initial recipe for glfw

Armin Kuster (1):
      renderdoc: package need opengl

Christophe PRIOUZEAU (91):
      spawn-fcgi: Clarify BSD license variant
      webmin: Clarify BSD license variant
      cyrus-sasl: Clarify BSD license variant
      libnet: Clarify BSD license variant
      openhpi: Clarify BSD license variant
      ptpd: Clarify BSD license variant
      pure-ftpd: Clarify BSD license variant
      corosync: Clarify BSD license variant
      netkit-ftp: Clarify BSD license variant
      netkit-rusers: Clarify BSD license variant
      netkit-rwho: Clarify BSD license variant
      netkit-telnet: Clarify BSD license variant
      freediameter: Clarify BSD license variant
      radiusclient: Clarify BSD license variant
      celt051: Clarify BSD license variant
      libmemcached: Clarify BSD license variant
      spice-protocol: Clarify BSD license variant
      tcpdump: Clarify BSD license variant
      libnet: Clarify BSD license variant
      iperf3: Clarify BSD license variant
      rfkill: Clarify BSD license variant
      postgresql: Clarify BSD license variant
      cscope: Clarify BSD license variant
      mcpp: Clarify BSD license variant
      yasm: Clarify BSD license variant
      cmpi binding: Clarify BSD license variant
      hwloc: Clarify BSD license variant
      liblogging: Clarify BSD license variant
      pmdk: Clarify BSD license variant
      openwsman: Clarify BSD license variant
      redis: Clarify BSD license variant
      scsirastools: Clarify BSD license variant
      libopus: Clarify BSD license variant
      opus-tools: Clarify BSD license variant
      wavpack: Clarify BSD license variant
      libvpx: Clarify BSD license variant
      passwdqc: Clarify BSD license variant
      testfloat: Clarify BSD license variant
      Python: flask-sqlalchemy: Clarify BSD license variant
      Python: meld3: Clarify BSD license variant
      Python: ply: Clarify BSD license variant
      Python: prompt toolkit: Clarify BSD license variant
      Python: pocket sphinx: Clarify BSD license variant
      Python: pysmi: Clarify BSD license variant
      Python: speaklater: Clarify BSD license variant
      Python: wrapt: Clarify BSD license variant
      Python: h5py: Clarify BSD license variant
      Python: xlrd: Clarify BSD license variant
      Python: alembic: Clarify BSD license variant
      Python: feed formatter: Clarify BSD license variant
      Python: decorator: Clarify BSD license variant
      Python: flask babel: Clarify BSD license variant
      Python: falsk mail: Clarify BSD license variant
      Python: isodate: Clarify BSD license variant
      Python: passlib: Clarify BSD license variant
      Python: pynetlinux: Clarify BSD license variant
      Python: webcolors: Clarify BSD license variant
      Python: werkzeug: Clarify BSD license variant
      Python: evdev: Clarify BSD license variant
      Python: netaddr: Clarify BSD license variant
      Python: pretend: Clarify BSD license variant
      Python: prettytable: Clarify BSD license variant
      Python: pysocks: Clarify BSD license variant
      Python: rdflib: Clarify BSD license variant
      Python: wtforms: Clarify BSD license variant
      Python: supervisor: Clarify BSD license variant
      Python: pysnmp: Clarify BSD license variant
      Python: flask pymongo: Clarify BSD license variant
      Python: flask xstatic: Clarify BSD license variant
      Python: lazy object proxy: Clarify BSD license variant
      Python: whoosh: Clarify BSD license variant
      Python: pyserial: Clarify BSD license variant
      Python: pika: Clarify BSD license variant
      Python: flask: Clarify BSD license variant
      Python: flask wtf: Clarify BSD license variant
      Python: click: Clarify BSD license variant
      Python: babel: Clarify BSD license variant
      Python: flask user: Clarify BSD license variant
      Python: jsonpointer: Clarify BSD license variant
      Python: xxhash: Clarify BSD license variant
      Python: markdown: Clarify BSD license variant
      Python: dnspython: Clarify BSD license variant
      Python: flask bcrypt: Clarify BSD license variant
      Python: jsonpatch: Clarify BSD license variant
      Python: ndg httpsclient: Clarify BSD license variant
      Python: flask scrypt: Clarify BSD license variant
      Python: oauthlib: Clarify BSD license variant
      Python: psutil: Clarify BSD license variant
      Python: pyhamcrest: Clarify BSD license variant
      Python: pyusb: Clarify BSD license variant
      Python: ujson: Clarify BSD license variant

David Roman (1):
      nlohmann-json: upgrade 3.3.0 -> 3.7.0

Diego Rondini (1):
      ttf-roboto: add recipe

Hongxu Jia (2):
      postfix: split /etc from ${PN} to ${PN}-cfg for ostree
      postfix.inc: make deterministic build

Kai Kang (1):
      blueman: fix fail to enable bluetooth issue

Khem Raj (8):
      open-vm-tools: Upgrade to 11.0.1
      libftdi: Add target deps for python bindings
      mraa: Define PYTHON_LIBRARY and PYTHON_INCLUDE_DIR
      upm: Define PYTHON_INCLUDE_DIR and PYTHON_LIBRARY for cmake
      python3-astor: Upgrade to 0.8
      python3-astor: Fix build with setuptools>=41.4
      libiio: Inherit distutils3-base for packaging python files
      open-vm-tools: Fix build by removing deprecated G_INLINE_FUNC

Michal Lower (1):
      update python setuptools-scm from 2.1.0 to 3.3.3

Paolo Valente (1):
      s-suite: push SRCREV to version 3.6

Richard Purdie (1):
      dconf: Fix build with meson 0.52

Tanu Kaskinen (1):
      pavucontrol: polish the recipe

Trevor Gamblin (1):
      freeradius: fix PIDFile path in radiusd.service file

Zang Ruochen (18):
      ltrace:Bug fix for data type length judgment
      python-ipaddress: upgrade 1.0.22 -> 1.0.23
      python-cryptography: upgrade 2.7 -> 2.8
      python-cryptography-vectors: upgrade 2.7 -> 2.8
      python-automat: upgrade 0.7.0 -> 0.8.0
      python-asn1crypto: upgrade 1.0.1 -> 1.2.0
      python-attrs: upgrade 19.2.0 -> 19.3.0
      python-cffi: upgrade 1.13.0 -> 1.13.1
      python-cmd2: upgrade 0.9.18 -> 0.9.19
      python-pip: upgrade 19.3 -> 19.3.1
      python-pyro4: upgrade 4.73 -> 4.77
      python-pytun: upgrade 2.2.1 -> 2.3.0
      python-astroid: upgrade 1.6.5 -> 2.3.2
      python-aws-iot-device-sdk-python: upgrade 1.4.0 -> 1.4.7
      python-backports-ssl: upgrade 3.5.0.1 -> 3.7.0.1
      python-bcrypt: upgrade 3.1.4 -> 3.1.7
      snort: upgrade 2.9.14.1 -> 2.9.15
      wolfssl: upgrade 4.1.0 -> 4.2.0

Zheng Ruoqin (9):
      byacc: upgrade 20180510 -> 20190617
      drbd-utils: upgrade 9.10.0 -> 9.11.0
      hwdata: upgrade 327 -> 328
      multipath-tools: upgrade 0.8.2 -> 0.8.3
      owfs: upgrade 3.2p2 -> 3.2p3
      simple-mtpfs: upgrade to 0.3.0.
      fuse3: upgrade 3.6.2 -> 3.7.0
      f2fs-tools: upgrade 1.11.0 -> 1.13.0
      xorriso: upgrade 1.4.0 -> 1.5.0

nick83ola (2):
      python3-pyconnman: fix import issues with python3
      python3-dbus-next: first commit of dbus-next 0.1.2

Change-Id: I6d500f726de3c5369b19c73e6ca7dc92aaf192d8
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-meld3.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-meld3.inc
index d4e274e..558e436 100644
--- a/meta-openembedded/meta-python/recipes-devtools/python/python-meld3.inc
+++ b/meta-openembedded/meta-python/recipes-devtools/python/python-meld3.inc
@@ -5,7 +5,7 @@
 another.  See http://www.entrian.com/PyMeld for a treatise on the \
 benefits of this pattern."
 HOMEPAGE = "https://github.com/supervisor/meld3"
-LICENSE = "BSD"
+LICENSE = "BSD-4-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9e7581cef5645475fcefebdc15ed7abf"
 
 SRC_URI[md5sum] = "3ccc78cd79cffd63a751ad7684c02c91"