Hi, On Thu, Feb 17, 2011 at 04:31:17PM +0100, Luca Capello wrote: > Package: www.debian.org > Severity: normal > > Hi there! > > I think we need to document this somewhere and with my events@d.o hat on > this is the BTS. Please keep it cc:ed when the discussion is relevant > or follow-up on debian-www@: this is a website problem, as I just wrote > in the announcement for the new events@d.o handling [1]. > > [1] Message-ID: <[🔎] 87tyg2g6ed.fsf@gismo.pca.it> > URL: <http://lists.debian.org/msgid-search/%3c87tyg2g6ed.fsf%40gismo.pca.it%3e> > > The original email I replied to is at [2]. > > [2] Message-ID: <201102171548.43246@fortytwo.ch> > URL: <http://lists.debian.org/msgid-search/%3c201102171548.43246%40fortytwo.ch%3e> > > On Thu, 17 Feb 2011 15:47:08 +0100, Adrian von Bidder wrote: > > On Thursday 17 February 2011 14.03:22 Luca Capello wrote: > >> [14] <http://www.debian.org/misc/merchandise> > > > > Hmm. Umbrellas are missing in debian.ch's entry :-) > > Noted, but I still need to acquaint myself with WML [3], if someone from > the Webmaster team wants to quickly fix it, please go on. > > [3] <http://www.debian.org/devel/website/> Done. The changes will be visible in few hours. > > More importantly: on one hand, we don't endorse any specific vendor, but > > otoh debian.ch isn't a commercial vendor but the money owned by it is fully > > under the authority of the Debian project. I wonder if this should be > > indicated. Perhaps for each shop add to the listing "commercial vendor" / > > "commercial vendor, part of the income goes to the Debian project" / "part > > of the Debian project"? Not sure what the exact terms should be, but I > > guess at least some people will be happy to prefer ordering stuff from > > places that are closely linked with Debian. > > Yesterday, while reviewing debian-www@ spam [4] I found out something > related which should be taken care of when we are going to restructure > that page [5]. No flames, please. > > [4] <http://wiki.debian.org/Teams/Webmaster/SpamClean#preview> > [5] Message-ID: <20100526143008.GA19199@anguilla.debian.or.at> > URL: <http://lists.debian.org/msgid-search/%3c20100526143008.GA19199%40anguilla.debian.or.at%3e> > > > (Disclaimer: Yes, I *am* on the debian.ch board.) > > Again, no flames, please. > > That being said, it does not matter who is on the board and who is not > and for those who do not know that already, I am the current debian.ch > president. > > Yes, debian.ch *is* a special case, no matter what other people say. It > is a special case exactly as any other *official* Debian sister > association. > > Yes, I agree that we need a special case for these sister association, > but *only* if, as Adrian already wrote in his reply, the money that they > own is under the authority of the Debian project. > > Thx, bye, > Gismo / Luca I'm not completely sure to have understand your request. If you're asking for a further entry for vendors, with a statement of which part of the income goes to Debian (and/or if a part of the income goes to Debian), IMO we can add it. In that case, my patch would be something like the attached ones (for now I've added data about proceeds only for debian.ch - in the patch - if we'll all agree on it I'll collect data also about others vendors). Note that as I'm not a native english speaker the statements added in the patch need a proofread. So, what you think about it? Cheers, Francesca
Index: merchandise.def =================================================================== RCS file: /cvs/webwml/webwml/english/misc/merchandise.def,v retrieving revision 1.41 diff -u -u -r1.41 merchandise.def --- merchandise.def 17 Feb 2011 16:18:44 -0000 1.41 +++ merchandise.def 17 Feb 2011 18:05:51 -0000 @@ -65,3 +65,25 @@ <strong><products>:</strong> %attributes <br> </define-tag> + +<define-tag their_proceeds>\ + <strong><proceeds>:</strong> %attributes + <br /> +</define-tag> + +<define-tag proceeds whitespace=delete> + <gettext domain="others">Proceeds</gettext> +</define-tag> + +<define-tag noncommercial whitespace=delete> + <gettext domain="others">the vendor gives all proceeds to Debian</gettext> +</define-tag> + +<define-tag mid-commercial whitespace=delete> + <gettext domain="others">the vendor gives part of the proceeds to Debian</gettext> +</define-tag> + +<define-tag commercial whitespace=delete> + <gettext domain="others">the vendor doesn't give any part of the proceeds to Debian</gettext> +</define-tag> +
Index: merchandise.data =================================================================== RCS file: /cvs/webwml/webwml/english/misc/merchandise.data,v retrieving revision 1.45 diff -u -u -r1.45 merchandise.data --- merchandise.data 17 Feb 2011 16:18:43 -0000 1.45 +++ merchandise.data 17 Feb 2011 18:06:58 -0000 @@ -19,6 +19,7 @@ <vendor debian.ch> <URL "http://www.debian.ch/merchandise/";> <their_products <t-shirts>, <stickers>, <umbrellas>> + <their_proceeds <noncommercial>> </mercentry> # Disabled, no longer operating
Attachment:
signature.asc
Description: Digital signature