==== merge point of

2004-03-13  Dodji  <dodji@gnome.org>

	* ====
	    merge point of dodji@gnome.org--xml-style-2004/libcroco--snapshots--0.1--patch-1
	  ===
	* configure.in: bumped version number to 0.5 and bumped version-info.

	* src/cr-sel-eng.c,src/cr-stylesheet.c,
	src/cr-tknzr.c,tests/test5-main.c,tests/testctl:
	massive mem leaks/corruption killing.
	* vg.supp: added this to suppress glib normal leaks
	from the leak report.

2004-03-12  Dodji  <dodji@gnome.org>

	* src/cr-declaration.c,src/cr-doc-handler.c,
	src/cr-input.[ch],src/cr-parser.c,src/cr-rgb.c,
	src/cr-selector.c,src/cr-term.c,src/cr-token.c,
	tests/test1-main.c,tests/test4-main.c: started to kill mem leaks
	and corruptions.

	* tests/testctl: added the --show-reachable=yes flag to valgrind.

	* tests/testctl: added better valgrind error reporting.

2004-03-11  Dodji  <dodji@gnome.org>

	* Makefile.am: now, tests are to be run by doing "make test".
	Also, cleans up the previous test output before actually running.
	* global-vars.sh: added this sh script that sets variable used
	in all the test sh scripts based on csslint.
	* test-prop-ident,test-unknown-at-rule,test-unknown-at-rule2:
	renamed these into *.sh (e.g) test-prop-ident.sh to reflect
	that it's a shell script, not a test written in C.
	Also, make these use global-vars.sh
	* tests/testctl: added a descent valgrind support when runned
	with like "./testctl run --valgrind" or RUN_VALGRIND=yes ./testctl run.
	Puts the valgrind logs in valgrind-logs/ and report their presence
	to the user. This'll help catch mem leaks/corruption at the
	regression test level.
	Also make sure to launch ./libs/testblah and not ./testblah which
	is actually a shell script.

	* tests/testctl: don't activate valgrind tests by default.

2004-03-10  Dodji  <dodji@gnome.org>

	* src/cr-statement.[ch]:
	(cr_statement_to_string): do not add leading end of lines.
	* cr-stylesheet.c: added cr_stylesheet_to_string(), handle
	end of lines between statements here.
	* tests/test-output-refs/test5.1.css.out: updated non
	regression tests.

	* tests/testctl: added valgrind support in the non regression
	tests. I think I still need to improve it to make it detect
	the errors when there are some, and report it in a consistent
	way.

	* tests/testctl: added support for tests that gets
	called without any argument.
	* tests/* added csslint based non regression tests for proprietary INDENT and
	unknown at rule.

	* src/cr-utils.c:
	(cr_utils_ucs1_to_utf8): handle zero length input gently.

	* src/cr-statement.c: finish the coding of the
	cr_statement_to_string() function and make cr_statement_dump()
	use it.
	* src/cr-term.c: merge from libcroco--mainline--0.1

2004-03-09  Dodji  <dodji@gnome.org>

	* src/cr-term.[ch]: applied a patch from Rob BUIS that adds
	two new methods:
	(cr_term_get_from_list) and (cr_term_get_from_list).

	* src/cr-statement.c:
          (cr_statement_font_face_rule_to_string): added this method.
          (cr_statement_dump_font_face_rule): make this use the new
          cr_statement_font_face_rule_to_string() function.
        * tests/testctl: update this to exclude .arch-ids from the diffs.

	* src/cr-parser.c,src/cr-tknzr.c: droped the way I was handling
	the vendor proprietary properties and make sure to parse and IDENT by
	following css3 rules.

	* src/cr-parser.c:
	(cr_parser_parse_any_core): semicolon (';') is not part of the 'any'
	production.
	(cr_parser_parse_ruleset): consider the case where we have an empty ruleset (e.g 'x{}')
	* {arch}/=tagging-method: changed this to make objects generation by the
	compilation accepted by tla.

2004-03-08  Dodji  <dodji@gnome.org>

	* Merged in the following patches:
        => dodji@seketeli.org--2004-xml-style-d/libcroco--dodji-d--0.1--base-0
	   tag of dodji@gnome.org--xml-style-2004/libcroco--mainline--0.1--base-0
	=> dodji@seketeli.org--2004-xml-style-d/libcroco--dodji-d--0.1--patch-1
	   removed useless files.

	* files.txt,dirs.txt: removed these files.

	====starting from here, going upward, we use gnu arch ===

3 files changed, 113 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 1d80d96..36c5834 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,110 @@
+2004-03-13  Dodji  <dodji@gnome.org>
+
+	* ==== 
+	    merge point of dodji@gnome.org--xml-style-2004/libcroco--snapshots--0.1--patch-1
+	  ===
+	* configure.in: bumped version number to 0.5 and bumped version-info.
+
+	* src/cr-sel-eng.c,src/cr-stylesheet.c,
+	src/cr-tknzr.c,tests/test5-main.c,tests/testctl:
+	massive mem leaks/corruption killing.
+	* vg.supp: added this to suppress glib normal leaks
+	from the leak report.
+
+2004-03-12  Dodji  <dodji@gnome.org>
+
+	* src/cr-declaration.c,src/cr-doc-handler.c,
+	src/cr-input.[ch],src/cr-parser.c,src/cr-rgb.c,
+	src/cr-selector.c,src/cr-term.c,src/cr-token.c,
+	tests/test1-main.c,tests/test4-main.c: started to kill mem leaks
+	and corruptions.
+
+	* tests/testctl: added the --show-reachable=yes flag to valgrind.
+
+	* tests/testctl: added better valgrind error reporting.
+
+2004-03-11  Dodji  <dodji@gnome.org>
+
+	* Makefile.am: now, tests are to be run by doing "make test".
+	Also, cleans up the previous test output before actually running.
+	* global-vars.sh: added this sh script that sets variable used
+	in all the test sh scripts based on csslint.
+	* test-prop-ident,test-unknown-at-rule,test-unknown-at-rule2: 
+	renamed these into *.sh (e.g) test-prop-ident.sh to reflect
+	that it's a shell script, not a test written in C. 
+	Also, make these use global-vars.sh
+	* tests/testctl: added a descent valgrind support when runned
+	with like "./testctl run --valgrind" or RUN_VALGRIND=yes ./testctl run.
+	Puts the valgrind logs in valgrind-logs/ and report their presence
+	to the user. This'll help catch mem leaks/corruption at the 
+	regression test level.
+	Also make sure to launch ./libs/testblah and not ./testblah which
+	is actually a shell script.
+
+	* tests/testctl: don't activate valgrind tests by default.
+
+2004-03-10  Dodji  <dodji@gnome.org>
+
+	* src/cr-statement.[ch]: 
+	(cr_statement_to_string): do not add leading end of lines.
+	* cr-stylesheet.c: added cr_stylesheet_to_string(), handle
+	end of lines between statements here.
+	* tests/test-output-refs/test5.1.css.out: updated non
+	regression tests.
+
+	* tests/testctl: added valgrind support in the non regression
+	tests. I think I still need to improve it to make it detect
+	the errors when there are some, and report it in a consistent
+	way.
+
+	* tests/testctl: added support for tests that gets
+	called without any argument.
+	* tests/* added csslint based non regression tests for proprietary INDENT and
+	unknown at rule.
+
+	* src/cr-utils.c: 
+	(cr_utils_ucs1_to_utf8): handle zero length input gently.
+
+	* src/cr-statement.c: finish the coding of the
+	cr_statement_to_string() function and make cr_statement_dump()
+	use it.
+	* src/cr-term.c: merge from libcroco--mainline--0.1
+
+2004-03-09  Dodji  <dodji@gnome.org>
+
+	* src/cr-term.[ch]: applied a patch from Rob BUIS that adds
+	two new methods:
+	(cr_term_get_from_list) and (cr_term_get_from_list).
+
+	* src/cr-statement.c:
+          (cr_statement_font_face_rule_to_string): added this method.
+          (cr_statement_dump_font_face_rule): make this use the new 
+          cr_statement_font_face_rule_to_string() function.
+        * tests/testctl: update this to exclude .arch-ids from the diffs.
+
+	* src/cr-parser.c,src/cr-tknzr.c: droped the way I was handling 
+	the vendor proprietary properties and make sure to parse and IDENT by
+	following css3 rules.
+	
+	* src/cr-parser.c: 
+	(cr_parser_parse_any_core): semicolon (';') is not part of the 'any' 
+	production.
+	(cr_parser_parse_ruleset): consider the case where we have an empty ruleset (e.g 'x{}')
+	* {arch}/=tagging-method: changed this to make objects generation by the
+	compilation accepted by tla.
+
+2004-03-08  Dodji  <dodji@gnome.org>
+
+	* Merged in the following patches:
+        => dodji@seketeli.org--2004-xml-style-d/libcroco--dodji-d--0.1--base-0
+	   tag of dodji@gnome.org--xml-style-2004/libcroco--mainline--0.1--base-0
+	=> dodji@seketeli.org--2004-xml-style-d/libcroco--dodji-d--0.1--patch-1
+	   removed useless files.
+
+	* files.txt,dirs.txt: removed these files.
+
+	====starting from here, going upward, we use gnu arch ===
+
 2004-03-07  Dodji Seketeli  <dodji@gnome.org>
 
 	* src/cr-statement.c: 
diff --git a/Makefile.am b/Makefile.am
index 37da322..e06ba30 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,7 @@ bin_SCRIPTS=croco-config
 man_MANS = croco-config.1
 
 EXTRA_DIST= croco-config.in libcroco.pc libcroco.spec TODO Doxyfile \
-HACKING COPYING.LIB COPYING  libcroco.spec tests/testctl $(man_MANS)
+HACKING COPYING.LIB COPYING  libcroco.spec $(man_MANS)
 
 cleantar:
 	@(rm -f libcroco*.tar.gz)
@@ -20,8 +20,8 @@ cleantar:
 rpm: cleantar
 	@(mkdir -p $(top_srcdir)/rpmbuildroot ; $(MAKE) dist && rpmbuild  -ta --buildroot $(top_srcdir)/rpmbuildroot $(distdir).tar.gz)
 
-nr-tests:
-	if test -x $(top_srcdir)/tests/testctl ; then $(top_srcdir)/tests/testctl mkcleanup ; $(top_srcdir)/tests/testctl run ; fi 
+test:
+	if test -x $(top_srcdir)/tests/testctl ; then $(top_srcdir)/tests/testctl cleanup ; $(top_srcdir)/tests/testctl  ; $(top_srcdir)/tests/testctl run ; fi 
 
 apidoc:
 	if ! test -d docs/apis ; then  mkdir -p docs/apis ;  fi ;
diff --git a/configure.in b/configure.in
index df9361a..673cc61 100644
--- a/configure.in
+++ b/configure.in
@@ -9,11 +9,11 @@ AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 
 LIBCROCO_MAJOR_VERSION=0
-LIBCROCO_MINOR_VERSION=4
+LIBCROCO_MINOR_VERSION=5
 LIBCROCO_MICRO_VERSION=0
 
-LIBCROCO_CURRENT=1
-LIBCROCO_REVISION=1
+LIBCROCO_CURRENT=2
+LIBCROCO_REVISION=0
 LIBCROCO_AGE=0
 
 #LIBCROCO_VERSION_INFO=`expr $LIBCROCO_MAJOR_VERSION + $LIBCROCO_MINOR_VERSION`:$LIBCROCO_MICRO_VERSION:$LIBCROCO_MINOR_VERSION