diff --git a/debian/changelog b/debian/changelog index 99e74ab..ba6bc6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +pspp (0.7.9+git20120311-1) unstable; urgency=low + + * New upstream snapshot, fix FTBFS on hurd-i386. + * debian/copyright: add details about lib/gtk-contrib/* + + -- bojo42 Mon, 12 Mar 2012 14:29:25 +0100 + pspp (0.7.9+git20120303-1) unstable; urgency=low * New upstream snapshot, should fix outstanding testsuite failures. diff --git a/debian/copyright b/debian/copyright index 979a62f..64a5ebc 100644 --- a/debian/copyright +++ b/debian/copyright @@ -13,6 +13,16 @@ * Michael Kiefte * Patrick Kobly * Rob van Son + +Files: lib/gtk-contrib/*sheet.* +Copyright: 1999-2001 Adrian E. Feiguin + based on GtkClist widget by Jay Painter +License: LGPL-2.1+ + +Files: lib/gtk-contrib/gtkxpaned.* +Copyright: 2005-2006 Mirco "MacSlow" Müller + based on GtkPaned by Peter Mattis, Spencer Kimball and Josh MacDonald +License: LGPL-2.1+ Copyright: Copyright (C) 2007 Free Software Foundation, Inc. diff --git a/src/language/stats/regression.q b/src/language/stats/regression.q index 4ef12c9..ca1f67d 100644 --- a/src/language/stats/regression.q +++ b/src/language/stats/regression.q @@ -963,8 +963,10 @@ dict_get_weight (dict), MV_ANY); reader = casereader_clone (input); - reader = casereader_create_filter_missing (reader, v_variables, n_variables, + reader = casereader_create_filter_missing (reader, all_vars, n_all_vars, MV_ANY, NULL, NULL); + + for (; (c = casereader_read (reader)) != NULL; case_unref (c)) { covariance_accumulate (cov, c); diff --git a/src/ui/gui/psppire-output-window.c b/src/ui/gui/psppire-output-window.c index 29b8490..3000a5a 100644 --- a/src/ui/gui/psppire-output-window.c +++ b/src/ui/gui/psppire-output-window.c @@ -736,6 +736,12 @@ SELECT_FMT_ODT }; +/* GNU Hurd doesn't have PATH_MAX. Use a fallback. + Temporary directory names are usually not that long. */ +#ifndef PATH_MAX +# define PATH_MAX 1024 +#endif + static void clipboard_get_cb (GtkClipboard *clipboard, GtkSelectionData *selection_data, diff --git a/tests/language/stats/regression.at b/tests/language/stats/regression.at index 81bbce4..ee14143 100644 --- a/tests/language/stats/regression.at +++ b/tests/language/stats/regression.at @@ -1614,3 +1614,62 @@ AT_CHECK([pspp -o pspp.csv regcrash.sps], [1], [ignore], [ignore]) AT_CLEANUP + + + +AT_SETUP([REGRESSION missing dependent variable]) + +dnl Test for a bug where missing values in the dependent variable were not being +dnl ignored like they should have been. +AT_DATA([reg-mdv-ref.sps], [dnl +data list notable list / v0 to v2. +begin data + 0.65377128 7.735648 -23.97588 +-0.13087553 6.142625 -19.63854 + 0.34880368 7.651430 -25.26557 + 0.69249021 6.125125 -16.57090 +-0.07368178 8.245789 -25.80001 +-0.34404919 6.031540 -17.56743 + 0.75981559 9.832291 -28.35977 +-0.46958313 5.343832 -16.79548 +-0.06108490 8.838262 -29.25689 + 0.56154863 6.200189 -18.58219 +end data +regression /variables=v0 v1 + /statistics defaults + /dependent=v2 + /method=enter. +]) + +AT_CHECK([pspp -o pspp-ref.csv reg-mdv-ref.sps]) + +AT_DATA([reg-mdv.sps], [dnl +data list notable list / v0 to v2. +begin data + 0.65377128 7.735648 -23.97588 +-0.13087553 6.142625 -19.63854 + 0.34880368 7.651430 -25.26557 + 0.69249021 6.125125 -16.57090 +-0.07368178 8.245789 -25.80001 +-0.34404919 6.031540 -17.56743 + 0.75981559 9.832291 -28.35977 +-0.46958313 5.343832 -16.79548 +-0.06108490 8.838262 -29.25689 + 0.56154863 6.200189 -18.58219 + 0.5 8 9 +end data + +missing values v2 (9). + +regression /variables=v0 v1 + /statistics defaults + /dependent=v2 + /method=enter. +]) + +AT_CHECK([pspp -o pspp.csv reg-mdv.sps]) + +AT_CHECK([diff pspp.csv pspp-ref.csv]) + + +AT_CLEANUP