%define name sliver-openvswitch
# to check for any change:
# grep AC_INIT configure.ac
-%define version 1.10.90
-%define taglevel 2
+%define version 2.0.90
+%define taglevel 0
%define debug_package %{nil}
%postun
%changelog
+* Sat Jul 06 2013 Giuseppe Lettieri <g.lettieri@iet.unipi.it> - sliver-openvswitch-1.11.90-1
+- merge with mainstream
+
+* Sat Jul 06 2013 Giuseppe Lettieri <g.lettieri@iet.unipi.it> - sliver-openvswitch-1.10.90-3
+- merge with mainstream
+
* Wed May 01 2013 Giuseppe Lettieri <g.lettieri@iet.unipi.it> - sliver-openvswitch-1.10.90-2
- - fixed several bugs in the external-nodes support in exp-tool/Makefile
- - let sliver-ovs return an error if tap device configuration failed