Merge lp:~ben-kietzman/ubuntu/quantal/yasm/fix-for-1064341 into lp:ubuntu/quantal/yasm

[Ben Kietzman]

[Jamie Strandboge (jdstrand)]

Thanks for your patch! Unfortunately this patch does not qualify for a stable release update as per https://wiki.ubuntu.com/StableReleaseUpdates#When. I checked Ubuntu 13.04 and it no longer has the error string. Thanks again for your patch.

review: Disapprove

Unmerged revisions

17. By Ben Kietzman on 2012-12-17

Fixed typo. Changed "implimented" to "implemented". (Closes: #1064341)

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-08 23:34:17 +0000
+++ debian/changelog	2012-12-17 18:01:24 +0000
@@ -1,3 +1,9 @@
+yasm (1.1.0-1ubuntu2) quantal; urgency=low
+
+  * Fixed typo.  Changed "implimented" to "implemented". (Closes: #1064341) 
+
+ -- Ben Kietzman <ben@office>  Mon, 17 Dec 2012 11:51:50 -0600
+
 yasm (1.1.0-1build1) quantal; urgency=low
 
   * Rebuild for new armel compiler default of ARMv5t.

=== modified file 'modules/preprocs/gas/gas-preproc.c'
--- modules/preprocs/gas/gas-preproc.c	2011-06-10 01:05:23 +0000
+++ modules/preprocs/gas/gas-preproc.c	2012-12-17 18:01:24 +0000
@@ -636,7 +636,7 @@
                 return 0;
             }
             /* TODO */
-            yasm_error_set(YASM_ERROR_SYNTAX, N_("redefining symbols not yet implimented"), name);
+            yasm_error_set(YASM_ERROR_SYNTAX, N_("redefining symbols not yet implemented"), name);
             yasm_errwarn_propagate(pp->errwarns, pp->current_line_number);
             return 0;
         } else {