[SCM] pd-cyclone/master: Merge remote branch 'origin/master'

[fsateler at users.alioth.debian.org]

added Recommends: pd-pddp since help files use things from that lib
added Recommends: pd-import since the help uses the 'import' object
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 3016df47a1bbed0282b3f4df3eab2d0f3db94fc5
X-Git-Newrev: 6106cf261b381e8437b9b70a0dc20b70855590a6

The following commit has been merged in the master branch:
commit 6106cf261b381e8437b9b70a0dc20b70855590a6
Merge: 54d25ec25b2c19af7b36bc29cc4fdf27ddf654d8 3016df47a1bbed0282b3f4df3eab2d0f3db94fc5
Author: Felipe Sateler <fsateler at debian.org>
Date:   Thu Dec 2 21:43:36 2010 -0300

    Merge remote branch 'origin/master'
    
    Conflicts:
    	debian/control

diff --combined debian/control
index 2e2c18c,2afaba0..82966d7
--- a/debian/control
+++ b/debian/control
@@@ -2,11 -2,9 +2,11 @@@ Source: pd-cyclon
  Section: sound
  Priority: optional
  Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 -Uploaders: Hans-Christoph Steiner <hans at eds.org>
 +Uploaders: Hans-Christoph Steiner <hans at eds.org>,
 + Felipe Sateler <fsateler at debian.org>
  Build-Depends: debhelper (>= 7.0.50~),
                 quilt (>= 0.46-7~),
 +               cdbs,
                 puredata
  Standards-Version: 3.9.1
  Homepage: http://suita.chopin.edu.pl/~czaja/miXed/externs/cyclone.html
@@@ -17,7 -15,9 +17,9 @@@ Depends: ${shlibs:Depends}
           pd,
           pd-libdir,
           ${misc:Depends}
+ Recommends: pd-import,
+             pd-pddp
 -Description:  a Pd library of clones of Max/MSP 4.5 objects
 +Description: a Pd library of clones of Max/MSP 4.5 objects
   Cyclone is a library of PureData classes, bringing some level of
   compatibility between Max/MSP and Pd environments. Although being itself in
   the early sta ge of development, it is meant to eventually become part of a

-- 
pd-cyclone packaging