aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog45
-rwxr-xr-xdebian/rules2
2 files changed, 4 insertions, 43 deletions
diff --git a/debian/changelog b/debian/changelog
index 849085b..1ee114f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,54 +1,15 @@
-libdbusmenu (0.2.9-0ubuntu2~ppa2~refs7) lucid; urgency=low
+libdbusmenu (0.2.9-0ubuntu3~ppa1) UNRELEASED; urgency=low
* Upstream Merge
* Only unref root if the root has changed.
-
- -- Ted Gould <ted@ubuntu.com> Fri, 16 Apr 2010 12:23:56 -0500
-
-libdbusmenu (0.2.9-0ubuntu2~ppa2~refs6) lucid; urgency=low
-
- * Upstream Merge
* Ensure that callbacks retain references to objects incase
they get deleted quickly.
-
- -- Ted Gould <ted@ubuntu.com> Fri, 16 Apr 2010 12:16:21 -0500
-
-libdbusmenu (0.2.9-0ubuntu2~ppa2~refs5) lucid; urgency=low
-
- * debian/rules: Massive debugging
-
- -- Ted Gould <ted@ubuntu.com> Fri, 16 Apr 2010 12:02:48 -0500
-
-libdbusmenu (0.2.9-0ubuntu2~ppa2~refs4) lucid; urgency=low
-
- * Upstream merge
- * Removing extra unref which allows us to not make an
- extra ref.
-
- -- Ted Gould <ted@ubuntu.com> Fri, 16 Apr 2010 11:54:19 -0500
-
-libdbusmenu (0.2.9-0ubuntu2~ppa2~refs3) lucid; urgency=low
-
- * Upstream merge
* Protecting references before signalling
-
- -- Ted Gould <ted@ubuntu.com> Fri, 16 Apr 2010 11:45:54 -0500
-
-libdbusmenu (0.2.9-0ubuntu2~ppa2~refs2) lucid; urgency=low
-
- * Upstream merge
- * Trying reffing the root still.
-
- -- Ted Gould <ted@ubuntu.com> Fri, 16 Apr 2010 11:09:30 -0500
-
-libdbusmenu (0.2.9-0ubuntu2~ppa2~refs1) lucid; urgency=low
-
- * Upstream Merge
* Decrementing refs when added to child menus
- -- Ted Gould <ted@ubuntu.com> Fri, 16 Apr 2010 10:54:22 -0500
+ -- Ted Gould <ted@ubuntu.com> Sat, 17 Apr 2010 12:53:25 -0500
-libdbusmenu (0.2.9-0ubuntu2~ppa1) lucid; urgency=low
+libdbusmenu (0.2.9-0ubuntu2) lucid; urgency=low
* Upstream Merge
* Changing GTK layer to look at position in realized
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)'