aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog42
-rwxr-xr-xdebian/rules2
2 files changed, 5 insertions, 39 deletions
diff --git a/debian/changelog b/debian/changelog
index 45b046d..44c67ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,51 +1,17 @@
-libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering6) lucid; urgency=low
-
- * Upstream Merge
- * A position functions using realized position
-
- -- Ted Gould <ted@ubuntu.com> Thu, 15 Apr 2010 00:57:35 -0500
-
-libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering5) lucid; urgency=low
+libdbusmenu (0.2.9-0ubuntu2~ppa1) UNRELEASED; urgency=low
* Upstream Merge
* Changing GTK layer to look at position in realized
- children to avoid realization races.
-
- -- Ted Gould <ted@ubuntu.com> Wed, 14 Apr 2010 23:56:36 -0500
-
-libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering4) lucid; urgency=low
-
- * Upstream Merge
- * I really don't want to talk about it.
-
- -- Ted Gould <ted@ubuntu.com> Wed, 14 Apr 2010 17:21:11 -0500
-
-libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering3) lucid; urgency=low
-
- * Upstream Merge
- * Fixing the truth
-
- -- Ted Gould <ted@ubuntu.com> Wed, 14 Apr 2010 17:16:01 -0500
-
-libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering2) lucid; urgency=low
-
- * Upstream Merge
+ children to avoid realization races. (LP: #555816)
* Don't allow setting children twice
* Ref children of a menuitem
* Return error when parent ID of getlayout can't be found
-
- -- Ted Gould <ted@ubuntu.com> Wed, 14 Apr 2010 17:10:29 -0500
-
-libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering1) lucid; urgency=low
-
- * Upstream Merge
* Adding in visible property to docs
* Helpful comments in the code
- * debian/rules: Massive debugging
- -- Ted Gould <ted@ubuntu.com> Wed, 14 Apr 2010 14:44:04 -0500
+ -- Ted Gould <ted@ubuntu.com> Thu, 15 Apr 2010 01:17:34 -0500
-libdbusmenu (0.2.9-0ubuntu1~ppa1) lucid; urgency=low
+libdbusmenu (0.2.9-0ubuntu1) lucid; urgency=low
* New upstream release.
* Documentation fix
diff --git a/debian/rules b/debian/rules
index 7399803..c23bde6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/gnome.mk
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-massivedebugging
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
LDFLAGS += -Wl,-z,defs -Wl,--as-needed
DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk1 += -V 'libdbusmenu-gtk1 (>= 0.2.5)'