Merging U. Desktop

3 files changed, 27 insertions, 16 deletions

diff --git a/debian/changelog b/debian/changelog
index 4131e3c..54caa03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,18 +1,33 @@
-libappindicator (0.2.95-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libappindicator (0.2.95-0ubuntu3) natty; urgency=low
 
-  * New upstream release (0.2.93)
+  * debian/control:
+    - Use new build-depends for libgtk-3-dev
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Wed, 23 Feb 2011 10:42:57 +1100
+
+libappindicator (0.2.95-0ubuntu2) natty; urgency=low
+
+  * debian/control
+    - Bump build depends for libindicator-dev and libindicator3-dev to >= 0.3.19
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 17 Feb 2011 15:05:29 -0500
+
+libappindicator (0.2.95-0ubuntu1) natty; urgency=low
+
+  [ Ted Gould ]
+  * New upstream release (0.2.95)
     ∘ Fix Vala bindings
     ∘ Add support for scroll events
-  * New upstream release (0.2.94)
     ∘ Include vala example files as well
-  * New upstream release (0.2.95)
     ∘ Fixing build for GTK2/3 dual build
   * debian/libappindicator-dev.install, debian/libappindicator3-dev.install:
     switching the file name of the vapi files.
-  * debian/rules: Not building libappindicator3-dev until we've got the GTK3
-    build all put together.
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 10 Feb 2011 22:39:44 -0600
+  [ Ken VanDine ]
+  * debian/rules
+    - build and install the vapi for gtk3
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Fri, 11 Feb 2011 10:03:17 -0500
 
 libappindicator (0.2.92-0ubuntu2) natty; urgency=low
 
diff --git a/debian/control b/debian/control
index 73e285e..4f608a9 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
 Build-Depends: debhelper (>= 7.0),
                cdbs (>= 0.4.41),
                libgtk2.0-dev (>= 2.12.0),
-               libgtk3.0-dev (>= 2.91.3),
+               libgtk-3-dev (>= 2.91.3),
                libdbus-glib-1-dev (>= 0.82),
                gnome-doc-utils,
                gtk-doc-tools,
@@ -15,8 +15,8 @@ Build-Depends: debhelper (>= 7.0),
                python-gtk2-dev,
                libindicate-dev (>= 0.2.0),
                libindicate-gtk-dev (>= 0.2.0),
-               libindicator-dev (>= 0.3.14),
-               libindicator3-dev (>= 0.3.14),
+               libindicator-dev (>= 0.3.19),
+               libindicator3-dev (>= 0.3.19),
                libdbusmenu-glib-dev (>= 0.3.94),
                libdbusmenu-gtk-dev (>= 0.3.94),
                libdbusmenu-gtk3-dev (>= 0.3.94),
diff --git a/debian/rules b/debian/rules
index c381e8d..3f266b0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -73,27 +73,23 @@ configure-stamp-gtk3:
 
 configure/libappindicator3-1:: configure-stamp-gtk3
 
-configure/libappindicator3-dev:: configure-stamp-gtk3
-
 build-stamp-gtk3:
 	: # build for GTK+ 3.0
 	$(MAKE) -C build-gtk3/src;
+	$(MAKE) -C build-gtk3/bindings/vala;
 	touch $@
 
 build/libappindicator3-1:: build-stamp-gtk3
 
-build/libappindicator3-dev:: build-stamp-gtk3
-
 install-stamp-gtk3:
 	: # install for GTK+ 3.0
 	$(MAKE) -C build-gtk3/src DESTDIR=$(CURDIR)/debian/tmp install
+	$(MAKE) -C build-gtk3/bindings/vala DESTDIR=$(CURDIR)/debian/tmp install
 	touch $@
 
 binary-install/libappindicator3-1:: install-stamp-gtk3
 	dh_makeshlibs -plibappindicator3-1
 
-binary-install/libappindicator3-dev:: install-stamp-gtk3
-
 binary-install/libappindicator0.1-cil:: binary-fixup/libappindicator1
 	dh_clistrip
 	dh_clifixperms