[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][debian-mate-team/mate-settings-daemon][master] 3 commits: debian/patches: Drop all patches. Shipped upstream now.



Title: GitLab

Mike Gabriel pushed to branch master at Debian and Ubuntu MATE Packaging Team / mate-settings-daemon

Commits:

4 changed files:

Changes:

  • debian/changelog
    1
    +mate-settings-daemon (1.20.3-1) unstable; urgency=medium
    
    2
    +
    
    3
    +  * New upstream release.
    
    4
    +  * debian/patches:
    
    5
    +    + Drop all patches. Shipped upstream now.
    
    6
    +  * debian/control:
    
    7
    +    + debian/control: Bump versioned B-D for libmate-desktop-dev to
    
    8
    +      (>= 1.20.2).
    
    9
    +    + Update Vcs-*: fields. Package has been migrated to salsa.debian.org.
    
    10
    +    + Bump Standards-Version: to 4.1.4. No changes needed.
    
    11
    +    + Drop pkg-mate-team Alioth mailing list from Uploaders: field.
    
    12
    +  * debian/copyright:
    
    13
    +    + Make Upstream-Name: field's value more human readable.
    
    14
    +    + Update Upstream-Contact: field.
    
    15
    +    + Update Source: field. Use secure URLs.
    
    16
    +  * debian/upstream/metadata:
    
    17
    +    + Add file. Be compliant with DEP-12 proposal.
    
    18
    +    + Use Martin's address as Contact: address.
    
    19
    +
    
    20
    + -- Mike Gabriel <sunweaver@debian.org>  Fri, 06 Jul 2018 14:18:14 +0200
    
    21
    +
    
    1 22
     mate-settings-daemon (1.20.1-3) unstable; urgency=medium
    
    2 23
     
    
    3 24
       * debian/control:
    

  • debian/control
    ... ... @@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 10.3~),
    15 15
                    libfontconfig1-dev,
    
    16 16
                    libglib2.0-dev,
    
    17 17
                    libgtk-3-dev,
    
    18
    -               libmate-desktop-dev (>= 1.20.1-2~),
    
    18
    +               libmate-desktop-dev (>= 1.20.2),
    
    19 19
                    libmatekbd-dev (>= 1.18),
    
    20 20
                    libmatemixer-dev (>= 1.18),
    
    21 21
                    libnotify-dev,
    

  • debian/patches/0001_hidpi_background_support.patch deleted
    1
    -Author: Victor Kareh <vkareh@vkareh.net>
    
    2
    -Description: Support background fallback on HiDPI
    
    3
    -
    
    4
    -diff --git a/plugins/background/msd-background-manager.c b/plugins/background/msd-background-manager.c
    
    5
    -index b4eaca6..724e01e 100644
    
    6
    ---- a/plugins/background/msd-background-manager.c
    
    7
    -+++ b/plugins/background/msd-background-manager.c
    
    8
    -@@ -185,11 +185,12 @@ real_draw_bg (MsdBackgroundManager *manager,
    
    9
    - {
    
    10
    - 	MsdBackgroundManagerPrivate *p = manager->priv;
    
    11
    - 	GdkWindow *window = gdk_screen_get_root_window (screen);
    
    12
    --	gint width   = WidthOfScreen (gdk_x11_screen_get_xscreen (screen));
    
    13
    --	gint height  = HeightOfScreen (gdk_x11_screen_get_xscreen (screen));
    
    14
    -+	gint scale   = gdk_window_get_scale_factor (window);
    
    15
    -+	gint width   = WidthOfScreen (gdk_x11_screen_get_xscreen (screen)) / scale;
    
    16
    -+	gint height  = HeightOfScreen (gdk_x11_screen_get_xscreen (screen)) / scale;
    
    17
    - 
    
    18
    - 	free_bg_surface (manager);
    
    19
    --	p->surface = mate_bg_create_surface (p->bg, window, width, height, TRUE);
    
    20
    -+	p->surface = mate_bg_create_surface_scale (p->bg, window, width, height, scale, TRUE);
    
    21
    - 
    
    22
    - 	if (p->do_fade)
    
    23
    - 	{
    
    24
    -@@ -255,10 +256,12 @@ on_screen_size_changed (GdkScreen            *screen,
    
    25
    - 	if (!p->msd_can_draw || p->draw_in_progress || caja_is_drawing_bg (manager))
    
    26
    - 		return;
    
    27
    - 
    
    28
    -+	GdkWindow *window = gdk_screen_get_root_window (screen);
    
    29
    -+	gint scale = gdk_window_get_scale_factor (window);
    
    30
    - 	gint scr_num = gdk_x11_screen_get_screen_number (screen);
    
    31
    - 	gchar *old_size = g_list_nth_data (manager->priv->scr_sizes, scr_num);
    
    32
    --	gchar *new_size = g_strdup_printf ("%dx%d", WidthOfScreen (gdk_x11_screen_get_xscreen (screen)),
    
    33
    --						    HeightOfScreen (gdk_x11_screen_get_xscreen (screen)));
    
    34
    -+	gchar *new_size = g_strdup_printf ("%dx%d", WidthOfScreen (gdk_x11_screen_get_xscreen (screen)) / scale,
    
    35
    -+						    HeightOfScreen (gdk_x11_screen_get_xscreen (screen)) / scale);
    
    36
    - 	if (g_strcmp0 (old_size, new_size) != 0)
    
    37
    - 	{
    
    38
    - 		g_debug ("Screen%d size changed: %s -> %s", scr_num, old_size, new_size);
    
    39
    -@@ -297,8 +300,7 @@ settings_change_event_idle_cb (MsdBackgroundManager *manager)
    
    40
    - {
    
    41
    - 	mate_settings_profile_start ("settings_change_event_idle_cb");
    
    42
    - 
    
    43
    --	mate_bg_load_from_gsettings (manager->priv->bg,
    
    44
    --				     manager->priv->settings);
    
    45
    -+	mate_bg_load_from_preferences (manager->priv->bg);
    
    46
    - 
    
    47
    - 	mate_settings_profile_end ("settings_change_event_idle_cb");
    
    48
    - 

  • debian/patches/series deleted
    1
    -0001_hidpi_background_support.patch


  • Reply to: