Vangelis Mouhtsis · Vangelis Mouhtsis · Vangelis Mouhtsis · Vangelis Mouhtsis · Martin Wimpress · Martin Wimpress
--- a/debian/changelog
+++ b/debian/changelog
+mate-settings-daemon (1.20.3-1~bpo9+1) stretch-backports; urgency=medium
+
+  * Rebuild for stretch-backports.
+
+ -- Mike Gabriel <sunweaver@debian.org>  Mon, 23 Jul 2018 10:34:28 +0200
+
+mate-settings-daemon (1.20.3-1) unstable; urgency=medium
+
+  * New upstream release.
+  * debian/patches:
+    + Drop all patches. Shipped upstream now.
+  * debian/control:
+    + debian/control: Bump versioned B-D for libmate-desktop-dev to
+      (>= 1.20.2).
+    + Update Vcs-*: fields. Package has been migrated to salsa.debian.org.
+    + Bump Standards-Version: to 4.1.4. No changes needed.
+    + Drop pkg-mate-team Alioth mailing list from Uploaders: field.
+  * debian/copyright:
+    + Make Upstream-Name: field's value more human readable.
+    + Update Upstream-Contact: field.
+    + Update Source: field. Use secure URLs.
+  * debian/upstream/metadata:
+    + Add file. Be compliant with DEP-12 proposal.
+    + Use Martin's address as Contact: address.
+
+ -- Mike Gabriel <sunweaver@debian.org>  Fri, 06 Jul 2018 14:18:14 +0200
+
+mate-settings-daemon (1.20.1-3) unstable; urgency=medium
+
+  * debian/control:
+    + Bump versioned B-D on libmate-desktop-dev to 1.20.1-2~ due to added
+      symbol mate_bg_create_surface_scale(). Fixes FTBFS of previous
+      upload.
+
+ -- Mike Gabriel <sunweaver@debian.org>  Wed, 18 Apr 2018 13:51:50 +0200
+
+mate-settings-daemon (1.20.1-2) unstable; urgency=medium
+
+  [ Martin Wimpress ]
+  * debian/patches:
+    + Add 0001_hidpi_background_support.patch. Support background fallback on
+      HiDPI.
+    + 0001_hidpi_background_support.patch add Author and Description
+
+ -- Mike Gabriel <sunweaver@debian.org>  Wed, 18 Apr 2018 12:15:28 +0200
+
+mate-settings-daemon (1.20.1-1) unstable; urgency=medium
+
+  [ Martin Wimpress ]
+  * New upstream release.
+  * debian/patches:
+    + Drop 0001_scale_osd_on_hidpi_displays.patch. Applied upstream.
+    + Drop 0002_prevent_media-keys_swallowing_modifier_keys.patch. Applied
+      upstream.
+
+  [ Mike Gabriel ]
+  * debian/copyright:
+    + Update copyright attributions.
+
+ -- Mike Gabriel <sunweaver@debian.org>  Thu, 05 Apr 2018 11:57:28 +0200
+
+mate-settings-daemon (1.20.0-2) unstable; urgency=medium
+
+  [ Mike Gabriel ]
+  * debian/control:
+    + Drop extra Priority: field for bin:pkg mate-settings-dev.
+  * debian/copyright:
+    + Use secure URI for copyright format.
+  * debian/patches:
+    + Add patch header to
+      0002_prevent_media-keys_swallowing_modifier_keys.patch.
+  * debian/watch:
+    + Use secure URI to obtain upstream sources
+
+  [ Martin Wimpress ]
+  * debian/patches:
+    + Add 0002_prevent_media-keys_swallowing_modifier_keys.patch. Prevent
+      media-keys bindings from swallowing modifier keys.
+
+ -- Mike Gabriel <sunweaver@debian.org>  Sun, 11 Mar 2018 11:53:24 +0100
+
+mate-settings-daemon (1.20.0-1) unstable; urgency=medium
+
+  [ Martin Wimpress ]
+  * debian/patches (already in 1.19.2-0ubuntu1):
+    + Drop 1000_global_menu_support.diff. Applied upstream.
+    + Add 000{0,1}_hidpi.patch. HiDPI support.
+  * debian/patches: (already in 1.20.0-0ubuntu1):
+    + Drop 000*_hidpi.patch files. Applied upstream.
+  * debian/patches: (this release):
+    + Add 0001_scale_osd_on_hidpi_displays.patch. Scale OSD size correctly
+      on HiDPI displays.
+  * debian/copyright (already in 1.20.0-0ubuntu1):
+    + Update copyright attributions.
+  * debian/control (already in 1.19.2-0ubuntu1):
+    + Dependencies updated for MATE 1.19.
+    + Drop B-D autotools-dev. Since compatibility level 10, debhelper enables
+      the autoreconf sequence by default.
+  * debian/control (already in 1.20.0-0ubuntu1):
+    + Update Build-Depends: to support MATE Desktop 1.20.
+  * debian/changelog: White-space cleanup.
+
+  [ Vangelis Mouhtsis ]
+  * debian/control (already in 1.19.2-0ubuntu1):
+    + Temporarily have pkg-mate-team ML under Uploaders:.
+    + Update Maintainer: field to debian-mate ML on lists.debian.org.
+    + Rename pretty name of our team -> Debian+Ubuntu MATE Packaging Team.
+    + Bump Standards-Version: to 4.1.3. No changes needed.
+
+ -- Mike Gabriel <sunweaver@debian.org>  Mon, 12 Feb 2018 11:31:35 +0100
+
+mate-settings-daemon (1.20.0-0ubuntu1) bionic; urgency=medium
+
+  * New upstream release.
+
+ -- Martin Wimpress <martin.wimpress@ubuntu.com>  Wed, 07 Feb 2018 14:03:55 +0000
+
+mate-settings-daemon (1.19.2-0ubuntu3) bionic; urgency=medium
+
+  * debian/patches:
+    + Add 0001_hidpi.patch. HiDPI configuration in XSettings.
+
+ -- Martin Wimpress <martin.wimpress@ubuntu.com>  Tue, 06 Feb 2018 14:47:59 +0000
+
+mate-settings-daemon (1.19.2-0ubuntu2) bionic; urgency=medium
+
+  * debian/patches:
+    + Update 0000_hidpi.patch. Fix where DPI is getting scaled and remove ceil
+      for scaled DPI.
+
+ -- Martin Wimpress <martin.wimpress@ubuntu.com>  Thu, 25 Jan 2018 23:27:52 +0000
+
+mate-settings-daemon (1.19.2-0ubuntu1) bionic; urgency=medium
+
+  * New upstream release.
+
+ -- Martin Wimpress <martin.wimpress@ubuntu.com>  Tue, 23 Jan 2018 11:52:50 +0000
+
 mate-settings-daemon (1.18.2-1~bpo9+1) stretch-backports; urgency=medium

  * Rebuild for stretch-backports.

--- a/debian/control
+++ b/debian/control
 Source: mate-settings-daemon
 Section: x11
 Priority: optional
-Maintainer: MATE Packaging Team <pkg-mate-team@lists.alioth.debian.org>
+Maintainer: Debian+Ubuntu MATE Packaging Team <debian-mate@lists.debian.org>
 Uploaders: Mike Gabriel <sunweaver@debian.org>,
           John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>,
           Stefano Karapetsas <stefano@karapetsas.com>,
           Vangelis Mouhtsis <vangelis@gnugr.org>,
-Build-Depends: autotools-dev,
-               debhelper (>= 10.3~),
+Build-Depends: debhelper (>= 10.3~),
               dpkg-dev (>= 1.16.1.1),
               intltool,
               libcanberra-gtk3-dev,
@@ -16,7 +15,7 @@ Build-Depends: autotools-dev,
               libfontconfig1-dev,
               libglib2.0-dev,
               libgtk-3-dev,
-               libmate-desktop-dev (>= 1.18),
+               libmate-desktop-dev (>= 1.20.2),
               libmatekbd-dev (>= 1.18),
               libmatemixer-dev (>= 1.18),
               libnotify-dev,
@@ -33,10 +32,10 @@ Build-Depends: autotools-dev,
               libxt-dev,
               mate-common (>= 1.18),
               x11proto-kb-dev,
-Standards-Version: 4.1.1
+Standards-Version: 4.1.4
 Homepage: http://www.mate-desktop.org/
-Vcs-Browser: https://anonscm.debian.org/git/pkg-mate/mate-settings-daemon.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-mate/mate-settings-daemon.git
+Vcs-Browser: https://salsa.debian.org/debian-mate-team/mate-settings-daemon
+Vcs-Git: https://salsa.debian.org/debian-mate-team/mate-settings-daemon.git

 Package: mate-settings-daemon
 Architecture: any
@@ -93,7 +92,6 @@ Description: daemon handling the MATE session settings (common files)

 Package: mate-settings-daemon-dev
 Section: devel
-Priority: extra
 Architecture: any
 Depends: mate-settings-daemon (= ${binary:Version}),
         libdbus-glib-1-dev,

--- a/debian/copyright
+++ b/debian/copyright
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: mate-settings-daemon
-Upstream-Contact: Stefano Karapetsas <stefano@karapetsas.com>
-Source: http://git.mate-desktop.org/mate-settings-daemon/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: MATE Settings Daemon
+Upstream-Contact: Martin Wimpress <martin@mate-desktop.org>
+Source: https://git.mate-desktop.org/mate-settings-daemon/

 Files: mate-settings-daemon/main.c
       mate-settings-daemon/mate-settings-manager.c
@@ -73,6 +73,11 @@ Files: mate-settings-daemon/mate-settings-plugin-info.h
 Copyright: 2006-2010 Red Hat, Inc
 License: GPL-2+

+Files: plugins/xsettings/wm-common.c
+       plugins/xsettings/wm-common.h
+Copyright: 2018 Victor Kareh <vkareh@vkareh.net>
+License: GPL-2+
+
 Files: plugins/clipboard/list.c
       plugins/clipboard/list.h
       plugins/clipboard/xutils.c
@@ -269,6 +274,7 @@ Comment:
 License assumed from COPYING file.

 Files: .tx/config
+       .github/issue_template.md
       data/Makefile.am
       data/*.in.in
       data/*.in
@@ -276,6 +282,7 @@ Files: .tx/config
       data/msd-locate-pointer.1
       data/mate-settings-daemon.1
       Makefile.am
+       makepot
       mate-settings-daemon/Makefile.am
       mate-settings-daemon/mate-settings-manager.xml
       plugins/a11y-keyboard/Makefile.am
@@ -349,7 +356,8 @@ License: GPL-2+ or LGPL-2.1+
 Comment:
 License(s) assumed from COPYING and COPYING.LIB files.

-Files: po/*.po
+Files: mate-settings-daemon.pot
+       po/*.po
       po/gnome-copyrights.txt
 Copyright:
 2003-2006, Miloslav Trmac <mitr@volny.cz>

--- a/debian/patches/1000_global_menu_support.diff
+++ b/debian/patches/1000_global_menu_support.diff
-Description: Add interfaces to support Global Menu. (LP: #1675956)
-Author: Martin Wimpress <martin@ubuntu-mate.org>
-Abstract:
- These interfaces were accidently not included in the
- mate-settings-daemon 1.18.0 release. This patch adds them so Global
- Menu integration can be supported.
-
-
-diff --git a/plugins/xsettings/msd-xsettings-manager.c b/plugins/xsettings/msd-xsettings-manager.c
-index 5e2e585..445be61 100644
--- a/plugins/xsettings/msd-xsettings-manager.c
-+++ b/plugins/xsettings/msd-xsettings-manager.c
-@@ -198,6 +198,8 @@ static TranslationEntry translations [] = {
-         { INTERFACE_SCHEMA, "icon-theme",             "Net/IconThemeName",             translate_string_string },
-         { INTERFACE_SCHEMA, "file-chooser-backend",   "Gtk/FileChooserBackend",        translate_string_string },
-         { INTERFACE_SCHEMA, "gtk-decoration-layout",  "Gtk/DecorationLayout",          translate_string_string },
-+        { INTERFACE_SCHEMA, "gtk-shell-shows-app-menu","Gtk/ShellShowsAppMenu",        translate_bool_int },
-+        { INTERFACE_SCHEMA, "gtk-shell-shows-menubar","Gtk/ShellShowsMenubar",         translate_bool_int },
-         { INTERFACE_SCHEMA, "menus-have-icons",       "Gtk/MenuImages",                translate_bool_int },
-         { INTERFACE_SCHEMA, "buttons-have-icons",     "Gtk/ButtonImages",              translate_bool_int },
-         { INTERFACE_SCHEMA, "menubar-accel",          "Gtk/MenuBarAccel",              translate_string_string },
--- a/debian/patches/series
+++ b/debian/patches/series
-1000_global_menu_support.diff
-
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
+Name: MATE Settings Daemon
+Bug-Database: https://github.com/mate-desktop/mate-settings-daemon/issues
+Bug-Submit: https://github.com/mate-desktop/mate-settings-daemon/issues/new
+Contact: martin@mate-desktop.org
+Donation: http://mate-desktop.org/donate/
+Repository: https://github.com/mate-desktop/mate-settings-daemon
+Repository-Browse: https://github.com/mate-desktop/mate-settings-daemon
+Security-Contact: security@mate-desktop.org
--- a/debian/watch
+++ b/debian/watch
 version=3
-http://git.mate-desktop.org/mate-settings-daemon/ \
+https://git.mate-desktop.org/mate-settings-daemon/ \
    snapshot/mate-settings-daemon-(\d\.(?:[0-9]+|)[24680]\.\d)\.tar\.xz