16 files changed, 480 insertions, 2 deletions
diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf
new file mode 100644
index 0000000..36c28f8
--- /dev/null
+++ b/.bzr-builddeb/default.conf
@@ -0,0 +1,2 @@
+[BUILDDEB]
+merge = False
diff --git a/Makefile.in b/Makefile.in
index 1dba7dc..c12d7bc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -40,7 +40,10 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	compile config.guess config.sub depcomp install-sh ltmain.sh \
 	missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..4b426c4
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,310 @@
+libindicator (0.3.16-0ubuntu1~ppa1) UNRELEASED; urgency=low
+
+  * New upstream release.
+    * GDBus Port
+  * debian/control: Migrating library versions from 1 to 2
+  * debian/control: Dropping dbus-glib as a build-dep
+  * debian/libindicator-tools: Removing indicator-loader3
+  * debian/libindicator3-dev: Adding in the include files for this
+    version of the library.
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 13 Jan 2011 12:45:16 -0600
+
+libindicator (0.3.15-0ubuntu2) natty; urgency=low
+
+  * debian/control: 
+    - dropped libindicator-debugenv package
+  * -debian/libindicator-debugenv.install
+  * debian/libindicator-tools.install
+    - Install indicator-loader and indicator-loader3 in the 
+    libindicator-tools package (means it depends on both gtk2 and gtk3)
+    - Install sample xsession env in pkgdatadir for developer use
+  * tools/Makefile.am
+    - Install 80indicator-debugging in pkgdatadir
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Mon, 06 Dec 2010 10:19:58 -0500
+
+libindicator (0.3.15-0ubuntu1) natty; urgency=low
+
+  * debian/rules
+    - Added build targets to build with gtk3 enabled in additional to
+      default build with gtk2
+  * debian/control
+    - Updated build depends to support building with gtk+-3.0
+    - Added dh-autoreconf build depends
+    - Added libindicator3-1, libindicator3-dev, libindicator3-tools binaries
+      binaries
+  * libindicator/Makefile.am and tools/Makefile.am
+    - Fixes needed for building with-gtk=3
+
+  [ Ted Gould ]
+  * New upstream release.
+    * Adding a small file to set debugging environment variables
+    * Allowing to build for GTK 2/3 and build parallel libraries
+  * debian/control: Adding package libindicator-debugenv
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Wed, 24 Nov 2010 18:29:40 -0500
+
+libindicator (0.3.14-0ubuntu1) maverick; urgency=low
+
+  * New upstream release.
+    * Adding a function to signal a menu is shown (LP: #637692)
+    * Changing indicator directory to '4'
+  * debian/source:
+    - don't use quilt format, it's making the daily build not working
+  * debian/control:
+    - rename to soname bump
+    - put the Vcs-Bzr to point the right official branch
+  * debian/libindicator1.install: rename to soname bump
+  * debian/rules:
+    - update MAKESHLIBS_ARGS
+
+  [Ted Gould]
+  * debian/rules:
+    - removing simple-patchsys
+
+ -- Didier Roche <didrocks@ubuntu.com>  Wed, 22 Sep 2010 18:09:44 +0200
+
+libindicator (0.3.13-0ubuntu1) maverick; urgency=low
+
+  * New upstream release.
+    * Adding a menu_show signal
+
+ -- Ted Gould <ted@ubuntu.com>  Wed, 15 Sep 2010 11:46:37 -0500
+
+libindicator (0.3.12-0ubuntu1) maverick; urgency=low
+
+  * New upstream release.
+    * Removing a g_error that was breaking Unity on failed icons
+  * dropping workaround-icon-crash.patch: 
+
+ -- Ted Gould <ted@ubuntu.com>  Wed, 18 Aug 2010 11:05:51 -0500
+
+libindicator (0.3.11-0ubuntu2) maverick; urgency=low
+
+  * workaround-icon-crash.patch: 
+    - change from Mikkel Kamstrup Erlandsen to workaround a crasher in the 
+       new version
+  * debian/control:
+    - updated the gtk build requirement
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Fri, 13 Aug 2010 11:40:29 +0200
+
+libindicator (0.3.11-0ubuntu1) maverick; urgency=low
+
+  * New upstream release.
+    * Allowing absolute paths in the image name (LP: #564034)
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 12 Aug 2010 14:42:46 -0500
+
+libindicator (0.3.10-1) unstable; urgency=low
+
+  * Merging new upstream release from Ubuntu.
+
+ -- Evgeni Golov <evgeni@debian.org>  Sun, 25 Jul 2010 12:08:48 +0200
+
+libindicator (0.3.10-0ubuntu1) maverick; urgency=low
+
+  * New upstream release.
+    * Fixing unwatching crash (LP: #603489)
+    * Adding configurable timeout for slow test systems
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 15 Jul 2010 10:02:56 -0500
+
+libindicator (0.3.9-1) unstable; urgency=low
+
+  * Merging new upstream release and some changes from Ubuntu.
+  * Don't drop debian/source/*
+  * Standards-Version: 3.9.0
+
+ -- Evgeni Golov <evgeni@debian.org>  Wed, 14 Jul 2010 10:07:36 +0200
+
+libindicator (0.3.9-0ubuntu2) maverick; urgency=low
+
+  * Merged in fix for (LP: #603489)
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Fri, 09 Jul 2010 15:24:33 -0400
+
+libindicator (0.3.9-0ubuntu1) maverick; urgency=low
+
+  * New upstream release.
+    * Removing checking for style properties that aren't used.
+    * Make it so that a watcher dying is the same as unregistering.
+  * Merge debian changes
+  	* Drop debian/source/*
+  * debian/control: Switch VCS for this branch to be the indicator
+    applet developers branch.
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 08 Jul 2010 15:19:08 -0500
+
+libindicator (0.3.8-2) UNRELEASED; urgency=low
+
+  * Revert cdbs drop, as requested by the Ubuntu maintainers.
+  * Update Maintainer and Vcs-* fields for pkg-ayatana.
+
+ -- Evgeni Golov <evgeni@debian.org>  Wed, 16 Jun 2010 09:54:50 +0200
+
+libindicator (0.3.8-1) unstable; urgency=low
+
+  * Merge Ubuntu package into Debian.
+    Closes: #549999
+  * debian/copyright:
+    + Update to machine readable format.
+  * debian/control:
+    + Drop cdbs Build-Dep, bump debhelper to >=7.
+    + Standards-Version 3.8.4.
+    + Update Vcs-* fields.
+    + Drop GNOME from Description, the package is not GNOME specific.
+    + Slightly update Description, thanks lintian.
+  * debian/rules:
+    + Use minimal debhelper 7 rules without cdbs.
+    + Disable tests for now, they fail (launchpad 587811)
+  * debian/source/format:
+    + Add file, make package 3.0 (quilt).
+
+ -- Evgeni Golov <evgeni@debian.org>  Mon, 07 Jun 2010 11:21:32 +0200
+
+libindicator (0.3.8-0ubuntu1) lucid; urgency=low
+
+  * New upstream release.
+    * Adding template files to tarball
+
+ -- Ted Gould <ted@ubuntu.com>  Fri, 09 Apr 2010 12:56:19 -0500
+
+libindicator (0.3.7-0ubuntu1~ppa1) lucid; urgency=low
+
+  * New upstream release.
+    * Use the domain in desktop files for shortcuts (LP: #549322)
+
+ -- Ted Gould <ted@ubuntu.com>  Fri, 09 Apr 2010 12:53:39 -0500
+
+libindicator (0.3.6-0ubuntu1) lucid; urgency=low
+
+  * Upstream release 0.3.6
+    * Adding in scroll signals for the indicators
+  * debian/rules: Updating shlibs 
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 18 Mar 2010 11:10:20 -0500
+
+libindicator (0.3.5-0ubuntu1) lucid; urgency=low
+
+  * Upstream release 0.3.5
+    * Adding in a image loader helper for indicators.
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 11 Mar 2010 14:27:04 -0600
+
+libindicator (0.3.4-0ubuntu1) lucid; urgency=low
+
+  * Upstream Release 0.3.4
+    * Reducing gio-unix dependency to 2.22
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 25 Feb 2010 11:27:18 -0600
+
+libindicator (0.3.3-0ubuntu2) lucid; urgency=low
+
+  * debian/control:
+    Reducing libglib dependency down to 2.22 for Karmic builds
+
+ -- Ted Gould <ted@ubuntu.com>  Wed, 24 Feb 2010 21:05:01 -0600
+
+libindicator (0.3.3-0ubuntu1) lucid; urgency=low
+
+  * debian/control:
+    - build-depends on libglib2.0-dev
+  * debian/rules:
+    - updated shlibs version
+
+  [ Ted Gould ]
+  * Upstream release 0.3.3
+    * Adding new object for parsing desktop files for Shortcuts
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Thu, 18 Feb 2010 17:32:08 +0100
+
+libindicator (0.3.2-0ubuntu1) lucid; urgency=low
+
+  * Upstream release 0.3.2
+    * Various fixes to timeout handling in services and the
+      service manager.
+    * Fix test suite when run headless
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 04 Feb 2010 17:40:06 -0800
+
+libindicator (0.3.1-0ubuntu1) lucid; urgency=low
+
+  * Upstream release 0.3.1
+    * Adding in entry ordering.
+    * Adding in the code to restart services
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 21 Jan 2010 13:15:07 -0600
+
+libindicator (0.3.0-0ubuntu1) lucid; urgency=low
+
+  * debian/control:
+    - Added description for libindicator-tools
+
+  [Ted Gould]
+  * Upstream 0.3.0 Release 
+    * Adds a new tool to load indicators from the command line.
+    * Adds an object for loading indicators.
+    * Changes the indicator interface to be object based.
+  * debian/control, debian/libindicator0: Adding in a new packages
+    for the binary library.
+  * debian/control, debian/libindicator-tools: Adding in a new
+    package for the tools of libindicator.
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 10 Dec 2009 12:11:49 -0500
+
+libindicator (0.2.1-0ubuntu2~ppa1) karmic; urgency=low
+
+  * Adding in service management code.
+  * debian/control: Adding a target for libindicator0
+  * Adding libindicator0.install and libindicator-dev.install
+
+ -- Ted Gould <ted@ubuntu.com>  Wed, 04 Nov 2009 08:19:01 -0600
+
+libindicator (0.2.1-0ubuntu1) karmic; urgency=low
+
+  * Upstream release 0.2.1 (LP: #446619)
+    * Puts a copyright header on the header file.  Should have
+      been there all along.
+
+ -- Ted Gould <ted@ubuntu.com>  Fri, 09 Oct 2009 08:12:18 +0200
+
+libindicator (0.2.0-0ubuntu1) karmic; urgency=low
+
+  * Upstream release 0.2.0 (LP: #427443):
+    - Use silent automake mode.
+    - Tag for final release.
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 10 Sep 2009 20:22:45 +0200
+
+libindicator (0.2.0~bzr325-0ubuntu1) karmic; urgency=low
+
+  [ Ted Gould ]
+  * New version (LP: #417039)
+  * Merging in the seperation from indicator-applet
+  * debian/* Removing all of the indicator-applet stuff
+  * Setting the icon path in the .pc file.
+  * Merging onto the main packaging branch.
+  * Renaming the second Bonobo server description file to match that
+    of the FastUserSwitchApplet.
+  * Upstream merge for better naming of the applet.
+  * Updating from upstream with two (count them) two applets
+    installed in the source.
+  * debian/control: Adding information on indicator-applet-sus which
+    is a different applet for the SUS indicator.
+  * debian/indicator-applet.install: Making it more specific so that
+    it doesn't grab the directories that now have additional files
+    created by indicator-applet-sus existing.
+  * debian/indicator-applet-sus.install: List files that are now
+    used by the new binary package.
+
+  [ Ken VanDine ]
+  * debian/control:
+    - Set both Vcs-Bzr and Vcs-Bzr-Browser, with ~ubuntu-desktop 
+
+  [ Martin Pitt ]
+  * Flush changelog.
+  * debian/control: Fix Vcs-* links.
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Tue, 25 Aug 2009 08:35:00 +0200
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..17855cf
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,89 @@
+Source: libindicator
+Section: libs
+Priority: optional
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: The Ayatana Packagers <pkg-ayatana-devel@lists.alioth.debian.org>
+Uploaders: Evgeni Golov <evgeni@debian.org>, Kartik Mistry <kartik@debian.org>
+Build-Depends: debhelper (>= 5.0),
+               cdbs (>= 0.4.41),
+               libglib2.0-dev (>= 2.22),
+               libgtk2.0-dev (>= 2.18),
+               libgtk3.0-dev (>= 2.91.3),
+               libtool,
+               intltool,
+               gtk-doc-tools,
+               dh-autoreconf
+Standards-Version: 3.9.0
+Homepage: https://launchpad.net/libindicator
+Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/libindicator/ubuntu
+Vcs-Browser: http://bazaar.launchpad.net/~indicator-applet-developers/libindicator/ubuntu
+
+Package: libindicator2
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description: panel indicator applet - shared library
+ This library contains information to build indicators to go into
+ the indicator applet.
+ .
+ This package contains the library itself.
+
+Package: libindicator-dev
+Section: libdevel
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         libgtk2.0-dev (>= 2.12.0),
+         libindicator2 (= ${binary:Version})
+Description: panel indicator applet - library development files
+ This library contains information to build indicators to go into
+ the indicator applet.
+ .
+ This package contains files that are needed to build applications.
+
+Package: libindicator-tools
+Section: devel
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         libindicator2 (= ${binary:Version})
+Description: Tools for libindicator
+ Tools useful for developers of applications using indicators.
+ .
+ This package contains files that are needed to build applications.
+
+Package: libindicator3-2
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description: panel indicator applet - shared library
+ This library contains information to build indicators to go into
+ the indicator applet.
+ .
+ This package contains the library itself.
+
+Package: libindicator3-dev
+Section: libdevel
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         libgtk3.0-dev (>= 2.91.3),
+         libindicator3-2 (= ${binary:Version})
+Description: panel indicator applet - library development files
+ This library contains information to build indicators to go into
+ the indicator applet.
+ .
+ This package contains files that are needed to build applications.
+
+Package: libindicator3-tools
+Section: devel
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         libindicator3-2 (= ${binary:Version})
+Description: Tools for libindicator
+ Tools useful for developers of applications using indicators.
+ .
+ This package contains files that are needed to build applications.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..f47fefc
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,17 @@
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: libindicator
+Maintainer: Ted Gould <ted@canonical.com>
+Source: https://launchpad.net/libindicator
+
+Files: *
+Copyright: 2009-2010 Ted Gould <ted@canonical.com>, Canonical Ltd.
+License: GPL-3
+
+Files: debian/*
+Copyright: 2009-2010 Evgeni Golov <evgeni@debian.org>
+Copyright: 2009-2010 Ted Gould <ted@canonical.com>, Canonical Ltd.
+License: GPL-3
+
+License: GPL-3
+On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
diff --git a/debian/libindicator-dev.install b/debian/libindicator-dev.install
new file mode 100644
index 0000000..bbdcdeb
--- /dev/null
+++ b/debian/libindicator-dev.install
@@ -0,0 +1,4 @@
+debian/tmp/usr/include/libindicator-0.3/libindicator/*
+debian/tmp/usr/lib/pkgconfig/indicator.pc
+debian/tmp/usr/lib/libindicator.a
+debian/tmp/usr/lib/libindicator.so
diff --git a/debian/libindicator-tools.install b/debian/libindicator-tools.install
new file mode 100644
index 0000000..34f8177
--- /dev/null
+++ b/debian/libindicator-tools.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/libindicator/indicator-loader
+debian/tmp/usr/share/libindicator/80indicator-debugging
diff --git a/debian/libindicator2.install b/debian/libindicator2.install
new file mode 100644
index 0000000..85dbd3e
--- /dev/null
+++ b/debian/libindicator2.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libindicator.so.*
diff --git a/debian/libindicator3-2.install b/debian/libindicator3-2.install
new file mode 100644
index 0000000..aaa2e72
--- /dev/null
+++ b/debian/libindicator3-2.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libindicator3.so.*
diff --git a/debian/libindicator3-dev.install b/debian/libindicator3-dev.install
new file mode 100644
index 0000000..d11f81d
--- /dev/null
+++ b/debian/libindicator3-dev.install
@@ -0,0 +1,4 @@
+debian/tmp/usr/include/libindicator3-0.3/libindicator/*
+debian/tmp/usr/lib/pkgconfig/indicator3.pc
+debian/tmp/usr/lib/libindicator3.a
+debian/tmp/usr/lib/libindicator3.so
diff --git a/debian/libindicator3-tools.install b/debian/libindicator3-tools.install
new file mode 100644
index 0000000..2766bc0
--- /dev/null
+++ b/debian/libindicator3-tools.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libindicator/indicator-loader3
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..e4f4f04
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,39 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
+
+DEB_SRCDIR = .
+DEB_BUILDDIR = $(DEB_SRCDIR)/build
+
+LDFLAGS += -Wl,-z,defs -Wl,--as-needed
+
+DEB_DH_MAKESHLIBS_ARGS_libindicator1 += -V 'libindicator1 (>= 0.3.15)'
+DEB_DH_MAKESHLIBS_ARGS_libindicator3 += -V 'libindicator3-1 (>= 0.3.15)'
+
+configure/libindicator3-1:: stamp-configure-gtk3
+stamp-configure-gtk3:
+	: # configure for GTK+ 3.0
+	set -e; \
+	rm -rf build-gtk3; \
+	mkdir build-gtk3; \
+	cd build-gtk3; \
+	$(DEB_CONFIGURE_SCRIPT_ENV) ../configure --with-gtk=3 \
+		$(filter-out --srcdir=%, $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS)); \
+	cd ..;
+	touch stamp-configure-gtk3
+
+build/libindicator3-1:: stamp-build-gtk3
+stamp-build-gtk3: stamp-configure-gtk3
+	: # build for GTK+ 3.0
+	$(MAKE) -C build-gtk3;
+	touch stamp-build-gtk3
+
+common-install-prehook-arch:: stamp-build-gtk3
+	: # install for GTK+ 3.0
+	$(MAKE) -C build-gtk3 DESTDIR=$(CURDIR)/debian/tmp install
+
+clean::
+	rm -f stamp-*-gtk3
+	rm -rf build-gtk3
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..16f79e0
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://launchpad.net/libindicator/+download .*/libindicator-([0-9.]+)\.tar\.gz
diff --git a/libindicator3-1.install b/libindicator3-1.install
new file mode 100644
index 0000000..aaa2e72
--- /dev/null
+++ b/libindicator3-1.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libindicator3.so.*
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 287d34f..795e4fc 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -19,6 +19,7 @@ indicator_loader_SOURCES = \
 indicator_loader_CFLAGS = \
 	-Wall -Werror \
 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \
+        -Wall -Werror \
 	-DBUILD_DIR="\"$(builddir)\""
 
 indicator_loader_LDADD = \
@@ -34,7 +35,7 @@ indicator_loader3_SOURCES = $(indicator_loader_SOURCES)
 indicator_loader3_CFLAGS = $(indicator_loader_CFLAGS)
 indicator_loader3_LDADD = $(indicator_loader_LDADD)
 
-xsessiondir = $(sysconfdir)/X11/Xsession.d
+xsessiondir = $(pkgdatadir)
 
 xsession_DATA = 80indicator-debugging