Patchwork [3,of,6,STABLE] builddeb: use the os codename instead of 'unstable'

login
register
mail settings
Submitter Sean Farley
Date April 18, 2016, 5:52 p.m.
Message ID <fb21760760ee4cd90a19.1461001930@laptop.office.atlassian.com>
Download mbox | patch
Permalink /patch/14719/
State Superseded
Headers show

Comments

Sean Farley - April 18, 2016, 5:52 p.m.
# HG changeset patch
# User Sean Farley <sean@farley.io>
# Date 1460835773 25200
#      Sat Apr 16 12:42:53 2016 -0700
# Branch stable
# Node ID fb21760760ee4cd90a19208ac21cba6417c34122
# Parent  da3179bb3ca884e261034064c546d184dcd32a3a
# EXP-Topic ppa
builddeb: use the os codename instead of 'unstable'

This fixes a lintian error (and indeed, launchpad rejects it) by using the
distribution's codename (e.g. xenial, trusty, etc).
Yuya Nishihara - April 19, 2016, 2:40 p.m.
On Mon, 18 Apr 2016 10:52:10 -0700, Sean Farley wrote:
> # HG changeset patch
> # User Sean Farley <sean@farley.io>
> # Date 1460835773 25200
> #      Sat Apr 16 12:42:53 2016 -0700
> # Branch stable
> # Node ID fb21760760ee4cd90a19208ac21cba6417c34122
> # Parent  da3179bb3ca884e261034064c546d184dcd32a3a
> # EXP-Topic ppa
> builddeb: use the os codename instead of 'unstable'
> 
> This fixes a lintian error (and indeed, launchpad rejects it) by using the
> distribution's codename (e.g. xenial, trusty, etc).
> 
> diff --git a/contrib/builddeb b/contrib/builddeb
> --- a/contrib/builddeb
> +++ b/contrib/builddeb
> @@ -67,10 +67,11 @@ if [ "$BUILD" ]; then
>      cp -r $PWD/contrib/debian debian
>      chmod -R 0755 debian
>  
>      sed -i.tmp "s/__VERSION__/$debver/" $changelog
>      sed -i.tmp "s/__DATE__/$(date --rfc-2822)/" $changelog
> +    sed -i.tmp "s/__CODENAME__/$CODENAME/" $changelog
>      rm $changelog.tmp
>  
>      debuild -us -uc -b
>      if [ $? != 0 ]; then
>          echo 'debuild failed!'
> diff --git a/contrib/debian/changelog b/contrib/debian/changelog
> --- a/contrib/debian/changelog
> +++ b/contrib/debian/changelog
> @@ -1,5 +1,5 @@
> -mercurial (__VERSION__) unstable; urgency=medium
> +mercurial (__VERSION__) __CODENAME__; urgency=medium

I guess the distribution isn't always the same as the codename. For example,
we seem to use "unstable" for Debian sid/testing packages.
Anton Shestakov - April 19, 2016, 4:18 p.m.
19.04.2016, 22:41, "Yuya Nishihara" <yuya@tcha.org>:
> On Mon, 18 Apr 2016 10:52:10 -0700, Sean Farley wrote:
>>  # HG changeset patch
>>  # User Sean Farley <sean@farley.io>
>>  # Date 1460835773 25200
>>  # Sat Apr 16 12:42:53 2016 -0700
>>  # Branch stable
>>  # Node ID fb21760760ee4cd90a19208ac21cba6417c34122
>>  # Parent da3179bb3ca884e261034064c546d184dcd32a3a
>>  # EXP-Topic ppa
>>  builddeb: use the os codename instead of 'unstable'
>>
>>  This fixes a lintian error (and indeed, launchpad rejects it) by using the
>>  distribution's codename (e.g. xenial, trusty, etc).
>>
>>  diff --git a/contrib/builddeb b/contrib/builddeb
>>  --- a/contrib/builddeb
>>  +++ b/contrib/builddeb
>>  @@ -67,10 +67,11 @@ if [ "$BUILD" ]; then
>>       cp -r $PWD/contrib/debian debian
>>       chmod -R 0755 debian
>>
>>       sed -i.tmp "s/__VERSION__/$debver/" $changelog
>>       sed -i.tmp "s/__DATE__/$(date --rfc-2822)/" $changelog
>>  + sed -i.tmp "s/__CODENAME__/$CODENAME/" $changelog
>>       rm $changelog.tmp
>>
>>       debuild -us -uc -b
>>       if [ $? != 0 ]; then
>>           echo 'debuild failed!'
>>  diff --git a/contrib/debian/changelog b/contrib/debian/changelog
>>  --- a/contrib/debian/changelog
>>  +++ b/contrib/debian/changelog
>>  @@ -1,5 +1,5 @@
>>  -mercurial (__VERSION__) unstable; urgency=medium
>>  +mercurial (__VERSION__) __CODENAME__; urgency=medium
>
> I guess the distribution isn't always the same as the codename. For example,
> we seem to use "unstable" for Debian sid/testing packages.

I didn't apply the first two patches, but I've just manually changed unstable to jessie in the contrib/debian/changelog and run `make docker-debian-jessie`. Lintian didn't seem to complain. Also worked with trusty and docker-ubuntu-trusty, the "bad-distribution-in-changes-file unstable" error is gone.

I'm on 97811ff79647 (current stable).
Sean Farley - April 19, 2016, 5:39 p.m.
Anton Shestakov <engored@ya.ru> writes:

> 19.04.2016, 22:41, "Yuya Nishihara" <yuya@tcha.org>:
>> On Mon, 18 Apr 2016 10:52:10 -0700, Sean Farley wrote:
>>> # HG changeset patch
>>> # User Sean Farley <sean@farley.io>
>>> # Date 1460835773 25200
>>> # Sat Apr 16 12:42:53 2016 -0700
>>> # Branch stable
>>> # Node ID fb21760760ee4cd90a19208ac21cba6417c34122
>>> # Parent da3179bb3ca884e261034064c546d184dcd32a3a
>>> # EXP-Topic ppa
>>> builddeb: use the os codename instead of 'unstable'
>>>
>>> This fixes a lintian error (and indeed, launchpad rejects it) by using the
>>> distribution's codename (e.g. xenial, trusty, etc).
>>>
>>> diff --git a/contrib/builddeb b/contrib/builddeb
>>> --- a/contrib/builddeb
>>> +++ b/contrib/builddeb
>>> @@ -67,10 +67,11 @@ if [ "$BUILD" ]; then
>>> cp -r $PWD/contrib/debian debian
>>> chmod -R 0755 debian
>>>
>>> sed -i.tmp "s/__VERSION__/$debver/" $changelog
>>> sed -i.tmp "s/__DATE__/$(date --rfc-2822)/" $changelog
>>> + sed -i.tmp "s/__CODENAME__/$CODENAME/" $changelog
>>> rm $changelog.tmp
>>>
>>> debuild -us -uc -b
>>> if [ $? != 0 ]; then
>>> echo 'debuild failed!'
>>> diff --git a/contrib/debian/changelog b/contrib/debian/changelog
>>> --- a/contrib/debian/changelog
>>> +++ b/contrib/debian/changelog
>>> @@ -1,5 +1,5 @@
>>> -mercurial (__VERSION__) unstable; urgency=medium
>>> +mercurial (__VERSION__) __CODENAME__; urgency=medium
>>
>> I guess the distribution isn't always the same as the codename. For example,
>> we seem to use "unstable" for Debian sid/testing packages.
>
> I didn't apply the first two patches, but I've just manually changed unstable to jessie in the contrib/debian/changelog and run `make docker-debian-jessie`. Lintian didn't seem to complain. Also worked with trusty and docker-ubuntu-trusty, the "bad-distribution-in-changes-file unstable" error is gone.
>
> I'm on 97811ff79647 (current stable).

Yeah, I was hoping that using the code name would be better. Without
that, launchpad rejects this. Any other ideas?
Augie Fackler - April 19, 2016, 5:56 p.m.
On Tue, Apr 19, 2016 at 10:39:57AM -0700, Sean Farley wrote:
>
> Anton Shestakov <engored@ya.ru> writes:
>
> > 19.04.2016, 22:41, "Yuya Nishihara" <yuya@tcha.org>:
> >> On Mon, 18 Apr 2016 10:52:10 -0700, Sean Farley wrote:
> >>> # HG changeset patch
> >>> # User Sean Farley <sean@farley.io>
> >>> # Date 1460835773 25200
> >>> # Sat Apr 16 12:42:53 2016 -0700
> >>> # Branch stable
> >>> # Node ID fb21760760ee4cd90a19208ac21cba6417c34122
> >>> # Parent da3179bb3ca884e261034064c546d184dcd32a3a
> >>> # EXP-Topic ppa
> >>> builddeb: use the os codename instead of 'unstable'
> >>>
> >>> This fixes a lintian error (and indeed, launchpad rejects it) by using the
> >>> distribution's codename (e.g. xenial, trusty, etc).
> >>>
> >>> diff --git a/contrib/builddeb b/contrib/builddeb
> >>> --- a/contrib/builddeb
> >>> +++ b/contrib/builddeb
> >>> @@ -67,10 +67,11 @@ if [ "$BUILD" ]; then
> >>> cp -r $PWD/contrib/debian debian
> >>> chmod -R 0755 debian
> >>>
> >>> sed -i.tmp "s/__VERSION__/$debver/" $changelog
> >>> sed -i.tmp "s/__DATE__/$(date --rfc-2822)/" $changelog
> >>> + sed -i.tmp "s/__CODENAME__/$CODENAME/" $changelog
> >>> rm $changelog.tmp
> >>>
> >>> debuild -us -uc -b
> >>> if [ $? != 0 ]; then
> >>> echo 'debuild failed!'
> >>> diff --git a/contrib/debian/changelog b/contrib/debian/changelog
> >>> --- a/contrib/debian/changelog
> >>> +++ b/contrib/debian/changelog
> >>> @@ -1,5 +1,5 @@
> >>> -mercurial (__VERSION__) unstable; urgency=medium
> >>> +mercurial (__VERSION__) __CODENAME__; urgency=medium
> >>
> >> I guess the distribution isn't always the same as the codename. For example,
> >> we seem to use "unstable" for Debian sid/testing packages.
> >
> > I didn't apply the first two patches, but I've just manually changed unstable to jessie in the contrib/debian/changelog and run `make docker-debian-jessie`. Lintian didn't seem to complain. Also worked with trusty and docker-ubuntu-trusty, the "bad-distribution-in-changes-file unstable" error is gone.
> >
> > I'm on 97811ff79647 (current stable).
>
> Yeah, I was hoping that using the code name would be better. Without
> that, launchpad rejects this. Any other ideas?

I think this is a strict improvement - it's better for the people that
most need nightlies (ubuntu users, debian stale users), so I think we
should go this way for now.

We could probably hard-code sid -> unstable as a mapping and solve it
the rest of the way?

> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Yuya Nishihara - April 20, 2016, 1:54 p.m.
On Tue, 19 Apr 2016 13:56:30 -0400, Augie Fackler wrote:
> On Tue, Apr 19, 2016 at 10:39:57AM -0700, Sean Farley wrote:
> >
> > Anton Shestakov <engored@ya.ru> writes:
> >  
> > > 19.04.2016, 22:41, "Yuya Nishihara" <yuya@tcha.org>:  
> > >> On Mon, 18 Apr 2016 10:52:10 -0700, Sean Farley wrote:  
> > >>> # HG changeset patch
> > >>> # User Sean Farley <sean@farley.io>
> > >>> # Date 1460835773 25200
> > >>> # Sat Apr 16 12:42:53 2016 -0700
> > >>> # Branch stable
> > >>> # Node ID fb21760760ee4cd90a19208ac21cba6417c34122
> > >>> # Parent da3179bb3ca884e261034064c546d184dcd32a3a
> > >>> # EXP-Topic ppa
> > >>> builddeb: use the os codename instead of 'unstable'
> > >>>
> > >>> This fixes a lintian error (and indeed, launchpad rejects it) by using the
> > >>> distribution's codename (e.g. xenial, trusty, etc).
> > >>>
> > >>> diff --git a/contrib/builddeb b/contrib/builddeb
> > >>> --- a/contrib/builddeb
> > >>> +++ b/contrib/builddeb
> > >>> @@ -67,10 +67,11 @@ if [ "$BUILD" ]; then
> > >>> cp -r $PWD/contrib/debian debian
> > >>> chmod -R 0755 debian
> > >>>
> > >>> sed -i.tmp "s/__VERSION__/$debver/" $changelog
> > >>> sed -i.tmp "s/__DATE__/$(date --rfc-2822)/" $changelog
> > >>> + sed -i.tmp "s/__CODENAME__/$CODENAME/" $changelog
> > >>> rm $changelog.tmp
> > >>>
> > >>> debuild -us -uc -b
> > >>> if [ $? != 0 ]; then
> > >>> echo 'debuild failed!'
> > >>> diff --git a/contrib/debian/changelog b/contrib/debian/changelog
> > >>> --- a/contrib/debian/changelog
> > >>> +++ b/contrib/debian/changelog
> > >>> @@ -1,5 +1,5 @@
> > >>> -mercurial (__VERSION__) unstable; urgency=medium
> > >>> +mercurial (__VERSION__) __CODENAME__; urgency=medium  
> > >>
> > >> I guess the distribution isn't always the same as the codename. For example,
> > >> we seem to use "unstable" for Debian sid/testing packages.  
> > >
> > > I didn't apply the first two patches, but I've just manually changed unstable to jessie in the contrib/debian/changelog and run `make docker-debian-jessie`. Lintian didn't seem to complain. Also worked with trusty and docker-ubuntu-trusty, the "bad-distribution-in-changes-file unstable" error is gone.
> > >
> > > I'm on 97811ff79647 (current stable).  
> >
> > Yeah, I was hoping that using the code name would be better. Without
> > that, launchpad rejects this. Any other ideas?  
> 
> I think this is a strict improvement - it's better for the people that
> most need nightlies (ubuntu users, debian stale users), so I think we
> should go this way for now.

Indeed. Debian sid shouldn't be stale, so I'm okay for this.

Patch

diff --git a/contrib/builddeb b/contrib/builddeb
--- a/contrib/builddeb
+++ b/contrib/builddeb
@@ -67,10 +67,11 @@  if [ "$BUILD" ]; then
     cp -r $PWD/contrib/debian debian
     chmod -R 0755 debian
 
     sed -i.tmp "s/__VERSION__/$debver/" $changelog
     sed -i.tmp "s/__DATE__/$(date --rfc-2822)/" $changelog
+    sed -i.tmp "s/__CODENAME__/$CODENAME/" $changelog
     rm $changelog.tmp
 
     debuild -us -uc -b
     if [ $? != 0 ]; then
         echo 'debuild failed!'
diff --git a/contrib/debian/changelog b/contrib/debian/changelog
--- a/contrib/debian/changelog
+++ b/contrib/debian/changelog
@@ -1,5 +1,5 @@ 
-mercurial (__VERSION__) unstable; urgency=medium
+mercurial (__VERSION__) __CODENAME__; urgency=medium
 
   * Automated build performed by upstream.
 
  -- Mercurial Devel <mercurial-devel@selenic.com>  __DATE__