Re: Building console-setup cleanly?
On Fri, 2015-02-20 at 07:02 +0100, Christian PERRIER wrote:
> Quoting Ian Campbell (ijc@debian.org):
> > On Thu, 2015-02-19 at 18:39 +0100, Christian PERRIER wrote:
> > > Quoting Ian Campbell (ijc@debian.org):
> > > > On Thu, 2015-02-19 at 07:02 +0100, Christian PERRIER wrote:
> > > > > It appears that my use of git-buildpackage
> > > >
> > > > What does your gbp rune look like? My notes claim that my runes for a
> > > > source only upload are:
> > >
> > > I just run "git-buildpackage" from the source tree top
> >
> > are you sure? If you have a dirty git tree as described in your initial
> > mail then IME gbp will stop and complain and require the use of
> > additional options to continue.
>
> I, of course, start from a clean tree...:-)
I just wanted to check since you initially mentioned dch -r and showed a
git status output which showed a dirty debian/changelog.
Having built a few times with gbp it seems like the underlying problem
here may be that something is rebuilding a bunch of stuff in the
debian/rules clean rule, because it is calling "make maintainer-clean"
which does that regeneration.
That said, using gbp seems to be functioning as expected for me...
Rebuilding the 1.116 tag from git I get:
$ git checkout -b rebuild-1.116 1.116
$ gbp buildpackage -S --git-builder=debuild --git-ignore-branch
$ debdiff ../console-setup_1.116.dsc ~/tmp/build-area/console-setup_1.116.dsc | diffstat -p1
dpkg-source: warning: extracting unsigned source package (/local/scratch/ijc/tmp/build-area/console-setup_1.116.dsc)
Fonts/soft.Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(../ is the .dsc from the archive, ~/tmp/build-area is the newly built one)
Which is just the ordering issue in soft.Makefile which Samuel
identified.
Building the current HEAD (unreleased 1.117) I see a lot more changes:
$ git checkout master
$ debdiff ../console-setup_1.116.dsc ~/tmp/build-area/console-setup_1.117.dsc | diffstat -p1
Fonts/soft.Makefile | 4 ++--
debian/changelog | 14 ++++++++++++++
debian/console-setup-udeb.templates | 4 ++--
debian/keyboard-configuration.config | 22 ++++++++++++++++++----
debian/keyboard-configuration.templates | 4 ++--
debian/po/am.po | 14 +++++++++++++-
[... lots of these corresponding to adding Philippines and Burmese per changelog ]
debian/po/zh_TW.po | 14 +++++++++++++-
81 files changed, 1032 insertions(+), 92 deletions(-)
I think, apart from the identified Fonts/soft.Makefile issue, these are
all correctly identified in the debian/changelog.
Ian.
Reply to: