7 files changed, 31 insertions, 29 deletions
diff --git a/debian/changelog b/debian/changelog
index 4c5247e..d307e45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,76 +1,78 @@
-indicator-custom (0.0.1-0ubuntu3~ppa1~newname1) UNRELEASED; urgency=low
+indicator-application (0.0.1-0ubuntu3~ppa1~newname1) UNRELEASED; urgency=low
 
   * Massive name change.
+  * debian/* changing packaging to not be "custom" anymore and now
+    everything is "application"
 
  -- Ted Gould <ted@ubuntu.com>  Tue, 01 Dec 2009 09:21:54 -0600
 
-indicator-custom (0.0.1-0ubuntu3~ppa1~service8) karmic; urgency=low
+indicator-application (0.0.1-0ubuntu3~ppa1~service8) karmic; urgency=low
 
   * Sync to trunk and fix distcheck by delaying connecting to
     the service by checking for data.
 
  -- Ted Gould <ted@ubuntu.com>  Tue, 24 Nov 2009 17:08:34 -0600
 
-indicator-custom (0.0.1-0ubuntu3~ppa1~service7) karmic; urgency=low
+indicator-application (0.0.1-0ubuntu3~ppa1~service7) karmic; urgency=low
 
   * More updates and getting kinda stable-ish
 
  -- Ted Gould <ted@ubuntu.com>  Tue, 24 Nov 2009 16:31:53 -0600
 
-indicator-custom (0.0.1-0ubuntu3~ppa1~service6) karmic; urgency=low
+indicator-application (0.0.1-0ubuntu3~ppa1~service6) karmic; urgency=low
 
   * Debug messages
 
  -- Ted Gould <ted@ubuntu.com>  Mon, 23 Nov 2009 17:39:18 -0600
 
-indicator-custom (0.0.1-0ubuntu3~ppa1~service5) karmic; urgency=low
+indicator-application (0.0.1-0ubuntu3~ppa1~service5) karmic; urgency=low
 
   * Forgot return types.
 
  -- Ted Gould <ted@ubuntu.com>  Mon, 23 Nov 2009 16:52:16 -0600
 
-indicator-custom (0.0.1-0ubuntu3~ppa1~service4) karmic; urgency=low
+indicator-application (0.0.1-0ubuntu3~ppa1~service4) karmic; urgency=low
 
   * Adding marshallers
 
  -- Ted Gould <ted@ubuntu.com>  Mon, 23 Nov 2009 16:37:51 -0600
 
-indicator-custom (0.0.1-0ubuntu3~ppa1~service3) karmic; urgency=low
+indicator-application (0.0.1-0ubuntu3~ppa1~service3) karmic; urgency=low
 
   * Adding more fun.  Now we're cookin'!
 
  -- Ted Gould <ted@ubuntu.com>  Mon, 23 Nov 2009 14:56:35 -0600
 
-indicator-custom (0.0.1-0ubuntu3~ppa1~service2) karmic; urgency=low
+indicator-application (0.0.1-0ubuntu3~ppa1~service2) karmic; urgency=low
 
   * Building the service and getting things in better shape.
 
  -- Ted Gould <ted@ubuntu.com>  Sun, 08 Nov 2009 23:04:48 -0600
 
-indicator-custom (0.0.1-0ubuntu3~ppa1~service1) karmic; urgency=low
+indicator-application (0.0.1-0ubuntu3~ppa1~service1) karmic; urgency=low
 
   * Grabbing from the service development branch
 
  -- Ted Gould <ted@ubuntu.com>  Mon, 02 Nov 2009 21:56:33 -0600
 
-indicator-custom (0.0.1-0ubuntu3~ppa1) karmic; urgency=low
+indicator-application (0.0.1-0ubuntu3~ppa1) karmic; urgency=low
 
   * Flesh out the library to have stuff working.
   * Updating test suite to run under dbus-test-runner.
 
  -- Ted Gould <ted@ubuntu.com>  Tue, 01 Dec 2009 09:17:24 -0600
 
-indicator-custom (0.0.1-0ubuntu2) karmic; urgency=low
+indicator-application (0.0.1-0ubuntu2) karmic; urgency=low
 
-  * debian/control: Splitting out libcustomindicator
-  * Adding debian/libcustomindicator0.install,
-    debian/libcustomindicator-dev.install,
-    debian/indicator-custom.install
+  * debian/control: Splitting out libappindicator
+  * Adding debian/libappindicator0.install,
+    debian/libappindicator-dev.install,
+    debian/indicator-application.install
     to make all the different packages.
 
  -- Ted Gould <ted@ubuntu.com>  Mon, 02 Nov 2009 21:41:20 -0600
 
-indicator-custom (0.0.1-0ubuntu1) karmic; urgency=low
+indicator-application (0.0.1-0ubuntu1) karmic; urgency=low
 
   * Development packaging edition.
 
diff --git a/debian/control b/debian/control
index 92bb538..a6f0473 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: indicator-custom
+Source: indicator-application
 Section: gnome
 Priority: optional
 Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
@@ -18,14 +18,14 @@ Standards-Version: 3.8.0
 Homepage: https://launchpad.net/cape-girardeau
 Vcs-Bzr: http://bazaar.launchpa.net/~canonical-dx-team/cape-girardeau/karmic
 
-Package: indicator-custom
+Package: indicator-application
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: cape-girardeau project
  .
  This package is the cape-girardeau project
 
-Package: libcustomindicator0
+Package: libappindicator0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -34,7 +34,7 @@ Description: cape-girardeau project
  .
  This package is the cape-girardeau project
 
-Package: libcustomindicator-dev
+Package: libappindicator-dev
 Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
diff --git a/debian/indicator-application.install b/debian/indicator-application.install
new file mode 100644
index 0000000..4429197
--- /dev/null
+++ b/debian/indicator-application.install
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/indicators/*
+debian/tmp/usr/lib/indicator-application/indicator-application-service
+debian/tmp/usr/share/dbus-1/services/indicator-application.service
diff --git a/debian/indicator-custom.install b/debian/indicator-custom.install
deleted file mode 100644
index a4eeb0b..0000000
--- a/debian/indicator-custom.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/tmp/usr/lib/indicators/*
-debian/tmp/usr/lib/indicator-custom/indicator-custom-service
-debian/tmp/usr/share/dbus-1/services/indicator-custom.service
diff --git a/debian/libcustomindicator-dev.install b/debian/libcustomindicator-dev.install
index 0f13680..ff27124 100644
--- a/debian/libcustomindicator-dev.install
+++ b/debian/libcustomindicator-dev.install
@@ -1,4 +1,4 @@
-debian/tmp/usr/include/libcustomindicator-0.1/*
-debian/tmp/usr/lib/libcustomindicator.so
-debian/tmp/usr/lib/libcustomindicator.a
-debian/tmp/usr/lib/libcustomindicator.la
+debian/tmp/usr/include/libappindicator-0.1/*
+debian/tmp/usr/lib/libappindicator.so
+debian/tmp/usr/lib/libappindicator.a
+debian/tmp/usr/lib/libappindicator.la
diff --git a/debian/libcustomindicator0.install b/debian/libcustomindicator0.install
index 20b62d5..a0b5976 100644
--- a/debian/libcustomindicator0.install
+++ b/debian/libcustomindicator0.install
@@ -1 +1 @@
-debian/tmp/usr/lib/libcustomindicator.so.*
+debian/tmp/usr/lib/libappindicator.so.*
diff --git a/debian/watch b/debian/watch
index f0f23d1..4d56068 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://launchpad.net/cape-girardeau/+download .*/indicator-custom-([0-9.]+)\.tar\.gz
+http://launchpad.net/cape-girardeau/+download .*/indicator-application-([0-9.]+)\.tar\.gz