Merge lp:~chriskingnet/ubuntu/saucy/ri-li/bug-858553 into lp:ubuntu/saucy/ri-li

[Chris King]

Fixed some spelling and grammar mistakes in the debian control file text.

[Martin Pitt (pitti)]

Thank you for this. Can you please send these updates to Debian instead? http://www.debian.org/Bugs/Reporting

We don't want to carry a delta in Ubuntu just for this little typo, and Debian will also benefit from fixing it.

Also, please undo your line wrapping changes in the "14 languages" lines. Package descriptions must not be wider than 72 characters.

Thank you!

review: Disapprove

[Martin Pitt (pitti)]

Please also see https://code.launchpad.net/~paulbrianstewart/ubuntu/oneiric/ri-li/858553-Spelling-Error-Fix/+merge/76874

[Chris King (chriskingnet)]

Thanks for the feedback!

I have submitted a debian bug report for this issue, and will make the changes, as you have said. As there was no issue already for this in debian, would it be correct for me to disregard the other merge request you posted above, and send my own update over to debian?

Thanks!

Debian issue: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=714015

[Martin Pitt (pitti)]

Perfect, thank you! The Debian bug report/patch looks fine, I linked it to the Ubuntu bug. You can disregard the other MP of course, I just linked here for reference.

Unmerged revisions

5. By Chris King <email address hidden> on 2013-06-23

Fixed spelling and grammar errors (LP: #858553)

=== modified file 'debian/changelog'
--- debian/changelog	2008-04-20 21:32:04 +0000
+++ debian/changelog	2013-06-23 17:58:21 +0000
@@ -1,3 +1,9 @@
+ri-li (2.0.1-2ubuntu1) UNRELEASED; urgency=low
+
+  * Fixed spelling and grammar errors (LP: #858553)
+
+ -- Chris King <[e-mail]>  Sun, 23 Jun 2013 14:19:08 +0200
+
 ri-li (2.0.1-2) unstable; urgency=low
 
   [ Barry deFreese ]

=== modified file 'debian/control'
--- debian/control	2008-04-20 21:32:04 +0000
+++ debian/control	2013-06-23 17:58:21 +0000
@@ -14,16 +14,14 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ri-li-data (>= ${source:Version})
 Description: a toy train simulation game
- Ri-Li is a game in which you drive a toy wood engine across many levels 
- and collect all the coaches to win.
+ Ri-Li is a game in which you drive a toy wooden steam engine across many levels 
+ and collect all of the coaches to win.
  .
  Full-features:
-  - 14 languages: Arabic, Breton, Chinese, English, Esperanto, French,
-  German, Italian, Japanese, Portuguese, Russian, Slovak,
-  Spanish, Swedish.
-  - Colorful animated wood engine.
-  - 40 levels in this first version
-  - 3 beautiful musics and many sound effects.
+  - 14 languages: Arabic, Breton, Chinese, English, Esperanto, French, German, Italian, Japanese, Portuguese, Russian, Slovak, Spanish, Swedish.
+  - Colorful, animated wooden steam engine.
+  - 40 levels in this first version.
+  - 3 beautiful music tunes and many sound effects.
 
 Package: ri-li-data
 Recommends: ri-li