Merge lp:~kroq-gar78/ubuntu/precise/lincity-ng/fix-674519 into lp:ubuntu/precise/lincity-ng

[kroq-gar78]

I fixed the typo "electricityand" to "electricity and" in lincity-ng.desktop.

[Daniel Holbach (dholbach)]

Thanks a lot for your work on this.

A few small bits I noticed:
 - the package uses the quilt patch system, so it would be nice if you
   could use edit-patch to make modifications to the actual source code
 - as your change modifies source code (it's not a mere rebuild), it
   would make sense to change the revision in debian/changelog to
   2.0-2ubuntu1 instead of 2.0-2build2.

The change is pretty small and maybe not worth creating a delta between Debian and Ubuntu, so I would suggest you forward the change to lincity-ng.desktop to Upstream. (As Upstream is moving from berlios to fedorahosted, it might be enough to just mail it to this mailing list.)

Thanks again for your work on this. I hope you agree with the suggested course of action. (I'll mark this as 'Disapprove' just to indicate that we don't merge this as-is, but instead forward to Upstream and let the change trickle back from there.)

review: Disapprove

Unmerged revisions

8. By kroq-gar78 on 2012-03-24

lincity-ng.desktop: fix typo "electricityand" (LP: #674519)

=== modified file 'debian/changelog'
--- debian/changelog	2010-09-25 23:52:22 +0000
+++ debian/changelog	2012-03-24 04:03:17 +0000
@@ -1,3 +1,9 @@
+lincity-ng (2.0-2build2) precise; urgency=low
+
+  * lincity-ng.desktop: fix typo "electricityand" (LP: #674519)
+
+ -- Aditya Vaidya <[e-mail]>  Fri, 23 Mar 2012 22:56:17 -0500
+
 lincity-ng (2.0-2build1) maverick; urgency=low
 
   * Rebuild against new libphysfs (LP: #614067)

=== modified file 'lincity-ng.desktop'
--- lincity-ng.desktop	2007-12-05 05:13:23 +0000
+++ lincity-ng.desktop	2012-03-24 04:03:17 +0000
@@ -5,7 +5,7 @@
 Name=Lincity-NG
 GenericName=City Simulation Game
 GenericName[de]=Stadtsimulationsspiel
-Comment=Plan and Build a city and take care of transport, economics, electricityand others.
+Comment=Plan and Build a city and take care of transport, economics, electricity and others.
 Icon=lincity-ng.png
 Exec=lincity-ng
 Terminal=false