Merge branch 'develop' into release

Conflicts:
	package/pkginfo.manifest
	src/common/package.rb
	src/common/parser.rb

diff --cc src/common/parser.rb
index f4195f91ec84cce8c0070a3b39dd3acff5ae9455,b57b82dfc37f5012023056582479c67d4694f13c..bf1ceafd0796756f436ee82171b124651a42f118
--- 1/src/common/parser.rb
--- 2/src/common/parser.rb
+++ b/src/common/parser.rb
@@@ -228,21 -237,16 +237,21 @@@ class Parse
                                end
                        end
  
-                       if only_common then return [common_source, common_version, common_maintainer] end
- 
-             # check last package
-                       case state
-                       when "PACKAGE" then
-                               if not package.package_name.empty? then pkglist.push package
-                               else raise RuntimeError, "Package name is not set in \"#{file}\" file"
+                       # check last package
+                       if not package.nil? then pkglist.push package end
+                       if not change_version.nil? then
+                               if change_log[change_version].nil? then change_log[change_version] = change_contents.strip
+                               else raise RuntimeError, "change log version is duplicated in \"#{file}\" file \n\t#{change_version}"
                                end
 +                      when "CHANGELOG" then
 +                              if not change_version.nil? then change_log[change_version] = change_contents.strip end
 +                              pkglist.each {|pkg| pkg.change_log = change_log }
 +                      else
 +                              # what ever
                        end
+                       pkglist.each {|pkg| pkg.change_log = change_log }
                end
+               if only_common then return [common_source, common_version, common_maintainer, change_log] end
                return pkglist
        end