r45634 - in /packages/morse/trunk/debian: changelog morse-simulator-doc.install patches/fixbuilddoc.diff patches/series rules

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Mon Mar 11 11:15:47 2013
New Revision: 45634

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45634
Log:
Enable the build of the documentation. See upstream bug #302

Added:
    packages/morse/trunk/debian/patches/fixbuilddoc.diff
Modified:
    packages/morse/trunk/debian/changelog
    packages/morse/trunk/debian/morse-simulator-doc.install
    packages/morse/trunk/debian/patches/series
    packages/morse/trunk/debian/rules

Modified: packages/morse/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/morse/trunk/debian/changelog?rev=45634&op=diff
==============================================================================
--- packages/morse/trunk/debian/changelog (original)
+++ packages/morse/trunk/debian/changelog Mon Mar 11 11:15:47 2013
@@ -1,3 +1,9 @@
+morse-simulator (1.0.0-1~exp4) experimental; urgency=low
+
+  * Enable the build of the documentation. See upstream bug #302
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 11 Mar 2013 10:46:58 +0100
+
 morse-simulator (1.0.0-1~exp3) experimental; urgency=low
 
   * Fix a bad dependency (python:depends instead of python3:depends).

Modified: packages/morse/trunk/debian/morse-simulator-doc.install
URL: http://svn.debian.org/wsvn/debian-science/packages/morse/trunk/debian/morse-simulator-doc.install?rev=45634&op=diff
==============================================================================
--- packages/morse/trunk/debian/morse-simulator-doc.install (original)
+++ packages/morse/trunk/debian/morse-simulator-doc.install Mon Mar 11 11:15:47 2013
@@ -1,2 +1,2 @@
-#*/doc/html/ usr/share/doc/morse/
+*/doc/html/ usr/share/doc/morse/
 examples/ usr/share/morse/

Added: packages/morse/trunk/debian/patches/fixbuilddoc.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/morse/trunk/debian/patches/fixbuilddoc.diff?rev=45634&op=file
==============================================================================
--- packages/morse/trunk/debian/patches/fixbuilddoc.diff (added)
+++ packages/morse/trunk/debian/patches/fixbuilddoc.diff Mon Mar 11 11:15:47 2013
@@ -1,0 +1,13 @@
+Index: morse-simulator-1.0.0/CMakeLists.txt
+===================================================================
+--- morse-simulator-1.0.0.orig/CMakeLists.txt	2013-03-01 17:33:19.000000000 +0100
++++ morse-simulator-1.0.0/CMakeLists.txt	2013-03-11 11:02:38.000000000 +0100
+@@ -156,7 +156,7 @@
+ 	SET (SPHINX_LATEX_OUTPUT ${CMAKE_DOC_OUT}/tex)
+ 	SET (SPHINX_MAN_OUTPUT ${CMAKE_DOC_OUT}/man)
+ 	SET (SPHINX_FALSE_PYTHON_ENV ${CMAKE_CURRENT_BINARY_DIR}/fakeenv)
+-	SET (PYTHON_DOC_ENV env PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CMAKE_CURRENT_BINARY_DIR}/src:${SPHINX_FALSE_PYTHON_ENV}:${CMAKE_CURRENT_SOURCE_DIR}/src:${CMAKE_CURRENT_SOURCE_DIR}/testing:${CMAKE_CURRENT_SOURCE_DIR}/bindings/pymorse/src/:$$PYTHONPATH PYTHONDONTWRITEBYTECODE="morse" LANG="en_US.UTF-8" LC_CTYPE="en_US.UTF-8")
++	SET (PYTHON_DOC_ENV env PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CMAKE_CURRENT_BINARY_DIR}/src:${SPHINX_FALSE_PYTHON_ENV}:${CMAKE_CURRENT_SOURCE_DIR}/src:${CMAKE_CURRENT_SOURCE_DIR}/testing:${CMAKE_CURRENT_SOURCE_DIR}/bindings/pymorse/src/:$$PYTHONPATH PYTHONDONTWRITEBYTECODE="morse" LANG="C.UTF-8" LC_ALL="C.UTF-8")
+ 	SET (SPHINX_BUILD_ENV ${PYTHON_DOC_ENV} ${SPHINX_BUILD})
+ 
+ 	# Copy the documentation in builddir, so we can include the generated part too

Modified: packages/morse/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/morse/trunk/debian/patches/series?rev=45634&op=diff
==============================================================================
--- packages/morse/trunk/debian/patches/series (original)
+++ packages/morse/trunk/debian/patches/series Mon Mar 11 11:15:47 2013
@@ -1,0 +1,3 @@
+fixbuilddoc.diff
+#fix-ftbfs-python-3.3.patch
+

Modified: packages/morse/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/morse/trunk/debian/rules?rev=45634&op=diff
==============================================================================
--- packages/morse/trunk/debian/rules (original)
+++ packages/morse/trunk/debian/rules Mon Mar 11 11:15:47 2013
@@ -8,7 +8,7 @@
 	dh $@ --with python3
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DBUILD_DOC_SUPPORT=OFF
+	dh_auto_configure -- -DBUILD_DOC_SUPPORT=ON
 
 override_dh_install:
 	dh_install