diff options
| -rw-r--r-- | .bzr-builddeb/default.conf | 2 | ||||
| -rw-r--r-- | debian/changelog | 177 | ||||
| -rw-r--r-- | debian/compat | 1 | ||||
| -rw-r--r-- | debian/control | 109 | ||||
| -rw-r--r-- | debian/copyright | 53 | ||||
| -rw-r--r-- | debian/indicator-applet.install | 4 | ||||
| -rw-r--r-- | debian/libindicate-dev.install | 4 | ||||
| -rw-r--r-- | debian/libindicate-doc.install | 2 | ||||
| -rw-r--r-- | debian/libindicate-gtk-dev.install | 4 | ||||
| -rw-r--r-- | debian/libindicate-gtk0.install | 1 | ||||
| -rw-r--r-- | debian/libindicate2.install | 1 | ||||
| -rw-r--r-- | debian/libindicator-dev.install | 2 | ||||
| -rwxr-xr-x | debian/rules | 8 | ||||
| -rw-r--r-- | debian/watch | 2 | ||||
| -rw-r--r-- | src/applet-main.c | 7 |
15 files changed, 377 insertions, 0 deletions
diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf new file mode 100644 index 0000000..3165e05 --- /dev/null +++ b/.bzr-builddeb/default.conf @@ -0,0 +1,2 @@ +[BUILDDEB] +merge = True diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..361e01a --- /dev/null +++ b/debian/changelog @@ -0,0 +1,177 @@ +indicator-applet (0.2.0~bzr309-0ubuntu4~ppa3) UNRELEASED; urgency=low + + * Merging in upstream code to split out libindicate-gtk + * debian/control: + * Changing the version number of libindcate to 2 to match + the .so numbering. + * Creating packages for libindicate-gtk + * Added libindicate-gtk-dev.install and libindicate-gtk0.install + for the new library. + * Renamed libindicate1.install to libindicate2.install to match + the package name change. + * Modified libindicate-dev to be more specific about the header + files that it grabs. + + -- Ted Gould <ted@ubuntu.com> Tue, 04 Aug 2009 00:30:55 +0100 + +indicator-applet (0.2.0~bzr309-0ubuntu3) karmic; urgency=low + + * Now moving on to Karmic + + -- Ted Gould <ted@ubuntu.com> Fri, 17 Jul 2009 21:24:41 -0500 + +indicator-applet (0.2.0~bzr309-0ubuntu2) jaunty; urgency=low + + * debian/control, debian/libindicate-doc.install: Merging in Ken + Vandine's work on making a -doc package for libindicate. + + -- Ted Gould <ted@ubuntu.com> Fri, 17 Jul 2009 21:23:41 -0500 + +indicator-applet (0.2.0~bzr309-0ubuntu1) jaunty; urgency=low + + * Merge from upstream, includes documentation. + + -- Ted Gould <ted@ubuntu.com> Tue, 05 May 2009 16:44:29 +0100 + +indicator-applet (0.2.0~bzr307-0ubuntu2) jaunty; urgency=low + + * Increment for PPA. Forgot to autogen.sh + + -- Ted Gould <ted@ubuntu.com> Mon, 27 Apr 2009 11:06:45 -0500 + +indicator-applet (0.2.0~bzr307-0ubuntu1) jaunty; urgency=low + + * Upstream Snapshot: Adding in a test suite. + * debian/control: Adding a build-dep on dbus-test-runner + + -- Ted Gould <ted@ubuntu.com> Mon, 27 Apr 2009 10:52:28 -0500 + +indicator-applet (0.2.0~bzr305-0ubuntu1) jaunty; urgency=low + + * Upstream snapshot + * debian/control: + * Add in package libindicator-dev + * Add build depends on libxml2-dev for upstream dep + * debian/libindicate-dev.install: Add greater specificity on what + gets installed to not get confused with files from libindicator + * debian/libindicator-dev.install: Specify which files should be + put into the development package. + + -- Ted Gould <ted@ubuntu.com> Wed, 22 Apr 2009 23:46:28 -0500 + +indicator-applet (0.1.6-0ubuntu1) jaunty; urgency=low + + * New upstream version + * Applied the same fixes as Cody Russell's patch to indicator-messages + to the finalize functions here. Should fix LP: #359018 completely. + * Minor warnings fixes in search of solution to above. + + -- Ted Gould <ted@ubuntu.com> Tue, 14 Apr 2009 11:36:12 +0200 + +indicator-applet (0.1.5-0ubuntu1) jaunty; urgency=low + + * debian/control: Switching libindicate0 to libindicate1 to express + the fact that the binary compatibility is broken. + * debian/libindicate0.install changed to debian/libindicate1.install + * New upstream version: + * Adds new API for detecting interests of various listeners. Implemented + on both client and server side. (LP: #353112) + * Makes it so that all objects down to the menu now use the gtkstyle + naming from FUSA to ensure that they all pick up the theme hacks that + are set for FUSA. (LP: #334490) + * Explicitly sets the about window's window icon. (LP: #356437) + + -- Ted Gould <ted@ubuntu.com> Fri, 03 Apr 2009 15:09:33 -0500 + +indicator-applet (0.1.4-0ubuntu1) jaunty; urgency=low + + * New upstream version + * Changing the text in the license box to make sense. (LP: #346215) + * Call GNOME Program Init to initialize all of the ATK and gettext + stuff that needs to be initialized for it all to work. Patch from + Eitan Isaacson. (LP: #349031) + * Give the indicator applet an ATK name so it can be found by the + accessibility frameworks. Patch from Eitan Isaacson. (LP: #349031) + * Making it so the 'No Indicators' situation uses a label instead of a + desensitized menu item to allow right click through. (LP: #346359) + * Remove the making of 'Indicator Applet Factory' translatable. + (LP: #349540) + * Make sure translations get loaded and make the 'No Indicators' error + and the license translatable. Patch from Gabor Kelemen. (LP: #349998) + * debian/control: Adding libgnomeui-dev as a dependency as it was added + upstream. + + -- Ted Gould <ted@ubuntu.com> Mon, 30 Mar 2009 09:31:44 +0200 + +indicator-applet (0.1.3-0ubuntu2) jaunty; urgency=low + + * debian/control: Add dependency to indicator-messages; the applet is + currently fairly useless without it. (LP: #346359) + + -- Martin Pitt <martin.pitt@ubuntu.com> Wed, 25 Mar 2009 11:25:29 +0100 + +indicator-applet (0.1.3-0ubuntu1) jaunty; urgency=low + + * New upstream version 0.1.3, makes the GObject introspection + an optional build item. + * debian/control: Removing GObject introspection + * debian/*.install, remove all of GIR references + + -- Ted Gould <ted@ubuntu.com> Wed, 18 Mar 2009 00:12:30 -0500 + +indicator-applet (0.1.2-0ubuntu2) UNRELEASED; urgency=low + + * Add debian/watch. + * Add bzr-builddeb configuration (merge mode). Fortunately this doesn't + insist on having *only* debian/ in bzr. This gives us the best of both + worlds, bzd-bd auto-downloading orig.tar.gz and merging in the + pre-generated autoconf stuff, and retaining the possibility of merging + directly from trunk, since we keep the full upstream source in this branch. + * debian/copyright: Fix download location. + + -- Martin Pitt <martin.pitt@ubuntu.com> Tue, 17 Mar 2009 10:51:46 +0100 + +indicator-applet (0.1.2-0ubuntu1) jaunty; urgency=low + + * New upstream version + * Removes duplicate prototypes (LP: #338885) + * Fixes background color to match them on dark themes when + the panel color is not set (LP: #334490) + * Removing the handle and replacing it with the ability to + right click on the applet to get a panel menu (LP: #339818) + * Various build fixes + + -- Ted Gould <ted@ubuntu.com> Sun, 15 Mar 2009 08:58:20 -0500 + +indicator-applet (0.1.1-0ubuntu2) jaunty; urgency=low + + * src/applet-main.c, applet_fill_cb(): Do not show anything if we + are running under a stracciatella GNOME session (i. e. without + Ubuntu components). See UbuntuSpec:stracciatella-session. + + -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 19 Feb 2009 17:24:04 +0100 + +indicator-applet (0.1.1-0ubuntu1) jaunty; urgency=low + + * New upstream release with some icon changes. + * debian/control: Fix Vcs-Bzr. + * debian/control: Update package descriptions; the messaging part is + provided by indicator-messages. + * debian/copyright: Fix leftover word "either" from the license + description. + + -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 19 Feb 2009 16:12:01 +0100 + +indicator-applet (0.1-0ubuntu1) jaunty; urgency=low + + * Initial release, based on DX team's PPA packaging branch. + (lp:~indicator-applet-developers/indicator-applet/applet-packaging) + * Repack orig.tar.gz with a copy of the LGPL 3, libindicate/* is + under that license. + * debian/control: Add Homepage:, Vcs-Bzr:, and proper package + descriptions. + * debian/copyright: Properly describe licenses. + * configure.ac: Add missing gio-2.0 pkgconfig check (from DX team + PPA packaging branch), and autoreconf to pick up the change. + + -- Martin Pitt <martin.pitt@ubuntu.com> Tue, 17 Feb 2009 10:28:14 +0100 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..f755f70 --- /dev/null +++ b/debian/control @@ -0,0 +1,109 @@ +Source: indicator-applet +Section: gnome +Priority: optional +Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com> +Build-Depends: debhelper (>= 5.0), + cdbs (>= 0.4.41), + libgtk2.0-dev (>= 2.12.0), + libpanel-applet2-dev (>= 2.0.0), + libdbus-glib-1-dev, + gnome-doc-utils, + libgnomeui-dev, + libtool, + intltool, + libxml2-dev +Standards-Version: 3.8.0 +Homepage: https://launchpad.net/indicator-applet +Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/indicator-applet/ubuntu + +Package: indicator-applet +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + gnome-panel, + indicator-messages +Description: GNOME panel indicator applet + indicator-applet is an applet to display information from + various applications consistently in the GNOME panel. + . + Currently this includes support for messaging applications in the + indicator-messages package. + +Package: libindicate2 +Section: libs +Conflicts: libindicate +Replaces: libindicate +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: GNOME panel indicator applet - shared library + indicator-applet is an applet to display information from + various applications consistently in the GNOME panel. + . + This package contains shared libraries to be used by applications. + +Package: libindicate-dev +Section: libdevel +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libindicate1 (= ${binary:Version}), + libdbus-glib-1-dev (>= 0.76) +Description: GNOME panel indicator applet - shared library + indicator-applet is an applet to display information from + various applications consistently in the GNOME panel. + . + This package contains files that are needed to build applications. + +Package: libindicate-gtk0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: GNOME panel indicator applet - shared library + indicator-applet is an applet to display information from + various applications consistently in the GNOME panel. + . + This package contains shared libraries to be used by applications. + +Package: libindicate-gtk-dev +Section: libdevel +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libindicate-gtk (= ${binary:Version}), + libindicate-dev, + libdbus-glib-1-dev (>= 0.76), + libgtk2.0-dev (>= 2.12.0) +Description: GNOME panel indicator applet - shared library + indicator-applet is an applet to display information from + various applications consistently in the GNOME panel. + . + This package contains files that are needed to build applications. + +Package: libindicator-dev +Section: libdevel +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libgtk2.0-dev (>= 2.12.0) +Description: GNOME panel indicator applet - shared library + This library contains information to build indicators to go into + the indicator applet. + . + This package contains files that are needed to build applications. + +Package: libindicate-doc +Section: doc +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libindicate1 (= ${binary:Version}), + libdbus-glib-1-dev (>= 0.76), + libgtk2.0-dev (>= 2.12.0) +Description: GNOME panel indicator applet - shared library + indicator-applet is an applet to display information from + various applications consistently in the GNOME panel.ยท + . + This package contains files that are needed to build applications. + diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..074097c --- /dev/null +++ b/debian/copyright @@ -0,0 +1,53 @@ +This package was debianized by Ted Gould <ted@canonical.com> on +Wed, 11 Feb 2009 15:41:06 -0600. + +It was downloaded from <http://launchpad.net/indicator-applet/> + +Upstream Author: + + Ted Gould <ted@canonical.com> + +Copyright: + + Copyright (C) 2009 Canonical Ltd. + +License: + + This program 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, version 3 of the License. + + This program 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, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-3'. + +License for libindicate/* (libindicate0 and libindicate-dev packages): + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 or 3 of the License. + + 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. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU Lesser General Public License +can be found in `/usr/share/common-licenses/LGPL-2.1' and +`/usr/share/common-licenses/LGPL-3'. + +The Debian packaging is (C) 2009, Canonical Ltd. and +is licensed under the GPLv3, see `/usr/share/common-licenses/GPL-3'. diff --git a/debian/indicator-applet.install b/debian/indicator-applet.install new file mode 100644 index 0000000..a6e5326 --- /dev/null +++ b/debian/indicator-applet.install @@ -0,0 +1,4 @@ +debian/tmp/etc +debian/tmp/usr/lib/bonobo +debian/tmp/usr/lib/indicator-applet +debian/tmp/usr/share/icons diff --git a/debian/libindicate-dev.install b/debian/libindicate-dev.install new file mode 100644 index 0000000..81e1396 --- /dev/null +++ b/debian/libindicate-dev.install @@ -0,0 +1,4 @@ +debian/tmp/usr/include/libindicate-0.1/libindicate/* +debian/tmp/usr/lib/pkgconfig/indicate.pc +debian/tmp/usr/lib/libindicate.a +debian/tmp/usr/lib/libindicate.so diff --git a/debian/libindicate-doc.install b/debian/libindicate-doc.install new file mode 100644 index 0000000..55af9eb --- /dev/null +++ b/debian/libindicate-doc.install @@ -0,0 +1,2 @@ +debian/tmp/usr/share/gtk-doc/html/libindicate/* +debian/tmp/usr/share/doc/indicator-applet/examples/* diff --git a/debian/libindicate-gtk-dev.install b/debian/libindicate-gtk-dev.install new file mode 100644 index 0000000..5f0e682 --- /dev/null +++ b/debian/libindicate-gtk-dev.install @@ -0,0 +1,4 @@ +debian/tmp/usr/include/libindicate-0.1/libindicate-gtk/* +debian/tmp/usr/lib/pkgconfig/indicate-gtk.pc +debian/tmp/usr/lib/libindicate-gtk.a +debian/tmp/usr/lib/libindicate-gtk.so diff --git a/debian/libindicate-gtk0.install b/debian/libindicate-gtk0.install new file mode 100644 index 0000000..fc6b412 --- /dev/null +++ b/debian/libindicate-gtk0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libindicate-gtk.so.* diff --git a/debian/libindicate2.install b/debian/libindicate2.install new file mode 100644 index 0000000..0618a58 --- /dev/null +++ b/debian/libindicate2.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libindicate.so.* diff --git a/debian/libindicator-dev.install b/debian/libindicator-dev.install new file mode 100644 index 0000000..7e7d9db --- /dev/null +++ b/debian/libindicator-dev.install @@ -0,0 +1,2 @@ +debian/tmp/usr/include/libindicator* +debian/tmp/usr/lib/pkgconfig/indicator.pc diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..3025b6a --- /dev/null +++ b/debian/rules @@ -0,0 +1,8 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/gnome.mk + +DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --disable-gobject-introspection +LDFLAGS += -Wl,-z,defs -Wl,--as-needed +DEB_DH_MAKESHLIBS_ARGS_libindicate0 += -V 'libindicate0 (>= 0.1.2)' diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..e8ab1bd --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://launchpad.net/indicator-applet/+download .*/indicator-applet-([0-9.]+)\.tar\.gz diff --git a/src/applet-main.c b/src/applet-main.c index 2aa03ee..5af2763 100644 --- a/src/applet-main.c +++ b/src/applet-main.c @@ -214,6 +214,13 @@ applet_fill_cb (PanelApplet * applet, const gchar * iid, gpointer data) GtkWidget *menubar; gint i; gint indicators_loaded = 0; + + /* check if we are running stracciatella session */ + if (g_strcmp0(g_getenv("GDMSESSION"), "gnome-stracciatella") == 0) { + g_debug("Running stracciatella GNOME session, disabling myself"); + return TRUE; + } + static gboolean first_time = FALSE; if (!first_time) |