6 files changed, 51 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index a412e6e..bb68def 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+indicator-applet (0.2.0~bzr319-0ubuntu1~ppa1) UNRELEASED; urgency=low
+
+  * Merging in upstream code to split out libindicate-gtk
+  * debian/control:
+    * Changing the version number of libindcate to 2 to match
+      the .so numbering.
+    * Creating packages for libindicate-gtk
+  * Added libindicate-gtk-dev.install and libindicate-gtk0.install
+    for the new library.
+  * Renamed libindicate1.install to libindicate2.install to match
+    the package name change.
+  * Modified libindicate-dev to be more specific about the header
+    files that it grabs.
+
+ -- Ted Gould <ted@ubuntu.com>  Tue, 04 Aug 2009 10:26:02 +0100
+
 indicator-applet (0.2.0~bzr309-0ubuntu3) karmic; urgency=low
 
   * Now moving on to Karmic
diff --git a/debian/control b/debian/control
index 47b903a..92c60a7 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,7 @@ Description: GNOME panel indicator applet
  Currently this includes support for messaging applications in the
  indicator-messages package.
 
-Package: libindicate1
+Package: libindicate2
 Section: libs
 Conflicts: libindicate
 Replaces: libindicate
@@ -47,7 +47,32 @@ Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libindicate1 (= ${binary:Version}),
+         libindicate2 (= ${binary:Version}),
+         libdbus-glib-1-dev (>= 0.76)
+Description: GNOME panel indicator applet - shared library
+ indicator-applet is an applet to display information from
+ various applications consistently in the GNOME panel. 
+ .
+ This package contains files that are needed to build applications.
+
+Package: libindicate-gtk0
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description: GNOME panel indicator applet - shared library
+ indicator-applet is an applet to display information from
+ various applications consistently in the GNOME panel. 
+ .
+ This package contains shared libraries to be used by applications.
+
+Package: libindicate-gtk-dev
+Section: libdevel
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         libindicate-gtk (= ${binary:Version}),
+         libindicate-dev (= ${binary:Version}),
          libdbus-glib-1-dev (>= 0.76),
          libgtk2.0-dev (>= 2.12.0)
 Description: GNOME panel indicator applet - shared library
@@ -73,7 +98,8 @@ Section: doc
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libindicate1 (= ${binary:Version}),
+         libindicate2 (= ${binary:Version}),
+         libindicate-gtk0 (= ${binary:Version}),
          libdbus-glib-1-dev (>= 0.76),
          libgtk2.0-dev (>= 2.12.0)
 Description: GNOME panel indicator applet - shared library
diff --git a/debian/libindicate-dev.install b/debian/libindicate-dev.install
index ba86036..81e1396 100644
--- a/debian/libindicate-dev.install
+++ b/debian/libindicate-dev.install
@@ -1,4 +1,4 @@
-debian/tmp/usr/include/libindicate*
+debian/tmp/usr/include/libindicate-0.1/libindicate/*
 debian/tmp/usr/lib/pkgconfig/indicate.pc
 debian/tmp/usr/lib/libindicate.a
 debian/tmp/usr/lib/libindicate.so
diff --git a/debian/libindicate-gtk-dev.install b/debian/libindicate-gtk-dev.install
new file mode 100644
index 0000000..5f0e682
--- /dev/null
+++ b/debian/libindicate-gtk-dev.install
@@ -0,0 +1,4 @@
+debian/tmp/usr/include/libindicate-0.1/libindicate-gtk/*
+debian/tmp/usr/lib/pkgconfig/indicate-gtk.pc
+debian/tmp/usr/lib/libindicate-gtk.a
+debian/tmp/usr/lib/libindicate-gtk.so
diff --git a/debian/libindicate-gtk0.install b/debian/libindicate-gtk0.install
new file mode 100644
index 0000000..fc6b412
--- /dev/null
+++ b/debian/libindicate-gtk0.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libindicate-gtk.so.*
diff --git a/debian/libindicate1.install b/debian/libindicate2.install
index 0618a58..0618a58 100644
--- a/debian/libindicate1.install
+++ b/debian/libindicate2.install