> Hi, > > I am trying to work on an orphaned package maradns. It uses quite a > lot of patches managed with quilt. I created a repo on alioth [1] to > manage different versions. I imported all the versions (debsnap and > git-import-dscs). Now I am stuck with two problems:
Thanks for adopting and your contribution to Debian! > 1. Should I keep the source unpatched in git or patched. If I keep it > unpatched, after patching (dquilt push -a) gbp complains that I have > uncommited changes. What should be done here? The patches should not be applied. http://honk.sigxcpu.org/projects/git-buildpackage/manual-html/gbp.building.html#GBP.BUILDING.PATCH should give you hints. > 2. I can see the newest maradns 2.X branch was installed only for > experimental. The latest in unstable/testing was 1.4.12-5. It is now > unusable, due to [2] and procpidfile change. I think the first release > I would make is fixing this, so people can use it again (now it does > not start). Is this git workflow correct ? If you want to adopt you're free to do so. But you can also start with the new upstream version if you think it is ready for primetime. > I will checkout debian/1.4.15-5 tag, bump the changelog to 1.4.15-6, > make changes in d/* and release with a new tag. Now, say I want to > release the new 2.X version. I go back to master, add the changelog > entry for 1.4.15-6 and work on the new release? Did not get the details what you want to archieve... Should 2.x go to experimental and (later) 1.4.15-6 to unstable? If so, you should make an own branch for expermimental, and do the packageing there. See http://honk.sigxcpu.org/projects/git-buildpackage/manual-html/gbp.import.html#GBP.BRANCH.NAMING for an proposal of the layout. Otherwise please explain your intentions... PS: You should change bug's title #739084 to ITA: .... and set yourself as owner of it > > > [1] http://anonscm.debian.org/gitweb/?p=collab-maint/maradns.git > [2] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=709826 > -- To UNSUBSCRIBE, email to debian-mentors-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/4f763bca51f97780f73dd5d08dbffa03.squir...@isengard.is-a-geek.net
