tags 433740 + patch
thanks
Hi,
Attached is the diff for my pybaz 1.5pre1-3.1 NMU.
Ana
diff -u pybaz-1.5pre1/debian/changelog pybaz-1.5pre1/debian/changelog
--- pybaz-1.5pre1/debian/changelog
+++ pybaz-1.5pre1/debian/changelog
@@ -1,3 +1,13 @@
+pybaz (1.5pre1-3.1) unstable; urgency=low
+
+ * Non-maintainer upload to fix RC bug.
+ * Add patch by Kumar Appaiah <[EMAIL PROTECTED]> to fix FTBFS with new
+ epydoc (Closes: #433740)
+ * Add patch system with quilt.
+ * Remove dh_python, not longer required.
+
+ -- Ana Beatriz Guerrero Lopez <[EMAIL PROTECTED]> Sat, 25 Aug 2007 09:41:50 +0200
+
pybaz (1.5pre1-3) unstable; urgency=low
* Update for the Python transition (Closes: #375592)
diff -u pybaz-1.5pre1/debian/control pybaz-1.5pre1/debian/control
--- pybaz-1.5pre1/debian/control
+++ pybaz-1.5pre1/debian/control
@@ -2,7 +2,7 @@
Section: python
Priority: extra
Maintainer: Anand Kumria <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11), python-support (>= 0.3), python-epydoc, bazaar (>= 1.4.2-5)
+Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11), python-support (>= 0.3), python-epydoc, bazaar (>= 1.4.2-5), quilt
Standards-Version: 3.7.2
Package: pybaz
diff -u pybaz-1.5pre1/debian/rules pybaz-1.5pre1/debian/rules
--- pybaz-1.5pre1/debian/rules
+++ pybaz-1.5pre1/debian/rules
@@ -32,6 +32,7 @@
build-stamp: configure-stamp
dh_testdir
+ $(MAKE) -f /usr/share/quilt/quilt.make patch
# Add here commands to compile the package.
#$(MAKE)
#docbook-to-man debian/pybaz.sgml > pybaz.1
@@ -47,6 +48,7 @@
dh_testroot
rm -f build-stamp configure-stamp
+ $(MAKE) -f /usr/share/quilt/quilt.make unpatch
# Add here commands to clean up after the build process.
#-$(MAKE) clean
for py in $(PYVERS); do \
@@ -100,7 +102,6 @@
dh_fixperms
# dh_perl
dh_pysupport
- dh_python
# dh_makeshlibs
dh_installdeb
dh_shlibdeps
only in patch2:
unchanged:
--- pybaz-1.5pre1.orig/debian/patches/series
+++ pybaz-1.5pre1/debian/patches/series
@@ -0,0 +1 @@
+epydoc.diff
only in patch2:
unchanged:
--- pybaz-1.5pre1.orig/debian/patches/epydoc.diff
+++ pybaz-1.5pre1/debian/patches/epydoc.diff
@@ -0,0 +1,30 @@
+diff -urN pybaz-1.5pre1/mypydoc pybaz-1.5pre1.new/mypydoc
+--- pybaz-1.5pre1/mypydoc 2005-11-30 16:13:25.000000000 +0530
++++ pybaz-1.5pre1.new/mypydoc 2007-08-21 13:11:07.000000000 +0530
+@@ -19,19 +19,22 @@
+ import sys
+ import inspect
+ import epydoc.cli
+-import epydoc.uid
++import epydoc.docintrospecter
+
+ def find_function_module(func):
+ # We trust the __module__ attribute of functions. That makes it
+ # possible to have functions documented in a module different from
+ # the module where they are defined.
+ try:
+- ret = sys.modules[func.__module__]
+- return ret
++ ret = sys.modules[func.__class__.__module__]
++ if ret == sys.modules['__builtin__']:
++ return '__builtin__'
++ else:
++ return ret
+ except KeyError:
+ pass
+ raise ValueError("Could not find a module for %s" % func.func_name)
+
+-epydoc.uid._find_function_module = find_function_module
++epydoc.docintrospecter._find_function_module = find_function_module
+
+ epydoc.cli.cli()
