Re: create Debian Source from GIT repository without tag

[Andrey Rahmatullin]

On Wed, Aug 17, 2016 at 09:25:21PM +0200, Adam Borowski wrote:
> > > > > If the repository contains any tags, I'd strongly recommend the 
> > > > > output of
> > > > > "git describe --tags".  This will, beside DTRT when you're exactly on 
> > > > > a
> > > > > tag (ie, on a release), produce version numbers of the form:
> > > > > -<# of commits>-g, which is both monotonic if 
> > > > > you
> > > > > fast-forward and can be given to git to unambigously refer to the 
> > > > > commit
> > > > > you're uploading even to users of other branches.
> > > > > 
> > > > > For example, one of my projects is currently at 0.17-128-g8606a54.
> > > > This also will cause the package version to have nothing in common with
> > > > the actual software version. I doubt we want this.
> > > 
> > > Eh?  How can you have _more_ in common with the actual version than "from
> > > release X, add Y commits, of all branch tips Y commits later pick the one
> > > whose hash starts with Z"?
> > You are using a tag for an older software release so while the software is
> > actually version 3.0 the package will have 2.0 version.
> 
> Only if 3.0 hasn't been released yet, and there were no rc tags.  In which
> case, the version number will be 2.0--g.
If 3.0 hasn't been released yet, and the 2.0 tag exists, this has no place
in this thread.

-- 
WBR, wRAR


signature.asc
Description: PGP signature

Re: create Debian Source from GIT repository without tag

[Adam Borowski]

On Wed, Aug 17, 2016 at 11:04:39AM +0500, Andrey Rahmatullin wrote:
> On Tue, Aug 16, 2016 at 11:39:33PM +0200, Adam Borowski wrote:
> > > > If the repository contains any tags, I'd strongly recommend the output 
> > > > of
> > > > "git describe --tags".  This will, beside DTRT when you're exactly on a
> > > > tag (ie, on a release), produce version numbers of the form:
> > > > -<# of commits>-g, which is both monotonic if 
> > > > you
> > > > fast-forward and can be given to git to unambigously refer to the commit
> > > > you're uploading even to users of other branches.
> > > > 
> > > > For example, one of my projects is currently at 0.17-128-g8606a54.
> > > This also will cause the package version to have nothing in common with
> > > the actual software version. I doubt we want this.
> > 
> > Eh?  How can you have _more_ in common with the actual version than "from
> > release X, add Y commits, of all branch tips Y commits later pick the one
> > whose hash starts with Z"?
> You are using a tag for an older software release so while the software is
> actually version 3.0 the package will have 2.0 version.

Only if 3.0 hasn't been released yet, and there were no rc tags.  In which
case, the version number will be 2.0--g.

-- 
An imaginary friend squared is a real enemy.

Re: create Debian Source from GIT repository without tag

[Andrey Rahmatullin]

On Tue, Aug 16, 2016 at 11:39:33PM +0200, Adam Borowski wrote:
> > > If the repository contains any tags, I'd strongly recommend the output of
> > > "git describe --tags".  This will, beside DTRT when you're exactly on a
> > > tag (ie, on a release), produce version numbers of the form:
> > > -<# of commits>-g, which is both monotonic if you
> > > fast-forward and can be given to git to unambigously refer to the commit
> > > you're uploading even to users of other branches.
> > > 
> > > For example, one of my projects is currently at 0.17-128-g8606a54.
> > This also will cause the package version to have nothing in common with
> > the actual software version. I doubt we want this.
> 
> Eh?  How can you have _more_ in common with the actual version than "from
> release X, add Y commits, of all branch tips Y commits later pick the one
> whose hash starts with Z"?
You are using a tag for an older software release so while the software is
actually version 3.0 the package will have 2.0 version.

-- 
WBR, wRAR


signature.asc
Description: PGP signature

Re: create Debian Source from GIT repository without tag

[Sean Whitton]

On Tue, Aug 16, 2016 at 08:43:05AM +0200, Ferenc Wágner wrote:
> Sean Whitton  writes:
> 
> > For example, support I'm packaging 0~git.abc123d.  This version number
> > might be used because I'm basing my packaging on upstream git commit
> > whose hash is uniquely identified by the string 'abc123d'.
> 
> Such version numbers won't order correctly.  Didn't you mean to include
> a monotonically increasing component before the hash?

Whoops, thanks.

I usually use: 0~git.MMDD.abc123d

-- 
Sean Whitton


signature.asc
Description: PGP signature

Re: create Debian Source from GIT repository without tag

[Adam Borowski]

On Tue, Aug 16, 2016 at 10:04:43PM +0500, Andrey Rahmatullin wrote:
> On Tue, Aug 16, 2016 at 05:00:02PM +0200, Adam Borowski wrote:
> > If the repository contains any tags, I'd strongly recommend the output of
> > "git describe --tags".  This will, beside DTRT when you're exactly on a
> > tag (ie, on a release), produce version numbers of the form:
> > -<# of commits>-g, which is both monotonic if you
> > fast-forward and can be given to git to unambigously refer to the commit
> > you're uploading even to users of other branches.
> > 
> > For example, one of my projects is currently at 0.17-128-g8606a54.
> This also will cause the package version to have nothing in common with
> the actual software version. I doubt we want this.

Eh?  How can you have _more_ in common with the actual version than "from
release X, add Y commits, of all branch tips Y commits later pick the one
whose hash starts with Z"?

It's both human and machine readable.

-- 
An imaginary friend squared is a real enemy.

Re: create Debian Source from GIT repository without tag

[Andrey Rahmatullin]

On Tue, Aug 16, 2016 at 05:00:02PM +0200, Adam Borowski wrote:
> If the repository contains any tags, I'd strongly recommend the output of
> "git describe --tags".  This will, beside DTRT when you're exactly on a
> tag (ie, on a release), produce version numbers of the form:
> -<# of commits>-g, which is both monotonic if you
> fast-forward and can be given to git to unambigously refer to the commit
> you're uploading even to users of other branches.
> 
> For example, one of my projects is currently at 0.17-128-g8606a54.
This also will cause the package version to have nothing in common with
the actual software version. I doubt we want this.

-- 
WBR, wRAR


signature.asc
Description: PGP signature

Re: create Debian Source from GIT repository without tag

[Adam Borowski]

On Tue, Aug 16, 2016 at 11:54:19AM +0500, Andrey Rahmatullin wrote:
> On Tue, Aug 16, 2016 at 07:50:37AM +0100, Ghislain Vaillant wrote:
> > > > For example, support I'm packaging 0~git.abc123d.  This version number
> > > > might be used because I'm basing my packaging on upstream git commit
> > > > whose hash is uniquely identified by the string 'abc123d'.
> > > 
> > > Such version numbers won't order correctly.  Didn't you mean to include
> > > a monotonically increasing component before the hash?
> > 
> > Generally speaking, is there a recommended Debian version format for
> > git snapshots?
> 1.1+20160816, or ~ instead of +, as usual.
> Unless you are packaging two different snapshots committed at the same
> day.

If the repository contains any tags, I'd strongly recommend the output of
"git describe --tags".  This will, beside DTRT when you're exactly on a
tag (ie, on a release), produce version numbers of the form:
-<# of commits>-g, which is both monotonic if you
fast-forward and can be given to git to unambigously refer to the commit
you're uploading even to users of other branches.

For example, one of my projects is currently at 0.17-128-g8606a54.

-- 
An imaginary friend squared is a real enemy.

Re: create Debian Source from GIT repository without tag

[Andrey Rahmatullin]

On Tue, Aug 16, 2016 at 10:09:48AM +0100, Ghislain Vaillant wrote:
> > > Generally speaking, is there a recommended Debian version format for
> > > git snapshots?
> > 1.1+20160816, or ~ instead of +, as usual.
> > Unless you are packaging two different snapshots committed at the same
> > day.
> 
> I have always thought that people kept the git hash so that their
> get-orig-source target can grab it from parsing the Debian version
> string and fetch the corresponding git snapshot.
You don't need get-orig-source when you use the upstream git and gbp
though.

-- 
WBR, wRAR


signature.asc
Description: PGP signature

Re: create Debian Source from GIT repository without tag

[Ghislain Vaillant]

On 16/08/16 07:54, Andrey Rahmatullin wrote:

On Tue, Aug 16, 2016 at 07:50:37AM +0100, Ghislain Vaillant wrote:

For example, support I'm packaging 0~git.abc123d.  This version number
might be used because I'm basing my packaging on upstream git commit
whose hash is uniquely identified by the string 'abc123d'.


Such version numbers won't order correctly.  Didn't you mean to include
a monotonically increasing component before the hash?


Generally speaking, is there a recommended Debian version format for
git snapshots?

1.1+20160816, or ~ instead of +, as usual.
Unless you are packaging two different snapshots committed at the same
day.


I have always thought that people kept the git hash so that their
get-orig-source target can grab it from parsing the Debian version
string and fetch the corresponding git snapshot.

Ghis

Re: create Debian Source from GIT repository without tag

[Andrey Rahmatullin]

On Tue, Aug 16, 2016 at 07:50:37AM +0100, Ghislain Vaillant wrote:
> > > For example, support I'm packaging 0~git.abc123d.  This version number
> > > might be used because I'm basing my packaging on upstream git commit
> > > whose hash is uniquely identified by the string 'abc123d'.
> > 
> > Such version numbers won't order correctly.  Didn't you mean to include
> > a monotonically increasing component before the hash?
> 
> Generally speaking, is there a recommended Debian version format for
> git snapshots?
1.1+20160816, or ~ instead of +, as usual.
Unless you are packaging two different snapshots committed at the same
day.

-- 
WBR, wRAR


signature.asc
Description: PGP signature

Re: create Debian Source from GIT repository without tag

[Ghislain Vaillant]

On 16/08/16 07:43, Ferenc Wágner wrote:

Sean Whitton  writes:


For example, support I'm packaging 0~git.abc123d.  This version number
might be used because I'm basing my packaging on upstream git commit
whose hash is uniquely identified by the string 'abc123d'.


Such version numbers won't order correctly.  Didn't you mean to include
a monotonically increasing component before the hash?


Generally speaking, is there a recommended Debian version format for
git snapshots?

Ghis

Re: create Debian Source from GIT repository without tag

[Ferenc Wágner]

Sean Whitton  writes:

> For example, support I'm packaging 0~git.abc123d.  This version number
> might be used because I'm basing my packaging on upstream git commit
> whose hash is uniquely identified by the string 'abc123d'.

Such version numbers won't order correctly.  Didn't you mean to include
a monotonically increasing component before the hash?
-- 
Regards,
Feri

Re: create Debian Source from GIT repository without tag

[Andrey Rahmatullin]

On Mon, Aug 15, 2016 at 04:53:59PM -0700, Sean Whitton wrote:
> One thing I've done is added a tag corresponding to upstream part of the
> version in my Debian changelog entry.  Then gbp can generate the tarball
> for me.
Sure, but Jerome didn't say he was using gbp.

-- 
WBR, wRAR


signature.asc
Description: PGP signature

Re: create Debian Source from GIT repository without tag

[Sean Whitton]

Hello,

On Mon, Aug 15, 2016 at 09:24:01PM +0500, Andrey Rahmatullin wrote:
> > Do you have a example or a wiki in mind ?
> Um. git archive  | xz > foo.tar.xz, I guess.

One thing I've done is added a tag corresponding to upstream part of the
version in my Debian changelog entry.  Then gbp can generate the tarball
for me.

For example, support I'm packaging 0~git.abc123d.  This version number
might be used because I'm basing my packaging on upstream git commit
whose hash is uniquely identified by the string 'abc123d'.  I would add
a tag '0_abc123d' (since gbp replaces '~' with '_' in tags due to git
restrictions).  Then `gbp buildpackage` would generate the tarball as
needed.

Just calling `git archive` yourself is fine.  The only advantage of the
method I just described is that it's easier to remember/document for
future releases -- create the tag, and let gbp do the rest.

-- 
Sean Whitton


signature.asc
Description: PGP signature

Re: create Debian Source from GIT repository without tag

[Jerome BENOIT]

Hi,

On 15/08/16 17:46, Andrew Shadura wrote:
> On 15 August 2016 at 17:24, Andrey Rahmatullin  wrote:
>> On Mon, Aug 15, 2016 at 04:58:32PM +0100, Jerome BENOIT wrote:
> So I am considering to create a Debian Source from the GIT repository.
> Unfortunately, the GIT repository contains no tags, so uscan(1) seems
> not be useful here. I have already submitted a ticket to the upstream
> maintainer [3], but he seems to be very busy.  Meanwhile, I want to step
> forward.
>
> What is the best way to create a Debian Source from the upstream GIT 
> repository ?
 git archive would be enough, you don't need uscan for that.
 You can't have a debian/watch in this case, of course.

>>>
>>> Do you have a example or a wiki in mind ?
>> Um. git archive  | xz > foo.tar.xz, I guess.
> 
> I did attempt to automate such tasks a couple of time for
> Ajenti-related packages (I haven't finished packaging Ajenti itself —
> any takers by the way?): python-catcher, python-exconsole,
> python-reconfigure (have a look at debian/rules:get-orig-source).
> 
The three of them have a d/wath file .


Jerome

Re: create Debian Source from GIT repository without tag

[gregor herrmann]

On Mon, 15 Aug 2016 16:58:32 +0100, Jerome BENOIT wrote:

> >> What is the best way to create a Debian Source from the upstream GIT 
> >> repository ?
> > git archive would be enough, you don't need uscan for that.
> > You can't have a debian/watch in this case, of course.
> Do you have a example or a wiki in mind ?

If you want to check what other Debian packages do,
codesearch.debian.net often helps:

https://codesearch.debian.net/search?q=git-archive+path%3Adebian%2F=1


Cheers,
gregor

-- 
 .''`.  Homepage https://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
 : :' : Debian GNU/Linux user, admin, and developer -  https://www.debian.org/
 `. `'  Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
   `-   NP: Tom Waits: America


signature.asc
Description: Digital Signature

Re: create Debian Source from GIT repository without tag

[Andrey Rahmatullin]

On Mon, Aug 15, 2016 at 04:58:32PM +0100, Jerome BENOIT wrote:
> >> So I am considering to create a Debian Source from the GIT repository.
> >> Unfortunately, the GIT repository contains no tags, so uscan(1) seems
> >> not be useful here. I have already submitted a ticket to the upstream
> >> maintainer [3], but he seems to be very busy.  Meanwhile, I want to step
> >> forward.
> >>
> >> What is the best way to create a Debian Source from the upstream GIT 
> >> repository ?
> > git archive would be enough, you don't need uscan for that.
> > You can't have a debian/watch in this case, of course.
> > 
> 
> Do you have a example or a wiki in mind ?
Um. git archive  | xz > foo.tar.xz, I guess.

-- 
WBR, wRAR


signature.asc
Description: PGP signature

Re: create Debian Source from GIT repository without tag

[Jerome BENOIT]

Hello Andrey,

thanks for your prompt reply.

On 15/08/16 16:43, Andrey Rahmatullin wrote:
> On Mon, Aug 15, 2016 at 04:19:03PM +0100, Jerome BENOIT wrote:
>> it appears that for one of my pacage, libgap-sage not to mention it [1],
>> the upstream source tarbal does not contain the required material to be not
>> rejected by ftpmaster [2]. 
> Your link doesn't seem to support that.

The answer from Ben Finney does, given that the upstream source ball
contains only the transformed source files (neither the original nor
the scripts used to transformed them),

https://lists.debian.org/debian-legal/2016/08/msg7.html

> 
> 
>> So I am considering to create a Debian Source from the GIT repository.
>> Unfortunately, the GIT repository contains no tags, so uscan(1) seems
>> not be useful here. I have already submitted a ticket to the upstream
>> maintainer [3], but he seems to be very busy.  Meanwhile, I want to step
>> forward.
>>
>> What is the best way to create a Debian Source from the upstream GIT 
>> repository ?
> git archive would be enough, you don't need uscan for that.
> You can't have a debian/watch in this case, of course.
> 

Do you have a example or a wiki in mind ?

Thanks in advance,
Jerome

create Debian Source from GIT repository without tag

[Jerome BENOIT]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512

Hello Forum,

it appears that for one of my pacage, libgap-sage not to mention it [1],
the upstream source tarbal does not contain the required material to be not
rejected by ftpmaster [2]. So I am considering to create a Debian Source
from the GIT repository. Unfortunately, the GIT repository contains no tags,
so uscan(1) seems not be useful here. I have already submitted a ticket to
the upstream maintainer [3], but he seems to be very busy.
Meanwhile, I want to step forward.

What is the best way to create a Debian Source from the upstream GIT repository 
?

Any hint and any (good) example is wellcome.

Thanks in advance,
Jerome


[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=833406
[2] https://lists.debian.org/debian-legal/2016/08/msg6.html
[3] https://bitbucket.org/vbraun/libgap/issues/14
- -- 
Jerome BENOIT | calculus+at-rezozer^dot*net
https://qa.debian.org/developer.php?login=calcu...@rezozer.net
AE28 AE15 710D FF1D 87E5  A762 3F92 19A6 7F36 C68B
-BEGIN PGP SIGNATURE-

iQQcBAEBCgAGBQJXsdv+AAoJED+SGaZ/NsaLqyIf+wTyHg7e49zH1SWPzEhI7QF0
fbmgtlWIx2he/qEFCaMCERpDuR3SzltVuhJHm4C8pmGk58uJur3Tfttz6H5m4cR4
qBUNXWMH3Xeigulx30gAIC6vKPoIaIKumhldqZpoOVvgNHplBXmZRsUGwa/+l8M1
Z3zh730VPEyHmG3foRpri7FQCUS2PQW+7GDUTt8hiEbYxErzp+zIVQdAQ1pzw7U+
JkKd31bmDGwKqC1In2dOk4/JnubEyZmmaKY8px/ptzrEUGOKwF/7Q95CChywmvzQ
r4wvcZttorl6me3Uea6Fi/iwfgcqs0I+g4wC7DzdwrBIxJe/kurt3Htj8EErEvIr
z8LHK7m4tPKF1iwTEIyieW1mczRz+lOwf8Ou9PyWBO5ZEHZC7R5jx/goW4lTZ9rv
Jl9HtgcjgdDLEwbTEHlZrNpOmkF3vPVNIP0KyQvDi6uwzScQD2q89sbcSK+YsMgU
ca3BtcKu6Sse71szNYEI5r7ANeLOg/4DcfT3ILiUPVskJPJq/agD5CYwCC10EBsv
oDnqWdBBDrJc1G0Brnul0qrzSiG3XR8HHRppXaatiLdBHKHUzP6PUykbSFl3AQ1G
Cm/oa1MrtOlFO5xE/Jh/HCIZshMEWPNA6K0eqWD0dI03T5WiRvILGSJ0Tdaa7k+7
eCD9XJo9ChdJNh+tgOhAWA1ljudBLzrEY/V7eRfVW2JXsnPYTiuPPkXKOLQVib/5
5jMaLVah30EGKY2agqOwtT3l6QnKW6PTkM46bWGJ6YgCIL8R8MDNrKfTfqae+Xle
9kbK3EqW60kFMF3XxjAkpWPnMIR21VN/X0iEDdkebzmJLLN7uf4AVJJP2DW6/RDG
9Httz7/c/Z2vFyakWMYdfGBClo2kKqmw4SNjhUQrfXGBt5CuFy3STTgH2I69cD8U
UK0jfNJA0o+arKb/7j0Y6cwlWrOZ0W5YHyGQdH2MJ7doExEncpk9429V0vskTGsg
mGq6sTn7RoJFCHp0YTdTRnYy1QgDYuPs53spJZffSvttNdyzkVYkb1WMWow7ix5K
pSyGO3iHnLRPGgs8Dno1REz/AteJczyF6nJr+KbUX5d+qE+jXpqww/V92BDh8/8L
U65k19+6IIG3pZzqk0wtTnS/yMEuYGFP9NiECeQIGX0jDln5CaBRwyvKnPDYsbYW
QGTMKEhuyStuVEIjUZpTU93XX6sCVhP9tvhKQv6W43IvInbuKNONOTonyFoc5eze
QBtE2fecv2rIY/FWP5cNE6RwQhrRIeyUhpZrz30X5u1GHR7Ush9BQZyB/fbCu607
ls5e7nJTcyu3+7i60CTQNtIGkXbW16wu/3igrx591ibXJzil1csOSxKTfYAUM08=
=Bf9+
-END PGP SIGNATURE-

Re: create Debian Source from GIT repository without tag

[Andrey Rahmatullin]

On Mon, Aug 15, 2016 at 04:19:03PM +0100, Jerome BENOIT wrote:
> it appears that for one of my pacage, libgap-sage not to mention it [1],
> the upstream source tarbal does not contain the required material to be not
> rejected by ftpmaster [2]. 
Your link doesn't seem to support that.


> So I am considering to create a Debian Source from the GIT repository.
> Unfortunately, the GIT repository contains no tags, so uscan(1) seems
> not be useful here. I have already submitted a ticket to the upstream
> maintainer [3], but he seems to be very busy.  Meanwhile, I want to step
> forward.
> 
> What is the best way to create a Debian Source from the upstream GIT 
> repository ?
git archive would be enough, you don't need uscan for that.
You can't have a debian/watch in this case, of course.

-- 
WBR, wRAR


signature.asc
Description: PGP signature

create Debian Source from GIT repository without tag

[Jerome BENOIT]

Hello Forum,

it appears that for one of my pacage, libgap-sage not to mention it [1],
the upstream source tarbal does not contain the required material to be not
rejected by ftpmaster [2]. So I am considering to create a Debian Source
from the GIT repository. Unfortunately, the GIT repository contains no tags,
so uscan(1) seems not be useful here. I have already submitted a ticket to
the upstream maintainer [3], but he seems to be very busy.
Meanwhile, I want to step forward.

What is the best way to create a Debian Source from the upstream GIT repository 
?

Any hint and any (good) example is wellcome.

Thanks in advance,
Jerome


[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=833406
[2] https://lists.debian.org/debian-legal/2016/08/msg6.html
[3] https://bitbucket.org/vbraun/libgap/issues/14