<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">2015-10-10 11:23 GMT+02:00 Michael Biebl <span dir="ltr"><<a href="mailto:biebl@debian.org" target="_blank">biebl@debian.org</a>></span>:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi Jérémy,<br>
<br>
thanks for the patch. I think the general idea is ok, but see for<br>
comments below:<br>
<br>
<br>
Am 10.10.2015 um 10:24 schrieb Jérémy Lal:<br>
> --- epiphany-3.18.0/debian/rules.old  2015-10-10 10:12:24.716438919 +0200<br>
> +++ epiphany-3.18.0/debian/rules      2015-10-10 10:16:28.467707332 +0200<br>
> @@ -26,7 +26,7 @@<br>
>               && mv epiphany-browser.sh epiphany-browser<br>
><br>
>  binary-post-install/epiphany-browser-data::<br>
> -     sed -i s/@PACKAGEVERSION@/$(DEB_VERSION)/ debian/<a href="http://branding.conf.in" rel="noreferrer" target="_blank">branding.conf.in</a><br>
> -     sed -i s/@DISTROID@/`lsb_release -is`/ debian/<a href="http://branding.conf.in" rel="noreferrer" target="_blank">branding.conf.in</a><br>
> -     sed -i s/@DISTROVERSION@/`lsb_release -rs`/ debian/<a href="http://branding.conf.in" rel="noreferrer" target="_blank">branding.conf.in</a> \<br>
> -             && mv debian/<a href="http://branding.conf.in" rel="noreferrer" target="_blank">branding.conf.in</a> debian/epiphany-browser-data/usr/share/epiphany-browser/branding.conf<br>
> +     sed -e s/@PACKAGEVERSION@/$(DEB_VERSION)/ \<br>
> +         -e s/@DISTROID@/`lsb_release -is`/ \<br>
> +         -e s/@DISTROVERSION@/`lsb_release -rs`/ debian/<a href="http://branding.conf.in" rel="noreferrer" target="_blank">branding.conf.in</a> \<br>
> +         debian/<a href="http://branding.conf.in" rel="noreferrer" target="_blank">branding.conf.in</a> > debian/epiphany-browser-data/usr/share/epiphany-browser/branding.conf<br>
<br>
Why is debian/<a href="http://branding.conf.in" rel="noreferrer" target="_blank">branding.conf.in</a> specified twice here? Won't this<br>
duplicate the entries?<br>
<br>
Did a test-build, and indeed the result looks like:<br>
$ cat debian/epiphany-browser-data/usr/share/epiphany-browser/branding.conf<br>
[User Agent]<br>
Vendor=Debian<br>
VendorSub=unstable<br>
VendorComment=3.18.0-2<br>
[User Agent]<br>
Vendor=Debian<br>
VendorSub=unstable<br>
VendorComment=3.18.0-2</blockquote><div><br></div><div>Oh !</div><div>Indeed, just a stupid mistake.</div><div><br></div><div> Jérémy</div></div><br></div></div>