---- arts/flow/gsl/gslmagic.c (.../tags/arts/1.5.3) (revision 549703)
-+++ arts/flow/gsl/gslmagic.c (.../branches/arts/1.5) (revision 549703)
-@@ -616,7 +616,7 @@
- return FALSE;
-
- do
-- ret = fstat (bfile->fd, &buf) < 0;
-+ ret = fstat (bfile->fd, &buf);
- while (ret < 0 && errno == EINTR);
- if (ret < 0)
- {
+--- examples/x11commtest.cc (.../tags/arts/1.5.4/arts) (revision 582125)
++++ examples/x11commtest.cc (.../branches/arts/1.5/arts) (revision 582125)
+@@ -25,7 +25,7 @@
+ */
+
+ #include <iostream>
+-#include "core.h"
++#include "common.h"
+
+ using namespace std;
+ using namespace Arts;
+Index: examples/helloserver.cc
+===================================================================
+--- examples/helloserver.cc (.../tags/arts/1.5.4/arts) (revision 582125)
++++ examples/helloserver.cc (.../branches/arts/1.5/arts) (revision 582125)
+@@ -23,7 +23,7 @@
+
+ */
+
+-#include "core.h"
++#include "common.h"
+ #include "hello_impl.h"
+
+ #include <stdio.h>
+Index: Makefile.am.in
+===================================================================
+--- Makefile.am.in (.../tags/arts/1.5.4/arts) (revision 582125)
++++ Makefile.am.in (.../branches/arts/1.5/arts) (revision 582125)
+@@ -21,7 +21,7 @@
+
+ $(top_srcdir)/acinclude.m4: $(top_srcdir)/libltdl/ltdl.m4
+
+-AUTOMAKE_OPTIONS = foreign 1.5
++AUTOMAKE_OPTIONS = foreign 1.6.1
+ COMPILE_FIRST = libltdl mcop mcopidl flow mcop_mt soundserver artsc examples tests doc
+ EXTRA_DIST = admin
+