On 07/16/2012 09:49 AM, Mickaël Canévet wrote: > On Fri, 2012-07-13 at 15:22 +0200, Alex Mestiashvili wrote: > >> On 07/13/2012 03:02 PM, Mickaël Canévet wrote: >> >>> On Fri, 2012-07-13 at 14:54 +0200, Andreas Tille wrote: >>> >>> >>>> Hi, >>>> >>>> On Fri, Jul 13, 2012 at 02:52:34PM +0200, Alex Mestiashvili wrote: >>>> >>>> >>>>> On 07/13/2012 02:41 PM, Mickaël Canévet wrote: >>>>> >>>>> >>>>>> Is it better now ? >>>>>> >>>>>> >>>>>> >>>>>> >>>>> Yes, now it looks better, >>>>> >>>>> >>>> It might be just me, but >>>> >>>> $ git pull >>>> remote: Counting objects: 4, done. >>>> remote: Compressing objects: 100% (3/3), done. >>>> remote: Total 4 (delta 0), reused 0 (delta 0) >>>> Unpacking objects: 100% (4/4), done. >>>> >From git+ssh://git.debian.org/git/debian-med/situs >>>> * [new branch] pristine-tar -> origin/pristine-tar >>>> * [new branch] upstream -> origin/upstream >>>> Already up-to-date. >>>> $ git branch >>>> * master >>>> >>>> ... just another Git secret to me that git pull claims to have pulled >>>> the new branches but a git branch does not show these??? >>>> >>>> >>>> >>>>> but it seems that "debian" directory is missing from the master branch... >>>>> >>>>> >>>> I can confirm that this is the case. >>>> >>>> >>>> >>> OK, then I made something wrong. I created then debian folder with a >>> patch for the Makefile that remove the linking toward the included >>> libfftw, but forgot to add it to git. >>> >>> Is it better after 'git add debian; git push' ? >>> >>> >> You also can tag it (or git push --tags) >> >> I haven't build it so far but: >> >> - debian/changelog you'll need to open the ITP bug >> > Fixed > > >> - debian/rules - no need in commented text.( dh-make template) >> > Fixed > > >> - debian/copyright should follow DEP5 guidelines [0] >> > Fixed > > Thanks! >> - debian/patches/Makefile.patch should have a DEP3 header [1] >> > I'm not sure how quilt will react if I modify by hand the .patch file... > I think the correct way is to use combination of quilt pop; quilt -e header
Best regards, Alex > >>> I also included .pc directory. I think it belongs to quilt. I don't know >>> if I had to add it. >>> >>> >>> >> you can add it to ~/.gitignore >> *.pc/ >> >> >> >>> Cheers >>> >>> >>> >>>> Kind regards >>>> >>>> Andreas. >>>> >>>> -- >>>> http://fam-tille.de >>>> >>>> >>>> >>> >>> >> Best regards, >> Alex >> >> [0] http://dep.debian.net/deps/dep5/#examples >> [1] http://dep.debian.net/deps/dep3/ >> >> >> > -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
