[SCM] general-purpose neural simulator branch, master, updated. upstream/2.3-16-ga91a97a

[Gabriele Giacone]

The following commit has been merged in the master branch:
commit 51f2df91e0efa9dcc8bea0a63285c4b19b46e8a3
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Sat Dec 10 18:45:04 2011 +0100

    wrap'n'sort

diff --git a/debian/control b/debian/control
index 70a4082..e89af22 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,15 @@ Section: science
 Priority: extra
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Gabriele Giacone <1o5g4r8o at gmail.com>
-Build-Depends: debhelper (>= 4.0), libx11-dev, libxt-dev, libxext-dev, zlib1g-dev, bison, flex, csh, libncurses5-dev
+Build-Depends: bison,
+               csh,
+               debhelper (>= 4.0),
+               flex,
+               libncurses5-dev,
+               libx11-dev,
+               libxext-dev,
+               libxt-dev,
+               zlib1g-dev
 Standards-Version: 3.7.2
 Homepage: http://foo.example.org/
 DM-Upload-Allowed: yes
@@ -12,7 +20,7 @@ Vcs-Browser: http://git.debian.org/?p=debian-science/packages/genesis.git
 
 Package: genesis
 Architecture: any
-Depends: genesis-data, ${shlibs:Depends}, ${misc:Depends}
+Depends: genesis-data, ${misc:Depends}, ${shlibs:Depends}
 Replaces: genesis-data (<< 2.2.1-7)
 Suggests: menu (>= 1.5)
 Description: general-purpose neural simulator
@@ -22,7 +30,7 @@ Description: general-purpose neural simulator
  neuronal components.
  .
  GENESIS has provided the basis for laboratory courses in neural simulation
- at both Caltech and the Marine Biological Laboratory in Woods Hole, MA. 
+ at both Caltech and the Marine Biological Laboratory in Woods Hole, MA.
  Most current GENESIS applications involve realistic simulations of
  biological neural systems.  Although the software can also model more
  abstract networks, other simulators are more suitable for backpropagation
diff --git a/debian/copyright b/debian/copyright
index 13aedf8..eb5506c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -51,7 +51,7 @@ Upstream Authors:
 ** Numerical methods enhancements by:
 **		Upinder S. Bhalla 	(bhalla at ncbs.tifrbng.res.in)
 **		Erik De Schutter	(erik at kuifje.bbf.uia.ac.be)
-**		Bruce P. Graham		(bruce at cns.ed.ac.uk)	
+**		Bruce P. Graham		(bruce at cns.ed.ac.uk)
 **
 ** Synapse Library development by:
 **		Mike Vanier		(mvanier at bbb.caltech.edu)
@@ -77,12 +77,12 @@ Copyright:
 ** notice appear in all copies and that both that copyright
 ** notice and this permission notice appear in supporting
 ** documentation, and that the name of the California Institute
-** of Technology not be used in advertising or publicity pertaining 
-** to distribution of the software without specific, written prior 
-** permission.  The California Institute of Technology makes no 
+** of Technology not be used in advertising or publicity pertaining
+** to distribution of the software without specific, written prior
+** permission.  The California Institute of Technology makes no
 ** representations about the suitability of this software for any purpose.
 ** It is provided "as is" without express or implied warranty.
-** 
+**
 **  Some components are copyright by the originating institution and are used
 **  with the permission of the authors.  The conditions of these copyrights
 **  (none of which restrict the free distribution of GENESIS) appear with

-- 
general-purpose neural simulator