<div dir="ltr"><div>Hey,<br></div><div><div><div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Apr 24, 2015 at 6:42 PM, Andreas Tille <span dir="ltr"><<a href="mailto:andreas@an3as.eu" target="_blank">andreas@an3as.eu</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Hi,<br>
<br>
sorry for the delay - I was a bit busy.<br>
<br></blockquote><div>Sorry for my delay, too.<br> <br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><span>> Then, I tried to create a Test rgit reo, using the script. The created git<br>
> repository is not observable on <a href="http://git.debian.org/openstack" target="_blank">http://git.debian.org/openstack</a>. Is this<br>
> the issue that Thamos has mentioned it, before?<br>
> "This should be slightly adapted if you're not add (to handle a<br>
> different username with "- guest" at the end). "<br>
<br>
</span>I guess the web display on <a href="http://git.debian.org" target="_blank">git.debian.org</a> is OK since the repository does<br>
not exist at all:<br>
<br>
moszumanska:~$ ls /git/openstack/* | grep manila<br>
moszumanska:~$<br>
<span><br></span></blockquote><div>The name of my repo in this state was "TEST" not manila, and after doing my test, I removed the repo from git-server. That's why you could not find it. <br><br></div><div>About the issue that I mentioned it in the previous email (web display of git repo), I found out it was related to time. It seems changes on <a href="http://git.debian.org" target="_blank">git.debian.org</a> are not displaying immediately on web. <br>In other words, After spending a little time removed/added items will be displayed. I should just be a little more patient ;)<br><br><br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><span>
</span>I think it might be a good idea to use the script with "set -x" to see<br>
where it fails and in case of problems do all the steps manually.</blockquote><div><br>Actually, It did not fail. As I mentioned above, It was just my mistake. The script was done successfully without reporting any failure. <br> <br><br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> If<br>
you send me the link where you downloaded the script I could check<br>
myself but I guess it will be no magic and contains some "git init" etc.<br>
stuff that could be done manually for sure.<br>
<span><br></span></blockquote><div>I think it is a little bit late for sending the link :P <br>sorry for delay<br><br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><span>
</span>Please always keep in mind that I do not know the relation between the<br>
launchpad and the github, but *I* consider it good practice to use the<br>
version that is released by upstream and as far as I can see upstream is<br>
at github. To fetch the latest version from github you can use a<br>
debian/watch file with the following content:<br>
<br>
<br>
version=3<br>
opts="uversionmangle=s/([\d.]*)([a-zA-Z])/$1~$2/;s/\.0b/~b/" \<br>
<a href="https://github.com/openstack/manila/releases" target="_blank">https://github.com/openstack/manila/releases</a> .*/archive/(\d[\d.-brc]+)\.(?:tar(?:\.gz|\.bz2)?|tgz)<br>
<br>
<br>
If you do this and go to the main packaging dir (== the dir where you<br>
see the content above if you do `cat debian/watch`) than you can do<br>
<br>
$ uscan --verbose --report<br>
-- Scanning for watchfiles in .<br>
-- Found watchfile in ./debian<br>
-- In debian/watch, processing watchfile line:<br>
opts="uversionmangle=s/([\d.]*)([a-zA-Z])/$1~$2/;s/\.0b/~b/" <a href="https://github.com/openstack/manila/releases" target="_blank">https://github.com/openstack/manila/releases</a> .*/archive/(\d[\d.-brc]+)\.(?:tar(?:\.gz|\.bz2)?|tgz)<br>
-- Found the following matching hrefs:<br>
/openstack/manila/archive/2015.1.0rc1.tar.gz (2015.1.0~rc1)<br>
/openstack/manila/archive/2015.1.0b3.tar.gz (2015.1.0~b3)<br>
/openstack/manila/archive/2015.1.0b2.tar.gz (2015.1.0~b2)<br>
/openstack/manila/archive/2015.1.0b1.tar.gz (2015.1.0~b1)<br>
/openstack/manila/archive/2014.2.tar.gz (2014.2)<br>
/openstack/manila/archive/2014.2.rc2.tar.gz (2014.2.~rc2)<br>
/openstack/manila/archive/2014.2.rc1.tar.gz (2014.2.~rc1)<br>
/openstack/manila/archive/2014.2.b3.tar.gz (2014.2.~b3)<br>
Newest version on remote site is 2015.1.0~rc1, local version is 2015.1~b2<br>
=> Newer version available from<br>
<a href="https://github.com/openstack/manila/archive/2015.1.0rc1.tar.gz" target="_blank">https://github.com/openstack/manila/archive/2015.1.0rc1.tar.gz</a><br>
-- Scan finished<br>
<br>
If you do<br>
<br>
$ uscan --verbose --force-download<br>
<br>
you get what *I* would start packaging (and I repeat that I'm quite<br>
clueless about OpenStack in general and Manila in special and so I have<br>
no idea whether it is a good idea to use "~b" but "~rc" seems to be even<br>
a release candidate from upstream which might be fit for packaging.<br>
<span><br></span></blockquote><div>Great explanation. thanks<br> <br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><span>
> Now, I dont know as the first commit, I should add a debian dir which is<br>
</span>> added using *dh-make*?<br>
<br>
I *personally* hate dh-make since it leaves you alone with a lot of<br>
useless templates you need to delete afterwards. Since I'd regard this<br>
as a very dumb work and I've seen so many not deleted templates that<br>
just leave noise I always recommend to start with some existing package.<br>
As you might have seen in the Debian Med policy I've created an adapted<br>
package_template but this is not as helpful in your case.<br>
<span><br>
> or i can copy ubuntu-Manila debian directory on my<br>
> repository, and do the first commit?<br>
<br>
</span>I'd (strongly) recommend to start from this since this is most probably<br>
the best way to start from. I'd always consider starting from some<br>
existing packaging work and see how far it leads. I had a view into<br>
this and have seen several needed changes - but we can do this step by<br>
step.<br>
<span><br></span></blockquote><div>Okay :)<br><br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><span>
> if iI copy ubuntu-Manila debian dir,<br>
> is it needed to change some thing like control file, changelog, ...? Or I<br>
> should just do the first commit, and then we will try to adapt it for<br>
> Debain Repositories?<br>
<br>
</span>You should have a close look into some other package done by the<br>
openstack team and adapt the "Maintainer" and "Uploaders" field<br>
accordingly. Please confirm that you were able to follow up to this<br>
point (or not and ask what might remain unclear). Than we might<br>
continue from here.<br>
<span></span><b><span><br></span></b></blockquote><div>I found them on control file. As for Uploaders, should I only add my and your name/email? or the name of main maintainer of openstack in Debian (I mean Thomas) should be added to all of the openstack packages, too.<br><br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
So please send me some mail that you did a commit (perhaps with a short<br>
commit log) and I'll pull from Git and will check your changes.<br>
<span><br></span></blockquote><div>Got it. sure, I will send.<br> <br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><span>> I dont know what are " d/watch files". May I know where can I find some<br>
> documents about it?<br>
<br>
</span>Sorry for the stupid shortcut. Please note: If I write "d/<something>"<br>
I mean "debian/<something>". Its a stupid pedagocial mistake of mine to<br>
throw those shortcuts onto newcomers and I'll avoid this in future. I<br>
think the debian/watch issue was explained above. Its simply the meta<br>
information where to seek for new upstream versions.<br>
<br></blockquote><div>Uhum. got it. <br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<br>
[tag-based-packaging]<br>
<span>> > > git clone git://<a href="http://github.com/openstack/manila.git" target="_blank">github.com/openstack/manila.git</a><br>
> > > cd manila<br>
> > > git tag 2015.1_b3 2015.1.0b3<br>
> > > git reset --hard 2015.1_b3<br>
> > > git checkout -b debian/kilo<br>
> > > git branch -d master<br>
> > > # <add here your debian folder for the packaging><br>
> > > git add debian<br>
> > > git commit -a -m "Initial debian folder"<br>
> > ><br>
> > > Make sure that, when you add your Debian folder, you get something<br>
> > > like this in debian/gbp.conf:<br>
> > ><br>
> > > [DEFAULT]<br>
> > > debian-branch = debian/kilo<br>
> > > upstream-tag = %(version)s<br>
> > > compression = xz<br>
> > ><br>
> > > [git-buildpackage]<br>
> > > export-dir = ../build-area/<br>
> > ><br>
> > > Then doing "pkgos-bop" should rebuild the package correctly.<br>
> ><br>
> Thank you Thomas for the explanation. I need to study about<br>
> debian/gbp.conf<br>
<br>
</span>Hmm, reading this again this is possibly what Thomas means with "tag<br>
based packaging". Did you went all these single steps? </blockquote><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">While I<br>
think the tag is not the one we should target at since uscan reports<br>
some newer version this sounds quite sensible to me. I'm afraid<br>
you just where not able to push this to <a href="http://git.debian.org" target="_blank">git.debian.org</a>.<br>
<br>
So please if there are remaining problems: Do *every* single step and<br>
post the output (may be shortened) to enable me reproducing what you did<br>
and comment ond potential problems. If you confirm that all above went<br>
smoothly you might just hang on the pkgos-alioth-new-git script which as<br>
I wrote above could be separated into simple steps most probably. Just<br>
let me know about any single step and any single failure that might<br>
occure. I'll try to reproduce this here and will take over things that<br>
might fail on your side (for whatever reason).<br>
<span><br></span></blockquote><div>Yes, I had done them when you replied my email. I just didn't know what is the correct format of line "<span>git tag 2015.1_b3 2015.1.0b3" in my case, as I described in the previous email. <br>Finally, I replaced the line with </span><span>"<span>git tag 2015.1_rc1 2015.1.0rc1"</span> and finished the above steps. Then I used </span><span>pkgos-alioth-new-git and uploaded the cod on git-server. The only problem was displaying on web, which it was not a real problem. But, I thought s/th is wrong when I saw nothing is displaying on the web, and so i deleted my repo from <a href="http://git.debian.org" target="_blank">git.debian.org</a> <br> </span><br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><span>
</span>I guess the retagging is done since in Debian we are using the tilde (~)<br>
to make sure we can easily increase the version number when there is an<br>
official release (without the attached "b3"). You might like to have a<br>
look at the following comparison:<br>
<br>
if dpkg --compare-versions 2015.1~b3 lt 2015.1 ; then echo "2015.1~b3 is lower than 2015.1" ; fi<br>
<br>
That's the reason why in debian/changelog you find the '~' before the<br>
'b' in the version string and this in turn is the reason why in<br>
debian/watch the '~' is injected in the uversionmangle expression (see<br>
above). However, (as far as I know) the tilde is no valid character for<br>
Git tags and thus in Git tags it is emulated with an underscore ('_').<br>
<br>
On the other hand you are correct that Thomas was not refering to the<br>
latest upstream tag (as we know from the uscan --report above) and thus<br>
I think it is rather<br>
<br>
git tag 2015.1.0_rc1 2015.1.0rc1<br>
<br>
what we want to write here. Please note that I have currently no clone<br>
on my machine - may be the upstream tag is different - adapt if needed.<br>
<span><br></span></blockquote><div>Great explanation. thanks.<br> <br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><span>
P</span>lease refer to Debian Med policy. Its explained there if you seek for<br>
"pristine-tar". I need to admit that I do not see the constraints given<br>
above.<br>
<span><br></span></blockquote><div>Okay. Thanks.<br> <br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><span>
</span>See above. As I said in the beginning you need to ask in more small<br>
steps and more frequently. I think this is more efficient than those<br>
large mails. Please break up your single steps in the future and do<br>
not hesitate to ask any single bit - there is no chance to ask stupid<br>
questions. Only my answers might be stupid - but I hope they will be<br>
not. ;-)<br>
<span><br></span></blockquote><div>Okay. I will do it :)<br> <br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><span>
</span>Hope this helps<br>
<div><div><br></div></div></blockquote><div>Of course it helps. <br></div><div>Thank you :)<br> <br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div><div>
Andreas.<br>
<br>
--<br>
<a href="http://fam-tille.de" target="_blank">http://fam-tille.de</a><br>
<br>
_______________________________________________<br>
Openstack-devel mailing list<br>
<a href="mailto:Openstack-devel@lists.alioth.debian.org" target="_blank">Openstack-devel@lists.alioth.debian.org</a><br>
<a href="http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/openstack-devel" target="_blank">http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/openstack-devel</a><br>
</div></div></blockquote></div><br><br clear="all"><br>-- <br><div><div dir="ltr"><div><div dir="ltr">------------<br><div><span style="color:rgb(51,51,51);font-family:Verdana,sans-serif;font-size:12.7273px;line-height:18px">you can't start the next chapter if you keep re-reading the last one</span><br></div><div><span style="color:rgb(51,51,51);font-family:Verdana,sans-serif;font-size:12.7273px;line-height:18px"><br></span></div><div>mali</div></div></div></div></div>
</div></div></div></div></div>