[pybtex] 12/20: Provide separate packages for Python 2 and docs

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Sat Jul 22 21:04:54 UTC 2017


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

ghisvail-guest pushed a commit to branch master
in repository pybtex.

commit b2a7bd5163a91b5ff1929f337ffc07ae267b8309
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Fri Jul 21 19:09:12 2017 +0100

    Provide separate packages for Python 2 and docs
    
    Gbp-Dch: Short
    Closes: 856930
---
 debian/control                                  | 57 +++++++++++++++++++++++--
 debian/doc-base                                 |  8 ----
 debian/docs                                     |  1 -
 debian/{manpages => pybtex.manpages}            |  0
 debian/{postinst => pybtex.postinst}            |  0
 debian/{prerm => pybtex.prerm}                  |  0
 debian/python-pybtex-doc.doc-base               |  9 ++++
 debian/python-pybtex-doc.docs                   |  1 +
 debian/{examples => python-pybtex-doc.examples} |  0
 debian/rules                                    | 14 +++---
 10 files changed, 73 insertions(+), 17 deletions(-)

diff --git a/debian/control b/debian/control
index 651a17d..f309026 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Section: tex
 Priority: optional
 Build-Depends: debhelper (>= 9),
                dh-python,
-               python,
+               python-all,
                python-latexcodec (>= 1.0.4),
                python-nose,
                python-pygments,
@@ -21,8 +21,7 @@ Package: pybtex
 Architecture: all
 Depends: ${misc:Depends},
          ${python:Depends},
-         ${sphinxdoc:Depends},
-         python-pkg-resources
+         python-pybtex (= ${binary:Version})
 Description: BibTeX-compatible bibliography processor
  Pybtex reads citation information from a file and produces a formatted
  bibliography. BibTeX style files are supported. Alternatively it is
@@ -37,3 +36,55 @@ Description: BibTeX-compatible bibliography processor
   * LaTeX
   * HTML
   * plain text
+ .
+ This package provides the command-line interface.
+
+Package: python-pybtex
+Architecture: all
+Section: python
+Depends: ${misc:Depends},
+         ${python:Depends},
+         python-pkg-resources
+Suggests: python-pybtex-doc
+Breaks: pybtex (<< 0.21-1)
+Replaces: pybtex (<< 0.21-1)
+Description: public modules for pybtex (Python 2)
+ Pybtex reads citation information from a file and produces a formatted
+ bibliography. BibTeX style files are supported. Alternatively it is
+ possible to write styles in Python.
+ .
+ Pybtex currently understands the following bibliography formats:
+  * BibTeX
+  * BibTeXML
+  * YAML-based format
+ .
+ The resulting bibliography may be output in one of the following formats:
+  * LaTeX
+  * HTML
+  * plain text
+ .
+ This package provides the modules for Python 2.
+
+Package: python-pybtex-doc
+Architecture: all
+Multi-Arch: foreign
+Section: doc
+Depends: ${misc:Depends},
+         ${sphinxdoc:Depends}
+Built-Using: ${sphinxdoc:Built-Using}
+Description: documentation for pybtex
+ Pybtex reads citation information from a file and produces a formatted
+ bibliography. BibTeX style files are supported. Alternatively it is
+ possible to write styles in Python.
+ .
+ Pybtex currently understands the following bibliography formats:
+  * BibTeX
+  * BibTeXML
+  * YAML-based format
+ .
+ The resulting bibliography may be output in one of the following formats:
+  * LaTeX
+  * HTML
+  * plain text
+ .
+ This package provides the documentation.
diff --git a/debian/doc-base b/debian/doc-base
deleted file mode 100644
index f973a4e..0000000
--- a/debian/doc-base
+++ /dev/null
@@ -1,8 +0,0 @@
-Document: pybtex-documentation
-Title: Pybtex documentation
-Author: Andrey Golovizin
-Section: Text
-
-Format: HTML
-Index: /usr/share/doc/pybtex/html/index.html
-Files: /usr/share/doc/pybtex/html/*.html
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index e845566..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-README
diff --git a/debian/manpages b/debian/pybtex.manpages
similarity index 100%
rename from debian/manpages
rename to debian/pybtex.manpages
diff --git a/debian/postinst b/debian/pybtex.postinst
similarity index 100%
rename from debian/postinst
rename to debian/pybtex.postinst
diff --git a/debian/prerm b/debian/pybtex.prerm
similarity index 100%
rename from debian/prerm
rename to debian/pybtex.prerm
diff --git a/debian/python-pybtex-doc.doc-base b/debian/python-pybtex-doc.doc-base
new file mode 100644
index 0000000..1291e55
--- /dev/null
+++ b/debian/python-pybtex-doc.doc-base
@@ -0,0 +1,9 @@
+Document: python-pybtex-doc
+Title: Pybtex Documentation
+Author: Andrey Golovizin
+Abstract: This is the reference documentation for pybtex.
+Section: Text
+
+Format: HTML
+Index: /usr/share/doc/python-pybtex-doc/html/index.html
+Files: /usr/share/doc/python-pybtex-doc/html/*.html
diff --git a/debian/python-pybtex-doc.docs b/debian/python-pybtex-doc.docs
new file mode 100644
index 0000000..6d28621
--- /dev/null
+++ b/debian/python-pybtex-doc.docs
@@ -0,0 +1 @@
+build/html
diff --git a/debian/examples b/debian/python-pybtex-doc.examples
similarity index 100%
rename from debian/examples
rename to debian/python-pybtex-doc.examples
diff --git a/debian/rules b/debian/rules
index fbaa63b..8fb5893 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,17 +9,21 @@ export PYBUILD_AFTER_TEST=rm -rf {build_dir}/*.egg-info
 %:
 	dh $@ --with python2,sphinxdoc --buildsystem=pybuild
 
+override_dh_auto_clean:
+	dh_auto_clean
+	$(RM) -rf build/html
+
+override_dh_auto_build:
+	dh_auto_build
+	PYTHONPATH=. sphinx-build -N -b html docs/source build/html
+
 .PHONY: override_dh_auto_install
 override_dh_auto_install:
 	dh_auto_install
+	dh_movefiles --package=pybtex --sourcedir=debian/python-pybtex usr/bin
 	mv debian/pybtex/usr/bin/pybtex debian/pybtex/usr/bin/bibtex.pybtex
 	rm -rf debian/pybtex/usr/lib/python*/*-packages/pybtex/tests/
 
-.PHONY: override_dh_installdocs
-override_dh_installdocs:
-	dh_installdocs
-	PYTHONPATH=. sphinx-build -N -bhtml docs/source debian/pybtex/usr/share/doc/pybtex/html
-
 .PHONY: override_dh_installman
 override_dh_installman:
 	dh_installman

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pybtex.git



More information about the debian-science-commits mailing list