--- libunity-misc-4.0.4.orig/unity-misc/na-tray-child.c +++ libunity-misc-4.0.4/unity-misc/na-tray-child.c @@ -218,6 +218,18 @@ } static void +na_tray_child_get_preferred_width (GtkWidget* widget, gint *mwidth, gint *nwidth) +{ + *mwidth = *nwidth = 22; +} + +static void +na_tray_child_get_preferred_height (GtkWidget *widget, gint *mheight, gint *nheight) +{ + *mheight = *nheight = 22; +} + +static void na_tray_child_init (NaTrayChild *child) { } @@ -236,6 +248,8 @@ widget_class->realize = na_tray_child_realize; widget_class->size_allocate = na_tray_child_size_allocate; widget_class->draw = na_tray_child_draw; + widget_class->get_preferred_width = na_tray_child_get_preferred_width; + widget_class->get_preferred_height = na_tray_child_get_preferred_height; } GtkWidget * --- libunity-misc-4.0.4.orig/debian/libunity-misc4.install +++ libunity-misc-4.0.4/debian/libunity-misc4.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/lib*.so.* --- libunity-misc-4.0.4.orig/debian/libunity-misc-dev.install +++ libunity-misc-4.0.4/debian/libunity-misc-dev.install @@ -0,0 +1,3 @@ +debian/tmp/usr/include/* +debian/tmp/usr/lib/lib*.so +debian/tmp/usr/lib/pkgconfig/* --- libunity-misc-4.0.4.orig/debian/watch +++ libunity-misc-4.0.4/debian/watch @@ -0,0 +1,2 @@ +version=3 +https://launchpad.net/libunity-misc/+download .*/libunity-misc-([0-9.]+)\.tar\.gz --- libunity-misc-4.0.4.orig/debian/libunity-misc-doc.install +++ libunity-misc-4.0.4/debian/libunity-misc-doc.install @@ -0,0 +1 @@ +debian/tmp/usr/share/gtk-doc/ --- libunity-misc-4.0.4.orig/debian/rules +++ libunity-misc-4.0.4/debian/rules @@ -0,0 +1,14 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.mk + +LDFLAGS += -Wl,-O1 -Wl,--as-needed + +common-binary-post-install-arch:: + find debian/tmp/usr/lib -name \*.la -exec rm {} \; + find debian/tmp/usr/lib -name \*.a -exec rm {} \; + +common-binary-predeb-arch:: list-missing --- libunity-misc-4.0.4.orig/debian/libunity-misc4.symbols +++ libunity-misc-4.0.4/debian/libunity-misc4.symbols @@ -0,0 +1,40 @@ +libunity-misc.so.4 libunity-misc4 #MINVER# + _na_marshal_VOID__OBJECT_LONG@Base 0.1.1 + _na_marshal_VOID__OBJECT_OBJECT@Base 0.1.1 + _na_marshal_VOID__OBJECT_STRING_LONG_LONG@Base 0.1.1 + get_current_slide@Base 4.0.4 + get_slide_timeout@Base 4.0.4 + na_fixed_tip_get_type@Base 0.2.1 + na_fixed_tip_new@Base 0.2.1 + na_fixed_tip_set_markup@Base 0.2.1 + na_fixed_tip_set_orientation@Base 0.2.1 + na_tray_child_force_redraw@Base 0.1.1 + na_tray_child_get_title@Base 0.1.1 + na_tray_child_get_type@Base 0.1.1 + na_tray_child_get_wm_class@Base 0.2.1 + na_tray_child_has_alpha@Base 0.1.1 + na_tray_child_new@Base 0.1.1 + na_tray_child_set_composited@Base 0.1.1 + na_tray_force_redraw@Base 0.2.1 + na_tray_get_manager@Base 0.2.1 + na_tray_get_orientation@Base 0.2.1 + na_tray_get_type@Base 0.2.1 + na_tray_manager_check_running@Base 0.1.1 + na_tray_manager_get_orientation@Base 0.1.1 + na_tray_manager_get_type@Base 0.1.1 + na_tray_manager_manage_screen@Base 0.1.1 + na_tray_manager_new@Base 0.1.1 + na_tray_manager_set_colors@Base 4.0.2 + na_tray_manager_set_icon_size@Base 4.0.2 + na_tray_manager_set_orientation@Base 0.1.1 + na_tray_manager_set_padding@Base 4.0.2 + na_tray_new_for_screen@Base 0.2.1 + na_tray_set_colors@Base 4.0.2 + na_tray_set_icon_size@Base 4.0.2 + na_tray_set_orientation@Base 0.2.1 + na_tray_set_padding@Base 4.0.2 + ordered_roles@Base 0.2.1 + read_slideshow_file@Base 4.0.4 + slideshow_ref@Base 4.0.4 + slideshow_unref@Base 4.0.4 + wmclass_roles@Base 0.2.1 --- libunity-misc-4.0.4.orig/debian/control +++ libunity-misc-4.0.4/debian/control @@ -0,0 +1,45 @@ +Source: libunity-misc +Priority: optional +Maintainer: Ubuntu Developers +Build-Depends: debhelper (>= 5.0), + cdbs (>= 0.4.41), + libgtk-3-dev (>= 3.0), + libglib2.0-dev (>= 2.22.0), + libx11-dev, +Standards-Version: 3.9.2 +Section: libs +Homepage: https://launchpad.net/libunity-misc +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libunity-misc/ubuntu + +Package: libunity-misc-dev +Section: libdevel +Architecture: any +Depends: libunity-misc4 (= ${binary:Version}), ${misc:Depends}, + libglib2.0-dev (>= 2.22.0), +Description: Miscellaneous functions for Unity - development files + libunity-misc is a shared library that provides miscellaneous functions for + Unity. + . + This package contains files that are needed to build applications. + +Package: libunity-misc4 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Miscellaneous functions for Unity - shared library + libunity-misc is a shared library that provides miscellaneous functions for + Unity. + . + This package contains shared libraries to be used by application. + +Package: libunity-misc-doc +Architecture: all +Section: doc +Depends: ${misc:Depends} +Suggests: devhelp +Description: Miscellaneous functions for Unity - documentation + libunity-misc is a shared library that provides miscellaneous functions for + Unity. + . + This package contains the documentation. + --- libunity-misc-4.0.4.orig/debian/changelog +++ libunity-misc-4.0.4/debian/changelog @@ -0,0 +1,82 @@ +libunity-misc (4.0.4-0ubuntu2) oneiric; urgency=low + + * Cherry-pick from upstream: + - update-notifier systray icons showed and the wrong place and size + (LP: #856125) + + -- Didier Roche Thu, 29 Sep 2011 17:03:57 +0200 + +libunity-misc (4.0.4-0ubuntu1) oneiric; urgency=low + + * New upstream release. + * debian/libunity-misc4.symbols: + - add the new symbols + * debian/control: + - build-dep on libx11-dev + + -- Didier Roche Mon, 01 Aug 2011 17:35:56 +0200 + +libunity-misc (4.0.2-0ubuntu1) oneiric; urgency=low + + * New upstream release. + * debian/control: + - build-dep now on libgtk-3-dev + * debian/libunity-misc4.install, debian/libunity-misc4.symbols, + debian/control: + - bump and adapt new symbols to new soname for gtk3 + + -- Didier Roche Tue, 21 Jun 2011 19:43:58 +0200 + +libunity-misc (0.2.1-0ubuntu2) natty; urgency=low + + * cherry-pick: + - the .pc file shouldn't depend on clutter anymore + + -- Didier Roche Thu, 17 Feb 2011 19:55:25 +0100 + +libunity-misc (0.2.1-0ubuntu1) natty; urgency=low + + * New upstream release: + - readd systray support to unity (LP: #596879) + * debian/control: + - don't build with clutter anymore + - remove -dbg package + - don't dep on gtk-doc + - add libgtk2.0-dev build-dep + * debian/rules: + - don't build the documentation + - remove uneeded DEB_DH_MAKESHLIBS_ARGS + * debian/libunity-misc0.symbols: + - updated + + -- Didier Roche Thu, 17 Feb 2011 19:04:43 +0100 + +libunity-misc (0.1.1-0ubuntu3) natty; urgency=low + + * debian/control: + - change the description + * debian/libunity-misc0.symbols: + - add symbol file (LP: #591158) + + -- Didier Roche Tue, 03 Aug 2010 13:07:44 +0200 + +libunity-misc (0.1.1-0ubuntu1) maverick; urgency=low + + * New upstream release + * Fix debian/copyright + * debian/rules: + - fix rm *{,l}a files + - fix LDFLAGS syntax + * debian/control: + - bump Standards-Version + - fix homepage + - remove uneeded build-dep + * added debian/watch + + -- Didier Roche Thu, 03 Jun 2010 19:19:11 +0200 + +libunity-misc (0.1.0-0ubuntu1~ppa1) lucid; urgency=low + + * Initial release + + -- Didier Roche Thu, 28 Jan 2010 22:04:01 +0100 --- libunity-misc-4.0.4.orig/debian/copyright +++ libunity-misc-4.0.4/debian/copyright @@ -0,0 +1,75 @@ +This work was packaged for Ubuntu by: + + Didier Roche on Fri, 15 Jan 2010 17:05:36 +0100 + +It was downloaded from https://launchpad.net/libunity-misc + +Upstream Author(s): + + Neil Jagdish Patel + Anders Carlsson + Vincent Untz + Neil Jagdish Patel + +Copyright: + + Copyright (C) 2002 Anders Carlsson + Copyright (C) 2003-2006 Vincent Untz + Copyright (C) 2008 Red Hat, Inc. + Copyright (C) 2009 Gnome Shell + Copyright (C) 2010 Canonical, Ltd. + +License: + + When not otherwise specified, the following license applies: + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License Version as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + +On Debian systems, the complete text of the GNU Lesser General Public License +can be found in `/usr/share/common-licenses/LGPL-2' + + * unity-misc/unity-misc.h: + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License + version 3.0 as published by the Free Software Foundation. + + This library 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 Lesser General Public License version 3.0 for more details. + +On Debian systems, the complete text of the GNU Lesser General Public License +can be found in `/usr/share/common-licenses/LGPL-3' + + * unity-misc/unity-tray-manager.h,shell-embedded-window-private.h, + unity-tray-manager.c,shell-embedded-window.c,shell-gtk-embed.h, + shell-gtk-embed.c,shell-embedded-window.h: + + This program is free software: you can redistribute it and/or modify it + under the terms of the the GNU General Public License version 2, as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranties of + MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR + PURPOSE. See the applicable version of the GNU Lesser General Public + License for more details. + +On Debian systems, the complete text of the GNU General Public License +can be found in `/usr/share/common-licenses/GPL-2' + + +The Debian packaging is: + + Copyright (C) 2010 Canonical Ltd. + +and is licensed under the GPL version 3, see `/usr/share/common-licenses/GPL-3'. --- libunity-misc-4.0.4.orig/debian/compat +++ libunity-misc-4.0.4/debian/compat @@ -0,0 +1 @@ +5