5 files changed, 17 insertions, 13 deletions
diff --git a/debian/changelog b/debian/changelog
index 6e67b9b..01246d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+libindicator (0.3.15-0ubuntu2) natty; urgency=low
+
+  * debian/control: 
+    - dropped libindicator-debugenv package
+  * -debian/libindicator-debugenv.install
+  * debian/libindicator-tools.install
+    - Install indicator-loader and indicator-loader3 in the 
+    libindicator-tools package (means it depends on both gtk2 and gtk3)
+    - Install sample xsession env in pkgdatadir for developer use
+  * tools/Makefile.am
+    - Install 80indicator-debugging in pkgdatadir
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Mon, 06 Dec 2010 10:19:58 -0500
+
 libindicator (0.3.15-0ubuntu1) natty; urgency=low
 
   * debian/rules
diff --git a/debian/control b/debian/control
index a7e93cb..71082ea 100644
--- a/debian/control
+++ b/debian/control
@@ -54,17 +54,6 @@ Description: Tools for libindicator
  .
  This package contains files that are needed to build applications.
 
-Package: libindicator-debugenv
-Section: devel
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         libindicator1 (= ${binary:Version})
-Description: Debug environment for libindicator
- Sets debug values useful for developers of applications using indicators.
- .
- This package contains session configuration files
-
 Package: libindicator3-1
 Section: libs
 Architecture: any
diff --git a/debian/libindicator-debugenv.install b/debian/libindicator-debugenv.install
deleted file mode 100644
index da1327b..0000000
--- a/debian/libindicator-debugenv.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/etc/*
diff --git a/debian/libindicator-tools.install b/debian/libindicator-tools.install
index 07cd88f..a95bc4b 100644
--- a/debian/libindicator-tools.install
+++ b/debian/libindicator-tools.install
@@ -1 +1,3 @@
 debian/tmp/usr/lib/libindicator/indicator-loader
+debian/tmp/usr/lib/libindicator/indicator-loader3
+debian/tmp/usr/share/libindicator/80indicator-debugging
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 9861ac1..795e4fc 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -35,7 +35,7 @@ indicator_loader3_SOURCES = $(indicator_loader_SOURCES)
 indicator_loader3_CFLAGS = $(indicator_loader_CFLAGS)
 indicator_loader3_LDADD = $(indicator_loader_LDADD)
 
-xsessiondir = $(sysconfdir)/X11/Xsession.d
+xsessiondir = $(pkgdatadir)
 
 xsession_DATA = 80indicator-debugging