Merge lp:~jeffreytremaine/ubuntu/precise/balazarbrothers/fix-829819 into lp:ubuntu/precise/balazarbrothers

[Jeffrey Tremaine]

Spelling update in control file (LP: #829819)

[Bryce Harrington (bryce)]

Looks like this got accepted in debian and we can just sync it in once it appears in their package. No need for a ubuntu-only patch for this one.

review: Disapprove

Unmerged revisions

7. By Jeffrey Tremaine <email address hidden> on 2012-05-17

debian/patches/control-patch.patch: Fixed spelling error (LP #829819)

=== modified file 'debian/changelog'
--- debian/changelog	2010-07-16 12:26:33 +0000
+++ debian/changelog	2012-05-17 05:08:24 +0000
@@ -1,3 +1,9 @@
+balazarbrothers (1.0~rc1-4.1ubuntu1) oneiric; urgency=low
+
+  * debian/patches/control-patch.patch: Fixed spelling error (LP #829819)
+
+ -- Jeff Tremaine <jtremaine@jeff-ubuntu-vm>  Wed, 16 May 2012 21:52:16 -0700
+
 balazarbrothers (1.0~rc1-4.1) unstable; urgency=low
 
   * Non-maintainer upload.

=== added file 'debian/patches/control-patch.patch'
--- debian/patches/control-patch.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/control-patch.patch	2012-05-17 05:08:24 +0000
@@ -0,0 +1,16 @@
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+Index: balazarbrothers/debian/control
+===================================================================
+--- balazarbrothers.orig/debian/control	2012-05-16 21:52:07.290648009 -0700
++++ balazarbrothers/debian/control	2012-05-16 21:51:52.510833814 -0700
+@@ -21,7 +21,7 @@
+  Simple? Yes! Easy? Not sure! Because nothing will
+  be spared to you: moving platforms, dangerous
+  monsters, vicious traps... will you manage to find
+- your way trough mad levels and free the princesses?
++ your way through mad levels and free the princesses?
+  You can count only on your agility, your guile...
+  and the unforgettable acrobatics of the Balazar
+  Brothers!

=== modified file 'debian/patches/series'
--- debian/patches/series	2007-07-01 15:15:55 +0000
+++ debian/patches/series	2012-05-17 05:08:24 +0000
@@ -1,1 +1,2 @@
 no_bytecompilation.patch
+control-patch.patch