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
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-06-05 14:46:42 +0000
3+++ debian/changelog 2013-06-14 08:01:27 +0000
4@@ -1,3 +1,9 @@
5+sudoku-app (0.4) raring; urgency=low
6+
7+ * Renamed files and package to sudoku-app
8+
9+ -- David Planella <david.planella@ubuntu.com> Fri, 14 Jun 2013 09:45:53 +0200
10+
11 sudokutouchgame (0.3ubuntu3) raring; urgency=low
12
13 * Animation changed to UbuntuAnimation
14
15=== modified file 'debian/compat'
16--- debian/compat 2013-04-26 08:01:21 +0000
17+++ debian/compat 2013-06-14 08:01:27 +0000
18@@ -1,1 +1,1 @@
19-8
20+9
21
22=== modified file 'debian/control'
23--- debian/control 2013-04-26 20:54:41 +0000
24+++ debian/control 2013-06-14 08:01:27 +0000
25@@ -1,13 +1,23 @@
26-Source: sudokutouchgame
27+Source: sudoku-app
28 Section: games
29 Priority: extra
30 Maintainer: Dinko Osmankovic <dinko.metalac@gmail.com>
31-Build-Depends: debhelper (>= 8.0.0)
32-Standards-Version: 3.9.3
33-Homepage: <https://launchpad.net/sudokutouchgame>
34+Build-Depends: debhelper (>= 9),
35+ gettext,
36+Standards-Version: 3.9.4
37+Homepage: http://launchpad.net/sudoku-app
38+Vcs-Bzr: https://code.launchpad.net/~sudoku-touch-dev/sudoku-app/trunk
39
40-Package: sudokutouchgame
41+Package: sudoku-app
42+Section: misc
43 Architecture: all
44-Depends: ${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},qmlscene
45+Depends: ${misc:Depends},
46+ qmlscene,
47+ qtdeclarative5-qtquick2-plugin,
48+ qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
49+ qtdeclarative5-localstorage-plugin,
50+ qtdeclarative5-particles-plugin,
51+ qtdeclarative5-window-plugin,
52+ qtdeclarative5-xmllistmodel-plugin,
53 Description: Sudoku game for Ubuntu devices
54 Simple Sudoku Touch game written in QML2/JS using Ubuntu SDK
55
56=== modified file 'debian/copyright'
57--- debian/copyright 2013-04-26 20:54:41 +0000
58+++ debian/copyright 2013-06-14 08:01:27 +0000
59@@ -1,13 +1,13 @@
60 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
61-Upstream-Name: sudokutouchgame
62-Source: https://launchpad.net/sudokutouchgame
63+Upstream-Name: sudoku-app
64+Source: https://launchpad.net/sudoku-app
65
66 Files: *
67-Copyright: <2013> <Dinko Osmankovic dinko.metalac@gmail.com>
68+Copyright: 2013 Dinko Osmankovic <dinko.metalac@gmail.com>
69 License: GPL-3.0+
70
71 Files: debian/*
72-Copyright: <2013> <Dinko Osmankovic dinko.metalac@gmail.com>
73+Copyright: 2013 Dinko Osmankovic <dinko.metalac@gmail.com>
74 License: GPL-3.0+
75
76 License: GPL-3.0+
77
78=== renamed file 'debian/install' => 'debian/sudoku-app.install'
79--- debian/install 2013-04-28 13:13:20 +0000
80+++ debian/sudoku-app.install 2013-06-14 08:01:27 +0000
81@@ -1,5 +1,6 @@
82-*.qml /usr/share/sudokutouchgame
83-*.js /usr/share/sudokutouchgame
84-*.png /usr/share/sudokutouchgame
85-icons /usr/share/sudokutouchgame
86-SudokuTouch.desktop /usr/share/applications
87+sudoku-app.desktop /usr/share/applications
88+sudoku-app /usr/bin
89+*.qml /usr/share/sudoku-app
90+*.js /usr/share/sudoku-app
91+*.png /usr/share/sudoku-app
92+icons /usr/share/sudoku-app
93
94=== renamed file 'po/messages.pot' => 'po/sudoku-app.pot'
95=== renamed file 'SudokuTouch' => 'sudoku-app'
96--- SudokuTouch 2013-04-26 10:10:00 +0000
97+++ sudoku-app 2013-06-14 08:01:27 +0000
98@@ -1,2 +1,2 @@
99 #!/bin/bash
100-qmlscene /usr/share/sudokutouchgame/SudokuTouch.qml
101+qmlscene /usr/share/sudoku-app/sudoku-app.qml
102
103=== renamed file 'SudokuTouch.desktop' => 'sudoku-app.desktop'
104--- SudokuTouch.desktop 2013-04-27 11:33:55 +0000
105+++ sudoku-app.desktop 2013-06-14 08:01:27 +0000
106@@ -1,10 +1,10 @@
107 [Desktop Entry]
108-Name=SudokuTouch
109+Name=Sudoku
110 Encoding=UTF-8
111 Version=1.0
112-Comment=SudokuTouch Game for Ubuntu Touch
113-Exec=qmlscene /usr/share/sudokutouchgame/SudokuTouch.qml
114-Icon=/usr/share/sudokutouchgame/SudokuGameIcon.png
115+Comment=Sudoku Game for Ubuntu Touch
116+Exec=qmlscene /usr/share/sudoku-app/sudoku-app.qml
117+Icon=/usr/share/sudoku-app/SudokuGameIcon.png
118 Terminal=false
119 Type=Application
120 X-Ubuntu-Touch=true
121
122=== renamed file 'SudokuTouch.qml' => 'sudoku-app.qml'
123--- SudokuTouch.qml 2013-05-27 20:07:38 +0000
124+++ sudoku-app.qml 2013-06-14 08:01:27 +0000
125@@ -7,8 +7,8 @@
126 MainView {
127 id: mainView
128 // objectName for functional testing purposes (autopilot-qt5)
129- objectName: "Sudoku Touch"
130- applicationName: "SudokuTouch"
131+ objectName: "sudoku"
132+ applicationName: "sudoku-app"
133
134 property real pageWidth: units.gu(40);
135 property real pageHeight: units.gu(71);
136@@ -93,7 +93,7 @@
137 id: mainTab;
138 objectName: "MainTab"
139
140- title: i18n.tr("SudokuTouch Game")
141+ title: i18n.tr("Sudoku")
142
143 Timer {
144 id: winTimer;
145@@ -402,7 +402,7 @@
146 anchors.horizontalCenter: parent.horizontalCenter;
147 Label {
148 font.bold: true;
149- text: "https://launchpad.net/sudokutouchgame"
150+ text: "https://launchpad.net/sudoku-app"
151 }
152 }
153 }
154
155=== renamed file 'SudokuTouch.qmlproject' => 'sudoku-app.qmlproject'
156--- SudokuTouch.qmlproject 2013-02-26 01:05:17 +0000
157+++ sudoku-app.qmlproject 2013-06-14 08:01:27 +0000
158@@ -3,7 +3,7 @@
159 import QmlProject 1.1
160
161 Project {
162- mainFile: "SudokuTouch.qml"
163+ mainFile: "sudoku-app.qml"
164
165 /* Include .qml, .js, and image files from current directory and subdirectories */
166 QmlFiles {

Subscribers

People subscribed via source and target branches