[Python-modules-commits] [jupyter-sphinx-theme] 01/01: Debian patch 0.0.6+ds1-3

Jerome Benoit calculus-guest at moszumanska.debian.org
Sat Feb 3 14:16:39 UTC 2018


This is an automated email from the git hooks/post-receive script.

calculus-guest pushed a commit to branch master
in repository jupyter-sphinx-theme.

commit 001e8663d68b472eac74bd6a998eb19ee0edf2fc
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Sat Feb 3 18:02:26 2018 +0400

    Debian patch 0.0.6+ds1-3
---
 debian/adhoc/examples/Makefile                     |  7 +++---
 .../examples/demo/source/_sources/examples.txt     |  1 +
 .../adhoc/examples/demo/source/_themes/bootstrap   |  1 -
 debian/adhoc/examples/demo/source/conf.py          | 17 ++++++++++++-
 debian/adhoc/examples/demo/source/examples.rst     |  2 +-
 debian/adhoc/examples/samples/helloworld.py        |  9 +++++++
 debian/changelog                                   | 29 ++++++++++++++++++++++
 debian/compat                                      |  2 +-
 debian/control                                     | 24 ++++++++++--------
 debian/copyright                                   | 13 +++++++---
 debian/jupyter-sphinx-theme-doc.lintian-overrides  |  4 ---
 debian/rules                                       |  4 +--
 debian/source/lintian-overrides                    |  2 +-
 debian/tests/control                               |  2 +-
 debian/watch                                       |  2 +-
 15 files changed, 90 insertions(+), 29 deletions(-)

diff --git a/debian/adhoc/examples/Makefile b/debian/adhoc/examples/Makefile
index 7e84906..25d1377 100644
--- a/debian/adhoc/examples/Makefile
+++ b/debian/adhoc/examples/Makefile
@@ -22,7 +22,7 @@
 #
 # written for Debian by Jerome Benoit <calculus at rezozer.net>
 # on behalf of the Debian Python Modules Team
-# copyright: 2016 Jerome Benoit <calculus at rezozer.net>
+# copyright: 2016-2018 Jerome Benoit <calculus at rezozer.net>
 # distributed under the terms and conditions of the MIT License
 #
 
@@ -42,8 +42,9 @@ JST_DEMO_LISTOF_ITEM = \
 	texinfo \
 	info \
 	gettext \
-	changes \
-	linkcheck
+	changes
+
+#JST_DEMO_LISTOF_ITEM += linkcheck
 
 default: all
 
diff --git a/debian/adhoc/examples/demo/source/_sources/examples.txt b/debian/adhoc/examples/demo/source/_sources/examples.txt
new file mode 120000
index 0000000..488124d
--- /dev/null
+++ b/debian/adhoc/examples/demo/source/_sources/examples.txt
@@ -0,0 +1 @@
+../examples.rst
\ No newline at end of file
diff --git a/debian/adhoc/examples/demo/source/_themes/bootstrap b/debian/adhoc/examples/demo/source/_themes/bootstrap
deleted file mode 120000
index 57a1195..0000000
--- a/debian/adhoc/examples/demo/source/_themes/bootstrap
+++ /dev/null
@@ -1 +0,0 @@
-../../../bootstrap
\ No newline at end of file
diff --git a/debian/adhoc/examples/demo/source/conf.py b/debian/adhoc/examples/demo/source/conf.py
index 7844046..7e69890 100644
--- a/debian/adhoc/examples/demo/source/conf.py
+++ b/debian/adhoc/examples/demo/source/conf.py
@@ -41,4 +41,19 @@ texinfo_documents = [
    u'Ryan Roemer', 'MyProject', 'One line description of project.',
    'Miscellaneous'),
 ]
-intersphinx_mapping = {'http://docs.python.org/': None}
+
+
+def check_object_path(key, url, path):
+    if os.path.isfile(path):
+        return {key: (url, path)}
+    return {}
+
+intersphinx_mapping = {}
+intersphinx_mapping.update(check_object_path('python',
+                                            'https://docs.python.org/',
+                                            '/usr/share/doc/python'
+                                              + '.'.join([str(x) for x in sys.version_info[0:2]])
+                                              + '/html/objects.inv'))
+intersphinx_mapping.update(check_object_path('sphinx',
+                                             'http://sphinx-doc.org/',
+                                             '/usr/share/doc/python-sphinx/html/objects.inv'))
diff --git a/debian/adhoc/examples/demo/source/examples.rst b/debian/adhoc/examples/demo/source/examples.rst
index 25c1cde..e6f96bb 100644
--- a/debian/adhoc/examples/demo/source/examples.rst
+++ b/debian/adhoc/examples/demo/source/examples.rst
@@ -29,7 +29,7 @@ The Sphinx Bootstrap Theme uses Bootstrap styling for ``inline code text`` and
 
 Here's an included example with line numbers.
 
-.. literalinclude:: ../../jupyter_sphinx_theme/__init__.py
+.. literalinclude:: ../../samples/helloworld.py
    :linenos:
 
 It also works with existing Sphinx highlighting:
diff --git a/debian/adhoc/examples/samples/helloworld.py b/debian/adhoc/examples/samples/helloworld.py
new file mode 100755
index 0000000..cf92cb9
--- /dev/null
+++ b/debian/adhoc/examples/samples/helloworld.py
@@ -0,0 +1,9 @@
+#!/usr/bin/python
+
+def main():
+	print 'Hello world !'
+
+if __name__ == '__main__':
+	main()
+
+## eos
diff --git a/debian/changelog b/debian/changelog
index e3238bd..42af02a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,32 @@
+jupyter-sphinx-theme (0.0.6+ds1-3) unstable; urgency=medium
+
+  * Debianization:
+    - debian/copyright:
+      - copyright year tuple, update;
+      - refresh;
+    - debian/control:
+      - debhelper, bump to 11;
+      - Standards Version, bump to 4.1.3 (no change);
+      - Build-Depends field, remove (was empty);
+      - Recommends, jupyter-sphinx-theme-doc, refresh;
+    - debian/rules:
+      - debhelper, bump to 11;
+      - get-orig-source target, compression option, move to d/watch;
+    - debian/tests/*:
+      - Restrictions field, add allow-stderr;
+    - debian/adhoc/examples/samples/*:
+      - d/a/e/s/helloworld.py , introduce;
+    - debian/adhoc/examples/demo/*:
+      - d/a/e/d/source/_sources/examples.txt
+        link to ../examples.rst , introduce;
+      - d/a/e/d/source/_themes/bootstrap , remove (Closes: #861505);
+      - d/a/e/d/conf.py , harden;
+      - d/a/e/d/examples.rst , local links, refresh;
+    - debian/watch, harden;
+    - debian/source/lintian-overrides, refresh.
+
+ -- Jerome Benoit <calculus at rezozer.net>  Sat, 03 Feb 2018 14:11:58 +0000
+
 jupyter-sphinx-theme (0.0.6+ds1-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/compat b/debian/compat
index f599e28..b4de394 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11
diff --git a/debian/control b/debian/control
index 2052c94..95197d8 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,7 @@ Section: python
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Jerome Benoit <calculus at rezozer.net>
-Build-Depends:
-Build-Depends-Indep: debhelper (>= 10),
+Build-Depends-Indep: debhelper (>= 11),
                      dh-python,
                      libjs-bootstrap,
                      libjs-bootswatch,
@@ -18,7 +17,7 @@ Build-Depends-Indep: debhelper (>= 10),
                      python3-nbsphinx,
                      python3-recommonmark,
                      python3-setuptools
-Standards-Version: 3.9.8
+Standards-Version: 4.1.3
 X-Python-Version: >= 2.7
 X-Python3-Version: >= 3.2
 Homepage: https://github.com/ipython/jupyter-sphinx-theme
@@ -79,13 +78,18 @@ Package: jupyter-sphinx-theme-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Recommends: python-entrypoints,
-            python-jupyter-sphinx-theme (= ${binary:Version}),
-            texinfo,
-            texlive-fonts-recommended,
-            texlive-generic-extra,
-            texlive-latex-extra,
-            texlive-latex-recommended
+Recommends:
+ python-entrypoints,
+ python-doc,
+ python-jupyter-sphinx-theme (= ${binary:Version}),
+ python3-doc,
+ python3-jupyter-sphinx-theme (= ${binary:Version}),
+ texinfo,
+ texlive-fonts-recommended,
+ texlive-generic-extra,
+ texlive-latex-extra,
+ texlive-latex-recommended,
+ latexmk
 Description: Jupyter Sphinx Theme -- documentation
  A Jupyter Sphinx theme for narrative documentation.
  .
diff --git a/debian/copyright b/debian/copyright
index e402be7..c047d91 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -15,7 +15,7 @@ Files-Excluded:
 
 Files: *
 Copyright:
- 2016 Jupyter Development Team <http://jupyter.org/>
+ 2016-2018 Jupyter Development Team <http://jupyter.org/>
 License: MIT
 
 Files: jupyter_sphinx_theme/jupyter/search.html
@@ -27,9 +27,15 @@ License: BSD-2-clause
 
 Files: debian/*
 Copyright:
- 2016 Jerome Benoit <calculus at rezozer.net>
+ 2016-2018 Jerome Benoit <calculus at rezozer.net>
 License: MIT
 
+Files: debian/adhoc/examples/samples/helloworld.py
+Copyright:
+ 2018 Jerome Benoit <calculus at rezozer.net>
+License: public-domain
+ This file is placed in the public domain.
+
 Files: debian/adhoc/examples/demo/*
 Copyright:
  2016 Jupyter Development Team <http://jupyter.org/>
@@ -39,7 +45,8 @@ Comment:
  This demo folder is part of the material provided by Ryan Roemer, but
  unfortunately not distributed within the source tarball. It was fetched
  as-is by hand from https://github.com/jupyter/jupyter-sphinx-theme modulo
- a commented-out privacy-breach[-generic].
+ a commented-out privacy-breach[-generic], a redirected local link,
+ a adapted intersphinx_mapping in conf.py .
 
 License: MIT
  Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/debian/jupyter-sphinx-theme-doc.lintian-overrides b/debian/jupyter-sphinx-theme-doc.lintian-overrides
index f7654e4..9e53014 100644
--- a/debian/jupyter-sphinx-theme-doc.lintian-overrides
+++ b/debian/jupyter-sphinx-theme-doc.lintian-overrides
@@ -1,6 +1,2 @@
 # The upstream source tarball contains no ChangeLog file.
 jupyter-sphinx-theme-doc: no-upstream-changelog
-
-# The `demo' material contains indeed a privacy-breach:
-# it was commented out by hand (so it is a False-Positive).
-jupyter-sphinx-theme-doc: privacy-breach-generic
diff --git a/debian/rules b/debian/rules
index e31b305..2dcbe55 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ default:
 	@uscan --no-conf --dehs --report || true
 
 %:
-	dh $@ --with autoreconf --with python2,python3 --buildsystem=pybuild
+	dh $@ --with python2,python3 --buildsystem=pybuild
 
 override_dh_installdocs:
 	dh_installdocs --package=python-jupyter-sphinx-theme  --link-doc=jupyter-sphinx-theme-common
@@ -17,4 +17,4 @@ override_dh_compress-indep:
 	dh_compress -Xexamples
 
 get-orig-source:
-	uscan --no-conf --download-current-version --compression xz --verbose
+	uscan --no-conf --download-current-version --verbose
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 3aa65e7..a4660f0 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,2 +1,2 @@
 # Upstream source downloaded from <https://pypi.debian.net/>
-debian-watch-may-check-gpg-signature
+debian-watch-does-not-check-gpg-signature
diff --git a/debian/tests/control b/debian/tests/control
index 9214092..999bbbc 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
 Tests: perform-demo
 Depends: jupyter-sphinx-theme-doc
-Restrictions: needs-recommends
+Restrictions: allow-stderr needs-recommends
diff --git a/debian/watch b/debian/watch
index 7b2254b..180645b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=4
-opts=repack,dversionmangle=s/\+ds[\d]?//,repacksuffix=+ds1,uversionmangle=s/(rc|a|b|c)/~$1/ \
+opts=repack,compression=xz,dversionmangle=s/\+ds[\d]?//,repacksuffix=+ds1,uversionmangle=s/(rc|a|b|c)/~$1/ \
 https://pypi.debian.net/jupyter-sphinx-theme/jupyter-sphinx-theme-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/jupyter-sphinx-theme.git



More information about the Python-modules-commits mailing list