Update acronyms from NetBSD.

Closes: #798185

debian/patches/0002-wtf-Add-acronyms-and-sort-them-alphabetically.patch

@@ -1,214 +0,0 @@
-From: Tobias Quathamer <toddy@debian.org>
-Date: Thu, 16 Feb 2012 11:26:48 +0100
-Subject: wtf: Add acronyms and sort them alphabetically
-
----
- wtf/acronyms      |  8 ++++++++
- wtf/acronyms.comp | 28 +++++++++++++++++++++-------
- 2 files changed, 29 insertions(+), 7 deletions(-)
-
-diff --git a/wtf/acronyms b/wtf/acronyms
-index 5baeef2..202bf15 100644
---- a/wtf/acronyms
-+++ b/wtf/acronyms
-@@ -87,6 +87,7 @@ HHIS	hanging head in shame
- HICA	here it comes again
- HTH	hope this helps
- IAC	in any case
-+IANADD	I am not a Debian developer
- IANAL	I am not a lawyer
- IC	I see
- ICBW	I could be wrong
-@@ -139,6 +140,8 @@ NFC	no fucking clue
- NFI	no fucking idea
- NFW	no fucking way
- NIH	not invented here
-+NIMB	not in my backyard
-+NIMBY	not in my backyard
- NMF	not my fault
- NMP	not my problem
- NOYB	none of your business
-@@ -146,6 +149,7 @@ NOYFB	none of your fucking business
- NP	no problem
- NRFPT	not ready for prime time
- NRN	no reply necessary
-+NSFW	not safe for work
- OIC	oh, I see
- OMG	oh, my god
- OT	off topic
-@@ -187,6 +191,7 @@ SEP	someone else's problem
- SFA	sweet fuck all
- SHID	slaps head in disgust
- SIMCA	sitting in my chair amused
-+SIYH	sooner if you help
- SMLSFB	so many losers, so few bullets
- SMOP	simple matter of programming
- SNAFU	situation normal, all fucked up
-@@ -212,7 +217,9 @@ TBOMK	the best of my knowledge
- THNX	thanks
- THX	thanks
- TIA	thanks in advance
-+TINASOTODP	this is not a statement of the official Debian position
- TINC	there is no cabal
-+TINLA	this is not legal advice
- TLA	three letter acronym
- TLB	translation lookaside buffer
- TMA	too many abbreviations
-@@ -237,6 +244,7 @@ WB	welcome back
- WFM	works for me
- WIBNI	wouldn't it be nice if
- WIP	work in progress
-+WIR	when it's ready
- WOFTAM	waste of fucking time and money
- WOMBAT	waste of money, brain, and time
- WRT	with respect to
-diff --git a/wtf/acronyms.comp b/wtf/acronyms.comp
-index 6f2b66f..c5283c4 100644
---- a/wtf/acronyms.comp
-+++ b/wtf/acronyms.comp
-@@ -17,8 +17,8 @@ APIC	advanced programmable interrupt controller
- ARP	address resolution protocol
- ARQ	automatic repeat request
- AS	autonomous system
--ASN	autonomous system number
- ASCII	american standard code for information interchange
-+ASN	autonomous system number
- AT	advanced technology
- ATA	advanced technology attachment
- ATAPI	advanced technology attachment packet interface
-@@ -62,7 +62,9 @@ DAC	digital [to] analog converter
- DCE	data control equipment
- DCE	distributed computing environment
- DCT	discrete cosine transform
-+DD	Debian developer
- DDC	display data channel
-+DDPO	Debian developer's package overview (http://qa.debian.org/developer.php)
- DDR	double data rate
- DDWG	digital display working group
- DER	distinguished encoding rules
-@@ -83,6 +85,7 @@ DTE	data terminal equipment
- DTE	dumb terminal emulator
- DVD	digital versatile disc
- DVI	digital visual interface
-+E-XER	extended XML encoding rules
- ECP	enhanced capability port
- EDID	extended display identification data
- EDO	extended data out
-@@ -96,7 +99,6 @@ EPP	enhanced parallel port
- EPRML	extended partial response, maximum likelihood
- EPROM	erasable programmable read only memory
- ESDRAM	enhanced synchronous dynamic random access memory
--E-XER	extended XML encoding rules
- FAT	file allocation table
- FBRAM	frame buffer random access memory
- FCS	frame check sequence
-@@ -108,12 +110,14 @@ FLOPS	floating [point] operations per second
- FM	frequency modulation
- FPM	fast page mode
- FQDN	fully qualified domain name
-+FTBFS	fails to build from source
- FTP	file transfer protocol
- GC	garbage collector
- GCR	group-coded recording
- GIF	graphics interchange format
--GNU	gnu's not unix
--GPL	gnu/general public license
-+GIYF	google is your friend
-+GNU	GNU's not unix
-+GPL	GNU general public license
- GPU	graphics processing unit
- GRE	generic routing encapsulation
- GUI	graphics user interface
-@@ -135,10 +139,10 @@ IGP	interior gateway protocol
- IKE	internet key exchange
- IMAP	internet mail access protocol
- INCITS	international committee on information technology standards
--IPC	interprocess communication
- IO	input/output
- IOCTL	input/output control
- IP	internet protocol
-+IPC	interprocess communication
- IPNG	internet protocol, next generation
- IPSEC	internet protocol security
- IRC	internet relay chat
-@@ -152,6 +156,7 @@ ISN	initial serial number
- ISO	international standards organization
- ISOC	internet society
- ISP	internet service provider
-+JFGI	just fucking google it
- JPEG	joint photographic experts group
- KVA	kernel virtual address
- LAN	local area network
-@@ -160,6 +165,7 @@ LCD	liquid crystal display
- LCP	link control protocol
- LDAP	lightweight directory access protocol
- LED	light emitting diode
-+LGPL	GNU lesser general public license
- LIR	local internet registry
- LLC	logical link control
- LRC	longitudinal redundancy check
-@@ -174,7 +180,9 @@ MIDI	musical instrument digital interface
- MIME	multipurpose internet mail extensions
- MIPS	million instructions per second
- MMU	memory management unit
-+MOTU	masters of the universe (Ubuntu developer)
- MPEG	moving picture experts group
-+MPL	Mozilla public license
- MSB	most significant bit [or: byte]
- MSF	minutes seconds frames
- MSS	maximum segment size
-@@ -205,8 +213,8 @@ PC	personal computer
- PCI	peripheral component interconnect
- PCM	pulse code modulation
- PCMCIA	personal computer memory card international association
--PDU	protocol data unit
- PDP	page descriptor page
-+PDU	protocol data unit
- PER	packed encoding rules
- PERL	practical extraction [and] report language
- PGP	pretty good privacy
-@@ -226,16 +234,17 @@ PPPOA	point-to-point protocol over ATM
- PPPOE	point-to-point protocol over ethernet
- PRML	partial response, maximum likelihood
- PROM	programmable read only memory
-+PSTN	public switched telephone network
- PTE	page table entry
- PTLA	pseudo top level aggregator
- PTP	page table page
--PSTN	public switched telephone network
- PWM	pulse width modulation
- QOS	quality of service
- RAID	redundant array of inexpensive disks
- RAM	random access memory
- RCS	revision control system
- RFC	request for comments
-+RFS	request for sponsorship
- RGB	red green blue
- RIP	routing information protocol
- RIR	regional internet registry
-@@ -246,6 +255,9 @@ ROM	read only memory
- RPM	revolutions per minute
- RTF	rich text format
- RTS	request to send
-+RTSL	read the source, Luke (open source programming)
-+RTSL	real-time shading language (Stanford University)
-+RTSL	real-time systems laboratory
- RTT	round time trip
- S/PDIF	sony/phillips digital interface
- SACD	super audio compact disc
-@@ -265,6 +277,7 @@ SMTP	simple mail transfer protocol
- SNMP	simple network management protocol
- SPD	serial presence detect
- SRAM	static random access memory
-+SRU	stable release update
- SSFDC	solid state floppy disc card
- SSH	secure shell
- SSL	secure sockets layer
-@@ -296,6 +309,7 @@ USART	universal synchronous/asynchronous receiver/transmitter
- USB	universal serial bus
- USWC	uncacheable speculative write combining
- UTP	unshielded twisted pair
-+UTSL	use the source, Luke (open source programming)
- UUCP	unix-to-unix copy protocol
- VAX	virtual address extension
- VCM	virtual channel memory

debian/patches/0012-wtf-Add-NMU.-Closes-574036.patch

@@ -1,20 +0,0 @@
-From: Tobias Quathamer <toddy@debian.org>
-Date: Thu, 16 Feb 2012 13:26:25 +0100
-Subject: wtf: Add NMU. Closes: #574036
-
----
- wtf/acronyms.comp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/wtf/acronyms.comp b/wtf/acronyms.comp
-index c5283c4..e365d72 100644
---- a/wtf/acronyms.comp
-+++ b/wtf/acronyms.comp
-@@ -196,6 +196,7 @@ NCP	network control protocol
- NFS	network file system
- NIC	network interface card
- NIS	network information service
-+NMU	Non-maintainer upload
- NRZ	non-return to zero
- NUMA	non uniform memory access
- OCL	object constraint language

debian/patches/0016-Add-Debian-acronyms.patch

@@ -0,0 +1,32 @@
+From: "Dr. Tobias Quathamer" <toddy@debian.org>
+Date: Thu, 26 Apr 2018 14:58:17 +0200
+Subject: Add Debian acronyms
+
+---
+ wtf/acronyms.comp | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/wtf/acronyms.comp b/wtf/acronyms.comp
+index e27697c..026547e 100644
+--- a/wtf/acronyms.comp
++++ b/wtf/acronyms.comp
+@@ -1472,3 +1472,19 @@ ZFOD	zero-filled on demand
+ ZIF	zero insertion force
+ ZIFS	zero insertion force socket
+ ZMA	zone multicast address
++DD	Debian developer
++DDPO	Debian developer's package overview (https://qa.debian.org/developer.php)
++IANADD	I am not a Debian developer
++JFGI	just fucking google it
++LGPL	GNU lesser general public license
++MOTU	masters of the universe (Ubuntu developer)
++MPL	Mozilla public license
++NMU	Non-maintainer upload
++RFS	request for sponsorship
++RTSL	read the source, Luke (open source programming)
++RTSL	real-time shading language (Stanford University)
++RTSL	real-time systems laboratory
++SIYH	sooner if you help
++SRU	stable release update
++TINASOTODP	this is not a statement of the official Debian position
++WIR	when it's ready

debian/patches/series

@@ -1,5 +1,4 @@
 0001-Replace-getline-with-get_line.patch
-0002-wtf-Add-acronyms-and-sort-them-alphabetically.patch
 0003-robots-Refresh-screen.patch
 0004-quiz-Update-presidents-capitals-fix-typos-in-murders.patch
 0005-Define-__dead-for-GNU-GCC.patch
@@ -9,8 +8,9 @@
 0009-quiz-Add-answers-to-adults-babies.-Closes-659528.patch
 0010-primes-Update-to-NetBSD-CVS-2012-02-16.patch
 0011-primes-Document-maximum-number-in-manpage.-Closes-63.patch
-0012-wtf-Add-NMU.-Closes-574036.patch
 0013-hangman-Error-out-on-1000-unsuitable-words.-Closes-6.patch
 0014-Fix-typos-spotted-by-Lintian.patch
 0015-Fix-format-security-compiling-errors.patch
 0016-Fix-include-stdio.h-C-incompatibility.patch
+0015-Update-acronyms.patch
+0016-Add-Debian-acronyms.patch