Commit 1e12dc00 authored by Mike Gabriel's avatar Mike Gabriel

Merge branch 'debian/experimental'

Conflicts (resolved by Mike Gabriel):
	debian/changelog
parents d2c3b517 0641f71c
mate-netbook (1.10.0-1) UNRELEASED; urgency=medium
* New upstream release.
* debian/control:
+ Add mate-netbook-common package.
* debian/patches:
+ Drop 0001_preserve_configuration.patch. Applied upstream.
-- Martin Wimpress <code@flexion.org> Sun, 14 Jun 2015 16:01:21 +0100
mate-netbook (1.8.2-2) unstable; urgency=medium
[ Martin Wimpress ]
......
......@@ -7,15 +7,15 @@ Uploaders: Mike Gabriel <sunweaver@debian.org>,
Stefano Karapetsas <stefano@karapetsas.com>,
Vangelis Mouhtsis <vangelis@gnugr.org>,
Build-Depends: debhelper (>= 9),
libdconf-dev,
libfakekey-dev,
libgtk2.0-dev,
libmate-desktop-dev,
libmate-desktop-dev (>= 1.9.0),
libmate-panel-applet-dev,
libwnck-dev,
libfakekey-dev,
libunique-dev,
yelp-tools,
libwnck-dev,
mate-common,
libdconf-dev,
yelp-tools,
Standards-Version: 3.9.6
Homepage: http://www.mate-desktop.org/
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-mate/mate-netbook.git;a=summary
......@@ -23,26 +23,44 @@ Vcs-Git: git://anonscm.debian.org/pkg-mate/mate-netbook.git
Package: mate-netbook
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
Depends: mate-netbook-common (= ${source:Version}),
${misc:Depends},
${shlibs:Depends},
Description: MATE utilities for netbooks
MATE netbooks provides an applet and a daemon to maximize windows and
move their titles on the panel.
MATE utilities for netbooks are an applet and a daemon to maximize
windows and move their titles on the panel.
.
Installing this package is recommended for netbooks and similar devices
with low resolution displays.
Installing these utilities is recommended for netbooks and similar
devices with low resolution displays.
Package: mate-netbook-common
Architecture: all
Depends: ${misc:Depends},
Replaces: mate-netbook (<< 1.9.0),
Breaks: mate-netbook (<< 1.9.0),
Description: MATE utilities for netbooks (common files)
MATE utilities for netbooks are an applet and a daemon to maximize
windows and move their titles on the panel.
.
Installing these utilities is recommended for netbooks and similar
devices with low resolution displays.
.
This package contains the architecture independent files.
Package: mate-netbook-dbg
Section: debug
Priority: extra
Architecture: any
Depends: ${misc:Depends},
mate-netbook (= ${binary:Version})
Depends: mate-netbook (= ${binary:Version}),
${misc:Depends},
Description: MATE utilities for netbooks (debugging symbols)
MATE netbooks provides an applet and a daemon to maximize windows and
move their titles on the panel.
MATE utilities for netbooks are an applet and a daemon to maximize
windows and move their titles on the panel.
.
Installing these utilities is recommended for netbooks and similar
devices with low resolution displays.
.
This package contains debugging symbols for mate-netbook.
.
The debugging symbols are installed in /usr/lib/debug
and will automatically be used by gdb.
The debugging symbols are installed in /usr/lib/debug and will
automatically be used by gdb.
etc/xdg/autostart/
usr/share/glib-2.0/
usr/share/locale/
usr/share/man/
usr/share/mate-panel/ui/
etc/xdg/autostart/
usr/bin/
usr/lib/
usr/share/dbus-1/services/
usr/share/glib-2.0/
usr/share/locale
usr/share/man
usr/share/mate-panel
usr/share/mate-panel/applets/
GNU nano 2.2.6 File: ../mate-netbook-181/debian/patches/0002_preserve_configuration.patch
From b84fe12fad7717ddfad5cb3bd12090f61864e759 Mon Sep 17 00:00:00 2001
From: Monsta <monsta@inbox.ru>
Date: Tue, 28 Apr 2015 16:56:54 +0300
Subject: [PATCH] window picker applet: don't mess with maximus settings
---
mate-window-picker-applet/applet.c | 19 -------------------
1 file changed, 19 deletions(-)
diff --git a/mate-window-picker-applet/applet.c b/mate-window-picker-applet/applet.c
index 3985383..3cd9c7a 100644
--- a/mate-window-picker-applet/applet.c
+++ b/mate-window-picker-applet/applet.c
@@ -47,10 +47,6 @@
#define APPLET_SCHEMA "org.mate.panel.applet.mate-window-picker-applet"
#define SHOW_WIN_KEY "show-all-windows"
-#define MAXIMUS_SCHEMA "org.mate.maximus"
-#define UNDECORATE_KEY "undecorate"
-#define NO_MAXIMIZE_KEY "no-maximize"
-
typedef struct
{
GtkWidget *tasks;
@@ -133,13 +129,6 @@ force_no_focus_padding (GtkWidget *widget)
static void
cw_applet_finalize (GObject *object)
{
- /* disable Maximus */
- GSettings *maximus_settings;
- maximus_settings = g_settings_new (MAXIMUS_SCHEMA);
- g_settings_set_boolean (maximus_settings, UNDECORATE_KEY, FALSE);
- g_settings_set_boolean (maximus_settings, NO_MAXIMIZE_KEY, TRUE);
- g_object_unref (maximus_settings);
-
if (G_OBJECT_CLASS (parent_class)->finalize)
(* G_OBJECT_CLASS (parent_class)->finalize) (object);
}
@@ -169,18 +158,10 @@ cw_applet_fill (MatePanelApplet *applet,
mainapp = app;
screen = wnck_screen_get_default ();
- /* prepare to disable Maximus */
object_class = G_OBJECT_GET_CLASS (G_OBJECT(applet));
object_class->finalize = cw_applet_finalize;
parent_class = g_type_class_peek_parent (object_class);
- /* enable Maximus */
- GSettings *maximus_settings;
- maximus_settings = g_settings_new (MAXIMUS_SCHEMA);
- g_settings_set_boolean (maximus_settings, UNDECORATE_KEY, TRUE);
- g_settings_set_boolean (maximus_settings, NO_MAXIMIZE_KEY, FALSE);
- g_object_unref (maximus_settings);
-
/* gsettings prefs */
app->settings = mate_panel_applet_settings_new (applet, APPLET_SCHEMA);
g_signal_connect (app->settings, "changed::" SHOW_WIN_KEY,
0001_preserve_configuration.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment