[Python-apps-team] Mercurial Debian patches applied upstream

[Faheem Mitha]

On Sat, 3 Jul 2010, Javi Merino wrote:

>> BTW, I've recently built 1.6 with your packaging on Lenny. I had to
>> adjust some of the patches. Do you want me to send you my changes?
>
> I was doing that myself right now! can you check that your changed
> patches are the same than the current version in the svn?

Looking them over:

1) In deb_specific__install-help-separately you have removed

--- a/mercurial/help.py
+++ b/mercurial/help.py
@@ -73,9 +73,11 @@
              module = __file__
          base = os.path.dirname(module)

+        docdir = '/usr/share/mercurial/help'
          for dir in ('.', '..'):
-            docdir = os.path.join(base, dir, 'help')
-            if os.path.isdir(docdir):
+            path = os.path.join(base, dir, 'help')
+            if os.path.isdir(path):
+                docdir = path
                  break

          path = os.path.join(docdir, topic + ".txt")

I'm guessing this corresponds to "Deleted a chunk in 
deb_specific__install-help-separately that has been
incorporated upstream." though I don't see it there.

******************************************************************

What method do you use to refresh the patches? Just curious.

I've been having a little trouble getting hg to output the right 
version string on install. Currently I'm getting

Mercurial Distributed SCM (version null+8-8dc1b6cb2e64+20100702)

The code suggests that mercurial/__version.py is not modified during 
build, but it is. If set as 1.6 it changes to something else. Can you shed 
any light on this? If you are going to upload 1.6 to unstable shortly, 
I'll wait and try it.

                                                           Regards, Faheem.