Re: watch files and .gitattributes export-ignore

2019-12-24 Thread Jean-Michel Vourgère
Here's the result of my research:

uscan does support git clone. But it won't ignore the .gitattributes file.
I opened https://bugs.debian.org/947317

I went for an ugly README.source using "git deborig" for now.

Thank you everyone for the help!

signature.asc
Description: This is a digitally signed message part.


Re: watch files and .gitattributes export-ignore

2019-12-12 Thread Sean Whitton
Hello Jean-Michel,

On Thu 12 Dec 2019 at 09:48AM +01, Jean-Michel Vourgère wrote:

> Upstream of phppgadmin has nice unit tests in its github.com repository, but
> they use a .gitattributes file [1] to strip these tests files from the
> distributed tar files: All the unit tests are missing from the orig.tar.
>
> I wonder how to proceed:
>
> I don't think there is an option in github.com to ignore the "export-ignore"
> in .gitattributes, that would have been perfect in my case.

If you use `git deborig` (in devscripts) to generate the orig.tar then
the export-ignore will be overridden automatically for you.

Just type `git deborig` after creating a new changelog entry with the
new upstream version number.

-- 
Sean Whitton


signature.asc
Description: PGP signature


Re: watch files and .gitattributes export-ignore

2019-12-12 Thread Richard Laager
On 12/12/19 2:48 AM, Jean-Michel Vourgère wrote:
> Upstream of phppgadmin has nice unit tests in its github.com repository, but 
> they use a .gitattributes file [1] to strip these tests files from the 
> distributed tar files: All the unit tests are missing from the orig.tar.

Have you asked upstream to ship the tests in the tarball?

-- 
Richard



signature.asc
Description: OpenPGP digital signature


Re: watch files and .gitattributes export-ignore

2019-12-12 Thread James Valleroy
On 12/12/19 3:48 AM, Jean-Michel Vourgère wrote:
> Hello
> 
> Upstream of phppgadmin has nice unit tests in its github.com repository, but 
> they use a .gitattributes file [1] to strip these tests files from the 
> distributed tar files: All the unit tests are missing from the orig.tar.
> 
> I wonder how to proceed:
> 
> I don't think there is an option in github.com to ignore the "export-ignore" 
> in .gitattributes, that would have been perfect in my case.
> 
> Ideally, I'd like to generate the orig.tar from a "git clone". But uscan 
> don't 
> support that.

Here is an approach that I'm using recently:
1) I followed the "No upstream tarballs" section of git-buildpackage manual [1].
2) After cloning the upstream repository and checkout of debian/sid branch, I 
"git rm"ed the .gitattributes file. This is necessary to preserve the tests 
during git-export.
3) I added "--git-upstream=SLOPPY" to the first "gbp buildpackage" command that 
commits the pristine tar, so it exports HEAD instead of the release tag.

[1] 
https://honk.sigxcpu.org/projects/git-buildpackage/manual-html/gbp.import.upstream-git.html#gbp.import.upstream.git.notarball



signature.asc
Description: OpenPGP digital signature


Re: watch files and .gitattributes export-ignore

2019-12-12 Thread merkys
Hi Jean-Michel,

On 2019-12-12 10:48, Jean-Michel Vourgère wrote:
> Ideally, I'd like to generate the orig.tar from a "git clone". But uscan 
> don't 
> support that.

Do you mean uscan's 'mode=git' does honor .gitattributes? I wasn't aware
of that.

Best,
Andrius




signature.asc
Description: OpenPGP digital signature


watch files and .gitattributes export-ignore

2019-12-12 Thread Jean-Michel Vourgère
Hello

Upstream of phppgadmin has nice unit tests in its github.com repository, but 
they use a .gitattributes file [1] to strip these tests files from the 
distributed tar files: All the unit tests are missing from the orig.tar.

I wonder how to proceed:

I don't think there is an option in github.com to ignore the "export-ignore" 
in .gitattributes, that would have been perfect in my case.

Ideally, I'd like to generate the orig.tar from a "git clone". But uscan don't 
support that.

Debian policy 4.1.4 did remove the get-orig-source target from debian/rules.

I guess I'll go for a manual build of the orig.tar, with a d/README.source. Or 
a script. Any better idea?

To make things worse, I think I'll keep the d/watch file so I get warning when 
upstream releases a new version. But that's pretty bad because then one has to 
be careful not to use uscan! :/

Any insight would be appreciated. Thanks!


[1] https://github.com/phppgadmin/phppgadmin/raw/master/.gitattributes

signature.asc
Description: This is a digitally signed message part.