Ubuntu One for Rhythmbox

Merge lp:~dobey/rhythmbox-ubuntuone/basic-checks into lp:rhythmbox-ubuntuone

  1. basic-checks
  2. Merge into trunk
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 123
Merged at revision: 123
Proposed branch: lp:~dobey/rhythmbox-ubuntuone/basic-checks
Merge into: lp:rhythmbox-ubuntuone
Diff against target: 52 lines (+4/-15)
4 files modified
po/POTFILES.in (+0/-2)
rhythmbox-ubuntuone.desktop.in (+0/-12)
run-tests (+3/-0)
setup.cfg (+1/-1)
To merge this branch: bzr merge lp:~dobey/rhythmbox-ubuntuone/basic-checks
Reviewer Review Type Date Requested Status
Mike McCracken (community) Approve
Review via email: mp+141985@code.launchpad.net

Commit message

Update POTFILES.in
Remove the .desktop file as we don't need it any more
Run setup.py build and clean in the run-tests script for basic checks

To post a comment you must log in.
Revision history for this message
Mike McCracken (mikemc) wrote :

looks ok to me, visual inspection only…

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/POTFILES.in'
2--- po/POTFILES.in 2012-02-23 00:50:54 +0000
3+++ po/POTFILES.in 2013-01-04 22:10:27 +0000
4@@ -1,5 +1,3 @@
5-rhythmbox-ubuntuone.desktop.in
6 ubuntuone/ubuntuone.py
7-ubuntuone/MusicStoreWidget.py
8 [type: gettext/ini]ubuntuone/ubuntuone.plugin.in
9
10
11=== removed file 'rhythmbox-ubuntuone.desktop.in'
12--- rhythmbox-ubuntuone.desktop.in 2012-03-07 16:01:45 +0000
13+++ rhythmbox-ubuntuone.desktop.in 1970-01-01 00:00:00 +0000
14@@ -1,12 +0,0 @@
15-[Desktop Entry]
16-Name=Ubuntu One Music Store
17-_Comment=Purchase music on Ubuntu One in Rhythmbox
18-Exec=rhythmbox %U
19-Terminal=false
20-Type=Application
21-Icon=rhythmbox
22-Categories=GNOME;GTK;AudioVideo;
23-MimeType=x-scheme-handler/u1ms
24-StartupNotify=true
25-X-Ubuntu-Gettext-Domain=rhythmbox-ubuntuone
26-NoDisplay=true
27
28=== modified file 'run-tests'
29--- run-tests 2012-08-24 19:36:25 +0000
30+++ run-tests 2013-01-04 22:10:27 +0000
31@@ -14,6 +14,7 @@
32 #
33 # You should have received a copy of the GNU General Public License along
34 # with this program. If not, see <http://www.gnu.org/licenses/>.
35+./setup.py build
36 export PYTHONPATH=ubuntuone
37 USE_PYFLAKES=1 u1lint .
38 if [ -x `which pep8` ]; then
39@@ -22,3 +23,5 @@
40 echo "Please install the 'pep8' package."
41 fi
42 rm -rf _trial_temp
43+./setup.py clean
44+
45
46=== modified file 'setup.cfg'
47--- setup.cfg 2012-02-23 00:50:54 +0000
48+++ setup.cfg 2013-01-04 22:10:27 +0000
49@@ -1,2 +1,2 @@
50 [build_i18n]
51-desktop_files=[("lib/rhythmbox/plugins/ubuntuone", ("ubuntuone/ubuntuone.plugin.in",)), ("share/applications", ("rhythmbox-ubuntuone.desktop.in",))]
52+desktop_files=[("lib/rhythmbox/plugins/ubuntuone", ("ubuntuone/ubuntuone.plugin.in",))]

Subscribers

People subscribed via source and target branches