Merge lp:~osomon/ubuntu/maverick/epiphany-browser/user_agent into lp:ubuntu/maverick/epiphany-browser

[Olivier Tilloy]

This branch fixes bug #578717: the user agent string for epiphany is wrong, it says "Debian/squeeze/sid ()" instead of "Ubuntu/10.10 (maverick)".

[James Westby (james-w)]

Hi,

Why not keep the @PACKAGEVERSION@ thing, I don't think it will
be the equivalent of "maverick" would it?

Thanks,

James

review: Needs Information

[Olivier Tilloy (osomon)]

I changed the @PACKAGEVERSION@ substitution to "maverick" to mimic Firefox's behaviour. My User-Agent string with ff in lucid is:

Mozilla/5.0 (X11; U; Linux i686; fr; rv:1.9.2.3) Gecko/20100423 Ubuntu/10.04 (lucid) Firefox/3.6.3

so I figured the VendorComment should be set to the release codename, but I'm happy to keep the @PACKAGEVERSION@ substitution if that sounds more sensible.

[James Westby (james-w)]

On Mon, 17 May 2010 11:20:44 -0000, Olivier Tilloy <email address hidden> wrote:
> I changed the @PACKAGEVERSION@ substitution to "maverick" to mimic Firefox's behaviour. My User-Agent string with ff in lucid is:
>
> Mozilla/5.0 (X11; U; Linux i686; fr; rv:1.9.2.3) Gecko/20100423 Ubuntu/10.04 (lucid) Firefox/3.6.3
>
> so I figured the VendorComment should be set to the release codename, but I'm happy to keep the @PACKAGEVERSION@ substitution if that sounds more sensible.

I think that's more appropriate to have the minimal change.

Note that for 10.04 the version should be "10.04 LTS", not just "10.04".

Thanks,

James

[lp:~osomon/ubuntu/maverick/epiphany-browser/user_agent]

101. By Olivier Tilloy on 2010-05-17

Revert the VendorComment to use @PACKAGEVERSION@.

[Luke Faraone (lfaraone)]

Looks good.

review: Approve

=== modified file 'debian/branding.conf.in'
--- debian/branding.conf.in	2010-03-08 23:50:25 +0000
+++ debian/branding.conf.in	2010-05-17 12:26:25 +0000
@@ -1,4 +1,4 @@
 [User Agent]
-Vendor=Debian
-VendorSub=squeeze/sid
+Vendor=Ubuntu
+VendorSub=10.10
 VendorComment=@PACKAGEVERSION@