Ubuntu
casper package

Merge lp:~jbicha/ubuntu/saucy/casper/adjust-to-ubiquity-desktop-rename into lp:ubuntu/saucy/casper

  1. Saucy (13.10)
  2. adjust-to-ubiquity-desktop-rename
  3. Merge into saucy
Proposed by Jeremy Bícha
Status: Merged
Merged at revision: 1127
Proposed branch: lp:~jbicha/ubuntu/saucy/casper/adjust-to-ubiquity-desktop-rename
Merge into: lp:ubuntu/saucy/casper
Diff against target: 44 lines (+10/-4)
2 files modified
debian/changelog (+6/-0)
scripts/casper-bottom/25adduser (+4/-4)
To merge this branch: bzr merge lp:~jbicha/ubuntu/saucy/casper/adjust-to-ubiquity-desktop-rename
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+178150@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 'debian/changelog'
2--- debian/changelog 2013-06-25 23:36:34 +0000
3+++ debian/changelog 2013-08-01 19:12:32 +0000
4@@ -1,3 +1,9 @@
5+casper (1.336) UNRELEASED; urgency=low
6+
7+ * 25adduser: Adjust to rename of ubiquity-gtkui.desktop to ubiquity.desktop
8+
9+ -- Jeremy Bicha <jbicha@ubuntu.com> Thu, 01 Aug 2013 15:08:13 -0400
10+
11 casper (1.335) saucy; urgency=low
12
13 * 22desktop_settings:
14
15=== modified file 'scripts/casper-bottom/25adduser'
16--- scripts/casper-bottom/25adduser 2013-06-24 02:26:12 +0000
17+++ scripts/casper-bottom/25adduser 2013-08-01 19:12:32 +0000
18@@ -78,7 +78,7 @@
19 if [ "$LTS" = "LTS" ] && [ -n "$RELEASE" ]; then
20 RELEASE="$RELEASE LTS"
21 fi
22-for file in /usr/share/applications/ubiquity-gtkui.desktop /usr/share/applications/kde4/ubiquity-kdeui.desktop; do
23+for file in /usr/share/applications/ubiquity.desktop /usr/share/applications/kde4/ubiquity-kdeui.desktop; do
24 if [ -f "/root/$file" ]; then
25 sed -i "s/RELEASE/$RELEASE/" "/root$file"
26 chroot /root install -d -o $USERNAME -g $USERNAME /home/$USERNAME/Desktop
27@@ -112,15 +112,15 @@
28
29 #Ubuntu MID wants to be installed with --automatic
30 if [ -f "/root/usr/share/ubuntu-mid-default-settings/mid-gui-start" ]; then
31- if [ -f "/root/usr/share/applications/ubiquity-gtkui.desktop" ]; then
32- sed -i 's/--desktop/--automatic --desktop/' "/root/usr/share/applications/ubiquity-gtkui.desktop"
33+ if [ -f "/root/usr/share/applications/ubiquity.desktop" ]; then
34+ sed -i 's/--desktop/--automatic --desktop/' "/root/usr/share/applications/ubiquity.desktop"
35 fi
36 fi
37
38 #Ubuntu MID uses kourou, and the ubiquity icon should be easy to find
39 if [ -f "/root/usr/lib/hildon-desktop/kourou.py" ]; then
40 if [ -f "/root/etc/xdg/menus/home.menu" ]; then
41- sed -i '/<\/Include>/i\ <Filename>ubiquity-gtkui.desktop</Filename>' "/root/etc/xdg/menus/home.menu"
42+ sed -i '/<\/Include>/i\ <Filename>ubiquity.desktop</Filename>' "/root/etc/xdg/menus/home.menu"
43 fi
44 fi
45

Subscribers

People subscribed via source and target branches

to all changes: