[Python-apps-commits] r6872 - in packages/mercurial/trunk/debian (3 files)

[stefanor at users.alioth.debian.org]

    Date: Wednesday, March 30, 2011 @ 17:05:18
  Author: stefanor
Revision: 6872

* Team Upload
* deb_specific__disable_libdir_replacement.patch: Disable @LIBDIR@
  replacement in the hg script, by setup.py (Closes: #620087, LP: #745250)

Added:
  packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch
Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/patches/series

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2011-03-30 12:52:29 UTC (rev 6871)
+++ packages/mercurial/trunk/debian/changelog	2011-03-30 17:05:18 UTC (rev 6872)
@@ -1,3 +1,11 @@
+mercurial (1.8.1-3) UNRELEASED; urgency=low
+
+  * Team Upload
+  * deb_specific__disable_libdir_replacement.patch: Disable @LIBDIR@
+    replacement in the hg script, by setup.py (Closes: #620087, LP: #745250)
+
+ -- Stefano Rivera <stefanor at debian.org>  Wed, 30 Mar 2011 18:58:07 +0200
+
 mercurial (1.8.1-2) unstable; urgency=low
 
   [ Vincent Danjean ]

Added: packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch	                        (rev 0)
+++ packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch	2011-03-30 17:05:18 UTC (rev 6872)
@@ -0,0 +1,23 @@
+Description: Disabled hginstallscripts @LIBDIR@ replacement in setup.py.
+ setup.py replaces @LIBDIR@ in the hg script, with a path that differs between
+ Python verisons.
+ libdir in hg doesn't need to be set if mercurial is available in the public
+ namespace, as it is in Debian.
+ hg doesn't alter sys.paths if this replacement hasn't happened.
+Author: Stefano Rivera <stefanor at debian.org>
+Bug-Debian: http://bugs.debian.org/620087
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/745250
+Forwarded: not-needed
+Last-Update: 2011-03-30
+ 
+--- a/setup.py
++++ b/setup.py
+@@ -310,7 +310,7 @@
+ cmdclass = {'build_mo': hgbuildmo,
+             'build_ext': hgbuildext,
+             'build_py': hgbuildpy,
+-            'install_scripts': hginstallscripts}
++           }
+ 
+ packages = ['mercurial', 'mercurial.hgweb', 'hgext', 'hgext.convert',
+             'hgext.highlight', 'hgext.zeroconf']

Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series	2011-03-30 12:52:29 UTC (rev 6871)
+++ packages/mercurial/trunk/debian/patches/series	2011-03-30 17:05:18 UTC (rev 6872)
@@ -5,3 +5,4 @@
 deb_specific__optional-dependencies
 proposed_upstream__correct-zeroconf-doc
 deb_specific__install-mo-fhs.patch
+deb_specific__disable_libdir_replacement.patch