[cpl-plugin-vimos] 03/04: 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 6dc8718420f191199ef03477239f289c034eb174
Merge: 916f755 4ae49e8
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Nov 27 16:05:59 2013 +0100

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

 debian/create_sphinx.py | 3 +++
 1 file changed, 3 insertions(+)

diff --cc debian/create_sphinx.py
index 3ee4c46,be553f9..c97f2b4
--- a/debian/create_sphinx.py
+++ b/debian/create_sphinx.py
@@@ -135,10 -135,14 +135,13 @@@ html_theme = 'sphinxdoc
  pipeline = sys.argv[1]
  
  cpl.Recipe.path = "recipes"
 -recipes = [ cpl.Recipe(name) for name, version in cpl.Recipe.list() ]
 +recipes = [ name for name, version in cpl.Recipe.list() ]
  oca = file(os.path.join("calib", "gasgano", "config", pipeline + ".oca")).read()
+ oca = oca[oca.find("action"):]
 -recipes_oca = [recipe for recipe in recipes if recipe.__name__ in oca]
 -index = [ oca.find(recipe.__name__) for recipe in recipes_oca ]
 +recipes_oca = [name for name in recipes if name in oca]
++index = [ oca.find(name) for name in recipes_oca ]
+ recipes_oca = [r for (i, r) in sorted(zip(index, recipes_oca))]
 -
 -recipes_x = [recipe for recipe in recipes if not recipe.__name__ in oca]
 +recipes_x = [name for name in recipes if not name in oca]
  
  def par(recipe, template, delimiter = "", count = None):
      return delimiter.join(template.format(

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