Ubuntu File Manager App

Merge lp:~popey/ubuntu-filemanager-app/fix-1343505 into lp:ubuntu-filemanager-app

  1. fix-1343505
  2. Merge into trunk
Proposed by Alan Pope 🍺🐧🐱 🦄
Status: Merged
Approved by: Nicholas Skaggs
Approved revision: 230
Merged at revision: 230
Proposed branch: lp:~popey/ubuntu-filemanager-app/fix-1343505
Merge into: lp:ubuntu-filemanager-app
Diff against target: 51 lines (+1/-7)
2 files modified
CMakeLists.txt (+0/-5)
manifest.json.in (+1/-2)
To merge this branch: bzr merge lp:~popey/ubuntu-filemanager-app/fix-1343505
Reviewer Review Type Date Requested Status
Nicholas Skaggs (community) Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+227248@code.launchpad.net

Commit message

fix 1343505 to remove urls

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:230
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/286/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1059
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1059/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/84

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/286/rebuild

review: Approve (continuous-integration)
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

LGTM

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 2014-07-16 15:42:46 +0000
3+++ CMakeLists.txt 2014-07-17 19:39:36 +0000
4@@ -12,7 +12,6 @@
5
6 set(APP_NAME filemanager)
7 set(DESKTOP_FILE "${PROJECT_NAME}.desktop")
8-set(URLS_FILE "${PROJECT_NAME}_${APP_NAME}.url-dispatcher")
9 set(LP_PROJECT ubuntu-filemanager-app)
10 set(ICON_FILE filemanager64.png)
11 set(AUTOPILOT_DIR ${APP_NAME})
12@@ -38,7 +37,6 @@
13 set(QT_IMPORTS_DIR "/lib/${ARCH_TRIPLET}")
14 set(BIN_DIR /lib/${ARCH_TRIPLET}/bin)
15 set(DESKTOP_DIR ${DATA_DIR})
16- set(URLS_DIR ${DATA_DIR})
17 if(NOT BZR_REVNO)
18 set(BZR_REVNO "latest")
19 endif(NOT BZR_REVNO)
20@@ -53,7 +51,6 @@
21 set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_NAME})
22 set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE})
23 set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
24- set(URLS_DIR ${CMAKE_INSTALL_DATADIR}/url-dispatcher/urls)
25 endif(CLICK_MODE)
26
27 file(GLOB_RECURSE I18N_SRC_FILES
28@@ -70,8 +67,6 @@
29 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
30 DESTINATION ${DESKTOP_DIR})
31
32-install(FILES ${URLS_FILE} DESTINATION ${URLS_DIR})
33-
34 # Tests
35 enable_testing()
36
37
38=== removed file 'com.ubuntu.filemanager_filemanager.url-dispatcher'
39=== modified file 'manifest.json.in'
40--- manifest.json.in 2014-07-16 15:42:46 +0000
41+++ manifest.json.in 2014-07-17 19:39:36 +0000
42@@ -7,8 +7,7 @@
43 "filemanager": {
44 "apparmor": "apparmor.json",
45 "desktop": "com.ubuntu.filemanager.desktop",
46- "content-hub": "hub-exporter.json",
47- "urls": "com.ubuntu.filemanager_filemanager.url-dispatcher"
48+ "content-hub": "hub-exporter.json"
49 }
50 },
51 "icon": "filemanager64.png",

Subscribers

People subscribed via source and target branches