Merge lp:~jbicha/ubuntu/saucy/language-selector/help-update-for-python-distutils-extra into lp:ubuntu/saucy/language-selector

[Jeremy Bícha]

=== modified file 'data/LanguageSelector.ui'
--- data/LanguageSelector.ui	2013-04-02 14:10:49 +0000
+++ data/LanguageSelector.ui	2013-07-23 17:14:29 +0000
@@ -789,7 +789,7 @@
                     <property name="use_action_appearance">False</property>
                     <property name="use_stock">True</property>
                     <property name="relief">GTK_RELIEF_NORMAL</property>
-                    <property name="uri">ghelp:language-selector</property>
+                    <property name="uri">help:language-selector</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-06-16 05:42:03 +0000
+++ debian/changelog	2013-07-23 17:14:29 +0000
@@ -1,3 +1,9 @@
+language-selector (0.114) UNRELEASED; urgency=low
+
+  * Update for python-distutils-extra changes to help handling
+
+ -- Jeremy Bicha <[e-mail]>  Tue, 23 Jul 2013 12:45:09 -0400
+
 language-selector (0.113) saucy; urgency=low
 
   * fontconfig/30-cjk-aliases.conf:
 
=== modified file 'debian/language-selector-gnome.install'
--- debian/language-selector-gnome.install	2011-11-04 07:52:38 +0000
+++ debian/language-selector-gnome.install	2013-07-23 17:14:29 +0000
@@ -1,5 +1,5 @@
 usr/bin/gnome-language-selector
 usr/lib/python*/*-packages/LanguageSelector/gtk
 usr/share/applications/language-selector.desktop
-usr/share/gnome/help
+usr/share/help
 usr/share/language-support/incomplete-language-support-gnome.note
 
=== renamed file 'help/C/language-selector.xml' => 'help/C/index.docbook'
=== modified file 'setup.py'
--- setup.py	2013-02-04 21:52:45 +0000
+++ setup.py	2013-07-23 17:14:29 +0000
@@ -28,9 +28,6 @@
                    ["dbus_backend/com.ubuntu.LanguageSelector.conf"]),
                   ('lib/language-selector/',
                    ["dbus_backend/ls-dbus-backend"]),
-                  # help
-                  ('share/gnome/help/language-selector/C',
-                   ['help/C/language-selector.xml']),
                   # pretty pictures
                   ('share/pixmaps',
                    ["data/language-selector.png"]),