Merge branch 'master' of ssh://git.onelab.eu/git/sfa

diff --combined sfa.spec
index ded4bb1,d36c9ad..5bd501f
--- 1/sfa.spec
--- 2/sfa.spec
+++ b/sfa.spec
@@@ -1,6 -1,6 +1,6 @@@
  %define name sfa
  %define version 1.0
- %define taglevel 16
+ %define taglevel 17
  
  %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
  %global python_sitearch       %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
@@@ -163,7 -163,7 +163,7 @@@ rm -rf $RPM_BUILD_ROO
  %{_bindir}/sfatables
  
  %files flashpolicy
 -%{_bindir}/sfa_flashpolicy.py
 +%{_bindir}/sfa_flashpolicy.py*
  /etc/sfa/sfa_flashpolicy_config.xml
  
  %files tests
@@@ -197,6 -197,12 +197,12 @@@ f
  
  
  %changelog
+ * Wed Mar 09 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - sfa-1.0-17
+ - fix packaging (apparently broken in 1.0-16)
+ - first working version of sfascan
+ - tweaks in GetVersion for exposing hrn(AM) and full set of aggregates(SM)
+ - deprecated the sfa_geni_aggregate config category
+ 
  * Tue Mar 08 2011 Andy Bavier <acb@cs.princeton.edu> - sfa-1.0-16
  - Fix build problem
  - First version of SFA scanner
@@@ -302,6 -308,12 +308,12 @@@
    cache and use in more general ways.     
  
  %changelog
+ * Wed Mar 09 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - sfa-1.0-17
+ - fix packaging (apparently broken in 1.0-16)
+ - first working version of sfascan
+ - tweaks in GetVersion for exposing hrn(AM) and full set of aggregates(SM)
+ - deprecated the sfa_geni_aggregate config category
+ 
  * Tue Mar 08 2011 Andy Bavier <acb@cs.princeton.edu> - sfa-1.0-16
  - Fix build problem
  - First version of SFA scanner