Merge lp:~nik90/cliffhanger/debian-packaging into lp:~flashback-dev/cliffhanger/trunk

[Nekhelesh Ramananthan]

Added debian packaging.

Added debian packaging.

[Daniel Holbach (dholbach)]

Regarding the licenses:
 - in debian/copyright you mention GPL-3+ but all the files' headers mention just GPL-3 (no "or later")
 - in debian/copyright you mention CC-BY-SA - which files are under this license?

review: Needs Information

[lp:~nik90/cliffhanger/debian-packaging]

46. By Nekhelesh Ramananthan on 2014-03-17

Fixed copyright file

[Nekhelesh Ramananthan (nik90)]

I copied the copyright file from the dropping-letters package and forgot to remove CC-BY-SA license. It should be fixed now.

[Nekhelesh Ramananthan (nik90)]

One thing that I am not unsure about is the debian changelog versioning,

32 +flashback (0.3.2) UNRELEASED; urgency=medium

I am targeting trusty. However since it is not released, I have set the distribution to UNRELEASED. This is also done in the music app. Is this correct? Or should I change this to trusty?

In the desktop file, I did,
+Exec=flashback

This works when I install the deb package on the desktop. However when I run the click lint, it complains that
found unexpected Exec with architecture 'all': flashback

How can I fix this?

review: Needs Information

[Daniel Holbach (dholbach)]

Yes, please use 'trusty' for an actual upload to trusty, just bear in mind that for actual inclusion into trusty, you might want to follow: https://wiki.ubuntu.com/FreezeExceptionProcess#FeatureFreeze_for_new_packages

Ignore the click-reviewers-tools lint check, as it's just a test for click packages. For Debian packages you can run 'lintian' instead. Here's the output of lintian if you run it against my branch of cliffhanger (sent MP a minute ago): http://paste.ubuntu.com/7107578/

[Daniel Holbach (dholbach)]

And feel free to ignore the manpage warning for now.

[lp:~nik90/cliffhanger/debian-packaging]

47. By Nekhelesh Ramananthan on 2014-03-17

Merged lp:~dholbach/cliffhanger/packaging-fixes

48. By Nekhelesh Ramananthan on 2014-03-17

Added keywords to desktop file

49. By Nekhelesh Ramananthan on 2014-03-17

Changed ubuntu version to trusty

[Nekhelesh Ramananthan (nik90)]

> Yes, please use 'trusty' for an actual upload to trusty, just bear in mind
> that for actual inclusion into trusty, you might want to follow:
> https://wiki.ubuntu.com/FreezeExceptionProcess#FeatureFreeze_for_new_packages
>

I changed it to trusty. I have no intention of an actual upload to trusty since the PPA is intended for testers to try out Flashback on their desktop and provide feedback on the convergent designs that will be implemented in the near future.

> Ignore the click-reviewers-tools lint check, as it's just a test for click
> packages. For Debian packages you can run 'lintian' instead. Here's the output
> of lintian if you run it against my branch of cliffhanger (sent MP a minute
> ago): http://paste.ubuntu.com/7107578/

Fixed the keywords issue.

[lp:~nik90/cliffhanger/debian-packaging]

50. By Nekhelesh Ramananthan on 2014-03-17

Fixed desktop file exec line

51. By Nekhelesh Ramananthan on 2014-03-17

Removed flashbin executable file

52. By Nekhelesh Ramananthan on 2014-03-17

Updated changelog due to first fail of PPA upload to launchpad

=== modified file 'Flashback.desktop'
--- Flashback.desktop	2014-02-12 13:14:11 +0000
+++ Flashback.desktop	2014-03-17 12:54:23 +0000
@@ -2,8 +2,9 @@
 Version=1.0
 Name=Flashback
 Comment=My project description
-Exec=qmlscene $@ Flashback.qml
+Exec=qmlscene $@ /usr/share/flashback/Flashback.qml
 Icon=flashback.png
 Terminal=false
 Type=Application
+Keywords=Movie,Film,TV,Show,Entertainment;
 X-Ubuntu-Touch=true

=== modified file 'Makefile'
--- Makefile	2014-03-07 10:48:17 +0000
+++ Makefile	2014-03-17 12:54:23 +0000
@@ -14,8 +14,5 @@
 	chmod +x tests/autopilot/run
 	tests/autopilot/run
 
-check:
-	qmltestrunner -input tests/unit
-
 run:
 	/usr/bin/qmlscene $@ Flashback.qml

=== added directory 'debian'
=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2014-03-17 12:54:23 +0000
@@ -0,0 +1,16 @@
+flashback (0.3.2ubuntu1) trusty; urgency=medium
+
+  [Nekhelesh Ramananthan]
+  * Fixed debian packaing failnig due to missing flashback executable file
+
+ -- Nekhelesh Ramananthan <[e-mail]>  Mon, 17 Mar 2014 13:51:18 +0100
+
+flashback (0.3.2) trusty; urgency=medium
+
+  [Nekhelesh Ramananthan]
+  * Added walkthrough feature
+  * Added new home page search function
+  * Improved the visual of detail carousel corner radius
+  * Improved TV Show experience
+
+ -- Nekhelesh Ramananthan <[e-mail]>  Mon, 17 Mar 2014 09:43:01 +0100

=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2014-03-17 12:54:23 +0000
@@ -0,0 +1,1 @@
+9

=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2014-03-17 12:54:23 +0000
@@ -0,0 +1,23 @@
+Source: flashback
+Section: utils
+Priority: extra
+Maintainer: Nekhelesh Ramananthan <[e-mail]>
+Build-Depends: debhelper (>= 9.0.0)
+Standards-Version: 3.9.5
+Homepage: http://launchpad.net/cliffhanger
+Vcs-Bzr: https://code.launchpad.net/~cliffhanger-dev/cliffhanger/trunk
+
+Package: flashback
+Architecture: all
+Depends: ${misc:Depends},
+	 qtdeclarative5-hud1.0,
+	 qtdeclarative5-qtquick2-plugin,
+	 qtdeclarative5-ubuntu-ui-toolkit-plugin,
+	 qtdeclarative5-u1db1.0,
+	 qmlscene
+Description: Flashback application
+ Flashback is an entertainment application that helps you manage your movie 
+ and TV show cravings. It integrates with Trakt and TMDB online services to 
+ provide a variety of features such as discovering new movie, keeping track 
+ of tv shows, adding movies and tv shows to your watchlist to watch later.
+

=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2014-03-17 12:54:23 +0000
@@ -0,0 +1,28 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: flashback
+Source: https://launchpad.net/cliffhanger
+
+Files: *
+Copyright: 2014 Nekhelesh Ramananthan <[e-mail]>
+License: GPL-3.0
+
+Files: debian/*
+Copyright: 2014 Nekhelesh Ramananthan <[e-mail]>
+License: GPL-3.0
+
+License: GPL-3.0
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".

=== added file 'debian/install'
--- debian/install	1970-01-01 00:00:00 +0000
+++ debian/install	2014-03-17 12:54:23 +0000
@@ -0,0 +1,9 @@
+Flashback.desktop usr/share/applications/
+Flashback.qml usr/share/flashback/
+flashback.png usr/share/icons/hicolor/256x256/apps/
+backend usr/share/flashback/
+components usr/share/flashback/
+graphics usr/share/flashback/
+models usr/share/flashback/
+ui usr/share/flashback/
+walkthrough usr/share/flashback/

=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2014-03-17 12:54:23 +0000
@@ -0,0 +1,7 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+	dh $@ 

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2014-03-17 12:54:23 +0000
@@ -0,0 +1,1 @@
+3.0 (native)

=== removed directory 'tests/unit'
=== removed file 'tests/unit/tst_hellocomponent.qml'
--- tests/unit/tst_hellocomponent.qml	2013-11-09 15:54:50 +0000
+++ tests/unit/tst_hellocomponent.qml	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-import QtQuick 2.0
-import QtTest 1.0
-import Ubuntu.Components 0.1
-import "../../components"
-
-// See more details @ http://qt-project.org/doc/qt-5.0/qtquick/qml-testcase.html
-
-// Execute tests with:
-//   qmltestrunner
-
-Item {
-    // The objects
-    HelloComponent {
-        id: objectUnderTest
-    }
-
-    TestCase {
-        name: "HelloComponent"
-
-        function init() {
-            console.debug(">> init");
-            compare("",objectUnderTest.text,"text was not empty on init");
-            console.debug("<< init");
-        }
-
-        function cleanup() {
-            console.debug(">> cleanup");
-            console.debug("<< cleanup");
-        }
-
-        function initTestCase() {
-            console.debug(">> initTestCase");
-            console.debug("<< initTestCase");
-        }
-
-        function cleanupTestCase() {
-            console.debug(">> cleanupTestCase");
-            console.debug("<< cleanupTestCase");
-        }
-
-        function test_canReadAndWriteText() {
-            var expected = "Hello World";
-
-            objectUnderTest.text = expected;
-
-            compare(expected,objectUnderTest.text,"expected did not equal result");
-        }
-    }
-}