[cpl-plugin-vimos] 12/17: Merge branch 'debian-template' into debian

[Ole Streicher]

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

olebole-guest pushed a commit to branch debian
in repository cpl-plugin-vimos.

commit 8e5fb92610a3b2eace577ca456951e40e0e785d7
Merge: 177b603 ed613f1
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Dec 10 14:21:38 2013 +0100

    Merge branch 'debian-template' into debian
    
    Conflicts:
    	debian/control
    	debian/create_sphinx.py
    	debian/rules

 debian/README.Source    |  6 +++++
 debian/create_sphinx.py | 65 +++++++++++++++++++++++++++----------------------
 debian/repackage.sh     | 39 +++++++++++++++--------------
 debian/rules            |  6 +++--
 debian/watch            |  1 +
 5 files changed, 66 insertions(+), 51 deletions(-)

diff --cc debian/create_sphinx.py
index e08184f,5c90c3f..fd63d0d
--- a/debian/create_sphinx.py
+++ b/debian/create_sphinx.py
@@@ -193,20 -197,20 +196,24 @@@ def rstpage(recipe, template, partempla
          author = recipe.__author__,
          license = recipe.__copyright__,
          pipeline = pipeline,
-         pars = par(recipe, par_template),
-         pars_example1 = par(recipe, '   {recipe}.param.{par} = {default}\n'),
-         pars_example2 = par(recipe, '"{par}":{default}', ', ', 2)
+         parameters = partemplate.format(
+             recipe = recipe.__name__,
+             pars = par(recipe, par_template),
+             pars_example1 = par(recipe,
+                                 '   {recipe}.param.{par} = {default}\n'),
+             pars_example2 = par(recipe, '"{par}":{default}', ', ', 2)
+         ) if len(recipe.param) > 0 else ''
      )
  
 -for recipe in recipes_oca + recipes_x:
 +version = ""
 +for name in recipes_oca + recipes_x:
 +    recipe = cpl.Recipe(name)
      f = open(os.path.join("sphinx",
                            fname_template.format(recipe = recipe.__name__)), "w")
-     f.write(rstpage(recipe, rst_template))
+     f.write(rstpage(recipe, rst_template, rst_partemplate))
      f.close()
 +    version = recipe.__version__
 +    del recipe._recipe
  
  if len(recipes_oca) > 0 and len(recipes_x) > 0:
      toc_recipes = "Standard recipes\n----------------\n"
diff --cc debian/watch
index 1557bdf,33a79fa..d638448
--- a/debian/watch
+++ b/debian/watch
@@@ -1,4 -1,5 +1,5 @@@
  version=3
+ opts=dversionmangle=s/\+dfsg// \
  http://www.eso.org/sci/software/pipelines/ \
 - .*/template-kit-(.*).tar.gz \
 + .*/vimos-kit-(.*).tar.gz \
   debian debian/repackage.sh

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