Source: nautilus-dropbox
Version: 0.6.8-1
Severity: important
Tags: patch
User: [email protected]
Usertags: docutils0.8
When rebuilt against python-docutils 0.8 (currently in experimental),
nautilus-dropbox failed to build from source:
| python docgen.py 0.6.8 < dropbox.txt.in > dropbox.txt
| python rst2man.py dropbox.txt > dropbox.1
| TypeError: get_language() takes exactly 2 arguments (1 given)
| Exiting due to error. Use "--traceback" to diagnose.
| Please report errors to <[email protected]>.
| Include "--traceback" output, Docutils version (0.8 [release]),
| Python version (2.6.7), your OS type & version, and the
| command line used.
| make[3]: *** [dropbox.1] Error 1
| make[3]: Leaving directory
`/build/nautilus-dropbox-PsRv_5/nautilus-dropbox-0.6.8'
The full traceback was:
| Traceback (most recent call last):
| File "rst2man.py", line 1091, in <module>
| publish_cmdline(writer=Writer(), description=description)
| File "/usr/lib/pymodules/python2.6/docutils/core.py", line 339, in
publish_cmdline
| config_section=config_section, enable_exit_status=enable_exit_status)
| File "/usr/lib/pymodules/python2.6/docutils/core.py", line 213, in publish
| output = self.writer.write(self.document, self.destination)
| File "/usr/lib/pymodules/python2.6/docutils/writers/__init__.py", line 77,
in write
| self.translate()
| File "rst2man.py", line 129, in translate
| visitor = self.translator_class(self.document)
| File "rst2man.py", line 180, in __init__
| self.language = languages.get_language(lcode)
| TypeError: get_language() takes exactly 2 arguments (1 given)
The attached patch makes the package use rst2man from python-docutils
(>= 0.6) rather than the embedded (and outdated) copy.
--
Jakub Wilk
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,6 +11,6 @@
dropbox.1: dropbox.txt.in dropbox docgen.py
python docgen.py $(PACKAGE_VERSION) < dropbox.txt.in > dropbox.txt
- python rst2man.py dropbox.txt > dropbox.1
+ rst2man dropbox.txt > dropbox.1
SUBDIRS = data src
\ No newline at end of file
--- a/Makefile.in
+++ b/Makefile.in
@@ -846,7 +846,7 @@
dropbox.1: dropbox.txt.in dropbox docgen.py
python docgen.py $(PACKAGE_VERSION) < dropbox.txt.in > dropbox.txt
- python rst2man.py dropbox.txt > dropbox.1
+ rst2man dropbox.txt > dropbox.1
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
--- nautilus-dropbox-0.6.8/debian/control 2011-07-15 10:56:48.000000000 +0200
+++ nautilus-dropbox-0.6.8/debian/control 2011-08-23 18:36:39.000000000 +0200
@@ -2,7 +2,7 @@
Section: non-free/gnome
Priority: optional
Maintainer: RaphaĂŤl Hertzog <[email protected]>
-Build-Depends: debhelper (>= 8), libnautilus-extension-dev (>= 2.16.0), libglib2.0-dev (>= 2.14.0), python-gtk2 (>= 2.12), python-docutils
+Build-Depends: debhelper (>= 8), libnautilus-extension-dev (>= 2.16.0), libglib2.0-dev (>= 2.14.0), python-gtk2 (>= 2.12), python-docutils (>= 0.6)
Standards-Version: 3.9.2
XS-Autobuild: yes
Homepage: http://www.dropbox.com/
