From 6e9fee7d9bf54add240166f60f5c942184add408 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 9 Dec 2010 12:56:54 -0500 Subject: releasing version 0.2.90-0ubuntu3 --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 643534e..44ffc1b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ -indicator-application (0.2.90-0ubuntu3) UNRELEASED; urgency=low +indicator-application (0.2.90-0ubuntu3) natty; urgency=low * debian/control - build depend on dbusmenu >= 0.3.90 + - Fixes FTBFS (LP: #684949) -- Ken VanDine Wed, 08 Dec 2010 13:32:07 -0500 -- cgit v1.2.3 From 29871df079babc88c93255f101edb19d266efd30 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 10 Dec 2010 16:38:00 -0500 Subject: * debian/rules - Changes to build targets to get it building multipass for python 2.6 and 2.7 --- debian/changelog | 10 ++++++++-- debian/control | 32 ++++++++++++++++---------------- debian/rules | 6 +++--- 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/debian/changelog b/debian/changelog index aa2f1a3..8e2a2e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,11 @@ -libappindicator (0.2.91-0ubuntu1~ppa1) UNRELEASED; urgency=low +libappindicator (0.2.90+r175-0ubuntu1) UNRELEASED; urgency=low + [ Ted Gould ] * Intial release. - -- Ted Gould Wed, 08 Dec 2010 16:28:55 -0600 + [ Ken VanDine ] + * debian/rules + - Changes to build targets to get it building multipass for + python 2.6 and 2.7 + + -- Ken VanDine Fri, 10 Dec 2010 16:37:17 -0500 diff --git a/debian/control b/debian/control index f87b2aa..bea497c 100644 --- a/debian/control +++ b/debian/control @@ -16,8 +16,8 @@ Build-Depends: debhelper (>= 5.0), libindicate-dev (>= 0.2.0), libindicate-gtk-dev (>= 0.2.0), libindicator-dev (>= 0.3.14), - libdbusmenu-gtk-dev (>= 0.3.90), - libdbusmenu-glib-dev (>= 0.3.90), + libdbusmenu-gtk-dev (>= 0.3.90+r175), + libdbusmenu-glib-dev (>= 0.3.90+r175), cli-common-dev (>= 0.5.7), mono-devel (>= 2.4.3), gtk-sharp2-gapi, @@ -33,6 +33,20 @@ Standards-Version: 3.8.4 Homepage: https://launchpad.net/indicator-application Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-application/ubuntu +Package: python-appindicator +Section: python +Architecture: any +XB-Python-Version: ${python:Versions} +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${python:Depends}, + libappindicator1 (= ${binary:Version}), + python-gobject +Provides: ${python:Provides} +Description: Python bindings for libappindicator + This package provides Python bindings so that you can use libappindicator from + a Python program. + Package: libappindicator1 Section: libs Architecture: any @@ -111,17 +125,3 @@ Description: Typelib files for libappindicator1. . This package can be used by other packages using the GIRepository format to generate dynamic bindings. - -Package: python-appindicator -Section: python -Architecture: any -XB-Python-Version: ${python:Versions} -Depends: ${shlibs:Depends}, - ${misc:Depends}, - ${python:Depends}, - libappindicator1 (= ${binary:Version}), - python-gobject -Provides: ${python:Provides} -Description: Python bindings for libappindicator - This package provides Python bindings so that you can use libappindicator from - a Python program. diff --git a/debian/rules b/debian/rules index 324b6ff..4c624b6 100755 --- a/debian/rules +++ b/debian/rules @@ -63,19 +63,19 @@ configure-stamp: $(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS) touch $@ -configure/libappindicator:: configure-stamp +configure/libappindicator1:: configure-stamp build-stamp: $(MAKE) -C $(DEB_BUILDDIR) touch $@ -build/libappindicator:: build-stamp +build/libappindicator1:: build-stamp install-stamp: $(MAKE) -C $(DEB_BUILDDIR) install DESTDIR=$(CURDIR)/debian/tmp touch $@ -install/libappindicator:: install-stamp +install/libappindicator1:: install-stamp binary-predeb/libappindicator1:: install-stamp dh_fixperms -- cgit v1.2.3 From 2437d4ba20b168534165456ed0ed989a9f5f2695 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 10 Dec 2010 18:04:32 -0500 Subject: releasing version 0.2.90+r175-0ubuntu1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8e2a2e5..c650fe0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libappindicator (0.2.90+r175-0ubuntu1) UNRELEASED; urgency=low +libappindicator (0.2.90+r175-0ubuntu1) natty; urgency=low [ Ted Gould ] * Intial release. -- cgit v1.2.3 From 54c9e642092a203b35f63acf915eef78d2cb1ef0 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 16 Dec 2010 10:10:13 -0500 Subject: releasing version 0.2.90-0ubuntu4 --- debian/changelog | 6 ++++++ debian/control | 8 +++++--- debian/gir1.0-appindicator-0.1.install | 1 - debian/gir1.2-appindicator-0.1.install | 1 + 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 debian/gir1.0-appindicator-0.1.install create mode 100644 debian/gir1.2-appindicator-0.1.install diff --git a/debian/changelog b/debian/changelog index 44ffc1b..31c80a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-application (0.2.90-0ubuntu4) natty; urgency=low + + * Updated for the gir abi transition + + -- Ken VanDine Thu, 16 Dec 2010 10:05:55 -0500 + indicator-application (0.2.90-0ubuntu3) natty; urgency=low * debian/control diff --git a/debian/control b/debian/control index 44e5ea1..02ca13c 100644 --- a/debian/control +++ b/debian/control @@ -26,8 +26,8 @@ Build-Depends: debhelper (>= 5.0), libgtk2.0-cil-dev, gobject-introspection, libgirepository1.0-dev, - gir1.0-glib-2.0, - gir1.0-gtk-2.0, + gir1.2-glib-2.0, + gir1.2-gtk-2.0, valac-0.12 Standards-Version: 3.8.4 Homepage: https://launchpad.net/indicator-application @@ -122,7 +122,9 @@ Description: Application Indicators . This package contains files that are needed to build applications. -Package: gir1.0-appindicator-0.1 +Package: gir1.2-appindicator-0.1 +Conflicts: gir1.0-appindicator-0.1 +Replaces: gir1.0-appindicator-0.1 Section: libs Architecture: any Depends: ${shlibs:Depends}, diff --git a/debian/gir1.0-appindicator-0.1.install b/debian/gir1.0-appindicator-0.1.install deleted file mode 100644 index 0791348..0000000 --- a/debian/gir1.0-appindicator-0.1.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/girepository-1.0/* diff --git a/debian/gir1.2-appindicator-0.1.install b/debian/gir1.2-appindicator-0.1.install new file mode 100644 index 0000000..0791348 --- /dev/null +++ b/debian/gir1.2-appindicator-0.1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/girepository-1.0/* -- cgit v1.2.3 From 087e6316977fbd3f870ce6d7b734de9765f6eed2 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 12 Jan 2011 09:01:09 -0600 Subject: Fix the pkgconfig name for dbusmenu-glib-0.4 --- src/appindicator-0.1.pc.in | 2 +- src/appindicator3-0.1.pc.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/appindicator-0.1.pc.in b/src/appindicator-0.1.pc.in index b80fded..d885fd3 100644 --- a/src/appindicator-0.1.pc.in +++ b/src/appindicator-0.1.pc.in @@ -5,7 +5,7 @@ bindir=@bindir@ includedir=@includedir@ Cflags: -I${includedir}/libappindicator-0.1 -Requires: dbusmenu-glib gtk+-2.0 +Requires: dbusmenu-glib-0.4 gtk+-2.0 Libs: -L${libdir} -lappindicator Name: appindicator-0.1 diff --git a/src/appindicator3-0.1.pc.in b/src/appindicator3-0.1.pc.in index a485910..f59ac70 100644 --- a/src/appindicator3-0.1.pc.in +++ b/src/appindicator3-0.1.pc.in @@ -5,7 +5,7 @@ bindir=@bindir@ includedir=@includedir@ Cflags: -I${includedir}/libappindicator3-0.1 -Requires: dbusmenu-glib gtk+-3.0 +Requires: dbusmenu-glib-0.4 gtk+-3.0 Libs: -L${libdir} -lappindicator3 Name: appindicator3-0.1 -- cgit v1.2.3 From 0092f8a844ac58cb784b110838fc3ca71c0678e1 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 12 Jan 2011 09:04:12 -0600 Subject: Rebuild for libindicator2 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index cf186b4..fe8c864 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libappindicator (0.2.90+r175-0ubuntu3) natty; urgency=low + + * Rebuild for libindicator2 + + -- Ken VanDine Tue, 11 Jan 2011 16:29:38 -0600 + libappindicator (0.2.90+r175-0ubuntu2) natty; urgency=low * Merged changes from ~ubuntu-desktop package -- cgit v1.2.3 From b38d1d8a853bee2d08ce7ead3f0ffa00a6670cd6 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Thu, 13 Jan 2011 17:36:29 -0600 Subject: use notdir in case make gives us full paths --- src/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index a5ea29b..069247f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -101,11 +101,11 @@ DBUS_SPECS = \ gen-%.xml.h: %.xml @echo "Building $@ from $<" - @echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $<)));" > $@ + @echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<))));" > $@ gen-%.xml.c: %.xml @echo "Building $@ from $<" - @echo "const char * _$(subst -,_,$(subst .,_,$(basename $<))) = " > $@ + @echo "const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<)))) = " > $@ @sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@ @echo ";" >> $@ -- cgit v1.2.3 From 05980b6e31ad1c48e93fb8733a89815d244ba933 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Thu, 13 Jan 2011 17:36:57 -0600 Subject: avoid nulls when crafting variants --- src/app-indicator.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app-indicator.c b/src/app-indicator.c index babdaf5..d7e040c 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -921,9 +921,9 @@ bus_get_prop (GDBusConnection * connection, const gchar * sender, const gchar * } else if (g_strcmp0(property, "IconName") == 0) { return g_variant_new_string(priv->icon_name); } else if (g_strcmp0(property, "AttentionIconName") == 0) { - return g_variant_new_string(priv->attention_icon_name); + return g_variant_new_string(priv->attention_icon_name ? priv->attention_icon_name : ""); } else if (g_strcmp0(property, "IconThemePath") == 0) { - return g_variant_new_string(priv->icon_theme_path); + return g_variant_new_string(priv->icon_theme_path ? priv->icon_theme_path : ""); } else if (g_strcmp0(property, "Menu") == 0) { if (priv->menuservice != NULL) { GValue strval = { 0 }; @@ -936,9 +936,9 @@ bus_get_prop (GDBusConnection * connection, const gchar * sender, const gchar * return g_variant_new("o", "/"); } } else if (g_strcmp0(property, "XAyatanaLabel") == 0) { - return g_variant_new_string(priv->label); + return g_variant_new_string(priv->label ? priv->label : ""); } else if (g_strcmp0(property, "XAyatanaLabelGuide") == 0) { - return g_variant_new_string(priv->label_guide); + return g_variant_new_string(priv->label_guide ? priv->label_guide : ""); } else if (g_strcmp0(property, "XAyatanaOrderingIndex") == 0) { return g_variant_new_uint32(priv->ordering_index); } -- cgit v1.2.3 From 0e9f42a12daf9bc3f14f6dd7dcc7efb33a22fa94 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Thu, 13 Jan 2011 17:48:53 -0600 Subject: aw shucks, do the required properties too, defensively --- src/app-indicator.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app-indicator.c b/src/app-indicator.c index d7e040c..40959bf 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -909,17 +909,17 @@ bus_get_prop (GDBusConnection * connection, const gchar * sender, const gchar * AppIndicatorPrivate *priv = app->priv; if (g_strcmp0(property, "Id") == 0) { - return g_variant_new_string(app->priv->id); + return g_variant_new_string(app->priv->id ? app->priv->id : ""); } else if (g_strcmp0(property, "Category") == 0) { GEnumValue *enum_value; enum_value = g_enum_get_value ((GEnumClass *) g_type_class_ref (APP_INDICATOR_TYPE_INDICATOR_CATEGORY), priv->category); - return g_variant_new_string(enum_value->value_nick); + return g_variant_new_string(enum_value->value_nick ? enum_value->value_nick : ""); } else if (g_strcmp0(property, "Status") == 0) { GEnumValue *enum_value; enum_value = g_enum_get_value ((GEnumClass *) g_type_class_ref (APP_INDICATOR_TYPE_INDICATOR_STATUS), priv->status); - return g_variant_new_string(enum_value->value_nick); + return g_variant_new_string(enum_value->value_nick ? enum_value->value_nick : ""); } else if (g_strcmp0(property, "IconName") == 0) { - return g_variant_new_string(priv->icon_name); + return g_variant_new_string(priv->icon_name ? priv->icon_name : ""); } else if (g_strcmp0(property, "AttentionIconName") == 0) { return g_variant_new_string(priv->attention_icon_name ? priv->attention_icon_name : ""); } else if (g_strcmp0(property, "IconThemePath") == 0) { -- cgit v1.2.3 From cf693f9f227c8d01d538ef366ba787c55fd6e26c Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 13 Jan 2011 20:05:12 -0600 Subject: Canonical.com conversion --- configure.ac | 2 +- src/dbus-shared.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 1623531..08035ec 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ AC_COPYRIGHT([Copyright 2009, 2010 Canonical]) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libappindicator, 0.2.91) +AM_INIT_AUTOMAKE(libappindicator, 0.2.91.1) AM_MAINTAINER_MODE diff --git a/src/dbus-shared.h b/src/dbus-shared.h index 1d8d89c..71c063e 100644 --- a/src/dbus-shared.h +++ b/src/dbus-shared.h @@ -20,9 +20,9 @@ with this program. If not, see . */ -#define INDICATOR_APPLICATION_DBUS_ADDR "org.ayatana.indicator.application" -#define INDICATOR_APPLICATION_DBUS_OBJ "/org/ayatana/indicator/application/service" -#define INDICATOR_APPLICATION_DBUS_IFACE "org.ayatana.indicator.application.service" +#define INDICATOR_APPLICATION_DBUS_ADDR "com.canonical.indicator.application" +#define INDICATOR_APPLICATION_DBUS_OBJ "/com/canonical/indicator/application/service" +#define INDICATOR_APPLICATION_DBUS_IFACE "com.canonical.indicator.application.service" #define NOTIFICATION_WATCHER_DBUS_ADDR "org.kde.StatusNotifierWatcher" #define NOTIFICATION_WATCHER_DBUS_OBJ "/StatusNotifierWatcher" -- cgit v1.2.3