Your message dated Thu, 17 Mar 2016 04:00:44 +0000
with message-id <[email protected]>
and subject line Bug#798086: fixed in php-guzzlehttp-ringphp 1.1.0-2
has caused the Debian Bug report #798086,
regarding php-guzzlehttp-ringphp: Rely on dh_sphinxdoc to do the linking
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
798086: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=798086
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
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 <[email protected]>
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
--- End Message ---
--- Begin Message ---
Source: php-guzzlehttp-ringphp
Source-Version: 1.1.0-2
We believe that the bug you reported is fixed in the latest version of
php-guzzlehttp-ringphp, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
David Prévot <[email protected]> (supplier of updated php-guzzlehttp-ringphp
package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Wed, 16 Mar 2016 21:42:17 -0400
Source: php-guzzlehttp-ringphp
Binary: php-guzzlehttp-ringphp php-guzzlehttp-ringphp-doc
Architecture: source
Version: 1.1.0-2
Distribution: unstable
Urgency: medium
Maintainer: Debian PHP PEAR Maintainers <[email protected]>
Changed-By: David Prévot <[email protected]>
Description:
php-guzzlehttp-ringphp - Ring adapter and handler system for Guzzle
php-guzzlehttp-ringphp-doc - Ring adapter and handler system for Guzzle -
documentation
Closes: 798086
Changes:
php-guzzlehttp-ringphp (1.1.0-2) unstable; urgency=medium
.
[ Dmitry Shachnev ]
* Rely on dh_sphinxdoc to do the necessary linking (Closes: #798086):
- 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
.
[ David Prévot ]
* Handle symlinks to directories change with dpkg-maintscript-helper
* PHP 7.0 transition:
- Build-depend on php-curl instead of php5-curl
- Rebuild with recent pkg-php-tools
* Update Standards-Version to 3.9.7
Checksums-Sha1:
fcfa7e3ad0e4a6994abd5aa16cee2ef8ad175662 2116
php-guzzlehttp-ringphp_1.1.0-2.dsc
71955d2c03a1396adc0a38ede3e7b4eb9c0a8990 5324
php-guzzlehttp-ringphp_1.1.0-2.debian.tar.xz
Checksums-Sha256:
7d34fe76d87c86ee10e4e96f5b574bd7c67f404248a2d90e1594664e2f9efb31 2116
php-guzzlehttp-ringphp_1.1.0-2.dsc
05c9a6a7805d133802c8aaaf605c46889fbbc0e65b81326265b34c5ee8f03a49 5324
php-guzzlehttp-ringphp_1.1.0-2.debian.tar.xz
Files:
94d8f0ce2f9906b39ae4c75d016d8979 2116 php optional
php-guzzlehttp-ringphp_1.1.0-2.dsc
17be7ab905d7fbefb399af709f15147a 5324 php optional
php-guzzlehttp-ringphp_1.1.0-2.debian.tar.xz
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQEcBAEBCAAGBQJW6g0kAAoJEAWMHPlE9r08ilcH/0N1TTnS43y60nbN33bVd7bN
grS9wLRX1/kev8KKFyxPLakXV2YqsVp/RWG616z2CrFVX/tuMCXCHy7i3B7ox4B5
vfHDX047BNwuR0B4sZqtWfCbfXyIVaXwOsRZ0E5vm7U4kMWUs5lrDYUV9PNK4BsG
8TMEWmdxAFv6zS0Q+ZRtXbprS4j3XbSIZ7MZrv7meFt8wZio8GjsqVPt5LoDC0F7
GxjGB5+ZiGx9liQ+uSEf9DM/l3QKEbaBx1KbDNfK/8ewjmbvOQOZE0ZHJm0waK+Q
F/DFgPAaK200aHNT0rZTESG1wQOJ7kYAicCC8/4vrPdbxG5hBhiPSEUF/ePDNnk=
=UEsv
-----END PGP SIGNATURE-----
--- End Message ---
