From 1e43a9194554911cc0a2a4b7149058f376bfcb8b Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 20 May 2010 08:41:36 -0400 Subject: * debian/patches/child-leakage.patch - Fixes a memory leak (LP: #569273) --- debian/changelog | 7 +++++++ debian/patches/child-leakage.patch | 17 +++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 debian/patches/child-leakage.patch diff --git a/debian/changelog b/debian/changelog index c396da1..a9de6a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-application (0.0.19-0ubuntu5) UNRELEASED; urgency=low + + * debian/patches/child-leakage.patch + - Fixes a memory leak (LP: #569273) + + -- Ken VanDine Thu, 20 May 2010 07:35:33 -0400 + indicator-application (0.0.19-0ubuntu4) lucid; urgency=low * bindings/mono/appindicator-sharp-0.1.pc.in: diff --git a/debian/patches/child-leakage.patch b/debian/patches/child-leakage.patch new file mode 100644 index 0000000..35176ff --- /dev/null +++ b/debian/patches/child-leakage.patch @@ -0,0 +1,17 @@ +=== modified file 'src/libappindicator/app-indicator.c' +--- src/libappindicator/app-indicator.c 2010-04-01 20:23:36 +0000 ++++ src/libappindicator/app-indicator.c 2010-05-19 18:23:24 +0000 +@@ -1408,6 +1408,12 @@ + DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, + G_CALLBACK (activate_menuitem), widget); + dbusmenu_menuitem_child_append (root, child); ++ ++ /* Get rid of initial ref now that the root is ++ holding the object */ ++ g_object_unref(child); ++ ++ return; + } + + static void + -- cgit v1.2.3 From 3096e1044187bb042f64f9c37188782c4fe140f9 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Thu, 20 May 2010 17:05:15 +0200 Subject: releasing version 0.0.19-0ubuntu5 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a9de6a4..3e2938b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-application (0.0.19-0ubuntu5) UNRELEASED; urgency=low +indicator-application (0.0.19-0ubuntu5) lucid-proposed; urgency=low * debian/patches/child-leakage.patch - Fixes a memory leak (LP: #569273) -- cgit v1.2.3 From cd4c6e073fde9cdaa17e58bc1a54eca708d57ac7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 20 May 2010 21:16:58 -0500 Subject: 0.0.20 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index c34bed2..dbb0b43 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(indicator-application, 0.0.19, ted@canonical.com) +AC_INIT(indicator-application, 0.0.20, ted@canonical.com) AC_COPYRIGHT([Copyright 2009, 2010 Canonical]) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-application, 0.0.19) +AM_INIT_AUTOMAKE(indicator-application, 0.0.20) AM_MAINTAINER_MODE -- cgit v1.2.3 From d16ae42788c2d64afb5b2cf75ce25571002c493f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 20 May 2010 21:42:57 -0500 Subject: Forgot to drop the patch --- debian/patches/child-leakage.patch | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 debian/patches/child-leakage.patch diff --git a/debian/patches/child-leakage.patch b/debian/patches/child-leakage.patch deleted file mode 100644 index 35176ff..0000000 --- a/debian/patches/child-leakage.patch +++ /dev/null @@ -1,17 +0,0 @@ -=== modified file 'src/libappindicator/app-indicator.c' ---- src/libappindicator/app-indicator.c 2010-04-01 20:23:36 +0000 -+++ src/libappindicator/app-indicator.c 2010-05-19 18:23:24 +0000 -@@ -1408,6 +1408,12 @@ - DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, - G_CALLBACK (activate_menuitem), widget); - dbusmenu_menuitem_child_append (root, child); -+ -+ /* Get rid of initial ref now that the root is -+ holding the object */ -+ g_object_unref(child); -+ -+ return; - } - - static void - -- cgit v1.2.3 From 38c5c108b3a5a9f1539c3b14e61bcf8bfed45c7a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 20 May 2010 21:52:14 -0500 Subject: Build fix to include the AssemblyInfo.cs file --- bindings/mono/Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index e573c9b..7e2b0d2 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -19,6 +19,7 @@ DISTCLEANFILES = $(ASSEMBLY).config TEST_SOURCES = TestIndicator.cs customs = ApplicationIndicator.custom EXTRA_DIST = \ + AssemblyInfo.cs \ $(RAW_API) \ $(METADATA) \ appindicator-sharp-0.1.pc.in \ @@ -74,9 +75,9 @@ generated-stamp: $(API) $(build_customs) --outdir=generated --assembly-name=$(ASSEMBLY_NAME) \ && touch generated-stamp -$(ASSEMBLY): generated-stamp +$(ASSEMBLY): generated-stamp $(srcdir)/AssemblyInfo.cs @rm -f $(ASSEMBLY).mdb - $(CSC) $(CSFLAGS) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES) AssemblyInfo.cs + $(CSC) $(CSFLAGS) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES) $(srcdir)/AssemblyInfo.cs install-data-local: echo "$(GACUTIL) -i $(ASSEMBLY_NAME).dll -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib"; \ -- cgit v1.2.3 From 6fcbfe59a0efa0275afb1ff3830eec3ed03a2518 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 20 May 2010 21:54:21 -0500 Subject: 0.0.21 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index dbb0b43..9d5b26d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(indicator-application, 0.0.20, ted@canonical.com) +AC_INIT(indicator-application, 0.0.21, ted@canonical.com) AC_COPYRIGHT([Copyright 2009, 2010 Canonical]) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-application, 0.0.20) +AM_INIT_AUTOMAKE(indicator-application, 0.0.21) AM_MAINTAINER_MODE -- cgit v1.2.3 From 2cbdb9ffcdaf2adad7975dd0c82c31aa4fa268e3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 20 May 2010 21:56:52 -0500 Subject: releasing version 0.0.20-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 115b43a..a45d667 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-application (0.0.20-0ubuntu1~ppa1) UNRELEASED; urgency=low +indicator-application (0.0.20-0ubuntu1~ppa1) lucid; urgency=low * New upstream release. * Unref the child when created in libappindicator (LP: #569273) @@ -6,7 +6,7 @@ indicator-application (0.0.20-0ubuntu1~ppa1) UNRELEASED; urgency=low binding (LP: #547195) * Remove child-leakage.patch as merged upstream - -- Ted Gould Thu, 20 May 2010 21:35:25 -0500 + -- Ted Gould Thu, 20 May 2010 21:56:44 -0500 indicator-application (0.0.19-0ubuntu5) lucid-proposed; urgency=low -- cgit v1.2.3 From 7cb5463c7a105be422f4f3ae995dbfd1c9a89e58 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 20 May 2010 21:59:50 -0500 Subject: releasing version 0.0.21-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9c6c2ba..1019416 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-application (0.0.21-0ubuntu1~ppa1) UNRELEASED; urgency=low +indicator-application (0.0.21-0ubuntu1~ppa1) lucid; urgency=low * New upstream release. * Adding AssemblyInfo.cs for building - -- Ted Gould Thu, 20 May 2010 21:58:05 -0500 + -- Ted Gould Thu, 20 May 2010 21:59:48 -0500 indicator-application (0.0.20-0ubuntu1~ppa1) lucid; urgency=low -- cgit v1.2.3