[Python-modules-commits] [sphinx] 06/06: Make dh_sphinxdoc generate ${sphinxdoc:Built-Using} substvar.
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Mon Oct 3 13:49:05 UTC 2016
This is an automated email from the git hooks/post-receive script.
mitya57 pushed a commit to branch master
in repository sphinx.
commit 2a947021ec71ab00dcff790c71084b4fbbee97b1
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Mon Oct 3 16:47:54 2016 +0300
Make dh_sphinxdoc generate ${sphinxdoc:Built-Using} substvar.
Closes: #836248.
---
debian/changelog | 2 ++
debian/dh-sphinxdoc/dh_sphinxdoc | 29 +++++++++++++++++++++++++++++
2 files changed, 31 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index b8e3553..74ffc74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ sphinx (1.4.8-1) UNRELEASED; urgency=medium
* New upstream bugfix release.
* Stop running jstest during build (but still run it in the autopkgtest).
* Update debian/watch to track only stable versions.
+ * Make dh_sphinxdoc generate ${sphinxdoc:Built-Using} substvar (closes:
+ #836248).
-- Dmitry Shachnev <mitya57 at debian.org> Sat, 03 Sep 2016 19:54:15 +0300
diff --git a/debian/dh-sphinxdoc/dh_sphinxdoc b/debian/dh-sphinxdoc/dh_sphinxdoc
index 1af3f45..4f4cac9 100755
--- a/debian/dh-sphinxdoc/dh_sphinxdoc
+++ b/debian/dh-sphinxdoc/dh_sphinxdoc
@@ -355,6 +355,33 @@ sub process_rtd($)
return @deps;
}
+sub get_installed_package_version($)
+{
+ my ($package_name) = @_;
+ return `dpkg-query -W -f '\${Version}' $package_name 2>/dev/null`;
+}
+
+sub list_built_using($)
+{
+ my ($path) = @_;
+ my @built_using;
+ my $sphinx_version = get_installed_package_version("sphinx-common");
+ push @built_using, "sphinx (= $sphinx_version)";
+ if (-d "$path/_static" and -f "$path/_static/alabaster.css")
+ {
+ my $alabaster_version = get_installed_package_version("python3-alabaster");
+ unless ($alabaster_version)
+ {
+ $alabaster_version = get_installed_package_version("python-alabaster");
+ }
+ if ($alabaster_version)
+ {
+ push @built_using, "alabaster (= $alabaster_version)";
+ }
+ }
+ return @built_using;
+}
+
sub fix_sphinx_doc($$)
{
my ($package, $path) = @_;
@@ -362,9 +389,11 @@ sub fix_sphinx_doc($$)
my @js = sanity_check($path);
my @rtd_deps = process_rtd($path);
my @deps = fix_symlinks($path, @js);
+ my @built_using = list_built_using($path);
drop_cruft($path);
map { addsubstvar($package, "sphinxdoc:Depends", $_) } @deps;
map { addsubstvar($package, "sphinxdoc:Depends", $_) } @rtd_deps;
+ map { addsubstvar($package, "sphinxdoc:Built-Using", $_) } @built_using;
return 1;
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/sphinx.git
More information about the Python-modules-commits
mailing list