Merge lp:~dholbach/ubuntu-rssreader-app/fix-paths into lp:~dpm/ubuntu-rssreader-app/enable-translations

[Daniel Holbach]

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-26 07:42:28 +0000
+++ debian/changelog	2013-09-26 08:54:07 +0000
@@ -1,6 +1,7 @@
 ubuntu-rssreader-app (0.2) saucy; urgency=low
 
-  * Added translations support, dropped ubuntu- prefix from desktop file and installation path
+  * Added translations support, dropped ubuntu- prefix from desktop file 
+    and installation path
 
  -- David Planella <[e-mail]>  Thu, 26 Sep 2013 09:29:27 +0200
 
 
=== modified file 'debian/control'
--- debian/control	2013-08-15 15:54:31 +0000
+++ debian/control	2013-09-26 08:54:07 +0000
@@ -1,30 +1,30 @@
 Source: ubuntu-rssreader-app
 Priority: extra
 Maintainer: Ubuntu App Cats <[e-mail]>
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 9)
 Standards-Version: 3.9.4
 Section: misc
 Homepage: https://launchpad.net/ubuntu-rssreader-app
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-rssreader-dev/ubuntu-rssreader-app/trunk
 
-Package: ubuntu-rssreader-app
-Section: misc
+Package: rssreader-app
 Architecture: all
-Depends: ${misc:Depends},
+Depends: libqt5webkit5-qmlwebkitplugin,
          qmlscene,
+         qtdeclarative5-localstorage-plugin,
+         qtdeclarative5-qtquick2-plugin,
          qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
-         qtdeclarative5-qtquick2-plugin,
          qtdeclarative5-xmllistmodel-plugin,
-         libqt5webkit5-qmlwebkitplugin,
-         qtdeclarative5-localstorage-plugin,
+         ${misc:Depends}
 Description: RSS Reader application
  Core RSS Reader application
 
-Package: ubuntu-rssreader-app-autopilot
+Package: rssreader-app-autopilot
 Architecture: all
 Depends: libautopilot-qt,
          libqt5test5,
+         rssreader-app (= ${source:Version}),
          ubuntu-ui-toolkit-autopilot,
-         ubuntu-rssreader-app (= ${source:Version})
+         ${misc:Depends}
 Description: Autopilot tests for RSS reader Application
  This package contains the autopilot tests for the RSS reader
 
=== renamed file 'debian/ubuntu-rssreader-app-autopilot.install' => 'debian/rssreader-app-autopilot.install'
=== modified file 'debian/rssreader-app.install'
--- debian/rssreader-app.install	2013-09-26 07:42:28 +0000
+++ debian/rssreader-app.install	2013-09-26 08:54:07 +0000
@@ -1,9 +1,9 @@
-rssreader-app usr/bin/
-rssreader-app.desktop usr/share/applications/
+*.js usr/share/rssreader-app/
+*.png usr/share/rssreader-app/
 *.qml usr/share/rssreader-app/
-*.png usr/share/rssreader-app/
-*.js usr/share/rssreader-app/
+article_items usr/share/rssreader-app/
 feeds usr/share/rssreader-app/
+icons_tmp usr/share/rssreader-app/
 listview usr/share/rssreader-app/
-article_items usr/share/rssreader-app/
-icons_tmp usr/share/rssreader-app/
+rssreader-app usr/bin/
+rssreader-app.desktop usr/share/applications/
 
=== renamed file 'ubuntu-rssreader-app' => 'rssreader-app'
--- ubuntu-rssreader-app	2013-04-11 21:21:44 +0000
+++ rssreader-app	2013-09-26 08:54:07 +0000
@@ -1,2 +1,2 @@
 #!/bin/bash
-qmlscene /usr/share/ubuntu-rssreader-app/ubuntu-rssreader-app.qml
+qmlscene /usr/share/rssreader-app/rssreader-app.qml
 
=== modified file 'rssreader-app.desktop'
--- rssreader-app.desktop	2013-09-26 07:00:25 +0000
+++ rssreader-app.desktop	2013-09-26 08:54:07 +0000
@@ -1,10 +1,10 @@
 [Desktop Entry]
-Encoding=UTF-8
 Version=1.0
 Type=Application
 Terminal=false
 Exec=qmlscene /usr/share/rssreader-app/rssreader-app.qml
 Icon=/usr/share/rssreader-app/rssreader64.png
 Name=Shorts
+Keywords=shorts;rss;reader
 X-Ubuntu-Touch=true
 X-Ubuntu-StageHint=SideStage
 
=== modified file 'rssreader-app.qmlproject'
--- rssreader-app.qmlproject	2013-09-26 07:00:25 +0000
+++ rssreader-app.qmlproject	2013-09-26 08:54:07 +0000
@@ -3,7 +3,7 @@
 import QmlProject 1.1
 
 Project {
-    mainFile: "ubuntu-rssreader-app.qml"
+    mainFile: "rssreader-app.qml"
 
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
 
=== modified file 'tests/autopilot/ubuntu_rssreader_app/tests/__init__.py'
--- tests/autopilot/ubuntu_rssreader_app/tests/__init__.py	2013-09-06 01:46:41 +0000
+++ tests/autopilot/ubuntu_rssreader_app/tests/__init__.py	2013-09-26 08:54:07 +0000
@@ -43,7 +43,7 @@
     else:
         scenarios = [('with touch', dict(input_device_class=Touch))]
 
-    local_location = "../../ubuntu-rssreader-app.qml"
+    local_location = "../../rssreader-app.qml"
     sqlite_dir = os.path.expanduser(
         "~/.local/share/Qt Project/QtQmlViewer/QML/OfflineStorage/Databases")
     backup_dir = sqlite_dir + ".backup"
@@ -75,9 +75,9 @@
     def launch_test_installed(self):
         self.app = self.launch_test_application(
             "qmlscene",
-            "/usr/share/ubuntu-rssreader-app/ubuntu-rssreader-app.qml",
+            "/usr/share/rssreader-app/rssreader-app.qml",
             "--desktop_file_hint=/usr/share/applications/"
-            "ubuntu-rssreader-app.desktop",
+            "rssreader-app.desktop",
             app_type='qt',
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)