Package: php-guzzlehttp-ringphp-doc Version: 1.1.0-1 Severity: wishlist Tags: patch
Dear Maintainer, Currently php-guzzlehttp-ringphp has some custom code to link to packaged versions of jquery and sphinx-rtd-theme. However, dh_sphinxdoc has always been able to link to jquery, and since version 1.3.1-3 it is also able to link to sphinx-rtd-theme. It uses sphinx-rtd-theme-common package which contains all the needed files, and linking to it is better than to python-sphinx-rtd-theme, as it allows i.e. transparent switch to Python 3 in case you want it. Please consider applying the attached patch to take advantage of the latest dh_sphinxdoc functionality. -- Dmitry Shachnev
From c8ff7e311cc208131094fe954ddc65f0954aa7e0 Mon Sep 17 00:00:00 2001
From: Dmitry Shachnev <mity...@gmail.com>
Date: Sat, 5 Sep 2015 14:13:31 +0300
Subject: [PATCH] Rely on dh_sphinxdoc to do the necessary linking.
- Bump build-dependencies on python-sphinx and python-sphinx-rtd-theme.
- Drop custom linking code in debian/php-guzzlehttp-ringphp-doc.links
and debian/rules.
- Add debian/php-guzzlehttp-ringphp-doc.preinst to handle symlinks to
directories change.
Git-Dch: Full
---
debian/control | 8 +++-----
debian/php-guzzlehttp-ringphp-doc.links | 5 -----
debian/php-guzzlehttp-ringphp-doc.lintian-overrides | 6 ++----
debian/php-guzzlehttp-ringphp-doc.preinst | 12 ++++++++++++
debian/rules | 9 ---------
5 files changed, 17 insertions(+), 23 deletions(-)
delete mode 100644 debian/php-guzzlehttp-ringphp-doc.links
create mode 100644 debian/php-guzzlehttp-ringphp-doc.preinst
diff --git a/debian/control b/debian/control
index 2e6d221..66173b0 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,8 @@ Build-Depends: ca-certificates,
phpab,
phpunit,
pkg-php-tools (>= 1.7~),
- python-sphinx,
- python-sphinx-rtd-theme,
+ python-sphinx (>= 1.3.1-3~),
+ python-sphinx-rtd-theme (>= 0.1.8-2~),
texlive-fonts-recommended,
texlive-latex-base,
texlive-latex-extra,
@@ -46,9 +46,7 @@ Description: Ring adapter and handler system for Guzzle
Package: php-guzzlehttp-ringphp-doc
Section: doc
Architecture: all
-Depends: libjs-jquery,
- python-sphinx-rtd-theme,
- ${misc:Depends},
+Depends: ${misc:Depends},
${sphinxdoc:Depends}
Description: Ring adapter and handler system for Guzzle - documentation
This package contains the documentation for RingPHP.
diff --git a/debian/php-guzzlehttp-ringphp-doc.links b/debian/php-guzzlehttp-ringphp-doc.links
deleted file mode 100644
index 9fd59b3..0000000
--- a/debian/php-guzzlehttp-ringphp-doc.links
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/share/javascript/jquery/jquery.min.js usr/share/doc/php-guzzlehttp-ringphp/html/_static/jquery.js
-usr/lib/python2.7/dist-packages/sphinx_rtd_theme/static/css usr/share/doc/php-guzzlehttp-ringphp/html/_static/css
-usr/lib/python2.7/dist-packages/sphinx_rtd_theme/static/fonts usr/share/doc/php-guzzlehttp-ringphp/html/_static/fonts
-usr/lib/python2.7/dist-packages/sphinx_rtd_theme/static/js usr/share/doc/php-guzzlehttp-ringphp/html/_static/js
-# usr/share/javascript/underscore/underscore.min.js usr/share/doc/php-guzzlehttp-ringphp/html/_static/underscore.js
diff --git a/debian/php-guzzlehttp-ringphp-doc.lintian-overrides b/debian/php-guzzlehttp-ringphp-doc.lintian-overrides
index d95d218..3517ac3 100644
--- a/debian/php-guzzlehttp-ringphp-doc.lintian-overrides
+++ b/debian/php-guzzlehttp-ringphp-doc.lintian-overrides
@@ -1,4 +1,2 @@
-# Symlinks pointing to directories belonging to python-sphinx-rtd-theme, which is a dependency
-package-contains-broken-symlink usr/share/doc/php-guzzlehttp-ringphp/html/_static/css ../../../../../lib/python2.7/dist-packages/sphinx_rtd_theme/static/css
-package-contains-broken-symlink usr/share/doc/php-guzzlehttp-ringphp/html/_static/fonts ../../../../../lib/python2.7/dist-packages/sphinx_rtd_theme/static/fonts
-package-contains-broken-symlink usr/share/doc/php-guzzlehttp-ringphp/html/_static/js ../../../../../lib/python2.7/dist-packages/sphinx_rtd_theme/static/js
+# Symlinks pointing to directories belonging to sphinx-rtd-theme-common and libjs-sphinxdoc
+package-contains-broken-symlink usr/share/doc/php-guzzlehttp-ringphp/html/_static/*
diff --git a/debian/php-guzzlehttp-ringphp-doc.preinst b/debian/php-guzzlehttp-ringphp-doc.preinst
new file mode 100644
index 0000000..cccb1ab
--- /dev/null
+++ b/debian/php-guzzlehttp-ringphp-doc.preinst
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+# Handle replacing symlinks with directories
+if [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt 1.1.0-2
+then
+ rm -rf /usr/share/doc/php-guzzlehttp-ringphp/html/_static/css
+ rm -rf /usr/share/doc/php-guzzlehttp-ringphp/html/_static/fonts
+ rm -rf /usr/share/doc/php-guzzlehttp-ringphp/html/_static/js
+fi
+
+#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index b7094ce..2fb6297 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,14 +9,5 @@ override_dh_auto_build:
src
$(MAKE) -C docs latexpdf
-override_dh_link:
- rm -r debian/php-guzzlehttp-ringphp-doc/usr/share/doc/php-guzzlehttp-ringphp/html/_static/css
- rm -r debian/php-guzzlehttp-ringphp-doc/usr/share/doc/php-guzzlehttp-ringphp/html/_static/fonts
- rm -r debian/php-guzzlehttp-ringphp-doc/usr/share/doc/php-guzzlehttp-ringphp/html/_static/js
- dh_link
-
-override_dh_sphinxdoc:
- dh_sphinxdoc --exclude=jquery.js
-
get-orig-source:
uscan --verbose --rename --force
--
2.5.1
signature.asc
Description: OpenPGP digital signature
