- Update to 1.2.1

3 files changed, 137 insertions, 50 deletions

diff --git a/science/brian/Makefile b/science/brian/Makefile
index 4def7a6b8347..fe9fc947c30a 100644
--- a/science/brian/Makefile
+++ b/science/brian/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	brian
-PORTVERSION=	1.2.0
-PORTREVISION=	2
+PORTVERSION=	1.2.1
 CATEGORIES=	science python
 MASTER_SITES=	CHEESESHOP \
 		SF/${PORTNAME}/Brian/${PORTVERSION}
diff --git a/science/brian/distinfo b/science/brian/distinfo
index ff8ad6f75eeb..5c9cdf082469 100644
--- a/science/brian/distinfo
+++ b/science/brian/distinfo
@@ -1,3 +1,3 @@
-MD5 (brian-1.2.0.zip) = cc3bca3b10b64bac7f81cd63f8f1eacf
-SHA256 (brian-1.2.0.zip) = 67ccbd44899f654761518d55244032b5049ac4692f5854f6b0cf7a32149a65f9
-SIZE (brian-1.2.0.zip) = 389345
+MD5 (brian-1.2.1.zip) = 50ab911a0da29d095af528ca7276485f
+SHA256 (brian-1.2.1.zip) = ceab4a8b92f2ad83d3571c9a7fc02b64b30b51576f0c6164ba83973bfb696297
+SIZE (brian-1.2.1.zip) = 408763
diff --git a/science/brian/pkg-plist b/science/brian/pkg-plist
index 6871829d419b..01331496eb4a 100644
--- a/science/brian/pkg-plist
+++ b/science/brian/pkg-plist
@@ -22,15 +22,9 @@
 %%PYTHON_SITELIBDIR%%/brian/connection.py
 %%PYTHON_SITELIBDIR%%/brian/connection.pyc
 %%PYTHON_SITELIBDIR%%/brian/connection.pyo
-%%PYTHON_SITELIBDIR%%/brian/correlatedspikes.py
-%%PYTHON_SITELIBDIR%%/brian/correlatedspikes.pyc
-%%PYTHON_SITELIBDIR%%/brian/correlatedspikes.pyo
 %%PYTHON_SITELIBDIR%%/brian/deprecated/__init__.py
 %%PYTHON_SITELIBDIR%%/brian/deprecated/__init__.pyc
 %%PYTHON_SITELIBDIR%%/brian/deprecated/__init__.pyo
-%%PYTHON_SITELIBDIR%%/brian/deprecated/neuronmodel.py
-%%PYTHON_SITELIBDIR%%/brian/deprecated/neuronmodel.pyc
-%%PYTHON_SITELIBDIR%%/brian/deprecated/neuronmodel.pyo
 %%PYTHON_SITELIBDIR%%/brian/directcontrol.py
 %%PYTHON_SITELIBDIR%%/brian/directcontrol.pyc
 %%PYTHON_SITELIBDIR%%/brian/directcontrol.pyo
@@ -40,9 +34,57 @@
 %%PYTHON_SITELIBDIR%%/brian/experimental/__init__.py
 %%PYTHON_SITELIBDIR%%/brian/experimental/__init__.pyc
 %%PYTHON_SITELIBDIR%%/brian/experimental/__init__.pyo
-%%PYTHON_SITELIBDIR%%/brian/experimental/ccodegen.py
-%%PYTHON_SITELIBDIR%%/brian/experimental/ccodegen.pyc
-%%PYTHON_SITELIBDIR%%/brian/experimental/ccodegen.pyo
+%%PYTHON_SITELIBDIR%%/brian/experimental/c_stdp.py
+%%PYTHON_SITELIBDIR%%/brian/experimental/c_stdp.pyc
+%%PYTHON_SITELIBDIR%%/brian/experimental/c_stdp.pyo
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/__init__.py
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/__init__.pyc
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/__init__.pyo
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/c_support_code.py
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/c_support_code.pyc
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/c_support_code.pyo
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/codegen.py
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/codegen.pyc
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/codegen.pyo
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/codegen_c.py
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/codegen_c.pyc
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/codegen_c.pyo
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/codegen_gpu.py
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/codegen_gpu.pyc
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/codegen_gpu.pyo
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/codegen_python.py
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/codegen_python.pyc
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/codegen_python.pyo
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/demo.py
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/demo.pyc
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/demo.pyo
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/expressions.py
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/expressions.pyc
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/expressions.pyo
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/integration_schemes.py
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/integration_schemes.pyc
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/integration_schemes.pyo
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/reset.py
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/reset.pyc
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/reset.pyo
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/rewriting.py
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/rewriting.pyc
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/rewriting.pyo
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/stateupdaters.py
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/stateupdaters.pyc
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/stateupdaters.pyo
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/test_hh.py
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/test_hh.pyc
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/test_hh.pyo
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/test_reset.py
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/test_reset.pyc
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/test_reset.pyo
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/test_threshold.py
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/test_threshold.pyc
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/test_threshold.pyo
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/threshold.py
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/threshold.pyc
+%%PYTHON_SITELIBDIR%%/brian/experimental/codegen/threshold.pyo
 %%PYTHON_SITELIBDIR%%/brian/experimental/coincidence_detection.py
 %%PYTHON_SITELIBDIR%%/brian/experimental/coincidence_detection.pyc
 %%PYTHON_SITELIBDIR%%/brian/experimental/coincidence_detection.pyo
@@ -67,9 +109,15 @@
 %%PYTHON_SITELIBDIR%%/brian/experimental/multilinearstateupdater.py
 %%PYTHON_SITELIBDIR%%/brian/experimental/multilinearstateupdater.pyc
 %%PYTHON_SITELIBDIR%%/brian/experimental/multilinearstateupdater.pyo
+%%PYTHON_SITELIBDIR%%/brian/experimental/new_c_propagate.py
+%%PYTHON_SITELIBDIR%%/brian/experimental/new_c_propagate.pyc
+%%PYTHON_SITELIBDIR%%/brian/experimental/new_c_propagate.pyo
 %%PYTHON_SITELIBDIR%%/brian/experimental/realtime_monitor.py
 %%PYTHON_SITELIBDIR%%/brian/experimental/realtime_monitor.pyc
 %%PYTHON_SITELIBDIR%%/brian/experimental/realtime_monitor.pyo
+%%PYTHON_SITELIBDIR%%/brian/experimental/spatialneuron.py
+%%PYTHON_SITELIBDIR%%/brian/experimental/spatialneuron.pyc
+%%PYTHON_SITELIBDIR%%/brian/experimental/spatialneuron.pyo
 %%PYTHON_SITELIBDIR%%/brian/experimental/trace_analysis.py
 %%PYTHON_SITELIBDIR%%/brian/experimental/trace_analysis.pyc
 %%PYTHON_SITELIBDIR%%/brian/experimental/trace_analysis.pyo
@@ -85,12 +133,36 @@
 %%PYTHON_SITELIBDIR%%/brian/hears/erb.py
 %%PYTHON_SITELIBDIR%%/brian/hears/erb.pyc
 %%PYTHON_SITELIBDIR%%/brian/hears/erb.pyo
+%%PYTHON_SITELIBDIR%%/brian/hears/examples/drnl.py
+%%PYTHON_SITELIBDIR%%/brian/hears/examples/drnl.pyc
+%%PYTHON_SITELIBDIR%%/brian/hears/examples/drnl.pyo
+%%PYTHON_SITELIBDIR%%/brian/hears/examples/gammachirp.py
+%%PYTHON_SITELIBDIR%%/brian/hears/examples/gammachirp.pyc
+%%PYTHON_SITELIBDIR%%/brian/hears/examples/gammachirp.pyo
+%%PYTHON_SITELIBDIR%%/brian/hears/examples/gammachirp2.py
+%%PYTHON_SITELIBDIR%%/brian/hears/examples/gammachirp2.pyc
+%%PYTHON_SITELIBDIR%%/brian/hears/examples/gammachirp2.pyo
+%%PYTHON_SITELIBDIR%%/brian/hears/examples/gammatone.py
+%%PYTHON_SITELIBDIR%%/brian/hears/examples/gammatone.pyc
+%%PYTHON_SITELIBDIR%%/brian/hears/examples/gammatone.pyo
+%%PYTHON_SITELIBDIR%%/brian/hears/examples/online_sounds.py
+%%PYTHON_SITELIBDIR%%/brian/hears/examples/online_sounds.pyc
+%%PYTHON_SITELIBDIR%%/brian/hears/examples/online_sounds.pyo
+%%PYTHON_SITELIBDIR%%/brian/hears/examples/online_sound_itd.py
+%%PYTHON_SITELIBDIR%%/brian/hears/examples/online_sound_itd.pyc
+%%PYTHON_SITELIBDIR%%/brian/hears/examples/online_sound_itd.pyo
+%%PYTHON_SITELIBDIR%%/brian/hears/examples/simple_peripheral_model.py
+%%PYTHON_SITELIBDIR%%/brian/hears/examples/simple_peripheral_model.pyc
+%%PYTHON_SITELIBDIR%%/brian/hears/examples/simple_peripheral_model.pyo
 %%PYTHON_SITELIBDIR%%/brian/hears/filtering.py
 %%PYTHON_SITELIBDIR%%/brian/hears/filtering.pyc
 %%PYTHON_SITELIBDIR%%/brian/hears/filtering.pyo
 %%PYTHON_SITELIBDIR%%/brian/hears/hrtf.py
 %%PYTHON_SITELIBDIR%%/brian/hears/hrtf.pyc
 %%PYTHON_SITELIBDIR%%/brian/hears/hrtf.pyo
+%%PYTHON_SITELIBDIR%%/brian/hears/gputools.py
+%%PYTHON_SITELIBDIR%%/brian/hears/gputools.pyc
+%%PYTHON_SITELIBDIR%%/brian/hears/gputools.pyo
 %%PYTHON_SITELIBDIR%%/brian/hears/sounds.py
 %%PYTHON_SITELIBDIR%%/brian/hears/sounds.pyc
 %%PYTHON_SITELIBDIR%%/brian/hears/sounds.pyo
@@ -112,24 +184,12 @@
 %%PYTHON_SITELIBDIR%%/brian/library/modelfitting/__init__.py
 %%PYTHON_SITELIBDIR%%/brian/library/modelfitting/__init__.pyc
 %%PYTHON_SITELIBDIR%%/brian/library/modelfitting/__init__.pyo
-%%PYTHON_SITELIBDIR%%/brian/library/modelfitting/cluster_splitting.py
-%%PYTHON_SITELIBDIR%%/brian/library/modelfitting/cluster_splitting.pyc
-%%PYTHON_SITELIBDIR%%/brian/library/modelfitting/cluster_splitting.pyo
-%%PYTHON_SITELIBDIR%%/brian/library/modelfitting/clustertools.py
-%%PYTHON_SITELIBDIR%%/brian/library/modelfitting/clustertools.pyc
-%%PYTHON_SITELIBDIR%%/brian/library/modelfitting/clustertools.pyo
-%%PYTHON_SITELIBDIR%%/brian/library/modelfitting/fittingparameters.py
-%%PYTHON_SITELIBDIR%%/brian/library/modelfitting/fittingparameters.pyc
-%%PYTHON_SITELIBDIR%%/brian/library/modelfitting/fittingparameters.pyo
 %%PYTHON_SITELIBDIR%%/brian/library/modelfitting/gpu_modelfitting.py
 %%PYTHON_SITELIBDIR%%/brian/library/modelfitting/gpu_modelfitting.pyc
 %%PYTHON_SITELIBDIR%%/brian/library/modelfitting/gpu_modelfitting.pyo
 %%PYTHON_SITELIBDIR%%/brian/library/modelfitting/modelfitting.py
 %%PYTHON_SITELIBDIR%%/brian/library/modelfitting/modelfitting.pyc
 %%PYTHON_SITELIBDIR%%/brian/library/modelfitting/modelfitting.pyo
-%%PYTHON_SITELIBDIR%%/brian/library/modelfitting/singleprocessing.py
-%%PYTHON_SITELIBDIR%%/brian/library/modelfitting/singleprocessing.pyc
-%%PYTHON_SITELIBDIR%%/brian/library/modelfitting/singleprocessing.pyo
 %%PYTHON_SITELIBDIR%%/brian/library/random_processes.py
 %%PYTHON_SITELIBDIR%%/brian/library/random_processes.pyc
 %%PYTHON_SITELIBDIR%%/brian/library/random_processes.pyo
@@ -160,9 +220,6 @@
 %%PYTHON_SITELIBDIR%%/brian/plotting.py
 %%PYTHON_SITELIBDIR%%/brian/plotting.pyc
 %%PYTHON_SITELIBDIR%%/brian/plotting.pyo
-%%PYTHON_SITELIBDIR%%/brian/quantityarray.py
-%%PYTHON_SITELIBDIR%%/brian/quantityarray.pyc
-%%PYTHON_SITELIBDIR%%/brian/quantityarray.pyo
 %%PYTHON_SITELIBDIR%%/brian/reset.py
 %%PYTHON_SITELIBDIR%%/brian/reset.pyc
 %%PYTHON_SITELIBDIR%%/brian/reset.pyo
@@ -196,6 +253,15 @@
 %%PYTHON_SITELIBDIR%%/brian/tests/testcorrectness/test_from_tutorial1c.py
 %%PYTHON_SITELIBDIR%%/brian/tests/testcorrectness/test_from_tutorial1c.pyc
 %%PYTHON_SITELIBDIR%%/brian/tests/testcorrectness/test_from_tutorial1c.pyo
+%%PYTHON_SITELIBDIR%%/brian/tests/testfeatures/__init__.py
+%%PYTHON_SITELIBDIR%%/brian/tests/testfeatures/__init__.pyc
+%%PYTHON_SITELIBDIR%%/brian/tests/testfeatures/__init__.pyo
+%%PYTHON_SITELIBDIR%%/brian/tests/testfeatures/test_connect.py
+%%PYTHON_SITELIBDIR%%/brian/tests/testfeatures/test_connect.pyc
+%%PYTHON_SITELIBDIR%%/brian/tests/testfeatures/test_connect.pyo
+%%PYTHON_SITELIBDIR%%/brian/tests/testfeatures/test_propagation.py
+%%PYTHON_SITELIBDIR%%/brian/tests/testfeatures/test_propagation.pyc
+%%PYTHON_SITELIBDIR%%/brian/tests/testfeatures/test_propagation.pyo
 %%PYTHON_SITELIBDIR%%/brian/tests/testinterface/__init__.py
 %%PYTHON_SITELIBDIR%%/brian/tests/testinterface/__init__.pyc
 %%PYTHON_SITELIBDIR%%/brian/tests/testinterface/__init__.pyo
@@ -208,6 +274,9 @@
 %%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_directcontrol.py
 %%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_directcontrol.pyc
 %%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_directcontrol.pyo
+%%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_equations.py
+%%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_equations.pyc
+%%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_equations.pyo
 %%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_inspection.py
 %%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_inspection.pyc
 %%PYTHON_SITELIBDIR%%/brian/tests/testinterface/test_inspection.pyo
@@ -238,12 +307,45 @@
 %%PYTHON_SITELIBDIR%%/brian/tests/testutils/test_sparse.py
 %%PYTHON_SITELIBDIR%%/brian/tests/testutils/test_sparse.pyc
 %%PYTHON_SITELIBDIR%%/brian/tests/testutils/test_sparse.pyo
+%%PYTHON_SITELIBDIR%%/brian/tests/testutils/test_statistics.py
+%%PYTHON_SITELIBDIR%%/brian/tests/testutils/test_statistics.pyc
+%%PYTHON_SITELIBDIR%%/brian/tests/testutils/test_statistics.pyo
 %%PYTHON_SITELIBDIR%%/brian/threshold.py
 %%PYTHON_SITELIBDIR%%/brian/threshold.pyc
 %%PYTHON_SITELIBDIR%%/brian/threshold.pyo
 %%PYTHON_SITELIBDIR%%/brian/timedarray.py
 %%PYTHON_SITELIBDIR%%/brian/timedarray.pyc
 %%PYTHON_SITELIBDIR%%/brian/timedarray.pyo
+%%PYTHON_SITELIBDIR%%/brian/tools/__init__.py
+%%PYTHON_SITELIBDIR%%/brian/tools/__init__.pyc
+%%PYTHON_SITELIBDIR%%/brian/tools/__init__.pyo
+%%PYTHON_SITELIBDIR%%/brian/tools/autodiff.py
+%%PYTHON_SITELIBDIR%%/brian/tools/autodiff.pyc
+%%PYTHON_SITELIBDIR%%/brian/tools/autodiff.pyo
+%%PYTHON_SITELIBDIR%%/brian/tools/correlatedspikes.py
+%%PYTHON_SITELIBDIR%%/brian/tools/correlatedspikes.pyc
+%%PYTHON_SITELIBDIR%%/brian/tools/correlatedspikes.pyo
+%%PYTHON_SITELIBDIR%%/brian/tools/information_theory.py
+%%PYTHON_SITELIBDIR%%/brian/tools/information_theory.pyc
+%%PYTHON_SITELIBDIR%%/brian/tools/information_theory.pyo
+%%PYTHON_SITELIBDIR%%/brian/tools/io.py
+%%PYTHON_SITELIBDIR%%/brian/tools/io.pyc
+%%PYTHON_SITELIBDIR%%/brian/tools/io.pyo
+%%PYTHON_SITELIBDIR%%/brian/tools/parameters.py
+%%PYTHON_SITELIBDIR%%/brian/tools/parameters.pyc
+%%PYTHON_SITELIBDIR%%/brian/tools/parameters.pyo
+%%PYTHON_SITELIBDIR%%/brian/tools/particle_swarm.py
+%%PYTHON_SITELIBDIR%%/brian/tools/particle_swarm.pyc
+%%PYTHON_SITELIBDIR%%/brian/tools/particle_swarm.pyo
+%%PYTHON_SITELIBDIR%%/brian/tools/remotecontrol.py
+%%PYTHON_SITELIBDIR%%/brian/tools/remotecontrol.pyc
+%%PYTHON_SITELIBDIR%%/brian/tools/remotecontrol.pyo
+%%PYTHON_SITELIBDIR%%/brian/tools/statistics.py
+%%PYTHON_SITELIBDIR%%/brian/tools/statistics.pyc
+%%PYTHON_SITELIBDIR%%/brian/tools/statistics.pyo
+%%PYTHON_SITELIBDIR%%/brian/tools/tabulate.py
+%%PYTHON_SITELIBDIR%%/brian/tools/tabulate.pyc
+%%PYTHON_SITELIBDIR%%/brian/tools/tabulate.pyo
 %%PYTHON_SITELIBDIR%%/brian/units.py
 %%PYTHON_SITELIBDIR%%/brian/units.pyc
 %%PYTHON_SITELIBDIR%%/brian/units.pyo
@@ -256,9 +358,6 @@
 %%PYTHON_SITELIBDIR%%/brian/utils/approximatecomparisons.py
 %%PYTHON_SITELIBDIR%%/brian/utils/approximatecomparisons.pyc
 %%PYTHON_SITELIBDIR%%/brian/utils/approximatecomparisons.pyo
-%%PYTHON_SITELIBDIR%%/brian/utils/autodiff.py
-%%PYTHON_SITELIBDIR%%/brian/utils/autodiff.pyc
-%%PYTHON_SITELIBDIR%%/brian/utils/autodiff.pyo
 %%PYTHON_SITELIBDIR%%/brian/utils/ccircular/__init__.py
 %%PYTHON_SITELIBDIR%%/brian/utils/ccircular/__init__.pyc
 %%PYTHON_SITELIBDIR%%/brian/utils/ccircular/__init__.pyo
@@ -303,21 +402,12 @@
 %%PYTHON_SITELIBDIR%%/brian/utils/fastexp/fastexp.cpp
 %%PYTHON_SITELIBDIR%%/brian/utils/fastexp/swigcompile.bat
 %%PYTHON_SITELIBDIR%%/brian/utils/fastexp/fexp.c
-%%PYTHON_SITELIBDIR%%/brian/utils/information_theory.py
-%%PYTHON_SITELIBDIR%%/brian/utils/information_theory.pyc
-%%PYTHON_SITELIBDIR%%/brian/utils/information_theory.pyo
-%%PYTHON_SITELIBDIR%%/brian/utils/parallelpython.py
-%%PYTHON_SITELIBDIR%%/brian/utils/parallelpython.pyc
-%%PYTHON_SITELIBDIR%%/brian/utils/parallelpython.pyo
-%%PYTHON_SITELIBDIR%%/brian/utils/parameters.py
-%%PYTHON_SITELIBDIR%%/brian/utils/parameters.pyc
-%%PYTHON_SITELIBDIR%%/brian/utils/parameters.pyo
-%%PYTHON_SITELIBDIR%%/brian/utils/particle_swarm.py
-%%PYTHON_SITELIBDIR%%/brian/utils/particle_swarm.pyc
-%%PYTHON_SITELIBDIR%%/brian/utils/particle_swarm.pyo
 %%PYTHON_SITELIBDIR%%/brian/utils/progressreporting.py
 %%PYTHON_SITELIBDIR%%/brian/utils/progressreporting.pyc
 %%PYTHON_SITELIBDIR%%/brian/utils/progressreporting.pyo
+%%PYTHON_SITELIBDIR%%/brian/utils/separate_equations.py
+%%PYTHON_SITELIBDIR%%/brian/utils/separate_equations.pyc
+%%PYTHON_SITELIBDIR%%/brian/utils/separate_equations.pyo
 %%PYTHON_SITELIBDIR%%/brian/utils/sparse_patch/__init__.py
 %%PYTHON_SITELIBDIR%%/brian/utils/sparse_patch/__init__.pyc
 %%PYTHON_SITELIBDIR%%/brian/utils/sparse_patch/__init__.pyo
@@ -330,22 +420,20 @@
 %%PYTHON_SITELIBDIR%%/brian/utils/sparse_patch/0_7_1.py
 %%PYTHON_SITELIBDIR%%/brian/utils/sparse_patch/0_7_1.pyc
 %%PYTHON_SITELIBDIR%%/brian/utils/sparse_patch/0_7_1.pyo
-%%PYTHON_SITELIBDIR%%/brian/utils/statistics.py
-%%PYTHON_SITELIBDIR%%/brian/utils/statistics.pyc
-%%PYTHON_SITELIBDIR%%/brian/utils/statistics.pyo
-%%PYTHON_SITELIBDIR%%/brian/utils/tabulate.py
-%%PYTHON_SITELIBDIR%%/brian/utils/tabulate.pyc
-%%PYTHON_SITELIBDIR%%/brian/utils/tabulate.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/brian/deprecated
+@dirrm %%PYTHON_SITELIBDIR%%/brian/experimental/codegen
 @dirrm %%PYTHON_SITELIBDIR%%/brian/experimental/cuda
 @dirrm %%PYTHON_SITELIBDIR%%/brian/experimental
+@dirrm %%PYTHON_SITELIBDIR%%/brian/hears/examples
 @dirrm %%PYTHON_SITELIBDIR%%/brian/hears
 @dirrm %%PYTHON_SITELIBDIR%%/brian/library/modelfitting
 @dirrm %%PYTHON_SITELIBDIR%%/brian/library
 @dirrm %%PYTHON_SITELIBDIR%%/brian/tests/testcorrectness
+@dirrm %%PYTHON_SITELIBDIR%%/brian/tests/testfeatures
 @dirrm %%PYTHON_SITELIBDIR%%/brian/tests/testinterface
 @dirrm %%PYTHON_SITELIBDIR%%/brian/tests/testutils
 @dirrm %%PYTHON_SITELIBDIR%%/brian/tests
+@dirrm %%PYTHON_SITELIBDIR%%/brian/tools
 @dirrm %%PYTHON_SITELIBDIR%%/brian/utils/ccircular
 @dirrm %%PYTHON_SITELIBDIR%%/brian/utils/fastexp
 @dirrm %%PYTHON_SITELIBDIR%%/brian/utils/sparse_patch