retitle 404533 missing build deps on e2fslibs-dev and libreiserfs0.3-dev
tag 404533 patch
tag 390678 patch
thanks

Turns out that when the abovementioned dev packages are installed, the
missing parts of pygrub get included automatically, so all you need is
this simple patch. I'll include the changes needed to fix #390678 also, to
make it more interesting.

-- 
see shy jo
diff -ur old/xen-3.0-3.0.3-0/debian/changelog xen-3.0-3.0.3-0/debian/changelog
--- old/xen-3.0-3.0.3-0/debian/changelog	2006-12-25 21:20:45.000000000 -0500
+++ xen-3.0-3.0.3-0/debian/changelog	2006-12-25 21:45:58.000000000 -0500
@@ -1,3 +1,11 @@
+xen-3.0 (3.0.3-0-2.1) UNRELEASED; urgency=low
+
+  * Add missing build deps on e2fslibs-dev and libreiserfs0.3-dev for
+    pygrub. Closes: #404533
+  * Fix path to python modules in pygrub. Closes: #390678
+
+ -- Joey Hess <[EMAIL PROTECTED]>  Mon, 25 Dec 2006 21:22:20 -0500
+
 xen-3.0 (3.0.3-0-2) unstable; urgency=medium
 
   [Bastian Blank]
diff -ur old/xen-3.0-3.0.3-0/debian/control xen-3.0-3.0.3-0/debian/control
--- old/xen-3.0-3.0.3-0/debian/control	2006-12-25 21:20:45.000000000 -0500
+++ xen-3.0-3.0.3-0/debian/control	2006-12-25 21:46:00.000000000 -0500
@@ -4,7 +4,7 @@
 Maintainer: Debian Xen Team <[EMAIL PROTECTED]>
 Uploaders: Julien Danjou <[EMAIL PROTECTED]>, Jeremy T. Bouse <[EMAIL PROTECTED]>, Guido Trotter <[EMAIL PROTECTED]>, Bastian Blank <[EMAIL PROTECTED]>
 Standards-Version: 3.7.2.0
-Build-Depends: debhelper (>= 5.0.37.2), python-dev (>= 2.3), libsdl1.2-dev, bcc, dpatch, lsb-release, python-central (>= 0.5), zlib1g-dev, libncurses5-dev, x11proto-core-dev
+Build-Depends: debhelper (>= 5.0.37.2), python-dev (>= 2.3), libsdl1.2-dev, bcc, dpatch, lsb-release, python-central (>= 0.5), zlib1g-dev, libncurses5-dev, x11proto-core-dev, e2fslibs-dev, libreiserfs0.3-dev
 Build-Depends-Indep: transfig, tetex-bin, tetex-extra, gs-common
 XS-Python-Version: current
 
diff -ur old/xen-3.0-3.0.3-0/debian/control.md5sum xen-3.0-3.0.3-0/debian/control.md5sum
--- old/xen-3.0-3.0.3-0/debian/control.md5sum	2006-12-25 21:20:45.000000000 -0500
+++ xen-3.0-3.0.3-0/debian/control.md5sum	2006-12-25 21:46:00.000000000 -0500
@@ -1,7 +1,7 @@
-b34c621399266d509cb6dd58aa5bf6e8  debian/changelog
+a60a5f294dd67eae4d3ca7ab4acb5c47  debian/changelog
 a6f482dc8dde7fa3d02c4ddf20c0f1c0  debian/templates/control.hypervisor.in
 65abcd55f0cab8a1fe0902a800e1cde4  debian/templates/control.main.in
-37186952935016b64fced5e90cc518ea  debian/templates/control.source.in
+c8da34d14b61826d29a3cf00a280f63a  debian/templates/control.source.in
 500cdf2c42ac337f8f1031e64c9addcd  debian/templates/control.utils.in
 db346ea343858c69dfdeeb24643e2c10  debian/arch/defines
 296aa76d387953934c54e282f7351d4e  debian/arch/amd64/defines
diff -ur old/xen-3.0-3.0.3-0/debian/rules.defs xen-3.0-3.0.3-0/debian/rules.defs
--- old/xen-3.0-3.0.3-0/debian/rules.defs	2006-12-25 21:20:45.000000000 -0500
+++ xen-3.0-3.0.3-0/debian/rules.defs	2006-12-25 21:30:59.000000000 -0500
@@ -1,4 +1,4 @@
-KERNELVERSION := 2.6.18-1
+KERNELVERSION := 2.6.18-3
 MAJOR := 3.0
 BUILD_DIR = debian/build
 STAMPS_DIR = debian/stamps
diff -ur old/xen-3.0-3.0.3-0/debian/templates/control.source.in xen-3.0-3.0.3-0/debian/templates/control.source.in
--- old/xen-3.0-3.0.3-0/debian/templates/control.source.in	2006-12-25 21:20:45.000000000 -0500
+++ xen-3.0-3.0.3-0/debian/templates/control.source.in	2006-12-25 21:25:46.000000000 -0500
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian Xen Team <[EMAIL PROTECTED]>
 Uploaders: Julien Danjou <[EMAIL PROTECTED]>, Jeremy T. Bouse <[EMAIL PROTECTED]>, Guido Trotter <[EMAIL PROTECTED]>, Bastian Blank <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5.0.37.2), python-dev (>= 2.3), libsdl1.2-dev, bcc, dpatch, lsb-release, python-central (>= 0.5), zlib1g-dev, libncurses5-dev, x11proto-core-dev
+Build-Depends: debhelper (>= 5.0.37.2), python-dev (>= 2.3), libsdl1.2-dev, bcc, dpatch, lsb-release, python-central (>= 0.5), zlib1g-dev, libncurses5-dev, x11proto-core-dev, e2fslibs-dev, libreiserfs0.3-dev
 Build-Depends-Indep: transfig, tetex-bin, tetex-extra, gs-common
 Standards-Version: 3.7.2.0
 XS-Python-Version: current
diff -ur old/xen-3.0-3.0.3-0/tools/pygrub/src/pygrub xen-3.0-3.0.3-0/tools/pygrub/src/pygrub
--- old/xen-3.0-3.0.3-0/tools/pygrub/src/pygrub	2006-10-20 06:26:02.000000000 -0400
+++ xen-3.0-3.0.3-0/tools/pygrub/src/pygrub	2006-12-25 21:22:18.000000000 -0500
@@ -20,7 +20,7 @@
 import curses, _curses, curses.wrapper, curses.textpad, curses.ascii
 import getopt
 
-sys.path = [ '/usr/lib/python' ] + sys.path
+sys.path.append('%s/../lib/python' % sys.path[0])
 
 import grub.GrubConf
 import grub.fsys

Attachment: signature.asc
Description: Digital signature

Reply via email to