diff options
-rw-r--r-- | .bzr-builddeb/default.conf | 2 | ||||
-rw-r--r-- | debian/changelog | 564 | ||||
-rw-r--r-- | debian/compat | 1 | ||||
-rw-r--r-- | debian/control | 92 | ||||
-rw-r--r-- | debian/copyright | 17 | ||||
-rw-r--r-- | debian/libindicator-dev.install | 4 | ||||
-rw-r--r-- | debian/libindicator-tools.install | 2 | ||||
-rw-r--r-- | debian/libindicator3-7.install | 1 | ||||
-rw-r--r-- | debian/libindicator3-dev.install | 4 | ||||
-rw-r--r-- | debian/libindicator3-tools.install | 1 | ||||
-rw-r--r-- | debian/libindicator7.install | 1 | ||||
-rwxr-xr-x | debian/rules | 30 | ||||
-rw-r--r-- | debian/source/format | 1 | ||||
-rw-r--r-- | debian/source/options | 1 | ||||
-rw-r--r-- | debian/watch | 2 | ||||
-rw-r--r-- | tests/service-manager-connect-service.c | 2 | ||||
-rw-r--r-- | tools/Makefile.am | 1 |
17 files changed, 725 insertions, 1 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/debian/changelog b/debian/changelog new file mode 100644 index 0000000..54d56a7 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,564 @@ +libindicator (0.4.91-0ubuntu1~ppa3) precise; urgency=low + + * Upstream Merge + * Increasing the test timeout to ensure that's not our issue + + -- Ted Gould <ted@ubuntu.com> Tue, 14 Feb 2012 21:11:29 -0600 + +libindicator (0.4.91-0ubuntu1~ppa2) precise; urgency=low + + * debian/rules: Adding messages + + -- Ted Gould <ted@ubuntu.com> Tue, 14 Feb 2012 16:48:11 -0600 + +libindicator (0.4.91-0ubuntu1~ppa1) precise; urgency=low + + * New upstream release. + * Visibility fixes for indicators using that functionality + * Ensure that parent_object is more aggressively set + * Fix memory leak on groups of items in desktop files + * Dropping debian/patches + * Upstream Merge + * Explicitly add in gmodule as a required library + * debian/control, debian/rules: + * Adding in autoreconf support + * Adding a check rule and requiring new build deps + + -- Ted Gould <ted@ubuntu.com> Tue, 14 Feb 2012 14:29:51 -0600 + +libindicator (0.4.90-0ubuntu4) precise; urgency=low + + * libindicator/indicator-object.c + - revert disabling visibility, there is now a better fix for disappearing + in indicator-appmenu + + -- Ken VanDine <ken.vandine@canonical.com> Thu, 26 Jan 2012 00:24:06 -0500 + +libindicator (0.4.90-0ubuntu3) precise; urgency=low + + * libindicator/indicator-object.c + - basically disable the new visibility stuff because it breaks appmenus + + -- Ken VanDine <ken.vandine@canonical.com> Wed, 25 Jan 2012 18:08:31 -0500 + +libindicator (0.4.90-0ubuntu2) precise; urgency=low + + * debian/control + - dropped the Conflicts with libindicator6 and libindicator3-6 + + -- Ken VanDine <ken.vandine@canonical.com> Tue, 24 Jan 2012 21:44:30 -0500 + +libindicator (0.4.90-0ubuntu1) precise; urgency=low + + [ Ted Gould ] + * New upstream release. + * Support hiding and showing indicators + * Track the parent object in the entry + * Adding activate function to include Window ID + * debian/control: Bumping ABI version of lib + + [ Ken VanDine ] + * debian/control + - set ubuntu-desktop VCS and maintainer + * debian/rules + - Updated shlibs + * debian/libindicator3-dev.install + - include headers + + -- Ken VanDine <ken.vandine@canonical.com> Tue, 24 Jan 2012 12:13:51 -0500 + +libindicator (0.4.1-1) experimental; urgency=low + + * Merge from Ubuntu. + + Re-enable GTK3 packages. + + Link to libm to prevent FTBFS. + Closes: #640459 + * Set single-debian-patch in debian/source/options. + + -- Evgeni Golov <evgeni@debian.org> Sun, 02 Oct 2011 15:08:46 +0200 + +libindicator (0.4.1-0ubuntu1) oneiric; urgency=low + + * New upstream release. + * Ensure loader doesn't use menu proxy + + -- Ted Gould <ted@ubuntu.com> Wed, 28 Sep 2011 10:51:08 -0500 + +libindicator (0.4.0-0ubuntu1) oneiric; urgency=low + + * New upstream release. + * Add libm to linking to fix FTBFS (LP: #840514) + + -- Ted Gould <ted@ubuntu.com> Mon, 19 Sep 2011 21:54:32 -0500 + +libindicator (0.3.93-0ubuntu2) oneiric; urgency=low + + * Drop the Breaks: against old versions of libindicator and libindicator3; + there are no file conflicts between the libraries, so this doesn't + accurately reflect the package relationships but does make it harder to + calculate upgrades from natty. LP: #839098. + + -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 01 Sep 2011 14:22:12 -0700 + +libindicator (0.3.93-0ubuntu1) oneiric; urgency=low + + * debian/rules: + - update the translations template + + [ Ted Gould ] + * New upstream release + + -- Sebastien Bacher <seb128@ubuntu.com> Thu, 11 Aug 2011 21:16:12 +0200 + +libindicator (0.3.92-0ubuntu1) oneiric; urgency=low + + * New upstream release. + * Adding support for a secondary activate signal + + -- Ted Gould <ted@ubuntu.com> Thu, 21 Jul 2011 10:39:10 -0500 + +libindicator (0.3.91-0ubuntu1) oneiric; urgency=low + + * New upstream release. + * Fix signals with NULL entries in the loader + * Adding a comment for setting up debugging options + * Adding annotations for GIR files + * Fixing watchers hashtable to detect when we have none + * Fix testing so no tests are XFAIL anymore + * Adding a replace mode for testing indicator services + * Watching new services when the name switches + + -- Ted Gould <ted@ubuntu.com> Thu, 14 Jul 2011 13:37:42 -0500 + +libindicator (0.3.90-0ubuntu1) oneiric; urgency=low + + [ Ted Gould ] + * New upstream release. + * Build Fixes + * Adding license to test files (LP: #684886) + * Bump API/ABI versions appropriately and make easier to edit them in + the future + * Adding a name-hint to the indicator entries + * Merging scroll functions into a single good one (LP: #804618) + * debian/*install, control: Changing ABI version number bump in package names + * debian/rules: Making GTK2 the special case as GTK3 is default now + * debian/*install: Fixing pkgconfig file names + + [ Ken VanDine ] + * debian/rules + - Simplify the dual builds with cdbs + - Fixed package names to match soname + * debian/*.install fixed paths to work with the dual builds change + * tools/Makefile.in + - Fixed path for xsessiondir + * debian/control + - Fixed package names to match soname + + -- Ken VanDine <ken.vandine@canonical.com> Thu, 07 Jul 2011 10:18:04 -0400 + +libindicator (0.3.22-1) unstable; urgency=low + + * Merge new upstream from Ubuntu. + + -- Evgeni Golov <evgeni@debian.org> Tue, 29 Mar 2011 10:07:03 +0200 + +libindicator (0.3.22-0ubuntu2) oneiric; urgency=low + + * debian/libindicator3-dev.install + - Don't install the headers twice, we only need them in libindicator-dev + * debian/control + - Make libindicator3-dev depend on libindicator-dev (LP: #3803136) + - Bump standards version to 3.9.2 + + -- Ken VanDine <ken.vandine@canonical.com> Wed, 29 Jun 2011 10:39:15 +0100 + +libindicator (0.3.22-0ubuntu1) natty; urgency=low + + * New upstream release. + * Adding the ability to know the environment the indicator + object is in. (LP: #703555) + + -- Ted Gould <ted@ubuntu.com> Wed, 23 Mar 2011 13:21:49 -0500 + +libindicator (0.3.21-1) unstable; urgency=low + + * Merge new upstream from Ubuntu. + * debian/control: + + Improve descriptions of the GTK3 packages. + + Standards-Version: 3.9.1 + * Disable GTK3 packages until libgtk-3-dev is in unstable. + + -- Evgeni Golov <evgeni@debian.org> Sun, 20 Mar 2011 15:58:35 +0100 + +libindicator (0.3.21-0ubuntu1) natty; urgency=low + + * New upstream release. + ∘ Don't check for TargetEnvironment on the desktop group + + -- Ted Gould <ted@ubuntu.com> Wed, 16 Mar 2011 13:29:21 -0500 + +libindicator (0.3.20-0ubuntu1) natty; urgency=low + + * New upstream release. + * Use the "TargetEnvironment" key in shortcuts + + -- Ted Gould <ted@ubuntu.com> Thu, 03 Mar 2011 14:02:12 -0600 + +libindicator (0.3.19-0ubuntu3) natty; urgency=low + + * debian/control + - More renaming of Depends to libgtk-3-dev + + -- Ken VanDine <ken.vandine@canonical.com> Wed, 23 Feb 2011 12:08:03 -0500 + +libindicator (0.3.19-0ubuntu2) natty; urgency=low + + * debian/control: + - Use new build-depends for libgtk-3-dev + + -- Ken VanDine <ken.vandine@canonical.com> Wed, 23 Feb 2011 08:49:50 -0500 + +libindicator (0.3.19-0ubuntu1) natty; urgency=low + + * debian/rules + - Updated shlibs + + [Ted Gould] + * New upstream release. + ∘ Adding in a11y description support + ∘ Fixing distcheck (LP: #587811) + * debian/*: Changing the library major version from 2 to 3 + * debian/control: Adding Breaks for the previous library rev + so that users don't end up with systems that use both. + + -- Ken VanDine <ken.vandine@canonical.com> Thu, 17 Feb 2011 14:04:55 -0500 + +libindicator (0.3.18-0ubuntu1) natty; urgency=low + + * New upstream release. + * Adding a signal for scrolling that includes the entry + * debian/rules: Updating shlibs + + -- Ted Gould <ted@ubuntu.com> Thu, 27 Jan 2011 15:31:04 -0600 + +libindicator (0.3.17-0ubuntu1~ppa1) natty; urgency=low + + * New upstream release. + * Fixing catching services dropping off + + -- Ted Gould <ted@ubuntu.com> Fri, 14 Jan 2011 11:09:36 -0600 + +libindicator (0.3.16-0ubuntu1) natty; 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. + + [ Ken VanDine ] + * debian/control: + - libindicator2 Breaks libindicator1 + + -- Ted Gould <ted@ubuntu.com> Thu, 13 Jan 2011 12:49:25 -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..998c41c --- /dev/null +++ b/debian/control @@ -0,0 +1,92 @@ +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), + dh-autoreconf, + cdbs (>= 0.4.41), + libglib2.0-dev (>= 2.22), + libgtk2.0-dev (>= 2.18), + libgtk-3-dev (>= 2.91.3), + libtool, + intltool, + gtk-doc-tools, + dbus-test-runner, + xvfb +Standards-Version: 3.9.2 +Homepage: https://launchpad.net/libindicator +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libindicator/ubuntu +Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/libindicator/ubuntu + +Package: libindicator7 +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), + libindicator7 (= ${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}, + libindicator7 (= ${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-7 +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}, + libgtk-3-dev (>= 2.91.3), + libindicator3-7 (= ${binary:Version}), + libindicator-dev (= ${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-7 (= ${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..25c2128 --- /dev/null +++ b/debian/libindicator-dev.install @@ -0,0 +1,4 @@ +debian/tmp/gtk2/usr/include /usr/ +debian/tmp/gtk2/usr/lib/pkgconfig/indicator-0.4.pc /usr/lib/pkgconfig/ +debian/tmp/gtk2/usr/lib/libindicator.a /usr/lib/ +debian/tmp/gtk2/usr/lib/libindicator.so /usr/lib/ diff --git a/debian/libindicator-tools.install b/debian/libindicator-tools.install new file mode 100644 index 0000000..20b86c8 --- /dev/null +++ b/debian/libindicator-tools.install @@ -0,0 +1,2 @@ +debian/tmp/gtk2/usr/lib/libindicator/indicator-loader /usr/lib/libindicator/ +debian/tmp/gtk2/usr/share/libindicator/80indicator-debugging /usr/share/libindicator/ diff --git a/debian/libindicator3-7.install b/debian/libindicator3-7.install new file mode 100644 index 0000000..75485eb --- /dev/null +++ b/debian/libindicator3-7.install @@ -0,0 +1 @@ +debian/tmp/gtk3/usr/lib/libindicator3.so.* /usr/lib/ diff --git a/debian/libindicator3-dev.install b/debian/libindicator3-dev.install new file mode 100644 index 0000000..e556af3 --- /dev/null +++ b/debian/libindicator3-dev.install @@ -0,0 +1,4 @@ +debian/tmp/gtk3/usr/include /usr/ +debian/tmp/gtk3/usr/lib/pkgconfig/indicator3-0.4.pc /usr/lib/pkgconfig/ +debian/tmp/gtk3/usr/lib/libindicator3.a /usr/lib/ +debian/tmp/gtk3/usr/lib/libindicator3.so /usr/lib/ diff --git a/debian/libindicator3-tools.install b/debian/libindicator3-tools.install new file mode 100644 index 0000000..47689fd --- /dev/null +++ b/debian/libindicator3-tools.install @@ -0,0 +1 @@ +debian/tmp/gtk3/usr/lib/libindicator/indicator-loader3 /usr/lib/libindicator/ diff --git a/debian/libindicator7.install b/debian/libindicator7.install new file mode 100644 index 0000000..c3bfad0 --- /dev/null +++ b/debian/libindicator7.install @@ -0,0 +1 @@ +debian/tmp/gtk2/usr/lib/libindicator.so.* /usr/lib/ diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..be53e6a --- /dev/null +++ b/debian/rules @@ -0,0 +1,30 @@ +#!/usr/bin/make -f + +DEB_BUILDDIR = build +DEB_MAKE_FLAVORS = gtk2 gtk3 + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/autoreconf.mk + +export G_MESSAGES_DEBUG = all + +DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@ +DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ + +DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2 +DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3 + +DEB_MAKE_CHECK_TARGET := check + +LDFLAGS += -Wl,-z,defs -Wl,--as-needed + +DEB_DH_MAKESHLIBS_ARGS_libindicator7 += -V 'libindicator7 (>= 0.4.90)' +DEB_DH_MAKESHLIBS_ARGS_libindicator3_7 += -V 'libindicator3-7 (>= 0.4.90)' + +debian/stamp-autotools/gtk2: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk2) +debian/stamp-autotools/gtk3: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk3) + +common-install-arch:: + find debian/tmp -name \*.la -delete + cd po; intltool-update --pot --verbose 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/source/options b/debian/source/options new file mode 100644 index 0000000..7423a2d --- /dev/null +++ b/debian/source/options @@ -0,0 +1 @@ +single-debian-patch 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/tests/service-manager-connect-service.c b/tests/service-manager-connect-service.c index 7f57f96..09a7ba1 100644 --- a/tests/service-manager-connect-service.c +++ b/tests/service-manager-connect-service.c @@ -55,7 +55,7 @@ main (int argc, char ** argv) IndicatorService * is = indicator_service_new("org.ayatana.test"); g_signal_connect(G_OBJECT(is), INDICATOR_SERVICE_SIGNAL_SHUTDOWN, shutdown, NULL); - g_timeout_add_seconds(1, timeout, NULL); + g_timeout_add_seconds(5, timeout, NULL); mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); diff --git a/tools/Makefile.am b/tools/Makefile.am index cefd944..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 = \ |