ayatana-commits team mailing list archive
-
ayatana-commits team
-
Mailing list archive
-
Message #00834
[Merge] lp:~indicator-applet-developers/libindicate/ubuntu into lp:libindicate
Ted Gould has proposed merging lp:~indicator-applet-developers/libindicate/ubuntu into lp:libindicate.
Requested reviews:
Sebastien Bacher (seb128)
0.3.0
--
https://code.launchpad.net/~indicator-applet-developers/libindicate/ubuntu/+merge/18649
Your team ayatana-commits is subscribed to branch lp:libindicate.
=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf 2010-02-04 23:31:12 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+merge = True
=== added directory 'debian'
=== added file 'debian/changelog'
--- debian/changelog 1970-01-01 00:00:00 +0000
+++ debian/changelog 2010-02-04 23:31:12 +0000
@@ -0,0 +1,71 @@
+libindicate (0.3.0-0ubuntu1~ppa1) lucid; urgency=low
+
+ * Upstream 0.3.0 release
+ * Fixing build of typelib file
+ * Removing the system bus from a default bus
+ * Unref'ing the proxies correctly
+ * Fixing the test suite
+ * Adding in a menu server as a property
+ * Adding a timestamp to activate signal
+ * Switching to ayatana.org namespace
+ * Making the properties as variants instead of strings
+ * debian/control:
+ * Adding libdbusmenu-glib-dev as a new dependency as well, it
+ is now.
+ * Dropping libxml dependency
+ * libindicate3 -> libindicate4
+ * libindicate-gtk1 -> libindicate-gtk2
+ * Setting dbusmenu dependency at 0.2.2
+
+ -- Ted Gould <ted@xxxxxxxxxx> Thu, 04 Feb 2010 15:23:42 -0800
+
+libindicate (0.2.3-0ubuntu1) karmic; urgency=low
+
+ * Upstream release 0.2.3 (LP: #440213)
+ * A new define to coordinate between KDE and GNOME
+ Messaging Menus
+
+ -- Ted Gould <ted@xxxxxxxxxx> Thu, 01 Oct 2009 23:31:26 +0200
+
+libindicate (0.2.2-0ubuntu1) karmic; urgency=low
+
+ * debian/rules:
+ - update shlib version
+
+ [ Ted Gould ]
+ * New upstream release (LP: #431947)
+ - Various small bug fixes including more convience functions,
+ making the examples better and fixing some runtime warnings.
+ - Applied memleak patch from agateau
+ - fix set_property so that it can be used with UINTs as well
+ - Allow UINT for properties
+
+ -- Sebastien Bacher <seb128@xxxxxxxxxx> Thu, 17 Sep 2009 22:17:54 +0200
+
+libindicate (0.2.0-0ubuntu1) karmic; urgency=low
+
+ * New upstream release (LP: #427364)
+ - Big change is renaming some signal names. :(
+ - Bug fixes in getting properties.
+ - Removing looking at the type on indicator lists.
+ - Fixing the count callback.
+ * debian/control:
+ - Increasing library versions to libindicate3
+ and libindicate-gtk1. Moving .install files as well.
+ * libindicate-dev and libindicate-gtk-dev.install change to
+ /usr/include/libindicate-0.2 from 0.1
+
+ -- Ted Gould <ted@xxxxxxxxxx> Wed, 09 Sep 2009 08:42:01 -0500
+
+libindicate (0.2.0~bzr325-0ubuntu1) karmic; urgency=low
+
+ [ Ken VanDine ]
+ * New source package, split out from the indicator-applet source
+ * Merging in changes to make this libindicate only.
+ * debian/* lots of changes to remove applet stuff.
+ * Renaming the directories to match new package name.
+ * Setting the icon path in the .pc file.
+ * debian/control:
+ - Set both Vcs-Bzr and Vcs-Bzr-Browser
+
+ -- Ted Gould <ted@xxxxxxxxxx> Thu, 03 Sep 2009 17:16:51 -0500
=== added file 'debian/compat'
--- debian/compat 1970-01-01 00:00:00 +0000
+++ debian/compat 2010-02-04 23:31:12 +0000
@@ -0,0 +1,1 @@
+5
=== added file 'debian/control'
--- debian/control 1970-01-01 00:00:00 +0000
+++ debian/control 2010-02-04 23:31:12 +0000
@@ -0,0 +1,85 @@
+Source: libindicate
+Section: libs
+Priority: optional
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@xxxxxxxxxxxxxxxx>
+Build-Depends: debhelper (>= 5.0),
+ cdbs (>= 0.4.41),
+ libgtk2.0-dev (>= 2.12.0),
+ libdbus-glib-1-dev,
+ libdbusmenu-glib-dev (>= 0.2.2),
+ gnome-doc-utils,
+ libtool,
+ intltool,
+ gtk-doc-tools
+Standards-Version: 3.8.0
+Homepage: https://launchpad.net/libindicate
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libindicate/ubuntu
+Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/libindicate/ubuntu
+
+Package: libindicate4
+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},
+ libindicate4 (= ${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-gtk2
+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-gtk2 (= ${binary:Version}),
+ libindicate-dev (= ${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.
+
+Package: libindicate-doc
+Section: doc
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ libindicate4 (= ${binary:Version}),
+ libindicate-gtk2 (= ${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.
+
=== added file 'debian/copyright'
--- debian/copyright 1970-01-01 00:00:00 +0000
+++ debian/copyright 2010-02-04 23:31:12 +0000
@@ -0,0 +1,35 @@
+This package was debianized by Ted Gould <ted@xxxxxxxxxxxxx> on
+Wed, 11 Feb 2009 15:41:06 -0600.
+
+It was downloaded from <http://launchpad.net/libindicate/>
+
+Upstream Author:
+
+ Ted Gould <ted@xxxxxxxxxxxxx>
+
+Copyright:
+
+ Copyright (C) 2009 Canonical Ltd.
+
+License:
+
+ 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'.
=== added file 'debian/libindicate-dev.install'
--- debian/libindicate-dev.install 1970-01-01 00:00:00 +0000
+++ debian/libindicate-dev.install 2010-02-04 23:31:12 +0000
@@ -0,0 +1,4 @@
+debian/tmp/usr/include/libindicate-0.2/libindicate/*
+debian/tmp/usr/lib/pkgconfig/indicate.pc
+debian/tmp/usr/lib/libindicate.a
+debian/tmp/usr/lib/libindicate.so
=== added file 'debian/libindicate-doc.install'
--- debian/libindicate-doc.install 1970-01-01 00:00:00 +0000
+++ debian/libindicate-doc.install 2010-02-04 23:31:12 +0000
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/gtk-doc/html/libindicate/*
+debian/tmp/usr/share/doc/libindicate/examples/*
=== added file 'debian/libindicate-gtk-dev.install'
--- debian/libindicate-gtk-dev.install 1970-01-01 00:00:00 +0000
+++ debian/libindicate-gtk-dev.install 2010-02-04 23:31:12 +0000
@@ -0,0 +1,4 @@
+debian/tmp/usr/include/libindicate-0.2/libindicate-gtk/*
+debian/tmp/usr/lib/pkgconfig/indicate-gtk.pc
+debian/tmp/usr/lib/libindicate-gtk.a
+debian/tmp/usr/lib/libindicate-gtk.so
=== added file 'debian/libindicate-gtk2.install'
--- debian/libindicate-gtk2.install 1970-01-01 00:00:00 +0000
+++ debian/libindicate-gtk2.install 2010-02-04 23:31:12 +0000
@@ -0,0 +1,1 @@
+debian/tmp/usr/lib/libindicate-gtk.so.*
=== added file 'debian/libindicate4.install'
--- debian/libindicate4.install 1970-01-01 00:00:00 +0000
+++ debian/libindicate4.install 2010-02-04 23:31:12 +0000
@@ -0,0 +1,1 @@
+debian/tmp/usr/lib/libindicate.so.*
=== added file 'debian/rules'
--- debian/rules 1970-01-01 00:00:00 +0000
+++ debian/rules 2010-02-04 23:31:12 +0000
@@ -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 --enable-gtk-doc
+LDFLAGS += -Wl,-z,defs -Wl,--as-needed
+DEB_DH_MAKESHLIBS_ARGS_libindicate0 += -V 'libindicate0 (>= 0.2.2)'
=== added file 'debian/watch'
--- debian/watch 1970-01-01 00:00:00 +0000
+++ debian/watch 2010-02-04 23:31:12 +0000
@@ -0,0 +1,2 @@
+version=3
+http://launchpad.net/libindicate/+download .*/libindicate-([0-9.]+)\.tar\.gz
=== modified file 'docs/reference/tmpl/libindicate-unused.sgml'
--- docs/reference/tmpl/libindicate-unused.sgml 2009-09-01 01:31:28 +0000
+++ docs/reference/tmpl/libindicate-unused.sgml 2010-02-04 23:31:12 +0000
@@ -35,6 +35,14 @@
@parent_class:
+<!-- ##### SIGNAL IndicateServer::indicator-added ##### -->
+<para>
+
+</para>
+
+@indicateserver: the object which received the signal.
+@arg1:
+
<!-- ##### SIGNAL IndicateServer::indicator-not-shown ##### -->
<para>
@@ -43,6 +51,14 @@
@indicateserver: the object which received the signal.
@arg1:
+<!-- ##### SIGNAL IndicateServer::indicator-removed ##### -->
+<para>
+
+</para>
+
+@indicateserver: the object which received the signal.
+@arg1:
+
<!-- ##### FUNCTION indicate_indicator_get_indicator_type ##### -->
<para>