[Python-modules-commits] [nbsphinx] 01/01: Improved intial packaging
Jerome Benoit
calculus-guest at moszumanska.debian.org
Mon Oct 3 23:18:54 UTC 2016
This is an automated email from the git hooks/post-receive script.
calculus-guest pushed a commit to branch master
in repository nbsphinx.
commit 321b82cd8ae732f583b1d4c3ba5073cd49dbdfb2
Author: Jerome Benoit <calculus at rezozer.net>
Date: Mon Oct 3 23:55:20 2016 +0100
Improved intial packaging
---
debian/changelog | 2 +-
debian/control | 58 +++++++++++-----------
debian/copyright | 6 +--
debian/patches/debianization-documentation.patch | 4 +-
...on-neutralize-lintian-privacy-breach-logo.patch | 4 +-
debian/python-nbsphinx-doc.docs | 4 +-
debian/rules | 12 ++---
7 files changed, 44 insertions(+), 46 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 98ea1c6..71f16d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,4 +2,4 @@ nbsphinx (0.2.9+ds-1) experimental; urgency=medium
* Initial release (Closes: #838806).
- -- Jerome Benoit <calculus at rezozer.net> Sun, 25 Sep 2016 21:04:53 +0000
+ -- Jerome Benoit <calculus at rezozer.net> Mon, 03 Oct 2016 22:57:17 +0000
diff --git a/debian/control b/debian/control
index 555c28a..94cd4e2 100644
--- a/debian/control
+++ b/debian/control
@@ -4,31 +4,30 @@ 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),
- dh-python,
- python-all,
- python-setuptools,
- python-nbconvert,
- python-nbformat,
- python-docutils,
- python-sphinx,
- python-entrypoints,
- python-jupyter-client,
- python-ipykernel,
- python3-all,
- python3-setuptools,
- python3-nbconvert,
- python3-nbformat,
- python3-docutils,
- python3-sphinx,
- python3-entrypoints,
- python3-jupyter-client,
- python3-ipykernel,
- libjs-mathjax,
- pandoc,
- rdfind,
- symlinks
+Build-Depends-Indep: debhelper (>= 10),
+ dh-python,
+ libjs-mathjax,
+ pandoc,
+ python-all,
+ python-docutils,
+ python-entrypoints,
+ python-ipykernel,
+ python-jupyter-client,
+ python-nbconvert,
+ python-nbformat,
+ python-setuptools,
+ python-sphinx,
+ python3-all,
+ python3-docutils,
+ python3-entrypoints,
+ python3-ipykernel,
+ python3-jupyter-client,
+ python3-nbconvert,
+ python3-nbformat,
+ python3-setuptools,
+ python3-sphinx,
+ rdfind,
+ symlinks
Standards-Version: 3.9.8
X-Python-Version: >= 2.7
X-Python3-Version: >= 3.2
@@ -38,7 +37,7 @@ Vcs-Browser: https://anonscm.debian.org/git/python-modules/packages/nbsphinx.git
Package: python-nbsphinx
Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${python:Depends}
Suggests: python-nbsphinx-doc (= ${source:Version})
Description: Jupyter Notebook Tools for Sphinx -- Python
nbsphinx is a Sphinx extension that provides a source parser for *.ipynb
@@ -51,7 +50,7 @@ Description: Jupyter Notebook Tools for Sphinx -- Python
Package: python3-nbsphinx
Architecture: all
-Depends: ${python3:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${python3:Depends}
Suggests: python-nbsphinx-doc (= ${source:Version})
Description: Jupyter Notebook Tools for Sphinx -- Python 3
nbsphinx is a Sphinx extension that provides a source parser for *.ipynb
@@ -65,9 +64,10 @@ Description: Jupyter Notebook Tools for Sphinx -- Python 3
Package: python-nbsphinx-doc
Section: doc
Architecture: all
-Depends: ${sphinxdoc:Depends}, ${misc:Depends}
+Depends: libjs-mathjax, ${misc:Depends}, ${sphinxdoc:Depends}
Suggests: pdf-viewer, www-browser
-Enhances: python-nbsphinx (= ${source:Version}), python3-nbsphinx (= ${source:Version})
+Enhances: python-nbsphinx (= ${source:Version}),
+ python3-nbsphinx (= ${source:Version})
Description: Jupyter Notebook Tools for Sphinx -- doc
nbsphinx is a Sphinx extension that provides a source parser for *.ipynb
files. Custom Sphinx directives are used to show Jupyter Notebook code cells
diff --git a/debian/copyright b/debian/copyright
index 851ac2a..2d1b83d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,14 +11,14 @@ Files-Excluded:
Files: *
Copyright:
2015-2016 Matthias Geier <Matthias.Geier at gmail.com>
-License: MIT
+License: Expat
Files: debian/*
Copyright:
2016 Jerome Benoit <calculus at rezozer.net>
-License: MIT
+License: Expat
-License: MIT
+License: Expat
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
diff --git a/debian/patches/debianization-documentation.patch b/debian/patches/debianization-documentation.patch
index d6d5fa2..4163550 100644
--- a/debian/patches/debianization-documentation.patch
+++ b/debian/patches/debianization-documentation.patch
@@ -1,8 +1,8 @@
Description: debianization: documentation
Meant to address Debian specific requirements and stuff for documentation.
-Origin: debian
+Origin: vendor, Debian
Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2016-09-25
+Last-Update: 2016-10-03
--- a/doc/conf.py
+++ b/doc/conf.py
diff --git a/debian/patches/debianization-neutralize-lintian-privacy-breach-logo.patch b/debian/patches/debianization-neutralize-lintian-privacy-breach-logo.patch
index dd01d77..b2bc753 100644
--- a/debian/patches/debianization-neutralize-lintian-privacy-breach-logo.patch
+++ b/debian/patches/debianization-neutralize-lintian-privacy-breach-logo.patch
@@ -1,10 +1,10 @@
Description: debianization: neutralize lintian privacy-breach-logo
The involved is literally removed: no local copy of the involved logo
is made as the involved code it meant to be a URL example.
-Origin: debian
+Origin: vendor, Debian
Author: Jerome Benoit <calculus at rezozer.net>
Comment: privacy-breach-logo
-Last-Update: 2016-09-25
+Last-Update: 2016-10-03
--- a/doc/code-cells.ipynb
+++ b/doc/code-cells.ipynb
diff --git a/debian/python-nbsphinx-doc.docs b/debian/python-nbsphinx-doc.docs
index 01112f3..e94b1c4 100644
--- a/debian/python-nbsphinx-doc.docs
+++ b/debian/python-nbsphinx-doc.docs
@@ -1,4 +1,4 @@
+CONTRIBUTING.rst
+NEWS.rst
PKG-INFO
README.rst
-NEWS.rst
-CONTRIBUTING.rst
diff --git a/debian/rules b/debian/rules
index 6bfed78..a3fa820 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,15 +13,13 @@ default:
%:
dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
-DEB_SPHINXDOC_DOCHTMLDIR=debian/python-nbsphinx-doc/usr/share/doc/python-nbsphinx-doc/html
+DEB_SPHINXDOC_DOCHTMLDIR=$(CURDIR)/debian/python-nbsphinx-doc/usr/share/doc/python-nbsphinx-doc/html
override_dh_sphinxdoc:
ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
- PYTHONPATH=. sphinx-build -b html doc $(DEB_SPHINXDOC_DOCHTMLDIR)
- cd $(DEB_SPHINXDOC_DOCHTMLDIR) && { \
- rdfind -outputname /dev/null -makesymlinks true . ; \
- symlinks -r -c -s -v . ; \
- }
- ## Debian Bug report #739300
+ PYTHONPATH=$(CURDIR) sphinx-build -b html doc $(DEB_SPHINXDOC_DOCHTMLDIR)
+ rdfind -outputname /dev/null -makesymlinks true $(DEB_SPHINXDOC_DOCHTMLDIR)
+ symlinks -r -c -s -v $(DEB_SPHINXDOC_DOCHTMLDIR)
+ ## cf Debian Bug report #739300
ln -s /usr/share/javascript/mathjax $(DEB_SPHINXDOC_DOCHTMLDIR)/_static
dh_sphinxdoc -O--buildsystem=pybuild
endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/nbsphinx.git
More information about the Python-modules-commits
mailing list