misc: Move merchandise into the events/ section

There is currently no better place for the merchandise page, which would
be better served by some kind of publicity section, but as there's no
such thing, and no consensus there should be, let's move it to the
closest section we have already, which is under events/, even though it
is just a subset of the uses where merchindise might be relevant.

This makes it possible to finally get rid of the misc/ section.

Closes: #924888

6 files changed, 332 insertions, 1 deletions

diff --git a/english/events/Makefile b/english/events/Makefile
index d94acbff24c..acd763b795d 100644
--- a/english/events/Makefile
+++ b/english/events/Makefile
@@ -8,6 +8,7 @@ SUBS=$(YEARS) weekly press
 # note: the materials/ subdirectory isn't in CVS.
 
 GETTEXTFILES += newsevents.mo
+GETTEXTFILES += others.mo
 
 include $(WMLBASE)/Make.lang
 
@@ -18,3 +19,7 @@ index.$(LANGUAGE).html: index.wml $(sort $(wildcard [0-9]*/*.wml)) \
 
 talks.$(LANGUAGE).html: index.wml $(ENGLISHSRCDIR)/events/talks.data \
 	$(ENGLISHSRCDIR)/events/talks.defs $(TEMPLDIR)/countries.wml
+
+merchandise.$(LANGUAGE).html: merchandise.wml $(TEMPLDIR)/template.wml \
+  $(TEMPLDIR)/url.wml $(ENGLISHSRCDIR)/events/merchandise.data \
+  $(ENGLISHSRCDIR)/events/merchandise.def $(GETTEXTDEP)
diff --git a/english/events/index.wml b/english/events/index.wml
index b3f9d9759ea..8008c6c867a 100644
--- a/english/events/index.wml
+++ b/english/events/index.wml
@@ -24,6 +24,10 @@ href="https://wiki.debian.org/DebianEvents">Debian Wiki's event page</a> if
 there is already an entry for that event. If yes, contribute there - if no,
 follow the <a href="checklist">Checklist for a booth</a>.</p>
 
+<p>If you want to see what merchandise other companies are making with the
+Debian logo, which among other things can be used on events, then you would
+want to check out our <a href="merchandise">merchandise page</a>.
+
 <p>If you plan to do a talk you should create an entry below <a
 href="https://wiki.debian.org/DebianEvents">Debian Wiki's event page</a>.
 Afterwards you might put your presentation into <a
diff --git a/english/events/material.wml b/english/events/material.wml
index 4442440ae1b..8c58f73d87b 100644
--- a/english/events/material.wml
+++ b/english/events/material.wml
@@ -210,7 +210,7 @@ are really that helpful). You can take a look at
 
 <p>If you want to convert your booth into a merchandise selling enterprise
 you can (if the event allows that) try selling T-shirts. There are a number
-of shops on the <a href="$(HOME)/misc/merchandise">merchandise page</a> with whom
+of shops on the <a href="$(HOME)/events/merchandise">merchandise page</a> with whom
 you can cooperate. If you need more ideas you can ask on <a
 href="eventsmailinglists">the relevant events mailinglist</a> or, if that
 is not fruitful, <a
diff --git a/english/events/merchandise.data b/english/events/merchandise.data
new file mode 100644
index 00000000000..5bc32550c7d
--- /dev/null
+++ b/english/events/merchandise.data
@@ -0,0 +1,172 @@
+#include "$(ENGLISHDIR)/events/merchandise.def"
+
+<hr>
+# disables, doesn't exist
+#<mercentry>
+#  <vendor About Debian.com>
+#  <URL "http://www.aboutdebian.com/gear.htm">
+#  <their_products <mouse_pads>, <t-shirts>, <mugs>, <basketball_goals>>
+#  <their_last_update> <:=spokendate('2019-03-21'):>
+#</mercentry>
+
+<mercentry>
+  <vendor Antcom Shop>
+  <URL "https://shop.spreadshirt.de/antcom/">
+  <their_products <t-shirts>, <mugs>, <other_clothing>, <badges>>
+  <their_last_update> <:=spokendate('2019-03-22'):>
+</mercentry>
+
+# Removed on request
+# <mercentry>
+#   <vendor Camisetas Nerds>
+#   <URL "http://camisetas.punksmedia.org/?product_cat=debian">
+#   <their_products <t-shirts>, <stickers>, <hats>, <other_clothing>, <usb-sticks>>
+# </mercentry>
+
+<mercentry>
+  <vendor common·shirts>
+  <URL "https://common-shirts.org/debian">
+  <their_products <t-shirts>>
+  <their_last_update> <:=spokendate('2019-03-22'):>
+</mercentry>
+
+# 20190322, ta, website no longer available
+#<mercentry>
+#  <vendor Curitiba Livre (Brasil)>
+#  <URL "http://loja.curitibalivre.org.br">
+#  <their_products <lanyards>, <stickers>, <t-shirts>>
+#  <money-events>
+#</mercentry>
+
+<mercentry>
+  <vendor debian.ch>
+  <URL "https://debian.ch/merchandise/">
+  <their_products <t-shirts>, <stickers>, <umbrellas>>
+  <their_last_update> <:=spokendate('2019-03-22'):>
+  <donates>
+</mercentry>
+
+<mercentry>
+  <vendor Debian France>
+  <URL "https://enventelibre.org/42-debian">
+  <their_products <t-shirts>, <polo_shirts>, <stickers>, <other_clothing>, <mugs>, <usb-sticks>, <others>>
+  <their_last_update> <:=spokendate('2019-03-23'):>
+  <money-events>
+  <donates>
+</mercentry>
+
+# Disabled, no longer operating
+#<mercentry>
+#  <vendor DebianShop>
+#  <URL "http://www.debianshop.com/">
+#  <their_products <badges>, <t-shirts>, <mugs>, <other_clothing>>
+#</mercentry>
+
+<mercentry>
+  <vendor CafePress>
+  <URL "http://www.cafepress.com/debianstuff">
+  <their_products <t-shirts>, <polo_shirts>, <other_clothing>, <hats>, <mouse_pads>, <mugs>, <toys>, <bags>, <pillowcases>, <badges>, <stickers>, <cards>, <others>>
+  <their_last_update> <:=spokendate('2019-03-23'):>
+  <donates>
+</mercentry>
+
+# Disabled, no longer operating
+#<mercentry>
+#  <vendor Digistickr>
+#  <URL "http://www.digistickr.de/debian-sticker.html">
+#  <their_products <stickers>>
+#</mercentry>
+
+<mercentry>
+  <vendor FreeWear.org>
+  <URL "https://www.freewear.org/?org=Debian">
+  <their_products <t-shirts>, <polo_shirts>, <other_clothing>, <mugs>>
+  <their_last_update> <:=spokendate('2019-03-23'):>
+  <donates>
+</mercentry>
+
+# Not a trustworthy vendor:
+# <9f0a69bf0911122109t32e071b8pc7c01b243c4b2139@mail.gmail.com>
+# <6E67CDEA-F626-400A-8095-D91AEE6DA998@thekurt.net>
+#<mercentry>
+#  <vendor HackerStickers>
+#  <URL "http://www.hackerstickers.com/product/sticker-debian/">
+#  <their_products <stickers>>
+#</mercentry>
+
+<mercentry>
+  <vendor HELLOTUX>
+  <URL "https://www.hellotux.com/debian">
+  <their_products <t-shirts>, <polo_shirts>, <other_clothing>, <usb-sticks>>
+  <their_last_update> <:=spokendate('2019-03-23'):>
+</mercentry>
+
+# Disabled, no longer operating
+#<mercentry>
+#  <vendor IT2L>
+#  <URL "http://www.it2l.com/debian-d-2.html">
+#  <their_products <mouse_pads>, <mugs>, <stickers>, <t-shirts>> 
+#</mercentry>
+
+<mercentry>
+ <vendor Koszulkomat>
+ <URL "https://www.koszulkomat.eu/tshirt/search?s=debian">
+ <their_products <t-shirts>, <pillowcases>>
+ <their_last_update> <:=spokendate('2019-03-23'):>
+</mercentry>
+
+# librestickers is on hiatus and will be back 2015-02
+#<mercentry>
+# <vendor LibreStickers>
+# <URL "http://www.librestickers.com/index.php/catalogsearch/result/?q=debian">
+# <their_products <stickers>>
+#</mercentry>
+
+# disabled as it is closed and redirects to another site:
+# https://lists.debian.org/22ef44b842316693f4d7fce202a4a69e.squirrel@mail.alcos.me
+#<mercentry>
+#  <vendor Linux Mall Brasil>
+#  <URL "http://www.linuxmall.com.br/index?page=search%2Fsearch_result&amp;keyword=debian">
+#  <their_products <t-shirts>, <hats>, <mugs>, <stickers>>
+#</mercentry>
+
+# added, see <9aee95f3-d99e-5db6-88f6-5aafbef22bd1@gmx.de>
+<mercentry>
+  <vendor Sticker Mule>
+  <URL "https://www.stickermule.com/unixstickers">
+  <their_products <stickers>>
+  <their_last_update> <:=spokendate('2019-03-23'):>
+</mercentry>
+
+#<mercentry>
+#  <vendor ThinkGeek>
+#  <URL "http://www.thinkgeek.com/">
+#  <their_products <polo_shirts>>
+#</mercentry>
+
+# disabled, see <4F27FB57.1020600@gmail.com>
+# reenabled, see <668D08A0FCCB4D50ABE8E712F0E4B755@unixstickers.com>
+# redisabled, see <9aee95f3-d99e-5db6-88f6-5aafbef22bd1@gmx.de>
+#<mercentry>
+#  <vendor Unixstickers>
+#  <URL "https://www.unixstickers.com/tag/debian">
+#  <their_products <t-shirts>, <other_clothing>, <badges>, <stickers>>
+#</mercentry>
+
+# disabled due complains, 2017-01-21
+# Unixstuff takes money, but does NOT sent goods. See
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=852284
+#<mercentry>
+#  <vendor UnixStuff>
+#  <URL "http://www.unixstuff.net/">
+#  <their_products <stickers>, <keychains>>
+#</mercentry>
+
+
+# disable, shop has no products currently (2016/09/17)    
+#<mercentry>
+#  <vendor STS Stitching>
+# <URL "https://www.etsy.com/shop/STSStitching?ref=hdr_shop_menu"> 
+# <their_products <hats>>
+#</mercentry>
+
diff --git a/english/events/merchandise.def b/english/events/merchandise.def
new file mode 100644
index 00000000000..9c58ace8312
--- /dev/null
+++ b/english/events/merchandise.def
@@ -0,0 +1,111 @@
+#use wml::debian::countries
+#use wml::debian::url
+#use wml::debian::common_tags
+#use wml::debian::common_translation
+#use wml::debian::ctime
+
+<bind-gettext-domain domain="others" />
+
+<define-tag products whitespace=delete>
+  <gettext domain="others">Products</gettext>
+</define-tag>
+<define-tag t-shirts whitespace=delete>
+  <gettext domain="others">T-shirts</gettext>
+</define-tag>
+<define-tag hats whitespace=delete>
+  <gettext domain="others">hats</gettext>
+</define-tag>
+<define-tag stickers whitespace=delete>
+  <gettext domain="others">stickers</gettext>
+</define-tag>
+<define-tag mugs whitespace=delete>
+  <gettext domain="others">mugs</gettext>
+</define-tag>
+<define-tag other_clothing whitespace=delete>
+  <gettext domain="others">other clothing</gettext>
+</define-tag>
+<define-tag polo_shirts whitespace=delete>
+  <gettext domain="others">polo shirts</gettext>
+</define-tag>
+<define-tag frisbees whitespace=delete>
+  <gettext domain="others">frisbees</gettext>
+</define-tag>
+<define-tag mouse_pads whitespace=delete>
+  <gettext domain="others">mouse pads</gettext>
+</define-tag>
+<define-tag badges whitespace=delete>
+  <gettext domain="others">badges</gettext>
+</define-tag>
+<define-tag basketball_goals whitespace=delete>
+  <gettext domain="others">basketball goals</gettext>
+</define-tag>
+# Jewelry for ears, usually on ear lobes.
+<define-tag earrings whitespace=delete>
+  <gettext domain="others">earrings</gettext>
+</define-tag>
+<define-tag suitcases whitespace=delete>
+  <gettext domain="others">suitcases</gettext>
+</define-tag>
+<define-tag umbrellas whitespace=delete>
+  <gettext domain="others">umbrellas</gettext>
+</define-tag>
+<define-tag pillowcases whitespace=delete>
+   <gettext domain="others">pillowcases</gettext>
+</define-tag>
+<define-tag keychains whitespace=delete>
+   <gettext domain="others">keychains</gettext>
+</define-tag>
+<define-tag knives whitespace=delete>
+   <gettext domain="others">Swiss army knives</gettext>
+</define-tag>
+<define-tag usb-sticks whitespace=delete>
+  <gettext domain="others">USB-Sticks</gettext>
+</define-tag>
+<define-tag toys whitespace=delete>
+  <gettext domain="toys">toys</gettext>
+</define-tag>
+<define-tag bags whitespace=delete>
+  <gettext domain="bags">bags</gettext>
+</define-tag>
+<define-tag calendars whitespace=delete>
+  <gettext domain="calendars">calendars</gettext>
+</define-tag>
+<define-tag cards whitespace=delete>
+  <gettext domain="cards">cards</gettext>
+</define-tag>
+<define-tag lanyards whitespace=delete>
+  <gettext domain="others">lanyards</gettext>
+</define-tag>
+<define-tag others whitespace=delete>
+  <gettext domain="others">others</gettext>
+</define-tag>
+
+
+<define-tag mercentry endtag=required>\
+  <p>%body
+  <hr>
+</define-tag>
+
+<define-tag vendor>\
+  <span class="merchtitle"><strong>%attributes</strong></span>
+  <br>
+</define-tag>
+
+<define-tag their_products>\
+  <strong><products>:</strong> %attributes
+  <br>
+</define-tag>
+
+<define-tag donates>\
+  <br>
+  <gettext domain="others">Donates money to Debian</gettext>
+</define-tag>
+
+<define-tag money-events>\
+  <br>
+  <gettext domain="others">Money is used to organize local free software events</gettext>
+</define-tag>
+
+<define-tag their_last_update>\
+  <strong><last_updated>:</strong> %attributes
+</define-tag>
diff --git a/english/events/merchandise.wml b/english/events/merchandise.wml
new file mode 100644
index 00000000000..4065423014f
--- /dev/null
+++ b/english/events/merchandise.wml
@@ -0,0 +1,39 @@
+#use wml::debian::template title="Debian Merchandise" GEN_TIME="yes" BARETITLE=true
+
+<P>
+As Debian's popularity has grown, we have received many requests for Debian
+merchandise. Being a non-profit organization, we don't make or sell anything
+ourselves. Luckily, a number of companies have seen a potential market and
+are trying to fill it. The information below is provided as a favor to our
+loyal users. The ordering is purely alphabetical and no ranking or
+endorsement of a specific vendor.
+
+<p>
+Some vendors contribute a portion of sales of Debian merchandise
+back to Debian. This is indicated under each vendor entry.
+We hope that vendors consider making donations to Debian.
+</p>
+
+<p>
+In addition, some Debian contributors or local groups have produced Debian
+branded merchandise and may have some stock still available, information about
+that is available on the <a href="https://wiki.debian.org/Merchandise">wiki</a>.
+</p>
+
+#include "$(ENGLISHDIR)/events/merchandise.data"
+
+<p>If you sell merchandise with a Debian theme and would like to be listed on
+this page, send mail <strong>in English</strong> to
+&lt;<a href="mailto:events@debian.org">events@debian.org</a>&gt;.
+<br>
+Please provide us with the following information:
+<ul>
+  <li>the company name,
+  <li>the URL for your main page,
+  <li>the URL where Debian merchandise can be found, and
+  <li>the list of Debian merchandise sold.
+</ul>
+We are only interested in advertising Debian related gear. 
+
+<p>Since we are protective of our reputation, we take customer service seriously.
+If we receive complaints about your service, you will be removed from the page.