On Fri, Feb 10, 2017 at 07:03:14PM -0000, Nish Aravamudan wrote: >Ah ok, do you want me to send the patches via git to you there? The >Server Team has adopted >(https://wiki.ubuntu.com/UbuntuDevelopment/Merging/GitWorkflow) for >Ubuntu merges so we have our own tree (that's tracking the archive(s) >for Ubuntu & Debian). But I am happy to send a patch or pull request >anywhere as you would like.
Not sure. I'll have a look when you're done. I'll probably pull it in as a patch, to avoid dragging in the entire second copy of the history. >Note that in the process of doing the merge, I think I found a bit of >delta that is actually missing. The last several merges have mentioned >d/rules installing the apport hook (added in 2.4.23-0ubuntu1), but I >believe that it got accidentally dropped on the next merge to Debian >(2.4.23-6ubuntu1) and no one has noticed since -- note that this is a >good reason to use the above workflow, as the d/changelog mentioned >delta that I couldn't find! Can you confirm that you see the same. I'll >fix this in the new merge (but does mean, I think apport for openldap >has been broken for a long time). My branch only has ubuntu history starting from when I got involved (around 2.4.40) - made one attempt at importing the bzr history into git but it didn't go well. >From the bzr history, it looks to me like it got lost in 2.4.25-4ubuntu1, when the conversion to dh was merged: http://bazaar.launchpad.net/~ubuntu- branches/ubuntu/wily/openldap/wily/revision/46#debian/rules But yes, a long time. -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/1654416 Title: Requesting 2.4.44 build which includes fix for ITS#8185 To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/openldap/+bug/1654416/+subscriptions -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs