Merge lp:~dpm/sudoku-app/rename into lp:~dinko-metalac/sudoku-app/trunk

Proposed by David Planella on 2013-06-14
Status: Merged
Approved by: Dinko Osmankovic on 2013-06-14
Approved revision: 42
Merged at revision: 41
Proposed branch: lp:~dpm/sudoku-app/rename
Merge into: lp:~dinko-metalac/sudoku-app/trunk
Prerequisite: lp:~dpm/sudoku-app/clean-unused
Diff against target: 166 lines (+43/-26)
9 files modified
debian/changelog (+6/-0)
debian/compat (+1/-1)
debian/control (+16/-6)
debian/copyright (+4/-4)
debian/sudoku-app.install (+6/-5)
sudoku-app (+1/-1)
sudoku-app.desktop (+4/-4)
sudoku-app.qml (+4/-4)
sudoku-app.qmlproject (+1/-1)
To merge this branch: bzr merge lp:~dpm/sudoku-app/rename
Reviewer Review Type Date Requested Status
Dinko Osmankovic 2013-06-14 Approve on 2013-06-14
Review via email: mp+169359@code.launchpad.net

Commit message

Renamed files and package to sudoku-app to be inline with other core apps

Description of the change

Renamed files and package to sudoku-app to be inline with other core apps

To post a comment you must log in.
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2013-06-05 14:46:42 +0000
+++ debian/changelog 2013-06-14 08:01:27 +0000
@@ -1,3 +1,9 @@
1sudoku-app (0.4) raring; urgency=low
2
3 * Renamed files and package to sudoku-app
4
5 -- David Planella <david.planella@ubuntu.com> Fri, 14 Jun 2013 09:45:53 +0200
6
1sudokutouchgame (0.3ubuntu3) raring; urgency=low7sudokutouchgame (0.3ubuntu3) raring; urgency=low
28
3 * Animation changed to UbuntuAnimation9 * Animation changed to UbuntuAnimation
410
=== modified file 'debian/compat'
--- debian/compat 2013-04-26 08:01:21 +0000
+++ debian/compat 2013-06-14 08:01:27 +0000
@@ -1,1 +1,1 @@
1819
22
=== modified file 'debian/control'
--- debian/control 2013-04-26 20:54:41 +0000
+++ debian/control 2013-06-14 08:01:27 +0000
@@ -1,13 +1,23 @@
1Source: sudokutouchgame1Source: sudoku-app
2Section: games2Section: games
3Priority: extra3Priority: extra
4Maintainer: Dinko Osmankovic <dinko.metalac@gmail.com>4Maintainer: Dinko Osmankovic <dinko.metalac@gmail.com>
5Build-Depends: debhelper (>= 8.0.0)5Build-Depends: debhelper (>= 9),
6Standards-Version: 3.9.36 gettext,
7Homepage: <https://launchpad.net/sudokutouchgame>7Standards-Version: 3.9.4
8Homepage: http://launchpad.net/sudoku-app
9Vcs-Bzr: https://code.launchpad.net/~sudoku-touch-dev/sudoku-app/trunk
810
9Package: sudokutouchgame11Package: sudoku-app
12Section: misc
10Architecture: all13Architecture: all
11Depends: ${misc:Depends},qtdeclarative5-localstorage-plugin,qtdeclarative5-particles-plugin,qtdeclarative5-qtquick2-plugin,qtdeclarative5-ubuntu-ui-toolkit-plugin|qt-components-ubuntu,qtdeclarative5-window-plugin,qtdeclarative5-xmllistmodel-plugin,${shlibs:Depends},qmlscene14Depends: ${misc:Depends},
15 qmlscene,
16 qtdeclarative5-qtquick2-plugin,
17 qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
18 qtdeclarative5-localstorage-plugin,
19 qtdeclarative5-particles-plugin,
20 qtdeclarative5-window-plugin,
21 qtdeclarative5-xmllistmodel-plugin,
12Description: Sudoku game for Ubuntu devices22Description: Sudoku game for Ubuntu devices
13 Simple Sudoku Touch game written in QML2/JS using Ubuntu SDK23 Simple Sudoku Touch game written in QML2/JS using Ubuntu SDK
1424
=== modified file 'debian/copyright'
--- debian/copyright 2013-04-26 20:54:41 +0000
+++ debian/copyright 2013-06-14 08:01:27 +0000
@@ -1,13 +1,13 @@
1Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/1Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
2Upstream-Name: sudokutouchgame2Upstream-Name: sudoku-app
3Source: https://launchpad.net/sudokutouchgame3Source: https://launchpad.net/sudoku-app
44
5Files: *5Files: *
6Copyright: <2013> <Dinko Osmankovic dinko.metalac@gmail.com>6Copyright: 2013 Dinko Osmankovic <dinko.metalac@gmail.com>
7License: GPL-3.0+7License: GPL-3.0+
88
9Files: debian/*9Files: debian/*
10Copyright: <2013> <Dinko Osmankovic dinko.metalac@gmail.com>10Copyright: 2013 Dinko Osmankovic <dinko.metalac@gmail.com>
11License: GPL-3.0+11License: GPL-3.0+
1212
13License: GPL-3.0+13License: GPL-3.0+
1414
=== renamed file 'debian/install' => 'debian/sudoku-app.install'
--- debian/install 2013-04-28 13:13:20 +0000
+++ debian/sudoku-app.install 2013-06-14 08:01:27 +0000
@@ -1,5 +1,6 @@
1*.qml /usr/share/sudokutouchgame1sudoku-app.desktop /usr/share/applications
2*.js /usr/share/sudokutouchgame2sudoku-app /usr/bin
3*.png /usr/share/sudokutouchgame3*.qml /usr/share/sudoku-app
4icons /usr/share/sudokutouchgame4*.js /usr/share/sudoku-app
5SudokuTouch.desktop /usr/share/applications5*.png /usr/share/sudoku-app
6icons /usr/share/sudoku-app
67
=== renamed file 'po/messages.pot' => 'po/sudoku-app.pot'
=== renamed file 'SudokuTouch' => 'sudoku-app'
--- SudokuTouch 2013-04-26 10:10:00 +0000
+++ sudoku-app 2013-06-14 08:01:27 +0000
@@ -1,2 +1,2 @@
1#!/bin/bash1#!/bin/bash
2qmlscene /usr/share/sudokutouchgame/SudokuTouch.qml2qmlscene /usr/share/sudoku-app/sudoku-app.qml
33
=== renamed file 'SudokuTouch.desktop' => 'sudoku-app.desktop'
--- SudokuTouch.desktop 2013-04-27 11:33:55 +0000
+++ sudoku-app.desktop 2013-06-14 08:01:27 +0000
@@ -1,10 +1,10 @@
1[Desktop Entry]1[Desktop Entry]
2Name=SudokuTouch2Name=Sudoku
3Encoding=UTF-83Encoding=UTF-8
4Version=1.04Version=1.0
5Comment=SudokuTouch Game for Ubuntu Touch5Comment=Sudoku Game for Ubuntu Touch
6Exec=qmlscene /usr/share/sudokutouchgame/SudokuTouch.qml6Exec=qmlscene /usr/share/sudoku-app/sudoku-app.qml
7Icon=/usr/share/sudokutouchgame/SudokuGameIcon.png7Icon=/usr/share/sudoku-app/SudokuGameIcon.png
8Terminal=false8Terminal=false
9Type=Application9Type=Application
10X-Ubuntu-Touch=true10X-Ubuntu-Touch=true
1111
=== renamed file 'SudokuTouch.qml' => 'sudoku-app.qml'
--- SudokuTouch.qml 2013-05-27 20:07:38 +0000
+++ sudoku-app.qml 2013-06-14 08:01:27 +0000
@@ -7,8 +7,8 @@
7MainView {7MainView {
8 id: mainView8 id: mainView
9 // objectName for functional testing purposes (autopilot-qt5)9 // objectName for functional testing purposes (autopilot-qt5)
10 objectName: "Sudoku Touch"10 objectName: "sudoku"
11 applicationName: "SudokuTouch"11 applicationName: "sudoku-app"
1212
13 property real pageWidth: units.gu(40);13 property real pageWidth: units.gu(40);
14 property real pageHeight: units.gu(71);14 property real pageHeight: units.gu(71);
@@ -93,7 +93,7 @@
93 id: mainTab;93 id: mainTab;
94 objectName: "MainTab"94 objectName: "MainTab"
9595
96 title: i18n.tr("SudokuTouch Game")96 title: i18n.tr("Sudoku")
9797
98 Timer {98 Timer {
99 id: winTimer;99 id: winTimer;
@@ -402,7 +402,7 @@
402 anchors.horizontalCenter: parent.horizontalCenter;402 anchors.horizontalCenter: parent.horizontalCenter;
403 Label {403 Label {
404 font.bold: true;404 font.bold: true;
405 text: "https://launchpad.net/sudokutouchgame"405 text: "https://launchpad.net/sudoku-app"
406 }406 }
407 }407 }
408 }408 }
409409
=== renamed file 'SudokuTouch.qmlproject' => 'sudoku-app.qmlproject'
--- SudokuTouch.qmlproject 2013-02-26 01:05:17 +0000
+++ sudoku-app.qmlproject 2013-06-14 08:01:27 +0000
@@ -3,7 +3,7 @@
3import QmlProject 1.13import QmlProject 1.1
44
5Project {5Project {
6 mainFile: "SudokuTouch.qml"6 mainFile: "sudoku-app.qml"
7 7
8 /* Include .qml, .js, and image files from current directory and subdirectories */8 /* Include .qml, .js, and image files from current directory and subdirectories */
9 QmlFiles {9 QmlFiles {

Subscribers

People subscribed via source and target branches