Bug#963651: morse-simulator: resend patch updated
Bo YU
tsu.yubo at gmail.com
Sat Nov 5 05:16:41 GMT 2022
Source: morse-simulator
Followup-For: Bug #963651
To update the patch to close bug number correctly.
--
Regards,
--
Bo YU
-------------- next part --------------
diff -Nru morse-simulator-1.4/debian/changelog morse-simulator-1.4/debian/changelog
--- morse-simulator-1.4/debian/changelog 2020-01-20 22:11:41.000000000 +0800
+++ morse-simulator-1.4/debian/changelog 2022-11-04 11:39:54.000000000 +0800
@@ -1,3 +1,19 @@
+morse-simulator (1.4-6.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix ftbfs on sphinxext. (Closes: #963651)
+ * Add disable-examples-sphinx.patch to fix sphinx extension does
+ not support example issue.
+ * Add fix-find-pythonlib.patch to fix find pythonlib(python3) issue
+ (Closes: #1023357).
+ * Drop morse-simulator-doc.lintian-overrides
+ * Broken symlink issue has disappeared. (Closes: #858958)
+ * Drop python3-morse-simulator and morse-simulator-data dependency
+ from morse-simulator
+ * Removed __pycache__ from dh-python
+
+ -- Bo YU <tsu.yubo at gmail.com> Fri, 04 Nov 2022 11:39:54 +0800
+
morse-simulator (1.4-6) unstable; urgency=medium
* Team upload.
diff -Nru morse-simulator-1.4/debian/control morse-simulator-1.4/debian/control
--- morse-simulator-1.4/debian/control 2020-01-20 22:11:41.000000000 +0800
+++ morse-simulator-1.4/debian/control 2022-11-04 11:39:54.000000000 +0800
@@ -7,6 +7,7 @@
Build-Depends: debhelper-compat (= 12),
cmake,
dh-python,
+ python3-all,
python3-dev,
python3-sphinx,
pkg-config,
@@ -23,8 +24,6 @@
${misc:Depends},
blender,
${python3:Depends},
- python3-morse-simulator (= ${binary:Version}),
- morse-simulator-data,
python3-numpy
Recommends: morse-simulator-doc
Conflicts: morse
diff -Nru morse-simulator-1.4/debian/morse-simulator-doc.lintian-overrides morse-simulator-1.4/debian/morse-simulator-doc.lintian-overrides
--- morse-simulator-1.4/debian/morse-simulator-doc.lintian-overrides 2020-01-20 22:04:19.000000000 +0800
+++ morse-simulator-1.4/debian/morse-simulator-doc.lintian-overrides 1970-01-01 07:30:00.000000000 +0730
@@ -1,3 +0,0 @@
-# It is the documentation ...
-morse-simulator-doc: python-script-but-no-python-dep usr/share/morse/examples/clients/atrv/ros_tutorial.py
-
diff -Nru morse-simulator-1.4/debian/patches/disable-examples-sphinx.patch morse-simulator-1.4/debian/patches/disable-examples-sphinx.patch
--- morse-simulator-1.4/debian/patches/disable-examples-sphinx.patch 1970-01-01 07:30:00.000000000 +0730
+++ morse-simulator-1.4/debian/patches/disable-examples-sphinx.patch 2022-11-04 11:39:54.000000000 +0800
@@ -0,0 +1,18 @@
+Description: disable sphinx extension example
+Author: Bo YU <tsu.yubo at gmail.com>
+Bug: no
+Forwarded: no
+Last-Update: 2022-11-04
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/doc/conf.py.in
++++ b/doc/conf.py.in
+@@ -25,7 +25,7 @@
+ # Add any Sphinx extension module names here, as strings. They can be extensions
+ # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+
+-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.todo', 'sphinx.ext.viewcode', 'tag', 'examples']
++extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.todo', 'sphinx.ext.viewcode', 'tag']
+ extensions.append('sphinx.ext.imgmath')
+
+ # Add any paths that contain templates here, relative to this directory.
diff -Nru morse-simulator-1.4/debian/patches/fix-find-pythonlib.patch morse-simulator-1.4/debian/patches/fix-find-pythonlib.patch
--- morse-simulator-1.4/debian/patches/fix-find-pythonlib.patch 1970-01-01 07:30:00.000000000 +0730
+++ morse-simulator-1.4/debian/patches/fix-find-pythonlib.patch 2022-11-04 11:39:54.000000000 +0800
@@ -0,0 +1,16 @@
+Description: fix findpythonlib
+Author: Bo YU <tsu.yubo at gmail.com>
+Forwarded: no
+Last-Update: 2022-11-04
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/config/FindPackageHandleStandardArgs.cmake
++++ b/config/FindPackageHandleStandardArgs.cmake
+@@ -229,7 +229,6 @@
+ # version handling:
+ SET(VERSION_MSG "")
+ SET(VERSION_OK TRUE)
+- SET(VERSION ${${FPHSA_VERSION_VAR}} )
+ IF (${_NAME}_FIND_VERSION)
+
+ IF(VERSION)
diff -Nru morse-simulator-1.4/debian/patches/fix-ftbfs-sphinxext.patch morse-simulator-1.4/debian/patches/fix-ftbfs-sphinxext.patch
--- morse-simulator-1.4/debian/patches/fix-ftbfs-sphinxext.patch 1970-01-01 07:30:00.000000000 +0730
+++ morse-simulator-1.4/debian/patches/fix-ftbfs-sphinxext.patch 2022-11-04 11:39:54.000000000 +0800
@@ -0,0 +1,16 @@
+Description: fix ftbfs due to sphinxext isssue
+Author: Bo YU <tsu.yubo at gmail.com>
+Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=963651
+Forwarded: yes
+Applied-Upstream: no
+Last-Update: 2022-11-04
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/doc/sphinxext/indexcontent.html
++++ b/doc/sphinxext/indexcontent.html
+@@ -1,4 +1,4 @@
+-{% extends "defindex.html" %}
++{% extends "layout.html" %}
+ {% block tables %}
+
+ <table class="contentstable" align="center">
diff -Nru morse-simulator-1.4/debian/patches/series morse-simulator-1.4/debian/patches/series
--- morse-simulator-1.4/debian/patches/series 2020-01-20 22:04:19.000000000 +0800
+++ morse-simulator-1.4/debian/patches/series 2022-11-04 11:39:54.000000000 +0800
@@ -2,3 +2,6 @@
disable-vimeo-sphinx.diff
async-keyword.diff
replace-pngmath-with-imgmath.patch
+fix-ftbfs-sphinxext.patch
+disable-examples-sphinx.patch
+fix-find-pythonlib.patch
diff -Nru morse-simulator-1.4/debian/rules morse-simulator-1.4/debian/rules
--- morse-simulator-1.4/debian/rules 2020-01-20 22:11:41.000000000 +0800
+++ morse-simulator-1.4/debian/rules 2022-11-04 11:39:54.000000000 +0800
@@ -14,7 +14,6 @@
override_dh_install:
cd debian/tmp/usr/bin/ && mv morse morsesim && ln -s morsesim morse
dh_install
- rm -fr $$(find $(CURDIR) -name '__pycache__')
if test -d $(CURDIR)/debian/morse-simulator-doc/usr/share/doc/morse/html/_static/; then \
cd $(CURDIR)/debian/morse-simulator-doc/usr/share/doc/morse/html/_static/ && \
rm -f jquery.js underscore.js && \
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://alioth-lists.debian.net/pipermail/debian-science-maintainers/attachments/20221105/766bf682/attachment-0001.sig>
More information about the debian-science-maintainers
mailing list