xfs: Changes to 'debian-unstable'

[Brice Goglin <bgoglin@alioth.debian.org>]

 debian/changelog |    7 +++++++
 os/config.c      |    2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 731c0ebd75d2318b515b188e16d40d8babdb73a5
Author: Brice Goglin <bgoglin@debian.org>
Date:   Fri May 23 18:57:25 2008 +0200

    Cherry-pick upstream commit 8144d75d to fix crash on startup

diff --git a/debian/changelog b/debian/changelog
index 0df83fc..0b97fb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xfs (1:1.0.7-2) unstable; urgency=low
+
+  * Cherry-pick upstream commit 8144d75d to fix crash on startup,
+    closes: #482551.
+
+ -- Brice Goglin <bgoglin@debian.org>  Fri, 23 May 2008 18:56:37 +0200
+
 xfs (1:1.0.7-1) unstable; urgency=low
 
   * New upstream release.

commit ebf01a132a42f86c3c499d30f355300bacc359fd
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");
     }