[dia: 9/9] Merge branch 'bilelmoussaoui/freedesktop-compliant' into 'master'

[Zander <zbrown src gnome org>]

commit 307b9a9d5583d29acb0163ddf4a2cff654c7efd8
Merge: cf950442 716c0c8b
Author: Zander <zbrown gnome org>
Date:   Thu Sep 19 22:31:25 2019 +0000

    Merge branch 'bilelmoussaoui/freedesktop-compliant' into 'master'
    
    Freedesktop compliant
    
    Closes #331
    
    See merge request GNOME/dia!44

 build-aux/flatpak/org.gnome.Dia.json               |  11 +----
 .../16x16/apps/{dia.png => org.gnome.Dia.png}      | Bin
 .../16x16/apps/{dia.svg => org.gnome.Dia.svg}      |   0
 .../22x22/apps/{dia.png => org.gnome.Dia.png}      | Bin
 .../22x22/apps/{dia.svg => org.gnome.Dia.svg}      |   0
 .../24x24/apps/{dia.png => org.gnome.Dia.png}      | Bin
 .../32x32/apps/{dia.png => org.gnome.Dia.png}      | Bin
 .../32x32/apps/{dia.svg => org.gnome.Dia.svg}      |   0
 .../48x48/apps/{dia.png => org.gnome.Dia.png}      | Bin
 data/icons/meson.build                             |  12 ++---
 .../scalable/apps/{dia.svg => org.gnome.Dia.svg}   |   0
 data/meson.build                                   |  34 +++++++++++++-
 data/org.gnome.Dia.appdata.xml.in                  |  51 +++++++++++++++++++++
 data/{dia.desktop => org.gnome.Dia.desktop.in}     |   2 +-
 data/screenshots/screenshot1.png                   | Bin 0 -> 236581 bytes
 meson.build                                        |   1 +
 po/POTFILES.in                                     |   3 +-
 po/meson.build                                     |   2 -
 18 files changed, 94 insertions(+), 22 deletions(-)
---