[scoop] 01/01: results from review (cf. Bug #760188)

[Daniel Stender]

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

danstender-guest pushed a commit to branch master
in repository scoop.

commit f23121f866ec8b501e3edab7590206ec36e2eeb3
Author: Daniel Stender <daniel at danielstender.com>
Date:   Wed Sep 3 15:12:06 2014 +0200

    results from review (cf. Bug #760188)
---
 debian/control                                     | 26 ++++++++++++++++++----
 debian/patches/no-adsense.patch                    |  2 +-
 debian/rules                                       |  2 +-
 .../{python-scoop.doc-base => scoop-doc.doc-base}  |  4 ++--
 .../{python-scoop.examples => scoop-doc.examples}  |  0
 5 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index 8ed040f..b6f8913 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
  python-sphinx (>= 1.0.7+dfsg-1~),
  python-zmq (>= 13.1.0~)
 Standards-Version: 3.9.5
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/scoop.git
+Vcs-Browser: http://anonscm.debian.org/cgit/debian-science/packages/scoop.git
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/scoop.git
 Homepage: http://scoop.googlecode.com/
 X-Python-Version: >= 2.6
@@ -26,10 +26,28 @@ Depends:
  python-zmq (>= 13.1.0~),
  ${misc:Depends},
  ${python:Depends},
- ${sphinxdoc:Depends}
 Recommends:
- openssh-client
+ openssh-client | ssh-client
+Suggests:
+ scoop-doc
 Description: Python library for concurrent parallel programming
  SCOOP (Scalable COncurrent Operations in Python) is a distributed task
  module allowing concurrent parallel programming on various environments,
- from heterogeneous grids to supercomputers.
\ No newline at end of file
+ from heterogeneous grids to supercomputers.
+ .
+ This package contains the Python modules.
+
+Package: scoop-doc
+Architecture: all
+Section: doc
+Depends:
+ ${misc:Depends},
+ ${sphinxdoc:Depends}
+Recommends:
+ python-scoop
+Description: Python library for concurrent parallel programming (docs)
+ SCOOP (Scalable COncurrent Operations in Python) is a distributed task
+ module allowing concurrent parallel programming on various environments,
+ from heterogeneous grids to supercomputers.
+ .
+ This package contains the documentation.
diff --git a/debian/patches/no-adsense.patch b/debian/patches/no-adsense.patch
index 7d83a21..4850563 100644
--- a/debian/patches/no-adsense.patch
+++ b/debian/patches/no-adsense.patch
@@ -1,6 +1,6 @@
 Description: remove google-adsense from documentation
 Author: Daniel Stender <debian at danielstender.com>
-Forwarded: no-needed
+Forwarded: no
 Last-Update: 2014-09-01
 --- a/doc/_template/page.html
 +++ b/doc/_template/page.html
diff --git a/debian/rules b/debian/rules
index 9ac2a90..d19204e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ override_dh_auto_test:
 override_dh_auto_install:
 	dh_auto_install
 ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
-	PYTHONPATH=. http_proxy='127.0.0.1:9' sphinx-build -N doc debian/python-scoop/usr/share/doc/python-scoop/html
+	PYTHONPATH=. http_proxy='127.0.0.1:9' sphinx-build -N doc debian/scoop-doc/usr/share/doc/scoop-doc/html
 endif
 
 override_dh_compress:
diff --git a/debian/python-scoop.doc-base b/debian/scoop-doc.doc-base
similarity index 52%
rename from debian/python-scoop.doc-base
rename to debian/scoop-doc.doc-base
index d1775fb..9de7a4e 100644
--- a/debian/python-scoop.doc-base
+++ b/debian/scoop-doc.doc-base
@@ -3,5 +3,5 @@ Title: Documentation of python-scoop
 Section: Programming/Python
 
 Format: HTML
-Index: /usr/share/doc/python-scoop/html/index.html
-Files: /usr/share/doc/python-scoop/html/*.html
\ No newline at end of file
+Index: /usr/share/doc/scoop-doc/html/index.html
+Files: /usr/share/doc/scoop-doc/html/*.html
\ No newline at end of file
diff --git a/debian/python-scoop.examples b/debian/scoop-doc.examples
similarity index 100%
rename from debian/python-scoop.examples
rename to debian/scoop-doc.examples

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