Bug#771157: unblock: metacity/3.14.3-1 (pre-approval)

[Dmitry Shachnev]

Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock

Dear Release Team,

I would like to see metacity 3.14.3 accepted into Jessie.

This is a bug-fix only release, and the fixes are:

* Initialize some variables properly to prevent random behavior.
* Use correct icon name [image-missing] for missing icon.
* A couple of updated translations (cs and sr).
* Minor man page fixes (to fix lintian warnings).

The diff of source part (excluding translations and auto-generated parts)
is attached.

Thanks in advance,

--
Dmitry Shachnev
--- metacity-3.14.1/configure.ac
+++ metacity-3.14.3/configure.ac
@@ -2,7 +2,7 @@
 
 m4_define([metacity_major_version], [3])
 m4_define([metacity_minor_version], [14])
-m4_define([metacity_micro_version], [1])
+m4_define([metacity_micro_version], [3])
 
 m4_define([metacity_version],
           [metacity_major_version.metacity_minor_version.metacity_micro_version])
@@ -109,7 +109,7 @@
 changequote([,])dnl
 
 GTK_API_VERSION=3.0
-GTK_MIN_VERSION=3.8.0
+GTK_MIN_VERSION=3.12.0
 GIO_MIN_VERSION=2.25.10
 CANBERRA_GTK=libcanberra-gtk3
 
@@ -547,8 +547,8 @@
 if test $(( $(echo $METACITY_MINOR_VERSION) %2)) == "1"; then
    stable_version=$(( ($METACITY_MINOR_VERSION / 2) * 2))
    echo "This is the UNSTABLE branch of metacity"
-   echo -n "Use 2.$stable_version.x for stable "
-   echo    "(gnome-2-$stable_version branch in Subversion)"
+   echo -n "Use 3.$stable_version.x for stable "
+   echo    "(gnome-3-$stable_version branch in Subversion)"
 else
    echo "This is the stable branch of metacity"
 fi
--- metacity-3.14.1/doc/man/metacity.1
+++ metacity-3.14.3/doc/man/metacity.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-METACITY \- minimal GTK2 Window Manager
+METACITY \- minimal GTK3 Window Manager
 .SH SYNOPSIS
 .B metacity
 [\-\-display=\fIDISPLAY\fP] [\-\-replace] [\-\-sm\-client\-id=\fIID\fP] [\-\-sm\-disable] [\-\-sm\-save\-file=\fIFILENAME\fP] [\-\-sync] [\-\-composite] [\-\-no-composite] [\-\-no-force-fullscreen] [\-\-version] [\-\-help]
@@ -34,7 +34,9 @@
 Connect to X display \fIDISPLAY\fP.
 .TP
 .B \-\-replace
-a window manager which is running is replaced by \fBmetacity\fP.  Users are encouraged to change the GNOME window manager by running the new WM with the --replace or -replace option, and subsequently saving the session.
+a window manager which is running is replaced by \fBmetacity\fP.
+Users are encouraged to change the GNOME window manager by running the new WM
+with the \-\-replace or \-replace option, and subsequently saving the session.
 .TP
 .B \-\-sm\-client\-id=ID
 Specify a session management \fIID\fP.
--- metacity-3.14.1/doc/man/metacity-message.1
+++ metacity-3.14.3/doc/man/metacity-message.1
@@ -29,7 +29,8 @@
 METACITY\-MESSAGE \- a command to send a message to Metacity
 .SH SYNOPSIS
 .B METACITY\-MESSAGE
-[restart|reload\-theme|enable\-keybindings|disable\-keybindings|enable\-mouse\-button\-modifiers|disable\-mouse\-button\-modifiers|toggle\-verbose]
+[ restart | reload\-theme | enable\-keybindings | disable\-keybindings |
+enable\-mouse\-button\-modifiers | disable\-mouse\-button\-modifiers | toggle\-verbose ]
 .SH DESCRIPTION
 This manual page documents briefly the
 .B metacity\-message\fP.
--- metacity-3.14.1/NEWS
+++ metacity-3.14.3/NEWS
@@ -1,3 +1,15 @@
+Version 3.14.3
+==============
+- Use correct icon name [image-missing] for missing icon. (Alberts Muktupāvels)
+- Updated translations:
+  Marek Černocký (cs), Мирослав Николић (sr).
+
+Version 3.14.2
+==============
+- Fix two bugs with Chromium - does not get focus and does not appear in
+  alt-tab switcher. (Alberts Muktupāvels)
+- Fix errors in manpages. (Dmitry Shachnev)
+
 Version 3.14.1
 ==============
 - Fix random bug when windows opens in fullscreen mode. (Alberts Muktupāvels)
--- metacity-3.14.1/src/core/window.c
+++ metacity-3.14.3/src/core/window.c
@@ -434,6 +434,12 @@
   /* initialize the remaining size_hints as if size_hints.flags were zero */
   meta_set_normal_hints (window, NULL);
 
+  window->has_custom_frame_extents = FALSE;
+  window->custom_frame_extents.left = 0;
+  window->custom_frame_extents.right = 0;
+  window->custom_frame_extents.top = 0;
+  window->custom_frame_extents.bottom = 0;
+
   /* And this is our unmaximized size */
   window->saved_rect = window->rect;
   window->user_rect = window->rect;
@@ -7305,6 +7311,8 @@
       break;
     }
 
+  remaining = 0;
+
   if (!check_moveresize_frequency (window, &remaining) && !force)
     {
       /* we are ignoring an event here, so we schedule a
--- metacity-3.14.1/src/ui/ui.c
+++ metacity-3.14.3/src/ui/ui.c
@@ -596,7 +596,7 @@
                                                    NULL);
       else
           default_icon = gtk_icon_theme_load_icon (theme,
-                                                   "gtk-missing-image",
+                                                   "image-missing",
                                                    META_ICON_WIDTH,
                                                    0,
                                                    NULL);
@@ -631,7 +631,7 @@
                                                    NULL);
       else
           default_icon = gtk_icon_theme_load_icon (theme,
-                                                   "gtk-missing-image",
+                                                   "image-missing",
                                                    META_MINI_ICON_WIDTH,
                                                    0,
                                                    NULL);

signature.asc
Description: OpenPGP digital signature