[Python-modules-commits] r27514 - in packages/jsonpickle/trunk/debian (9 files)

jandd at users.alioth.debian.org jandd at users.alioth.debian.org
Sun Feb 2 09:39:07 UTC 2014


    Date: Sunday, February 2, 2014 @ 09:39:06
  Author: jandd
Revision: 27514

  - add X-Python-Version and X-Python3-Version to source package stanza
* add doc package:
  - add new binary package python-jsonpickle-doc
  - add python-sphinx to Build-Depends
  - add patch debian/patches/disable-unsupported-sphinx-extension.patch to
    disable Sphinx extensions that are either not packaged in Debian or need
    remote access at build time
  - add override_dh_auto_build, override_dh_auto_install and
    override_dh_sphinxdoc to build and install Sphinx documentation properly
  - add debian/python-jsonpickle-doc.doc-base for docbase registration

Added:
  packages/jsonpickle/trunk/debian/patches/disable-unsupported-sphinx-extension.patch
  packages/jsonpickle/trunk/debian/python-jsonpickle-doc.doc-base
  packages/jsonpickle/trunk/debian/python-jsonpickle-doc.docs
Modified:
  packages/jsonpickle/trunk/debian/changelog
  packages/jsonpickle/trunk/debian/control
  packages/jsonpickle/trunk/debian/patches/series
  packages/jsonpickle/trunk/debian/rules
Deleted:
  packages/jsonpickle/trunk/debian/python-jsonpickle.install
  packages/jsonpickle/trunk/debian/python3-jsonpickle.install

Modified: packages/jsonpickle/trunk/debian/changelog
===================================================================
--- packages/jsonpickle/trunk/debian/changelog	2014-02-01 23:10:32 UTC (rev 27513)
+++ packages/jsonpickle/trunk/debian/changelog	2014-02-02 09:39:06 UTC (rev 27514)
@@ -12,6 +12,16 @@
     - add dh-python, python3, python3-feedparse and python3-simplejson to
       Build-Depends
     - use pybuild as buildsystem
+    - add X-Python-Version and X-Python3-Version to source package stanza
+  * add doc package:
+    - add new binary package python-jsonpickle-doc
+    - add python-sphinx to Build-Depends
+    - add patch debian/patches/disable-unsupported-sphinx-extension.patch to
+      disable Sphinx extensions that are either not packaged in Debian or need
+      remote access at build time
+    - add override_dh_auto_build, override_dh_auto_install and
+      override_dh_sphinxdoc to build and install Sphinx documentation properly
+    - add debian/python-jsonpickle-doc.doc-base for docbase registration
 
  -- Jan Dittberner <jandd at debian.org>  Sat, 01 Feb 2014 22:44:50 +0100
 

Modified: packages/jsonpickle/trunk/debian/control
===================================================================
--- packages/jsonpickle/trunk/debian/control	2014-02-01 23:10:32 UTC (rev 27513)
+++ packages/jsonpickle/trunk/debian/control	2014-02-02 09:39:06 UTC (rev 27514)
@@ -8,6 +8,7 @@
                python,
                python-feedparser,
                python-simplejson,
+               python-sphinx (>= 1.0.7+dfsg-1~),
                python3,
                python3-feedparser,
                python3-simplejson
@@ -15,13 +16,15 @@
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/jsonpickle/trunk
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/jsonpickle/trunk/
 Homepage: http://jsonpickle.github.com
+X-Python-Version: >= 2.6
+X-Python3-Version: >= 3.2
 
 Package: python-jsonpickle
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
 Provides: ${python:Provides}
 Suggests: python-simplejson
-Description: Python library for serializing arbitrary object graphs into JSON
+Description: Python library for serializing object graphs into JSON (Python 2)
  jsonpickle is a Python library for serialization and deserialization of
  complex Python objects to and from JSON. The standard Python libraries for
  encoding Python into JSON, such as the stdlib’s json, simplejson, and
@@ -37,9 +40,9 @@
 Package: python3-jsonpickle
 Architecture: all
 Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
-Provides: ${python:Provides}
+Provides: ${python3:Provides}
 Suggests: python3-simplejson
-Description: Python library for serializing arbitrary object graphs into JSON
+Description: Python library for serializing object graphs into JSON (Python 3)
  jsonpickle is a Python library for serialization and deserialization of
  complex Python objects to and from JSON. The standard Python libraries for
  encoding Python into JSON, such as the stdlib’s json, simplejson, and
@@ -51,3 +54,21 @@
  backends.
  .
  This is the Python 3 version of the package.
+
+Package: python-jsonpickle-doc
+Architecture: all
+Section: doc
+Priority: extra
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Description: Python library for serializing object graphs into JSON (documentation)
+ jsonpickle is a Python library for serialization and deserialization of
+ complex Python objects to and from JSON. The standard Python libraries for
+ encoding Python into JSON, such as the stdlib’s json, simplejson, and
+ demjson,  can only handle Python primitives that have a direct JSON
+ equivalent (e.g. dicts, lists, strings, ints, etc.). jsonpickle builds on
+ top of these libraries and allows more complex data structures to be
+ serialized to JSON. jsonpickle is highly configurable and
+ extendable–allowing the user to choose the JSON backend  and add additional
+ backends.
+ .
+ This is the documentation package.

Added: packages/jsonpickle/trunk/debian/patches/disable-unsupported-sphinx-extension.patch
===================================================================
--- packages/jsonpickle/trunk/debian/patches/disable-unsupported-sphinx-extension.patch	                        (rev 0)
+++ packages/jsonpickle/trunk/debian/patches/disable-unsupported-sphinx-extension.patch	2014-02-02 09:39:06 UTC (rev 27514)
@@ -0,0 +1,38 @@
+Author: Jan Dittberner <jandd at debian.org>
+Subject: disable Sphinx extensions not available in Debian or requiring remote access
+--- a/docs/source/conf.py
++++ b/docs/source/conf.py
+@@ -19,24 +19,11 @@
+ sys.path.insert(0, os.path.abspath(os.path.join('..', '..')))
+ import jsonpickle
+ 
+-sys.path.insert(1, os.path.abspath(os.path.join('..', '..', 'thirdparty', 'sphinx-to-github')))
+-try:
+-    import sphinxtogithub
+-    sphinxtogithub # import side-effects
+-except ImportError, e:
+-    raise ImportError('Could not import sphinxtogithub\n'
+-                      'Is the git submodule populated at thirdparty/sphinx-to-github?\n'
+-                      'At the project root run:\n'
+-                      '\tgit submodule init\n'
+-                      '\tgit submodule update')
+-
+ # -- General configuration -----------------------------------------------------
+ 
+ # 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.intersphinx', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinxtogithub']
+-
+-sphinx_to_github = True
++extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.todo', 'sphinx.ext.coverage']
+ 
+ # Add any paths that contain templates here, relative to this directory.
+ templates_path = ['_templates']
+@@ -206,7 +193,3 @@
+ 
+ # If false, no module index is generated.
+ #latex_use_modindex = True
+-
+-
+-# Example configuration for intersphinx: refer to the Python standard library.
+-intersphinx_mapping = {'http://docs.python.org/': None}

Modified: packages/jsonpickle/trunk/debian/patches/series
===================================================================
--- packages/jsonpickle/trunk/debian/patches/series	2014-02-01 23:10:32 UTC (rev 27513)
+++ packages/jsonpickle/trunk/debian/patches/series	2014-02-02 09:39:06 UTC (rev 27514)
@@ -1 +1,2 @@
 disable-tests-for-unpackaged-libraries.patch
+disable-unsupported-sphinx-extension.patch

Added: packages/jsonpickle/trunk/debian/python-jsonpickle-doc.doc-base
===================================================================
--- packages/jsonpickle/trunk/debian/python-jsonpickle-doc.doc-base	                        (rev 0)
+++ packages/jsonpickle/trunk/debian/python-jsonpickle-doc.doc-base	2014-02-02 09:39:06 UTC (rev 27514)
@@ -0,0 +1,9 @@
+Document: jsonpickle
+Title: jsonpickle Documentation
+Abstract: This is the documentation of jsonpickle a library to serialize
+ arbitrary Python object graphs into JSON
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python-jsonpickle-doc/html/index.html
+Files: /usr/share/doc/python-jsonpickle-doc/html/*.html

Added: packages/jsonpickle/trunk/debian/python-jsonpickle-doc.docs
===================================================================
--- packages/jsonpickle/trunk/debian/python-jsonpickle-doc.docs	                        (rev 0)
+++ packages/jsonpickle/trunk/debian/python-jsonpickle-doc.docs	2014-02-02 09:39:06 UTC (rev 27514)
@@ -0,0 +1 @@
+README.rst

Deleted: packages/jsonpickle/trunk/debian/python-jsonpickle.install
===================================================================
Deleted: packages/jsonpickle/trunk/debian/python3-jsonpickle.install
===================================================================
Modified: packages/jsonpickle/trunk/debian/rules
===================================================================
--- packages/jsonpickle/trunk/debian/rules	2014-02-01 23:10:32 UTC (rev 27513)
+++ packages/jsonpickle/trunk/debian/rules	2014-02-02 09:39:06 UTC (rev 27514)
@@ -1,8 +1,24 @@
 #!/usr/bin/make -f
+#DH_VERBOSE = 1
+export PYBUILD_DESTDIR_python2=debian/python-jsonpickle
+export PYBUILD_DESTDIR_python3=debian/python3-jsonpickle
 
+%:
+	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
+
+override_dh_auto_build:
+	dh_auto_build
+	sphinx-build -N -q -E -b html docs/source docs/build
+
+override_dh_auto_install:
+	dh_auto_install
+	mkdir -p $(CURDIR)/debian/python-jsonpickle-doc/usr/share/doc/python-jsonpickle-doc
+	mv docs/build $(CURDIR)/debian/python-jsonpickle-doc/usr/share/doc/python-jsonpickle-doc/html
+
 override_dh_auto_test:
 	PYBUILD_SYSTEM=custom \
 	PYBUILD_TEST_ARGS="tests/runtests.py" dh_auto_test
 
-%:
-	dh $@ --with python2,python3 --buildsystem=pybuild
+override_dh_sphinxdoc:
+	dh_sphinxdoc -p python-jsonpickle-doc
+




More information about the Python-modules-commits mailing list