[SCM] mate-panel Debian package branch, master, updated. 47c9fb22668f9f730bc3886c3058a33187b7fa80
Mike Gabriel
sunweaver at alioth.debian.org
Thu Aug 15 22:44:16 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-panel.git;a=commitdiff;h=47c9fb2
The following commit has been merged in the master branch:
commit 47c9fb22668f9f730bc3886c3058a33187b7fa80
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Aug 16 00:43:12 2013 +0200
add /debian packaging folder as provided by upstream internal packaging repos
---
debian/changelog | 5 ++
debian/compat | 1 +
debian/control | 148 +++++++++++++++++++++++++++++++
debian/copyright | 43 +++++++++
debian/gir1.2-mate-panel.install | 2 +
debian/libmate-panel-applet-dev.install | 3 +
debian/libmate-panel-applet-doc.install | 1 +
debian/libmate-panel-applet4-1.install | 1 +
debian/mate-panel-common.install | 3 +
debian/mate-panel.install | 11 +++
debian/patches/00-fix-reset.patch | 133 +++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 23 +++++
debian/source/format | 1 +
debian/watch | 3 +
15 files changed, 379 insertions(+)
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..5f0a52f
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+mate-panel (1.6.1-0) UNRELEASED; urgency=low
+
+ * Initial release.
+
+ -- Stefano Karapetsas <stefano at karapetsas.com> Sat, 13 Jul 2013 12:54:58 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..3b55df3
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,148 @@
+Source: mate-panel
+Section: mate
+Priority: optional
+Maintainer: Stefano Karapetsas <stefano at karapetsas.com>
+Build-Depends: debhelper (>= 9),
+ intltool,
+ mate-doc-utils,
+ mate-doc-utils-gnome | gnome-doc-utils,
+ python,
+ libx11-dev,
+ libxau-dev,
+ libice-dev,
+ libsm-dev,
+ libgtk2.0-dev,
+ libmatedesktop-dev,
+ libmatewnck-dev (>= 1.5.1-2),
+ libcairo2-dev,
+ gtk-doc-tools,
+ libmatemenu-dev,
+ libpango1.0-dev,
+ libglib2.0-dev ,
+ libmateweather-dev,
+ librsvg2-dev,
+ libdbus-glib-1-dev,
+ libdbus-1-dev,
+ libxrandr-dev,
+ libcanberra-gtk-dev,
+ libsoup2.4-dev,
+ libavahi-client-dev,
+ libavahi-common-dev,
+ libavahi-glib-dev,
+ libgirepository1.0-dev,
+ gobject-introspection,
+ gir1.2-gtk-2.0,
+ gir1.2-glib-2.0,
+ gir1.2-atk-1.0,
+ gir1.2-freedesktop,
+ gir1.2-pango-1.0,
+ gir1.2-gdkpixbuf-2.0,
+ mate-common,
+ lsb-release,
+ libdconf-dev
+Standards-Version: 3.9.3
+Homepage: http://www.mate-desktop.org/
+
+Package: mate-panel
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ mate-desktop,
+ mate-menus,
+ menu-xdg,
+ python,
+ mate-polkit,
+ libmate-panel-applet4-1 (= ${binary:Version}),
+ mate-panel-common (= ${source:Version})
+Breaks: mate-panel-common (<< 1.1.1-4)
+Replaces: mate-panel-common (<< 1.1.1-4)
+Description: launcher and docking facility for MATE
+ The MATE Panel is an essential part of the MATE Desktop, providing
+ toolbar-like “panels” which can be attached to the sides of your desktop.
+ They are used to launch applications and embed a number of other
+ functions, such as quick launch icons, the clock, the notification area,
+ volume controls and the battery charge indicator, and utilities ranging
+ from weather forecast to system monitoring.
+
+Package: mate-panel-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: ${misc:Depends},
+ mate-panel (= ${binary:Version}),
+ libmate-panel-applet4-1 (= ${binary:Version})
+Description: launcher and docking facility for MATE (debugging symbols)
+ This package contains debugging symbols for mate-panel and the
+ libmatepanelapplet library. It is provided to help debugging problem in
+ the panel itself or in the library.
+ .
+ The debugging symbols are installed in /usr/lib/debug and will
+ automatically be used by gdb.
+
+Package: mate-panel-common
+Architecture: all
+Depends: ${misc:Depends}
+Breaks: mate-panel (<= 1.0.2-3)
+Replaces: mate-panel (<= 1.0.2-3)
+Description: launcher and docking facility for MATE (common files)
+ The MATE Panel is an essential part of the MATE Desktop, providing
+ toolbar-like “panels” which can be attached to the sides of your desktop.
+ They are used to launch applications and embed a number of other
+ functions, such as quick launch icons, the clock, the notification area,
+ volume controls and the battery charge indicator, and utilities ranging
+ from weather forecast to system monitoring.
+ .
+ This package contains the architecture independent files.
+
+Package: libmate-panel-applet4-1
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Breaks: mate-panel (<= 1.0.0-3), libmatepanelapplet
+Replaces: libmatepanelapplet
+Provides: libmatepanelapplet
+Conflicts: libmatepanelapplet
+Description: library for MATE Panel applets
+ This library is used by MATE Panel applets.
+
+Package: libmate-panel-applet-dev
+Section: libdevel
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ libmate-panel-applet4-1 (= ${binary:Version}),
+ libgtk2.0-dev,
+ libglib2.0-dev
+Provides: libmatepanelapplet-dev
+Conflicts: libmatepanelapplet-dev
+Replaces: libmatepanelapplet-dev
+Description: library for MATE Panel applets (development files)
+ This library is used by MATE Panel applets.
+ .
+ This package contains the development files.
+
+Package: libmate-panel-applet-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Provides: libmatepanelapplet-doc
+Conflicts: libmatepanelapplet-doc
+Replaces: libmatepanelapplet-doc
+Description: library for MATE Panel applets (documentation files)
+ This library is used by MATE Panel applets.
+ .
+ This package contains the documentation files.
+
+Package: gir1.2-mate-panel
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ ${python:Depends},
+ ${gir:Depends},
+ gir1.2-gtk-2.0
+Description: GObject introspection data for MATE panel
+ This package contains introspection data for MATE panel.
+ .
+ It can be used by packages using the GIRepository format to generate
+ dynamic bindings.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..cdeece2
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,43 @@
+This work was packaged for Debian by:
+
+ Stefano Karapetsas <stefano at karapetsas.com> on Sat, 22 Oct 2011 02:12:53 +0200
+
+It was downloaded from:
+
+ <https://github.com/Perberos/Mate-Desktop-Environment>
+
+Upstream Author:
+
+ Perberos <perberos at gmail.com>
+
+Copyright:
+
+ Copyright (C) 2011 Perberos
+
+License:
+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+
+On Debian systems, the complete text of the GNU General
+Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+The Debian packaging is:
+
+ Copyright (C) 2011 Stefano Karapetsas <stefano at karapetsas.com>
+
+you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
diff --git a/debian/gir1.2-mate-panel.install b/debian/gir1.2-mate-panel.install
new file mode 100644
index 0000000..ee006c9
--- /dev/null
+++ b/debian/gir1.2-mate-panel.install
@@ -0,0 +1,2 @@
+usr/lib/girepository-1.0/
+usr/share/gir-1.0/
diff --git a/debian/libmate-panel-applet-dev.install b/debian/libmate-panel-applet-dev.install
new file mode 100644
index 0000000..5be5463
--- /dev/null
+++ b/debian/libmate-panel-applet-dev.install
@@ -0,0 +1,3 @@
+usr/include/
+usr/lib/*/*.so
+usr/lib/*/pkgconfig/
diff --git a/debian/libmate-panel-applet-doc.install b/debian/libmate-panel-applet-doc.install
new file mode 100644
index 0000000..d6da04c
--- /dev/null
+++ b/debian/libmate-panel-applet-doc.install
@@ -0,0 +1 @@
+usr/share/gtk-doc/
diff --git a/debian/libmate-panel-applet4-1.install b/debian/libmate-panel-applet4-1.install
new file mode 100644
index 0000000..3de3b10
--- /dev/null
+++ b/debian/libmate-panel-applet4-1.install
@@ -0,0 +1 @@
+usr/lib/*/*.so.*
diff --git a/debian/mate-panel-common.install b/debian/mate-panel-common.install
new file mode 100644
index 0000000..532e7fb
--- /dev/null
+++ b/debian/mate-panel-common.install
@@ -0,0 +1,3 @@
+usr/share/icons/
+usr/share/locale/
+usr/share/mate/help/
diff --git a/debian/mate-panel.install b/debian/mate-panel.install
new file mode 100644
index 0000000..1d573d2
--- /dev/null
+++ b/debian/mate-panel.install
@@ -0,0 +1,11 @@
+usr/bin/
+usr/lib/mate-panel/clock-applet
+usr/lib/mate-panel/fish-applet
+usr/lib/mate-panel/notification-area-applet
+usr/lib/mate-panel/wnck-applet
+usr/share/applications/
+usr/share/dbus-1/
+usr/share/glib-2.0/
+usr/share/man/
+usr/share/mate-panel/
+usr/share/omf/
diff --git a/debian/patches/00-fix-reset.patch b/debian/patches/00-fix-reset.patch
new file mode 100644
index 0000000..a312082
--- /dev/null
+++ b/debian/patches/00-fix-reset.patch
@@ -0,0 +1,133 @@
+diff --git a/mate-panel/libpanel-util/panel-dconf.c b/mate-panel/libpanel-util/panel-dconf.c
+index a103bcf..26ca092 100644
+--- a/mate-panel/libpanel-util/panel-dconf.c
++++ b/mate-panel/libpanel-util/panel-dconf.c
+@@ -111,3 +111,12 @@ panel_dconf_list_subdirs (const gchar *dir,
+
+ return (gchar **) g_array_free (array, FALSE);
+ }
++
++void panel_dconf_sync ()
++{
++#ifdef HAVE_DCONF_0_13
++ DConfClient *client = panel_dconf_client_get ();
++ dconf_client_sync (client);
++ g_object_unref (client);
++#endif
++}
+diff --git a/mate-panel/libpanel-util/panel-dconf.h b/mate-panel/libpanel-util/panel-dconf.h
+index 1683ec0..ba1abfd 100644
+--- a/mate-panel/libpanel-util/panel-dconf.h
++++ b/mate-panel/libpanel-util/panel-dconf.h
+@@ -39,6 +39,8 @@ gboolean panel_dconf_recursive_reset (const gchar *dir,
+ gchar **panel_dconf_list_subdirs (const gchar *dir,
+ gboolean remove_trailing_slash);
+
++void panel_dconf_sync ();
++
+ G_END_DECLS
+
+ #endif /* __PANEL_DCONF_H__ */
+diff --git a/mate-panel/panel-layout.c b/mate-panel/panel-layout.c
+index 4732420..9ad4026 100644
+--- a/mate-panel/panel-layout.c
++++ b/mate-panel/panel-layout.c
+@@ -122,6 +122,7 @@ panel_layout_append_group_helper (GKeyFile *keyfile,
+ char *unique_id = NULL;
+ char *path = NULL;
+ GSettings *settings = NULL;
++ GSettings *panel_settings = NULL;
+ char **keyfile_keys = NULL;
+ char *value_str;
+ int value_int;
+@@ -184,6 +185,8 @@ panel_layout_append_group_helper (GKeyFile *keyfile,
+ g_free (path);
+
+ keyfile_keys = g_key_file_get_keys (keyfile, group, NULL, NULL);
++ panel_settings = g_settings_new (PANEL_SCHEMA);
++ g_settings_delay (panel_settings);
+
+ if (keyfile_keys) {
+
+@@ -247,12 +250,9 @@ panel_layout_append_group_helper (GKeyFile *keyfile,
+ PANEL_TOPLEVEL_SCREEN_KEY,
+ set_screen_to);
+
+- GSettings *panel_settings;
+- panel_settings = g_settings_new (PANEL_SCHEMA);
+ panel_gsettings_append_strv (panel_settings,
+ id_list_key,
+ unique_id);
+- g_object_unref (panel_settings);
+
+ retval = TRUE;
+ }
+@@ -263,6 +263,11 @@ panel_layout_append_group_helper (GKeyFile *keyfile,
+ if (settings)
+ g_object_unref (settings);
+
++ if (panel_settings) {
++ g_settings_apply (panel_settings);
++ g_object_unref (panel_settings);
++ }
++
+ if (unique_id)
+ g_free (unique_id);
+
+diff --git a/mate-panel/panel-profile.c b/mate-panel/panel-profile.c
+index 57e11d0..37a2433 100644
+--- a/mate-panel/panel-profile.c
++++ b/mate-panel/panel-profile.c
+@@ -1601,7 +1601,7 @@ panel_profile_load_list (GSettings *settings,
+ g_free (key);
+ }
+
+-static void
++void
+ panel_profile_ensure_toplevel_per_screen ()
+ {
+ GSList *toplevels;
+diff --git a/mate-panel/panel-profile.h b/mate-panel/panel-profile.h
+index 665e237..162d84c 100644
+--- a/mate-panel/panel-profile.h
++++ b/mate-panel/panel-profile.h
+@@ -154,6 +154,8 @@ gboolean panel_profile_can_be_moved_freely (PanelToplevel *toplevel);
+
+ GSettings* panel_profile_get_attached_object_settings (PanelToplevel *toplevel);
+
++void panel_profile_ensure_toplevel_per_screen ();
++
+ G_END_DECLS
+
+ #endif /* __PANEL_PROFILE_H__ */
+diff --git a/mate-panel/panel-reset.c b/mate-panel/panel-reset.c
+index e441f55..6307ba2 100644
+--- a/mate-panel/panel-reset.c
++++ b/mate-panel/panel-reset.c
+@@ -28,19 +28,24 @@
+
+ #include <stdlib.h>
+ #include <glib.h>
++#include <gio/gio.h>
+ #include "panel-reset.h"
+ #include "panel-schemas.h"
++#include "panel-profile.h"
+ #include <libpanel-util/panel-dconf.h>
+
+ void
+ panel_reset()
+ {
++ /* reset configuration */
+ panel_dconf_recursive_reset (PANEL_GENERAL_PATH, NULL);
+ panel_dconf_recursive_reset (PANEL_TOPLEVEL_PATH, NULL);
+ panel_dconf_recursive_reset (PANEL_OBJECT_PATH, NULL);
++ panel_dconf_sync ();
+
+- /* TODO: send a dbus message to mate-panel, if active, to reload the panel
+- * configuration */
++ /* create default panels */
++ panel_profile_ensure_toplevel_per_screen ();
++ g_settings_sync ();
+ }
+
+ #endif /* !__PANEL_RESET_C__ */
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b4d7cf8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+00-fix-reset.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..7a8e4a2
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,23 @@
+#!/usr/bin/make -f
+
+%:
+ dh $@
+
+override_dh_install:
+ rm -f debian/tmp/usr/lib/*/*.la
+ rm -f debian/tmp/usr/share/MateConf/gsettings/mate-panel.convert
+ dh_install --list-missing
+
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ --localstatedir=/var \
+ --libexecdir=/usr/lib/mate-panel \
+ --disable-scrollkeeper \
+ --disable-static \
+ --enable-introspection
+
+override_dh_strip:
+ dh_strip --dbg-package=mate-panel-dbg
+
+get-orig-source:
+ uscan --noconf --force-download --rename --download-current-version --destdir=..
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..185baea
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=3
+opts=filenamemangle=s/.*\/mate-panel-?([\d\.-]+)\.tar\.gz/mate-panel-$1.tar.gz/ \
+https://github.com/mate-desktop/mate-panel/tags .*/archive/mate-panel-?([\d\.]+).tar.gz
--
mate-panel Debian package
More information about the pkg-mate-commits
mailing list