aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog51
-rw-r--r--debian/control1
-rwxr-xr-xdebian/rules1
3 files changed, 14 insertions, 39 deletions
diff --git a/debian/changelog b/debian/changelog
index 90a728d..a6e3bea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,52 +1,28 @@
-libdbusmenu (0.2.6-0ubuntu1~ppa2~gir5) lucid; urgency=low
-
- * debian/rules: Setting up to run autogen.sh
- * debian/control: Adding dep on gnome-common
-
- -- Ted Gould <ted@ubuntu.com> Mon, 01 Mar 2010 14:06:00 -0600
-
-libdbusmenu (0.2.6-0ubuntu1~ppa2~gir4) lucid; urgency=low
+libdbusmenu (0.2.6-0ubuntu2~ppa1) UNRELEASED; urgency=low
* Upstream Merge
+ * Adding in building of the GObject Introspection details
* Adding in building of VAPI files
- * debian/control: Adding dependency on valac
+ * debian/control:
+ * Adding dependency on valac
+ * Adding in gir's as build dependencies.
+ * Adding in build dependencies for GIR dev
* debian/libdbusmenu-glib-dev.install,
- debian/libdbusmenu-gtk-dev.install: Added VAPI files to
- the packages.
-
- -- Ted Gould <ted@ubuntu.com> Mon, 01 Mar 2010 10:56:47 -0600
-
-libdbusmenu (0.2.6-0ubuntu1~ppa2~gir3) lucid; urgency=low
-
- * debian/libdbusmenu-glib-dev.install,
- debian/libdbusmenu-gtk-dev.install: Added GIR files to
- the packages.
-
- -- Ted Gould <ted@ubuntu.com> Sun, 28 Feb 2010 22:22:21 -0600
-
-libdbusmenu (0.2.6-0ubuntu1~ppa2~gir2) lucid; urgency=low
-
- * debian/control: Adding in gir's as build dependencies.
-
- -- Ted Gould <ted@ubuntu.com> Sun, 28 Feb 2010 20:30:27 -0600
-
-libdbusmenu (0.2.6-0ubuntu1~ppa2~gir1) lucid; urgency=low
-
- * Upstream Merge
- * Adding in building of the GObject Introspection details
+ debian/libdbusmenu-gtk-dev.install:
+ * Added VAPI files to the packages.
+ * Added GIR files to the packages.
* debian/control, debian/gir1.0-dbusmenu-glib-0.2.install,
debian/gir1.0-dbusmenu-gtk-0.2.install: Adding new packages to
hold the typelib files generated by GObject introspection.
- * debian/control: Adding in build dependencies for GIR dev
- -- Ted Gould <ted@ubuntu.com> Sun, 28 Feb 2010 14:58:45 -0600
+ -- Ted Gould <ted@ubuntu.com> Mon, 01 Mar 2010 22:06:01 -0600
-libdbusmenu (0.2.6-0ubuntu1~ppa1) lucid; urgency=low
+libdbusmenu (0.2.6-0ubuntu1) lucid; urgency=low
* Upstream release 0.2.6
* Fix testing to make it more reliable
- * Remove delayed property queueing as it was causing
- properties to not get updated.
+ * Remove delayed property queueing as it was causing properties to not
+ get updated. (lp: #524308)
-- Ted Gould <ted@ubuntu.com> Thu, 25 Feb 2010 10:23:49 -0600
@@ -245,3 +221,4 @@ libdbusmenu (0.1~bzr5-0ubuntu1) karmic; urgency=low
* First version.
-- Ted Gould <ted@ubuntu.com> Wed, 05 Aug 2009 00:46:41 +0100
+
diff --git a/debian/control b/debian/control
index 6c925e5..869b3e8 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,6 @@ Build-Depends: debhelper (>= 5.0),
intltool,
libxml2-dev,
libjson-glib-dev,
- gnome-common,
libgirepository1.0-dev,
gir1.0-glib-2.0,
gir1.0-gtk-2.0,
diff --git a/debian/rules b/debian/rules
index 3b6e341..90e7af5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,6 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/gnome.mk
-DEB_CONFIGURE_SCRIPT=$(CURDIR)/$(DEB_SRCDIR)/autogen.sh
DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
LDFLAGS += -Wl,-z,defs -Wl,--as-needed