Control: tags -1 + patch

On 15-Mar-2015, Ben Finney wrote:
> The file mentioned (and one other in the package) contains the term
> “shit” to refer vaguely to some thing, which is puerile and
> unhelpful to the purpose. It is unwelcoming because it uses
> vulgarity merely as emphasis. It can easily be improved by choosing
> a more descriptive, emotionally neutral term instead.

Attached is a patch for an alternative solution: improving the package
by choosing better terms.

-- 
 \        “Pinky, are you pondering what I'm pondering?” “Umm, I think |
  `\       so, Brain, but three men in a tub? Ooh, that's unsanitary!” |
_o__)                                           —_Pinky and The Brain_ |
Ben Finney <b...@benfinney.id.au>
=== modified file 'debian/changelog'
--- old/debian/changelog	revid:ben+deb...@benfinney.id.au-20150315033931-fu4edqyat9nbw44r
+++ new/debian/changelog	2015-03-15 04:33:02 +0000
@@ -1,3 +1,12 @@
+yasnippet (0.6.1c-2) UNRELEASED; urgency=low
+
+  [ Ben Finney ]  
+  
+  * Improve unhelpful and puerile terms, to be more descriptive.
+    (Closes: bug#592645)
+
+ --
+
 yasnippet (0.6.1c-1) unstable; urgency=low
 
   * New upstream release

=== added file 'debian/patches/improve-unhelpful-terms'
--- old/debian/patches/improve-unhelpful-terms	1970-01-01 00:00:00 +0000
+++ new/debian/patches/improve-unhelpful-terms	2015-03-15 04:36:44 +0000
@@ -0,0 +1,42 @@
+Author: Ben Finney <ben+deb...@benfinney.id.au>
+Description: Improve some unhelpful terms in the source.
+ Upstream makes use of the puerile term “shit” to vaguely refer to
+ unspecified things. This patch improves the terms to be more
+ descriptive and emotionally neutral.
+Bug: https://bugs.debian.org/592645
+===================================================================
+=== modified file 'snippets/text-mode/html-mode/dov'
+--- old/snippets/text-mode/html-mode/dov	revid:ben+deb...@benfinney.id.au-20150315033931-fu4edqyat9nbw44r
++++ new/snippets/text-mode/html-mode/dov	2015-03-15 03:59:38 +0000
+@@ -3,9 +3,9 @@
+ a mirror up here $3
+ 
+ 
+-<dov ${1:id="${2:some_id and here comes another nested field: ${3:nested_shit}}"}>
++<dov ${1:id="${2:some_id and here comes another nested field: ${3:nested_value}}"}>
+     $0
+ </dov>
+ <dov $1>
+-    actually some other shit and $3
++    actually some other text and $3
+ </dov>
+
+=== modified file 'yasnippet.el'
+--- old/yasnippet.el	revid:ben+deb...@benfinney.id.au-20150315033931-fu4edqyat9nbw44r
++++ new/yasnippet.el	2015-03-15 04:24:45 +0000
+@@ -3473,11 +3473,11 @@
+ ;; some useful debug code for looking up snippet tables
+ ;;
+ ;; (insert (pp
+-;; (let ((shit))
++;; (let ((value))
+ ;;   (maphash #'(lambda (k v)
+-;;             (push k shit))
++;;             (push k value))
+ ;;         (yas/snippet-table-hash (gethash 'ruby-mode yas/snippet-tables)))
+-;;   shit)))
++;;   value)))
+ ;;
+ 
+ (defun yas/debug-tables ()
+

=== modified file 'debian/patches/series'
--- old/debian/patches/series	revid:ben+deb...@benfinney.id.au-20150315033931-fu4edqyat9nbw44r
+++ new/debian/patches/series	2015-03-15 04:32:01 +0000
@@ -1,1 +1,2 @@
 add-missing-css-files
+improve-unhelpful-terms

Attachment: signature.asc
Description: Digital signature

Reply via email to