MoarVM 2015.05 needs mentor approval :-D
daniel.dehennin at baby-gnu.org
Sat Jun 20 08:43:09 UTC 2015
Paul Cochrane <paul at liekut.de> writes:
> hrm, then I probably need to revert several commits in the nqp package.
> Sorry for the hassle! I'll clean it up as soon as I can.
Do you use “gbp import-orig”?
In which case, could you push your “pristine-tar” branch with
upstream/2015.04 and upstream/2015.05 tags?
> The funny thing is that I was getting build errors (in nqp) with the
> upstream sources and the patches (after merging upstream into the master
> branch), however after I'd updated the nqp source to that in the patches and
> committed (in master), then `debuild -uc -us` ran properly (i.e. I wasn't
> getting any errors about locally changed sources). This is probably because
> I wasn't using dquilt when creating the patches, which I just learned from
> the link you mentioned. This then begs the question: are you able to build
> the nqp package correctly in its current state?
Running “dpkg-buildpackage -S” does not complain even if
git diff --stat upstream..master
src/vm/moar/profiler/template.html | 2 +-
t/hll/06-sprintf.t | 9 +-
tools/build/Makefile-Moar.in | 2 +-
tools/build/gen-version.pl | 6 -
I think it's because dpkg-buildpackage use the upstream tarball:
dpkg-source: info: using source format `3.0 (quilt)'
dpkg-source: info: building nqp using existing ./nqp_2015.05.orig.tar.gz
dpkg-source: info: building nqp in nqp_2015.05-1.debian.tar.xz
dpkg-source: info: building nqp in nqp_2015.05-1.dsc
dpkg-genchanges -S >../nqp_2015.05-1_source.changes
in which case the source package does not include the changes on branch master.
So, making commits on the master branch outside the debian/ directory is
useless but they will show up in debian/changelog generated by “gbp dch”.
- to revert them
- to submit them as plain debian/patches to be included in the package
- to take care if generating the debian/changelog with “gbp dch” to
remove the unwanted lines
Récupérer ma clef GPG: gpg --recv-keys 0xCC1E9E5B7A6FE2DF
Fingerprint: 3E69 014E 5C23 50E8 9ED6 2AAD CC1E 9E5B 7A6F E2DF
-------------- next part --------------
A non-text attachment was scrubbed...
Size: 342 bytes
Desc: not available
More information about the Pkg-rakudo-devel