diff -u pidgin-2.6.2/debian/rules pidgin-2.6.2/debian/rules
--- pidgin-2.6.2/debian/rules
+++ pidgin-2.6.2/debian/rules
@@ -63,8 +63,9 @@
 	cd build; make docs
 
 binary-install/pidgin::
-	mkdir -p debian/pidgin/etc/indicators/messages/applications
-	echo /usr/share/applications/pidgin.desktop > debian/pidgin/etc/indicators/messages/applications/pidgin
+	# Add the launcher for pidgin
+	mkdir -p debian/pidgin/usr/share/indicators/messages/applications
+	echo /usr/share/applications/pidgin.desktop > debian/pidgin/usr/share/indicators/messages/applications/pidgin
 
 binary-install/pidgin-dev::
 	dh_installdocs -ppidgin-dev debian/README.Debian.dev
diff -u pidgin-2.6.2/debian/changelog pidgin-2.6.2/debian/changelog
--- pidgin-2.6.2/debian/changelog
+++ pidgin-2.6.2/debian/changelog
@@ -1,3 +1,13 @@
+pidgin (1:2.6.2-1ubuntu4) karmic; urgency=low
+
+  * debian/rules:
+    - Moved the indicator launcher to /usr/share (LP: #434097)
+  * debian/postinst:
+    - remove the old indicator from /etc and remove the directory
+      if it is empty
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 24 Sep 2009 15:33:36 -0400
+
 pidgin (1:2.6.2-1ubuntu3) karmic; urgency=low
 
   * debian/rules:
only in patch2:
unchanged:
--- pidgin-2.6.2.orig/debian/postinst
+++ pidgin-2.6.2/debian/postinst
@@ -0,0 +1,16 @@
+#!/bin/sh -e
+
+case $1 in
+    configure)
+	if test -e "/etc/indicators/messages/applications/pidgin" && \
+          test -e "/usr/share/indicators/messages/applications/pidgin"; then
+            rm "/etc/indicators/messages/applications/pidgin" || true
+        fi
+        if [ `ls "/etc/indicators/messages/applications/"|wc -l` -lt 1 ] && \
+          test -d "/etc/indicators/messages/applications"; then
+            rmdir "/etc/indicators/messages/applications/" || true
+        fi
+        ;;
+esac
+
+#DEBHELPER#