r49187 - in /desktop/unstable/metacity/debian: changelog control.in patches/ patches/series patches/titlebar_resize.diff

[mitya57 at users.alioth.debian.org]

Author: mitya57
Date: Tue Jun 28 07:06:41 2016
New Revision: 49187

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=49187
Log:
* New upstream bugfix release.
* Add a patch from upstream to restore window resize using titlebar
  (titlebar_resize.diff).
* Drop Breaks/Replaces, no more needed because metacity-common no
  longer ships the themes.

Added:
    desktop/unstable/metacity/debian/patches/
    desktop/unstable/metacity/debian/patches/series
    desktop/unstable/metacity/debian/patches/titlebar_resize.diff
Modified:
    desktop/unstable/metacity/debian/changelog
    desktop/unstable/metacity/debian/control.in

Modified: desktop/unstable/metacity/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/changelog?rev=49187&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/changelog	[utf-8] (original)
+++ desktop/unstable/metacity/debian/changelog	[utf-8] Tue Jun 28 07:06:41 2016
@@ -1,3 +1,13 @@
+metacity (1:3.20.1.1-1) unstable; urgency=medium
+
+  * New upstream bugfix release.
+  * Add a patch from upstream to restore window resize using titlebar
+    (titlebar_resize.diff).
+  * Drop Breaks/Replaces, no more needed because metacity-common no
+    longer ships the themes.
+
+ -- Dmitry Shachnev <mitya57 at debian.org>  Tue, 28 Jun 2016 10:06:20 +0300
+
 metacity (1:3.20.0-1) unstable; urgency=medium
 
   * New upstream release.

Modified: desktop/unstable/metacity/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/control.in?rev=49187&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/control.in	[utf-8] (original)
+++ desktop/unstable/metacity/debian/control.in	[utf-8] Tue Jun 28 07:06:41 2016
@@ -74,10 +74,6 @@
 Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}
-Breaks: gnome-accessibility-themes (<< 3.15.90),
-        gnome-themes-standard-data (<< 3.15.90)
-Replaces: gnome-accessibility-themes (<< 3.15.90),
-          gnome-themes-standard-data (<< 3.15.90)
 Description: shared files for the Metacity window manager
  Metacity is a small window manager, using GTK+ to do everything.
  .

Added: desktop/unstable/metacity/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/patches/series?rev=49187&op=file
==============================================================================
--- desktop/unstable/metacity/debian/patches/series	(added)
+++ desktop/unstable/metacity/debian/patches/series	[utf-8] Tue Jun 28 07:06:41 2016
@@ -0,0 +1 @@
+titlebar_resize.diff

Added: desktop/unstable/metacity/debian/patches/titlebar_resize.diff
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/patches/titlebar_resize.diff?rev=49187&op=file
==============================================================================
--- desktop/unstable/metacity/debian/patches/titlebar_resize.diff	(added)
+++ desktop/unstable/metacity/debian/patches/titlebar_resize.diff	[utf-8] Tue Jun 28 07:06:41 2016
@@ -0,0 +1,15 @@
+Description: frames: restore window resize using titlebar
+Origin: upstream, https://git.gnome.org/browse/metacity/commit/?id=b00cbe1ace14c274
+Last-Update: 2016-06-27
+
+--- a/src/ui/frames.c
++++ b/src/ui/frames.c
+@@ -2591,7 +2591,7 @@
+ 
+   if (POINT_IN_RECT (x, y, fgeom.title_rect))
+     {
+-      if (has_vert && y <= TOP_RESIZE_HEIGHT && has_north_resize)
++      if (has_vert && y <= (fgeom.borders.invisible.top + TOP_RESIZE_HEIGHT) && has_north_resize)
+         return META_FRAME_CONTROL_RESIZE_N;
+       else
+         return META_FRAME_CONTROL_TITLE;