Ubuntu
language-selector package

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

  1. Saucy (13.10)
  2. help-update-for-python-distutils-extra
  3. Merge into saucy
Proposed by Jeremy Bícha
Status: Merged
Merged at revision: 278
Proposed branch: lp:~jbicha/ubuntu/saucy/language-selector/help-update-for-python-distutils-extra
Merge into: lp:ubuntu/saucy/language-selector
Diff against target: 52 lines (+8/-5)
4 files modified
data/LanguageSelector.ui (+1/-1)
debian/changelog (+6/-0)
debian/language-selector-gnome.install (+1/-1)
setup.py (+0/-3)
To merge this branch: bzr merge lp:~jbicha/ubuntu/saucy/language-selector/help-update-for-python-distutils-extra
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+176434@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/LanguageSelector.ui'
2--- data/LanguageSelector.ui 2013-04-02 14:10:49 +0000
3+++ data/LanguageSelector.ui 2013-07-23 17:14:29 +0000
4@@ -789,7 +789,7 @@
5 <property name="use_action_appearance">False</property>
6 <property name="use_stock">True</property>
7 <property name="relief">GTK_RELIEF_NORMAL</property>
8- <property name="uri">ghelp:language-selector</property>
9+ <property name="uri">help:language-selector</property>
10 </object>
11 <packing>
12 <property name="expand">False</property>
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2013-06-16 05:42:03 +0000
16+++ debian/changelog 2013-07-23 17:14:29 +0000
17@@ -1,3 +1,9 @@
18+language-selector (0.114) UNRELEASED; urgency=low
19+
20+ * Update for python-distutils-extra changes to help handling
21+
22+ -- Jeremy Bicha <jbicha@ubuntu.com> Tue, 23 Jul 2013 12:45:09 -0400
23+
24 language-selector (0.113) saucy; urgency=low
25
26 * fontconfig/30-cjk-aliases.conf:
27
28=== modified file 'debian/language-selector-gnome.install'
29--- debian/language-selector-gnome.install 2011-11-04 07:52:38 +0000
30+++ debian/language-selector-gnome.install 2013-07-23 17:14:29 +0000
31@@ -1,5 +1,5 @@
32 usr/bin/gnome-language-selector
33 usr/lib/python*/*-packages/LanguageSelector/gtk
34 usr/share/applications/language-selector.desktop
35-usr/share/gnome/help
36+usr/share/help
37 usr/share/language-support/incomplete-language-support-gnome.note
38
39=== renamed file 'help/C/language-selector.xml' => 'help/C/index.docbook'
40=== modified file 'setup.py'
41--- setup.py 2013-02-04 21:52:45 +0000
42+++ setup.py 2013-07-23 17:14:29 +0000
43@@ -28,9 +28,6 @@
44 ["dbus_backend/com.ubuntu.LanguageSelector.conf"]),
45 ('lib/language-selector/',
46 ["dbus_backend/ls-dbus-backend"]),
47- # help
48- ('share/gnome/help/language-selector/C',
49- ['help/C/language-selector.xml']),
50 # pretty pictures
51 ('share/pixmaps',
52 ["data/language-selector.png"]),

Subscribers

People subscribed via source and target branches

to all changes: