Hi, Am Mittwoch, den 20.03.2013, 22:41 -0700 schrieb John Millikin: > The version of system-fileio currently uploaded to "testing", 0.3.8, > has two known issues: > > > * Calling isFile on a socket can block indefinitely. > * A dodgy hack for working around GHC 7.2's path handling is enabled > even in GHC versions that work properly, such as 7.4 (current version > in "testing") and 7.6. > > > These issues are fixed in a newer upstream release, 0.3.11, but there > are some significant other changes between 0.3.8 and 0.3.11. Since > Debian uses GHC 7.4+, the packaging patches to fix these two specific > issues are very small, so I would like to upload a patch release > against the package version in "testing". are these bugs release critical? If not, the release team is not likely to grant a freeze exception. Maybe you should talk to them too. > Version in testing and unstable: 0.3.8-1 > Version in experimental: 0.3.10-1 > Version in Hackage: 0.3.11 > > > So I want to upload a 0.3.8-2, but the Debian changelog checked into > Darcs > at http://anonscm.debian.org/darcs/pkg-haskell/haskell-system-fileio/changelog already has an entry for 0.3.10-1. > > > What is the preferred way to do this? Can I just commit a new > changelog entry with the correct version, or do I need to splice a > commit into the Darcs revision graph somehow? > > > Both patches attached, for reference. You should get the repo for 0.3.8-2 (e.g. with darcs get -t 0.3.8-2 darcs.nomeata.de:/darcs/pkg-haskell/haskell-system-fileio ), work from there as usual (i.e. add and tag 0.3.8-3). Then you pull that repo into the usual one. This will add the patches and cause conflicts in debian/control. Remove the patches (as you don’t want them in the experimental branch) and clean up debian/changelog (I suggest to keep 0.3.8-3 right above 0.3.8-2 and the remaining experimental change above that), commit this conflict resolution and push to the central repo. This is precisely what I did with, e.g. haskell-yesod-auth-1.0.2.1-2 Greetings, Joachim -- Joachim "nomeata" Breitner Debian Developer nomeata@debian.org | ICQ# 74513189 | GPG-Keyid: 4743206C JID: nomeata@joachim-breitner.de | http://people.debian.org/~nomeata
Attachment:
signature.asc
Description: This is a digitally signed message part