Re: RFS: testng/6.8.8-1

[Eugene Zhukov <jevgeni.zh@gmail.com>]

On Mon, Mar 17, 2014 at 2:13 AM, tony mancill <tmancill@debian.org> wrote:
> On 03/14/2014 05:32 AM, Eugene Zhukov wrote:
>> Hello,
>>
>> I updated TestNg to the latest version and I'm looking for a sponsor to
>> upload the package.
>>
>> ssh+git://alioth.debian.org/git/pkg-java/testng.git
>
> Hi Eugene,
>
> The pristine-tar branch doesn't include a delta for 6.8.8, and when I
> use get-orig-source and then try to git-import-orig the resulting
> orig.tar.gz, there are merge conflicts.
>
> Can you check to see that what you've pushed to master is current, and
> that you've imported the .orig.tar.gz and pushed an updated pristine-tar
> branch?
>
> Thank you,
> tony
>
Hi Tony,

Thanks for your time and review.
I forgot to push pristine-tar branch and upstream/6.8.8 tag, which I did now.

I fetched source with get-orig-source, then I run git-import-orig, but
as it generated plenty of merge conflicts incl. deleting debian/
folder, I discarded those. Then I just copied contents of orig.tar.gz
into main tree and was done with it. As debuild checks consistency
between orig.tar.gz and actual source, I believe master is up to date
with latest changes from tarball.

I'm still learning debian packaging and git work-flows, any hints are
appreciated.

Eugene