Re: Understanding Git workflow around DEP-14
On Tue, 12 Mar 2019 12:49:35 +1100, Ben Finney wrote: >Andreas Ronnquist writes: > >> debian/master is where your packaging work happens in the debian >> folder, and also where the building of the package happens. (Here you >> also should have the upstream source merged, to be able to build the >> package with the standard debuild or dpkg-buildpackage). > >So which branch contains *only* the Debian packaging files; that is, >the files that go into the “Debian package diff” (Debian Policy §3.3)? > >Or does DEP-14 mandate mixing the Debian packaging with the upstream >files? Nah, it doesn't mandate it, but it does recommend it - see "What to store in the packaging branches" a bit down the DEP-14 page, https://dep-team.pages.debian.net/deps/dep14/ >That would make DEP-14 incompatible with the “overlay” workflow, where >the Debian packaging is tracked in a separate VCS. > Sorry, I have only used gbp with the mixed branch workflow - does anyone else have any hints for gbp with the overlay workflow? -- Andreas Rönnquist mailingli...@gusnan.se andr...@ronnquist.net
Re: Understanding Git workflow around DEP-14
Andreas Ronnquist writes: > debian/master is where your packaging work happens in the debian > folder, and also where the building of the package happens. (Here you > also should have the upstream source merged, to be able to build the > package with the standard debuild or dpkg-buildpackage). So which branch contains *only* the Debian packaging files; that is, the files that go into the “Debian package diff” (Debian Policy §3.3)? Or does DEP-14 mandate mixing the Debian packaging with the upstream files? That would make DEP-14 incompatible with the “overlay” workflow, where the Debian packaging is tracked in a separate VCS. -- \ “If consumers even know there's a DRM, what it is, and how it | `\ works, we've already failed.” —Peter Lee, Disney corporation, | _o__) 2005 | Ben Finney
Re: Understanding Git workflow around DEP-14
Hi Geert! On Mon, Mar 11, 2019 at 2:12 PM Geert Stappers wrote: > On Mon, Mar 11, 2019 at 01:50:49PM -0500, Matt Zagrabelny wrote: > > > > > 2. What should the "master" branch be used for? > > Consider the string "master" a label for _your leading branch_ > > > > I don't use the master branch with DEP-14. I believe the DEP is stating > > that you'd use "master" for native packages - which from the sounds of > it, > > yours is not. Therefore, I'd not use "master". > > But you have your own leading branch > When I am packaging someone else's software (upstream/latest) for inclusion in Debian (debian/master), I don't feel like I have "my own" leading branch. What am I missing for using (or not using) a "master" branch? > > > > 3. When a new upstream tarball is released, where should it be > imported? > > > > > > > Assuming you have a remote named "github", I suppose you'd do something > > like: > > > > git pull github upstream/latest > > > I think it should be (be warned _not tested_ ) avoid that your > current branch gets pollueted. > What makes you believe that the current branch would get polluted? I believe a: git pull repo refspec is equivalent to: git checkout refspec git pull repo Am I wrong? Thanks for the dialog! -m
Re: Understanding Git workflow around DEP-14
On Mon, 11 Mar 2019 10:42:35 -0700, deb...@lewenberg.com wrote: >I am packaging some upstream software for Debian and I am trying to >understand the workflow around "DEP-14: Recommended layout for Git >packaging repositories". > >Looking at DEP-14 I might have these Git branches: > > master > debian/master > debian/stretch > upstream/latest > >I understand that the Debian packaging files in debian/ will appear in >the "debian/*" branch, but my general question is: what is the >workflow around all these branches? When and how do files get merged >from one branch to another? > In addition to what Matt and Geert has written: > >More specifically: > >1. Besides the debian/ directory, what is the difference between the >"debian/master" branch and the "upstream/latest" branch? debian/master is where your packaging work happens in the debian folder, and also where the building of the package happens. (Here you also should have the upstream source merged, to be able to build the package with the standard debuild or dpkg-buildpackage). upstream/latest (this branch is sometimes simply called upstream) is most often used for unpacked upstream release tarballs. If you have a pristine-tar branch, you can recreate the upstream tarball from these two branches). >2. What should the "master" branch be used for? It can be used for upstream git branch from the upstream git repository - this can be useful if you have imported an upstream version from a tarball, and simply want to cherry-pick an upstream fix from a commit that was just a tiny bit too late for the upstream release. > >3. When a new upstream tarball is released, where should it be >imported? In "upstream/latest"? In "debian/master"? Both? > Simply use gbp import-orig - Its man-page mentions: >The sources are placed on the upstream branch (default: upstream), >tagged and merged onto the debian branch (default: master). and I only have the addition that the defaults simply can be changed using a debian/gbp.conf to match DEP-14. -- Andreas Rönnquist mailingli...@gusnan.se andr...@ronnquist.net
Bug#922938: RFS: python-css-parser/1.0.4-1~bpo9+1
Hi Chris, If you have a minute would you please sponsor this backport and/or grant me DM permissions for it? I maintain it on the DPMT and my key is E2A6261E3900AED7CDC667085A8830475F7D1061 A stretch-backport of python-css-parser is needed to update the bpo of calibre, and a recent version of calibre is needed to support users who upgraded their Kobos (probably also affects Kindles) to late 2018 firmware. Link to the dsc is at the bottom of this email. On Thu, Feb 21, 2019 at 09:15:08PM -0700, Nicholas D Steeves wrote: > Package: sponsorship-requests > Severity: normal > Justification: necessary for to update the bpo for Calibre > > Dear mentors, > > I am looking for a sponsor for my package "python-css-parser" > > Package name: python-css-parser > Version : 1.0.4-1~bpo9+1 > Upstream Author : Christof Hoeke, Walter Doerwald, > and Kovid Goyal > URL : https://github.com/ebook-utils/css-parser > License : LGPL-3+ > Section : python > > It builds these binary packages: > > python-css-parser - CSS related utilities (parsing, serialization, etc) for > Python 2 > python3-css-parser - CSS related utilities (parsing, serialization, etc) > for Python 3 > > To access further information about this package, please visit the following > URL: > > https://mentors.debian.net/package/python-css-parser > > Alternatively, one can download the package with dget using this command: > > dget -x > https://mentors.debian.net/debian/pool/main/p/python-css-parser/python-css-parser_1.0.4-1~bpo9+1.dsc > Thanks! Nicholas signature.asc Description: PGP signature
Re: Understanding Git workflow around DEP-14
On Mon, Mar 11, 2019 at 01:50:49PM -0500, Matt Zagrabelny wrote: > On Mon, Mar 11, 2019 at 1:30 PM wrote: > > > I am packaging some upstream software for Debian and I am trying to > > understand the workflow around "DEP-14: Recommended layout for Git > > packaging repositories". > > > > Looking at DEP-14 I might have these Git branches: The DEP-14 we are talking about is https://dep-team.pages.debian.net/deps/dep14/ > >master > >debian/master > >debian/stretch > >upstream/latest > > > > I understand that the Debian packaging files in debian/ will appear in > > the "debian/*" branch, but my general question is: what is the workflow > > around all these branches? When and how do files get merged from one > > branch to another? > > > > git checkout debian/master > git merge upstream/latest > > You want to keep the upstream/latest branch free of Debian specific > packaging bits. > > You can use tags to mark any upstream releases. Here is an example: > > $ git tag > debian/2.4-1 > debian/2.4-2 > upstream/2.4 > > More specifically: > > > > 1. Besides the debian/ directory, what is the difference between the > > "debian/master" branch and the "upstream/latest" branch? > > > > I don't believe anything. True. It is the idea about branches. > > 2. What should the "master" branch be used for? Consider the string "master" a label for _your leading branch_ > I don't use the master branch with DEP-14. I believe the DEP is stating > that you'd use "master" for native packages - which from the sounds of it, > yours is not. Therefore, I'd not use "master". But you have your own leading branch > > 3. When a new upstream tarball is released, where should it be imported? > > > > Assuming you have a remote named "github", I suppose you'd do something > like: > > git pull github upstream/latest I think it should be (be warned _not tested_ ) avoid that your current branch gets pollueted. } git checkout upstream/latest } git pull github > Then, you'd do: > > git checkout debian/master > git merge upstream/latest Groeten Geert Stappers -- DEP14 for the win
Re: Understanding Git workflow around DEP-14
I'm no expert. I've commented inline with things I've done and how I read and understand DEP-14. On Mon, Mar 11, 2019 at 1:30 PM wrote: > I am packaging some upstream software for Debian and I am trying to > understand the workflow around "DEP-14: Recommended layout for Git > packaging repositories". > > Looking at DEP-14 I might have these Git branches: > >master >debian/master >debian/stretch >upstream/latest > > I understand that the Debian packaging files in debian/ will appear in > the "debian/*" branch, but my general question is: what is the workflow > around all these branches? When and how do files get merged from one > branch to another? > git checkout debian/master git merge upstream/latest You want to keep the upstream/latest branch free of Debian specific packaging bits. You can use tags to mark any upstream releases. Here is an example: $ git tag debian/2.4-1 debian/2.4-2 upstream/2.4 More specifically: > > 1. Besides the debian/ directory, what is the difference between the > "debian/master" branch and the "upstream/latest" branch? > I don't believe anything. > > 2. What should the "master" branch be used for? > I don't use the master branch with DEP-14. I believe the DEP is stating that you'd use "master" for native packages - which from the sounds of it, yours is not. Therefore, I'd not use "master". > > 3. When a new upstream tarball is released, where should it be imported? > Assuming you have a remote named "github", I suppose you'd do something like: git pull github upstream/latest Then, you'd do: git checkout debian/master git merge upstream/latest Cheers, -m
Understanding Git workflow around DEP-14
I am packaging some upstream software for Debian and I am trying to understand the workflow around "DEP-14: Recommended layout for Git packaging repositories". Looking at DEP-14 I might have these Git branches: master debian/master debian/stretch upstream/latest I understand that the Debian packaging files in debian/ will appear in the "debian/*" branch, but my general question is: what is the workflow around all these branches? When and how do files get merged from one branch to another? More specifically: 1. Besides the debian/ directory, what is the difference between the "debian/master" branch and the "upstream/latest" branch? 2. What should the "master" branch be used for? 3. When a new upstream tarball is released, where should it be imported? In "upstream/latest"? In "debian/master"? Both? Thanks, Adam Lewenberg
