Merge lp:~popey/ubuntu-rssreader-app/fix-1343505 into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

[Alan Pope 🍺🐧🐱 🦄]

fix 1343505 to remove urls

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:260
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/250/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1057
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1057/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-utopic-amd64-ci/29

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

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-04-02 05:10:33 +0000
+++ CMakeLists.txt	2014-07-17 19:17:42 +0000
@@ -9,7 +9,6 @@
 
 set(APP_NAME shorts)
 set(DESKTOP_FILE "${PROJECT_NAME}_${APP_NAME}.desktop")
-set(URLS_FILE "${PROJECT_NAME}_${APP_NAME}.url-dispatcher")
 set(APP_HARDCODE shorts-app)
 set(MAIN_QML shorts-app.qml)
 set(ICON_FILE [e-mail])
@@ -26,7 +25,6 @@
     set(ICON ${ICON_FILE})
     set(EXEC "qmlscene ${MAIN_QML}")
     set(DESKTOP_DIR ${DATA_DIR})
-    set(URLS_DIR ${DATA_DIR})
 else(CLICK_MODE)
     set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})
     set(EXEC ${APP_HARDCODE})
@@ -36,7 +34,6 @@
     install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE}
         DESTINATION ${CMAKE_INSTALL_BINDIR})
     set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
-    set(URLS_DIR ${CMAKE_INSTALL_DATADIR}/url-dispatcher/urls)
 endif(CLICK_MODE)
 
 file(GLOB_RECURSE I18N_SRC_FILES
@@ -61,8 +58,6 @@
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
     DESTINATION ${DESKTOP_DIR})
 
-install(FILES ${URLS_FILE} DESTINATION ${URLS_DIR})
-
 # Tests
 enable_testing()
 

=== modified file 'click/manifest.json.in'
--- click/manifest.json.in	2014-07-04 08:41:07 +0000
+++ click/manifest.json.in	2014-07-17 19:17:42 +0000
@@ -4,8 +4,7 @@
     "hooks": {
         "@APP_NAME@": {
             "apparmor": "apparmor.json",
-            "desktop": "@DESKTOP_FILE@",
-            "urls": "@URLS_FILE@"
+            "desktop": "@DESKTOP_FILE@"
         }
     },
     "icon": "@ICON@",

=== removed file 'com.ubuntu.shorts_shorts.url-dispatcher'