xfs: Changes to 'debian-unstable'
configure | 20 ++++++++++----------
configure.ac | 2 +-
debian/changelog | 8 ++++++++
debian/xfs.postinst.in | 4 ++++
4 files changed, 23 insertions(+), 11 deletions(-)
New commits:
commit a4b5b486d50bb848e9209c57269917b248d11ceb
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun May 25 19:07:33 2008 +0200
Always restart the xfs daemon on upgrade from << 1:1.0.7
diff --git a/debian/changelog b/debian/changelog
index fc26702..4a78221 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
xfs (1:1.0.8-1) UNRELEASED; urgency=low
* New upstream release.
+ * Always restart the xfs daemon on upgrade from << 1:1.0.7 since the
+ old prerm script always stopped it on upgrade, closes: #482788.
- -- Brice Goglin <bgoglin@debian.org> Sun, 25 May 2008 11:21:04 +0200
+ -- Brice Goglin <bgoglin@debian.org> Sun, 25 May 2008 19:07:02 +0200
xfs (1:1.0.7-2) unstable; urgency=low
diff --git a/debian/xfs.postinst.in b/debian/xfs.postinst.in
index 13927dc..5248921 100644
--- a/debian/xfs.postinst.in
+++ b/debian/xfs.postinst.in
@@ -37,6 +37,10 @@ if ! [ -e /var/run/xfs.install ]; then
if ! fgrep -qsx "restart-on-upgrade" /etc/X11/fs/xfs.options; then
NOSTART=yes
fi
+ # Before 1:1.0.7, the prerm script would always stop the daemon on upgrade, we always need to restart it
+ if dpkg --compare-versions "$2" lt 1:1.0.7; then
+ NOSTART=
+ fi
fi
[ -n "$NOSTART" ] || invoke-rc.d xfs start || true
commit 3e6b854aa4ce0636fd63f63afd04d68b28c0fa68
Author: Brice Goglin <bgoglin@debian.org>
Date: Fri May 23 22:29:50 2008 +0200
xfs 1.0.8
diff --git a/configure.ac b/configure.ac
index 321143e..54f81de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xfs,[1.0.7], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xfs)
+AC_INIT(xfs,[1.0.8], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xfs)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
commit 8144d75d4e71d8ae0493043f49fe9925f8099244
Author: Brice Goglin <bgoglin@debian.org>
Date: Fri May 23 18:53:55 2008 +0200
Fix nasty typo in SetConfigValues
Nasty typo introduced in 4a163a076e90808fa47ade1504fd0f2893bdc306,
causes xfs to crash on startup.
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=482551
diff --git a/os/config.c b/os/config.c
index 1efa2f2..1abf2af 100644
--- a/os/config.c
+++ b/os/config.c
@@ -296,7 +296,7 @@ SetConfigValues(void)
int err,
num;
- if (font_catalogue = NULL) {
+ if (font_catalogue == NULL) {
FatalError("font catalogue is missing/empty\n");
}
commit 9666b767a1f565bae06e84aacb53a1d9b7747f90
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 21 14:18:01 2008 -0400
xfs 1.0.7
diff --git a/configure.ac b/configure.ac
index 6f4006a..321143e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xfs,[1.0.6], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xfs)
+AC_INIT(xfs,[1.0.7], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xfs)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
commit 4a163a076e90808fa47ade1504fd0f2893bdc306
Author: Petter Reinholdtsen <pere@hungry.com>
Date: Fri May 16 20:27:48 2008 +0200
Return an error to the log instead of segfaulting
Return an error to the log instead of segfaulting
if catalogue line is omitted from config file.
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=148650
diff --git a/os/config.c b/os/config.c
index 4623390..1efa2f2 100644
--- a/os/config.c
+++ b/os/config.c
@@ -296,6 +296,10 @@ SetConfigValues(void)
int err,
num;
+ if (font_catalogue = NULL) {
+ FatalError("font catalogue is missing/empty\n");
+ }
+
err = SetFontCatalogue(font_catalogue, &num);
if (err != FSSuccess) {
FatalError("element #%d (starting at 0) of font path is bad or has a bad font:\n\"%s\"\n",
commit 6188cb8538b713296266238b7b780718fcec881b
Author: Stephan A. Maciej <stephanm@datenfriedhof.net>
Date: Mon Mar 17 18:00:49 2008 -0700
Allow font server to start with pid longer than 5 digits
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/os/utils.c b/os/utils.c
index fcc1c2a..5ee8b6e 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -562,7 +562,7 @@ StorePid (void)
strerror (errno));
return -1;
}
- if (fprintf (pidFilePtr, "%5ld\n", (long) getpid ()) != 6)
+ if (fprintf (pidFilePtr, "%11ld\n", (long) getpid ()) != 12)
{
ErrorF ("cannot write to process-id file %s: %s\n", pidFile,
strerror (errno));
commit 24d4172a71850299c797f887d3027c32068763d0
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Jan 14 19:32:09 2008 -0800
Fix --with-default-config to work with more than two config files
diff --git a/configure.ac b/configure.ac
index abedf43..6f4006a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,7 +51,7 @@ AC_ARG_WITH(default-config-file,
[comma-separated list of paths to look for config file when not specified (default: ${sysconfdir}/X11/fs/config)]),
[CONFIG_FILE="$withval"], [CONFIG_FILE="${sysconfdir}/X11/fs/config"])
-DEFAULT_CONFIG_FILE=`echo ${CONFIG_FILE} | sed 's/,/\\\\\\\\\\\",\\\\\\\\\\\"/'`
+DEFAULT_CONFIG_FILE=`echo ${CONFIG_FILE} | sed 's/,/\\\\\\\\\\\",\\\\\\\\\\\"/'g`
AC_DEFINE_DIR([DEFAULT_CONFIG_FILE], DEFAULT_CONFIG_FILE,
[comma-separated list of strings for config file paths when not specified])
Reply to: