Merge lp:~ted/mediaplayer-app/trusted-session-helper into lp:mediaplayer-app

[Ted Gould]

Convert from an app to a helper

[Renato Araujo Oliveira Filho (renatofilho)]

O noticed that you have update the pot file to no use the relative path based on pot directory. We did that way because a request from dpm, all our apps use this approach.

[Renato Araujo Oliveira Filho (renatofilho)]

I having a problem testing it I am not sure if this is a camera problem or the url dispatcher one.

On camera roll if you click once nothing happens on the ui saying that the video is going to be played, the user need to wait for about ~3 secs to the mp app to appear. If the user try to click again the mp app will open twice and crash.

[Ted Gould (ted)]

Updated to remove the changes to the pot file and actually the helper. We moved that into URL dispatcher as that's where it's likely to live long term.

In the future there'll probably be some sort of registration mechanism that mediaplayer will need to use, but we don't have that yet.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:328
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/253/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/847
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/408
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-vivid-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-vivid-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-vivid-armhf-ci/11/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-vivid-i386-ci/11
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/740
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/845
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/845/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17169
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/333
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/432
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/432/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mediaplayer-app-ci/253/rebuild

review: Needs Fixing (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

This has been long (3 months) in the train spreadsheet with comment "Cleaned, don't believe it is needed right now.". Please add a new landing line if you want to see this landed.

Unmerged revisions

328. By Ted Gould on 2015-01-16

Change pot file so there's nothing in the diff

327. By Ted Gould on 2015-01-15

Drop helper dependencies

326. By Ted Gould on 2015-01-15

Drop the helper from mediaplayer-app

325. By Ted Gould on 2015-01-09

Adding glib and mir build dependencies

324. By Ted Gould on 2015-01-08

Merging RTM 14.09 branch

323. By Ted Gould on 2015-01-08

Fix name of who is connecting

322. By Ted Gould on 2015-01-08

Add helper to packages

321. By Ted Gould on 2015-01-08

Flesh out the helper

320. By Ted Gould on 2015-01-08

Skeleton for the helper

319. By Ted Gould on 2015-01-08

Adding in a helper directory

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-10-02 13:42:17 +0000
+++ CMakeLists.txt	2015-01-16 15:44:43 +0000
@@ -4,7 +4,6 @@
 
 # Find includes in corresponding build directories
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
-set(DESKTOP_FILE mediaplayer-app.desktop)
 
 # Instruct CMake to run moc automatically when needed.
 set(CMAKE_AUTOMOC ON)

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2014-10-02 13:42:17 +0000
+++ data/CMakeLists.txt	2015-01-16 15:44:43 +0000
@@ -1,18 +1,7 @@
-set(MEDIAPLAYER_DESKTOP_FILE mediaplayer-app.desktop)
 set(MEDIAPLAYER_APP_ICON mediaplayer-app.png)
 set(MEDIAPLAYER_APP_SYMBOLIC_ICON mediaplayer-app-symbolic.svg)
 set(MEDIAPLAYER_URL_DISPATCHER mediaplayer-app.url-dispatcher)
 
-configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in)
-add_custom_target(${DESKTOP_FILE} ALL
-         COMMENT "Merging translations into ${DESKTOP_FILE}"
-         COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${DESKTOP_FILE}.in ${DESKTOP_FILE} >/dev/null
-        )
-
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${MEDIAPLAYER_DESKTOP_FILE}
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
-)
-
 install(FILES ${MEDIAPLAYER_APP_ICON} ${MEDIAPLAYER_APP_SYMBOLIC_ICON}
         DESTINATION ${MEDIAPLAYER_DIR}
 )

=== removed file 'data/mediaplayer-app.desktop.in.in'
--- data/mediaplayer-app.desktop.in.in	2014-10-02 19:11:44 +0000
+++ data/mediaplayer-app.desktop.in.in	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Type=Application
-_Name=Media Player
-_GenericName=Media Player
-_Comment=Media Player
-_Keywords=Movies;Movie Player;Video Player
-Exec=mediaplayer-app %u
-Terminal=false
-Icon=@MEDIAPLAYER_DIR@/@MEDIAPLAYER_APP_ICON@
-X-Ubuntu-SymbolicIcon=@MEDIAPLAYER_DIR@/@MEDIAPLAYER_APP_SYMBOLIC_ICON@
-X-Ubuntu-Gettext-Domain=mediaplayer-app
-X-Ubuntu-Single-Instance=true
-X-Ubuntu-Default-Department-ID=sound-video

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-15 21:51:43 +0000
+++ debian/changelog	2015-01-16 15:44:43 +0000
@@ -1,3 +1,17 @@
+mediaplayer-app (0.20.5+15.04.20141110.3~rtm-0ubuntu1) 14.09; urgency=low
+
+  [ Bill Filler ]
+  * update translations
+
+  [ Ubuntu daily release ]
+  * New rebuild forced
+
+  [ Renato Araujo Oliveira Filho ]
+  * Fixed cmake script to generate the necessary translations for
+    desktop file. (LP: #1382317)
+
+ -- Ubuntu daily release <[e-mail]>  Mon, 10 Nov 2014 19:57:49 +0000
+
 mediaplayer-app (0.20.5+14.10.20141015-0ubuntu1) 14.09; urgency=low
 
   [ CI bot ]

=== modified file 'debian/mediaplayer-app.install'
--- debian/mediaplayer-app.install	2014-09-29 20:53:44 +0000
+++ debian/mediaplayer-app.install	2015-01-16 15:44:43 +0000
@@ -1,4 +1,3 @@
-/usr/share/applications/mediaplayer-app.desktop
 /usr/bin/mediaplayer-app
 /usr/share/mediaplayer-app/mediaplayer-app.png
 /usr/share/mediaplayer-app/mediaplayer-app-symbolic.svg

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2014-06-16 14:08:17 +0000
+++ po/CMakeLists.txt	2015-01-16 15:44:43 +0000
@@ -5,11 +5,9 @@
 set(DOMAIN mediaplayer-app)
 set(POT_FILE ${DOMAIN}.pot)
 file(GLOB PO_FILES *.po)
-file(GLOB_RECURSE I18N_SRCS RELATIVE ${CMAKE_SOURCE_DIR}
+file(GLOB_RECURSE I18N_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_SOURCE_DIR}/src/*.qml)
-list(APPEND I18N_SRCS data/${DESKTOP_FILE}.in.in)
 list(SORT I18N_SRCS)
-message("Found ${I18N_SRCS}")
 
 foreach(PO_FILE ${PO_FILES})
     get_filename_component(LANG ${PO_FILE} NAME_WE)
@@ -24,8 +22,22 @@
 if(XGETTEXT_EXECUTABLE)
     add_custom_target(${POT_FILE} ALL
                   COMMENT "Generating translation template"
-                  COMMAND ${INTLTOOL_EXTRACT} --update --type=gettext/ini
-                          --srcdir=${CMAKE_SOURCE_DIR} data/${DESKTOP_FILE}.in.in
-                  COMMAND ${XGETTEXT_EXECUTABLE} --c++ --qt --add-comments=TRANSLATORS --keyword=tr --keyword=tr:1,2 -D ${CMAKE_SOURCE_DIR} -s -p ${CMAKE_CURRENT_SOURCE_DIR} -o mediaplayer-app.pot ${I18N_SRCS}
-    )
+                  COMMAND ${XGETTEXT_EXECUTABLE} -o ${POT_FILE}
+		          --c++ --qt --add-comments=TRANSLATORS
+                          --keyword=tr --keyword=tr:1,2 --keyword=N_
+                          --package-name=${DOMAIN}
+                          --copyright-holder='Canonical Ltd.'
+                          -s -p ${CMAKE_CURRENT_SOURCE_DIR} 
+ 			  -D ${CMAKE_CURRENT_SOURCE_DIR} ${I18N_SRCS}
+    )
+
+    add_custom_target(translations
+        COMMENT "Updating translation files"
+    )
+    add_dependencies(translations ${POT_FILE})
+    foreach(PO_FILE ${PO_FILES})
+       add_custom_command(TARGET translations
+            COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} ${PO_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/${POT_FILE} -o ${PO_FILE}
+       )
+    endforeach(PO_FILE)
 endif()

=== modified file 'po/mediaplayer-app.pot'
--- po/mediaplayer-app.pot	2014-11-05 22:59:33 +0000
+++ po/mediaplayer-app.pot	2015-01-16 15:44:43 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: mediaplayer-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-05 14:28-0300\n"
+"POT-Creation-Date: 2015-01-16 09:43-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -52,14 +52,6 @@
 msgid "Fail to open the source video."
 msgstr ""
 
-#: ../data/mediaplayer-app.desktop.in.in.h:1
-msgid "Media Player"
-msgstr ""
-
-#: ../data/mediaplayer-app.desktop.in.in.h:2
-msgid "Movies;Movie Player;Video Player"
-msgstr ""
-
 #: ../src/qml/player.qml:68
 msgid ""
 "No video selected to play. Connect your phone to your computer to transfer "