11 files changed, 207 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..40f817b
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,70 @@
+indicator-applet (0.1.2-0ubuntu3~ted2) jaunty; urgency=low
+
+  * PPA version bump.  Forgot autogen.sh
+
+ -- Ted Gould <ted@ubuntu.com>  Tue, 17 Mar 2009 11:28:38 -0500
+
+indicator-applet (0.1.2-0ubuntu3~ted1) jaunty; urgency=low
+
+  * debian/control: Removing GObject introspection
+  * configure.ac, libindicate/Makefile.am: Making the GObject
+    introspection optional.
+
+ -- Ted Gould <ted@ubuntu.com>  Tue, 17 Mar 2009 11:03:55 -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..fda7679
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,54 @@
+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,
+               libtool,
+               intltool
+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
+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: libindicate0
+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},
+         libindicate0 (= ${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..f65d387
--- /dev/null
+++ b/debian/libindicate-dev.install
@@ -0,0 +1,5 @@
+debian/tmp/usr/include/
+debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/lib/libindicate.a
+debian/tmp/usr/lib/libindicate.so
+debian/tmp/usr/share/gir/
diff --git a/debian/libindicate0.install b/debian/libindicate0.install
new file mode 100644
index 0000000..9369053
--- /dev/null
+++ b/debian/libindicate0.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/libindicate.so.*
+debian/tmp/usr/lib/girepository/
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..27b72eb
--- /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
+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 62faab0..cd07548 100644
--- a/src/applet-main.c
+++ b/src/applet-main.c
@@ -172,6 +172,12 @@ 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;
+        }
   
 	/* Set panel options */
 	gtk_container_set_border_width(GTK_CONTAINER (applet), 0);