--- psiconv/trunk/ChangeLog	2014/10/22 12:37:12	349
+++ psiconv/trunk/ChangeLog	2014/10/29 09:17:53	356
@@ -1,3 +1,71 @@
+2014-10-29 10:17  Frodo Looijaard  <frodo@frodo.looijaard.name>
+
+	* debian/control, lib/psiconv/Makefile.am:
+	  (Frodo) Fix two build errors:
+	    * general.h is generated and should not be distributed
+	    * Only build Debian against graphicsmagick
+
+2014-10-27 13:28  Frodo Looijaard  <frodo@frodo.looijaard.name>
+
+	* ChangeLog:
+	  (Frodo) Update Changelog
+
+2014-10-27 13:21  Frodo Looijaard  <frodo@frodo.looijaard.name>
+
+	* debian/: README.Debian, changelog, compat, control, copyright,
+	  docs, libpsiconv-dev.install, libpsiconv6.copyright,
+	  libpsiconv6.docs, psiconv-dev.dirs, psiconv-dev.install,
+	  psiconv-doc.copyright, psiconv-doc.manpages, psiconv.manpages,
+	  rules, source/format:
+	  (Frodo) Update debian directory.
+
+2014-10-24 13:52  Frodo Looijaard  <frodo@frodo.looijaard.name>
+
+	* lib/psiconv/psiconv.conf.man.in,
+	  program/psiconv-config/psiconv-config.man.in:
+	  (Frodo) Fix two small errors in the manpage formatting (lintian)
+
+2014-10-22 21:53  Frodo Looijaard  <frodo@frodo.looijaard.name>
+
+	* compat/compat.h, compat/dummy.c, lib/psiconv/buffer.c,
+	  lib/psiconv/buffer.h, lib/psiconv/checkuid.c,
+	  lib/psiconv/common.h, lib/psiconv/configuration.c,
+	  lib/psiconv/configuration.h, lib/psiconv/data.c,
+	  lib/psiconv/data.h, lib/psiconv/error.c, lib/psiconv/error.h,
+	  lib/psiconv/generate.h, lib/psiconv/generate_common.c,
+	  lib/psiconv/generate_driver.c, lib/psiconv/generate_image.c,
+	  lib/psiconv/generate_layout.c, lib/psiconv/generate_page.c,
+	  lib/psiconv/generate_routines.h, lib/psiconv/generate_simple.c,
+	  lib/psiconv/generate_texted.c, lib/psiconv/generate_word.c,
+	  lib/psiconv/image.c, lib/psiconv/image.h, lib/psiconv/list.c,
+	  lib/psiconv/list.h, lib/psiconv/misc.c, lib/psiconv/parse.h,
+	  lib/psiconv/parse_common.c, lib/psiconv/parse_driver.c,
+	  lib/psiconv/parse_formula.c, lib/psiconv/parse_image.c,
+	  lib/psiconv/parse_layout.c, lib/psiconv/parse_page.c,
+	  lib/psiconv/parse_routines.h, lib/psiconv/parse_sheet.c,
+	  lib/psiconv/parse_simple.c, lib/psiconv/parse_texted.c,
+	  lib/psiconv/parse_word.c, lib/psiconv/unicode.c,
+	  lib/psiconv/unicode.h, program/extra/checkuid.c,
+	  program/extra/empty.c, program/extra/rewrite.c,
+	  program/psiconv/gen.h, program/psiconv/gen_html4.c,
+	  program/psiconv/gen_image.c, program/psiconv/gen_rtf.c,
+	  program/psiconv/gen_txt.c, program/psiconv/gen_xhtml.c,
+	  program/psiconv/general.c, program/psiconv/general.h,
+	  program/psiconv/magick-aux.c, program/psiconv/magick-aux.h,
+	  program/psiconv/psiconv.c, program/psiconv/psiconv.h:
+	  (Frodo) Update copyright year in all source files
+
+2014-10-22 21:53  Frodo Looijaard  <frodo@frodo.looijaard.name>
+
+	* configure.in, lib/psiconv/Makefile.am,
+	  lib/psiconv/psiconv.conf.man.in:
+	  (Frodo) Add manpage for psiconf.conf
+
+2014-10-22 14:37  Frodo Looijaard  <frodo@frodo.looijaard.name>
+
+	* ChangeLog:
+	  (Frodo) Update Changelog
+
 2014-10-22 14:10  Frodo Looijaard  <frodo@frodo.looijaard.name>
 
 	* lib/psiconv/generate_layout.c, lib/psiconv/parse_image.c,