Merge lp:~maxolasersquad/stellarium/add_quicklist into lp:stellarium/0.11

Proposed by Alexander Wolf
Status: Merged
Merged at revision: 4940
Proposed branch: lp:~maxolasersquad/stellarium/add_quicklist
Merge into: lp:stellarium/0.11
Diff against target: 61 lines (+20/-3)
4 files modified
CMakeLists.txt (+1/-1)
data/Info.plist (+1/-1)
data/default_config.ini (+1/-1)
data/stellarium.desktop (+17/-0)
To merge this branch: bzr merge lp:~maxolasersquad/stellarium/add_quicklist
Reviewer Review Type Date Requested Status
Alexander Wolf Approve
Review via email: mp+94903@code.launchpad.net

This proposal supersedes a proposal from 2012-02-28.

Description of the change

Adds a Unity Quicklist shortcut to Stellarium's launcher.

To post a comment you must log in.
Revision history for this message
Alexander Wolf (alexwolf) wrote : Posted in a previous version of this proposal

I'm merge this patch with lp:stellarium/0.11 for include into 0.11.2 RC2

review: Approve
Revision history for this message
Alexander Wolf (alexwolf) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2012-02-18 22:33:56 +0000
3+++ CMakeLists.txt 2012-02-28 03:26:19 +0000
4@@ -12,7 +12,7 @@
5 PROJECT(Stellarium)
6 SET(STELLARIUM_MAJOR "0")
7 SET(STELLARIUM_MINOR "11")
8-SET(STELLARIUM_PATCH "2")
9+SET(STELLARIUM_PATCH "3")
10 SET(VERSION "${STELLARIUM_MAJOR}.${STELLARIUM_MINOR}.${STELLARIUM_PATCH}")
11 SET(PACKAGE stellarium)
12
13
14=== modified file 'data/Info.plist'
15--- data/Info.plist 2011-11-04 17:29:44 +0000
16+++ data/Info.plist 2012-02-28 03:26:19 +0000
17@@ -17,7 +17,7 @@
18 <key>CFBundleSignature</key>
19 <string>????</string>
20 <key>CFBundleVersion</key>
21- <string>0.11.2</string>
22+ <string>0.11.3</string>
23 <key>LSMinimumSystemVersion</key>
24 <string>10.5.0</string>
25 </dict>
26
27=== modified file 'data/default_config.ini'
28--- data/default_config.ini 2012-02-19 11:43:38 +0000
29+++ data/default_config.ini 2012-02-28 03:26:19 +0000
30@@ -1,5 +1,5 @@
31 [main]
32-version = 0.11.2
33+version = 0.11.3
34 invert_screenshots_colors = false
35
36 [plugins_load_at_startup]
37
38=== modified file 'data/stellarium.desktop'
39--- data/stellarium.desktop 2010-03-04 21:56:51 +0000
40+++ data/stellarium.desktop 2012-02-28 03:26:19 +0000
41@@ -7,3 +7,20 @@
42 Icon=stellarium
43 X-Icon-path=/usr/share/icons/
44 X-Window-Icon=stellarium
45+
46+X-Ayatana-Desktop-Shortcuts=Screen;Window
47+
48+[Window Group]
49+Name=Open in window
50+Exec=stellarium -f no
51+TargetEnvironment=Unity
52+
53+[Fullscreen Group]
54+Name=Open in fullscreen
55+Exec=stellarium -f yes
56+TargetEnvironment=Unity
57+
58+[Safemode Group]
59+Name=Open in safe mode
60+Exec=stellarium --safe-mode
61+TargetEnvironment=Unity

Subscribers

People subscribed via source and target branches