Merge from U. Desktop

3 files changed, 26 insertions, 8 deletions

diff --git a/debian/changelog b/debian/changelog
index fe711ee..90303c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,23 @@
-libindicator (0.3.19-0ubuntu1~ppa1) natty; urgency=low
+libindicator (0.3.19-0ubuntu3) natty; urgency=low
 
+  * debian/control
+    - More renaming of Depends to libgtk-3-dev
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Wed, 23 Feb 2011 12:08:03 -0500
+
+libindicator (0.3.19-0ubuntu2) natty; urgency=low
+
+  * debian/control:
+    - Use new build-depends for libgtk-3-dev
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Wed, 23 Feb 2011 08:49:50 -0500
+
+libindicator (0.3.19-0ubuntu1) natty; urgency=low
+
+  * debian/rules
+    - Updated shlibs
+
+  [Ted Gould]
   * New upstream release.
     ∘ Adding in a11y description support
     ∘ Fixing distcheck (LP: #587811)
@@ -7,7 +25,7 @@ libindicator (0.3.19-0ubuntu1~ppa1) natty; urgency=low
   * debian/control: Adding Breaks for the previous library rev
     so that users don't end up with systems that use both.
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 17 Feb 2011 10:27:14 -0600
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 17 Feb 2011 14:04:55 -0500
 
 libindicator (0.3.18-0ubuntu1) natty; urgency=low
 
diff --git a/debian/control b/debian/control
index 03085a2..c408e18 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 5.0),
                cdbs (>= 0.4.41),
                libglib2.0-dev (>= 2.22),
                libgtk2.0-dev (>= 2.18),
-               libgtk3.0-dev (>= 2.91.3),
+               libgtk-3-dev (>= 2.91.3),
                libtool,
                intltool,
                gtk-doc-tools,
@@ -72,7 +72,7 @@ Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libgtk3.0-dev (>= 2.91.3),
+         libgtk-3-dev (>= 2.91.3),
          libindicator3-3 (= ${binary:Version})
 Description: panel indicator applet - library development files
  This library contains information to build indicators to go into
diff --git a/debian/rules b/debian/rules
index de71b0a..4c21f86 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,10 +9,10 @@ DEB_BUILDDIR = $(DEB_SRCDIR)/build
 
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
-DEB_DH_MAKESHLIBS_ARGS_libindicator1 += -V 'libindicator1 (>= 0.3.18)'
-DEB_DH_MAKESHLIBS_ARGS_libindicator3 += -V 'libindicator3-1 (>= 0.3.18)'
+DEB_DH_MAKESHLIBS_ARGS_libindicator3 += -V 'libindicator3 (>= 0.3.19)'
+DEB_DH_MAKESHLIBS_ARGS_libindicator3_3 += -V 'libindicator3-3 (>= 0.3.19)'
 
-configure/libindicator3-1:: stamp-configure-gtk3
+configure/libindicator3-3:: stamp-configure-gtk3
 stamp-configure-gtk3:
 	: # configure for GTK+ 3.0
 	set -e; \
@@ -24,7 +24,7 @@ stamp-configure-gtk3:
 	cd ..;
 	touch stamp-configure-gtk3
 
-build/libindicator3-1:: stamp-build-gtk3
+build/libindicator3-3:: stamp-build-gtk3
 stamp-build-gtk3: stamp-configure-gtk3
 	: # build for GTK+ 3.0
 	$(MAKE) -C build-gtk3;