Fix Changelog for future release

generator/lexer.mll

 {
 
-  type release = 
-    | Current 
+  type release =
+    | Current
     | Release of string * string
         (* codename, version *)
     | CurrentPlugin of string * string
 	(* plugin-name, plugin-version *)
     | PluginRelease of string * string * string * string
 	(* plugin-name, plugin-version, kernel-name, kernel-version *)
-    | ToolRelease of string * string 
+    | ToolRelease of string * string
 	(* tool-name, tool-version *)
 
   type service =
@@ -89,7 +89,7 @@
 	| None , Some p , ("Gui"|"GUI") -> Plugin(p,Some "GUI")
 	| None , Some p , s -> Plugin(p,Some s)
 	| Some _ , None , s -> Service s
-	| Some _ , Some p , s -> 
+	| Some _ , Some p , s ->
 	    if (String.uppercase_ascii p)=(String.uppercase_ascii s) then Main else Service a
 
   let set_tag e t = e.tags <- t :: e.tags
@@ -140,15 +140,24 @@ rule main ce = parse
         set_release None (Release(codename,version)) ;
         main None lexbuf
       }
-  (* placeholder for next-release, facilitating merge between current stable
-     and master. Just discard it. *)
-  | ( letter+ space+)* '<'[^'>']+'>' { main None lexbuf }
   | space* ("Plugin") space+ ((file+) as pname) space+
     ((digit+) '.' (digit+) ('.' (digit+))? as version) space+ '(' ( (file+) as codename ) ')'
       {
         set_release (Some pname) (Release(codename,version)) ;
         main None lexbuf
       }
+
+  | space* ("Plugin") space+ ((file+) as pname) space+ '<'[^'>']+'>'
+      {
+        set_release (Some pname) (Current) ;
+        main None lexbuf
+      }
+
+  | ( letter+ space+)* '<'[^'>']+'>'
+    {
+        set_release None (Current) ;
+        main None lexbuf
+    }
   | space
       {
 	match ce with
@@ -220,7 +229,7 @@ and text e = parse
   let compare_string s1 s2 =
     let cmp = String.compare (String.uppercase_ascii s1) (String.uppercase_ascii s2) in
     if cmp = 0 then String.compare s1 s2 else cmp
-      
+
   let rec compare_strings s1 s2 =
     match s1 , s2 with
       | [] , _ -> (-1)