Bug#784667: www.debian.org: Merchandise vendors not listed alphabetically in /misc/merchandise
Hi:
On Thu, 07 May 2015 18:20:58 +0200
Laura Arjona Reina <larjona@larjona.net> wrote:
>
> A user reported [1] that the list of merchandise vendors is not listed
> alphabetically.
>
> [1] https://lists.debian.org/debian-www/2015/05/msg00032.html
>
> I believe the list is stored in the file
> https://anonscm.debian.org/viewvc/webwml/webwml/english/misc/merchandise.data
>
I'm attaching a patch which I think could work. I sorted the list as
follows:
fgrep '<vendor ' english/misc/merchandise.data | sort
I hope it helps.
Thanks,
--
Jeremías
Index: english/misc/merchandise.data
===================================================================
RCS file: /cvs/webwml/webwml/english/misc/merchandise.data,v
retrieving revision 1.61
diff -u -u -r1.61 merchandise.data
--- english/misc/merchandise.data 6 Jan 2015 03:41:19 -0000 1.61
+++ english/misc/merchandise.data 7 May 2015 20:10:02 -0000
@@ -1,24 +1,6 @@
#include "$(ENGLISHDIR)/misc/merchandise.def"
<hr>
-<mercentry>
- <vendor Digistickr>
- <URL "http://www.digistickr.de/debian-sticker.html";>
- <their_products <stickers>>
-</mercentry>
-
-<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 Debian France>
- <URL "http://www.enventelibre.org/debian";>
- <their_products <polo_shirts>, <stickers>, <other_clothing>, <knives>, <umbrellas>>
-</mercentry>
-
# disables, doesn't exist
#<mercentry>
# <vendor About Debian.com>
@@ -33,6 +15,12 @@
</mercentry>
<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 "http://common-shirts.org/?p=3444";>
<their_products <t-shirts>>
@@ -44,6 +32,12 @@
<their_products <t-shirts>, <stickers>, <umbrellas>>
</mercentry>
+<mercentry>
+ <vendor Debian France>
+ <URL "http://www.enventelibre.org/debian";>
+ <their_products <polo_shirts>, <stickers>, <other_clothing>, <knives>, <umbrellas>>
+</mercentry>
+
# Disabled, no longer operating
#<mercentry>
# <vendor DebianShop>
@@ -58,17 +52,17 @@
</mercentry>
<mercentry>
+ <vendor Digistickr>
+ <URL "http://www.digistickr.de/debian-sticker.html";>
+ <their_products <stickers>>
+</mercentry>
+
+<mercentry>
<vendor FreeWear.org>
<URL "http://www.freewear.org/?org=Debian";>
<their_products <t-shirts>, <other_clothing>>
</mercentry>
-#<mercentry>
-# <vendor ThinkGeek>
-# <URL "http://www.thinkgeek.com/";>
-# <their_products <polo_shirts>>
-#</mercentry>
-
# Not a trustworthy vendor:
# <9f0a69bf0911122109t32e071b8pc7c01b243c4b2139@mail.gmail.com>
# <6E67CDEA-F626-400A-8095-D91AEE6DA998@thekurt.net>
@@ -94,7 +88,7 @@
<vendor Koszulkomat>
<URL "http://debian.koszulkomat.eu";>
<their_products <t-shirts>, <pillowcases>>
- </mercentry>
+</mercentry>
# librestickers is on hiatus and will be back 2015-02
#<mercentry>
@@ -111,6 +105,11 @@
# <their_products <t-shirts>, <hats>, <mugs>, <stickers>>
#</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>
Reply to: