On 2006-04-13 Mike Brodbelt <[EMAIL PROTECTED]> wrote:
> Package: xfs
> Version: 1:1.0.1-4
> Severity: normal
> With previous versions of xfs, the config file used by default was
> /etc/X11/fs/config, however the newly packaged version now defaults to
> using /usr/lib/X11/fs/config.
[...]
Hello,
Afaict this easily fixable, either by patch.1 which requires
re-running automake or by patch.2 which simply hardcodes the path.
cu andreas
--
The 'Galactic Cleaning' policy undertaken by Emperor Zhark is a personal
vision of the emperor's, and its inclusion in this work does not constitute
tacit approval by the author or the publisher for any such projects,
howsoever undertaken. (c) Jasper Ffforde
diff -Nur xfs-1.0.1.orig/Makefile.am xfs-1.0.1/Makefile.am
--- xfs-1.0.1.orig/Makefile.am 2006-03-06 01:13:54.000000000 +0000
+++ xfs-1.0.1/Makefile.am 2006-04-29 16:03:07.000000000 +0000
@@ -19,7 +19,7 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
-configdir = $(libdir)/X11/fs
+configdir = $(sysconfdir)/X11/fs
bin_PROGRAMS = xfs
diff -Nur xfs-1.0.1.orig/debian/rules xfs-1.0.1/debian/rules
--- xfs-1.0.1.orig/debian/rules 2006-04-29 15:53:16.000000000 +0000
+++ xfs-1.0.1/debian/rules 2006-04-29 16:03:21.000000000 +0000
@@ -43,7 +43,8 @@
mkdir obj-$(DEB_BUILD_GNU_TYPE)
cd obj-$(DEB_BUILD_GNU_TYPE) && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info $(confflags) \
+ --infodir=\$${prefix}/share/info \
+ --sysconfdir=/etc $(confflags) \
CFLAGS="$(CFLAGS)"
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
diff -Nur xfs-1.0.1.orig/difs/main.c xfs-1.0.1/difs/main.c
--- xfs-1.0.1.orig/difs/main.c 2006-03-06 01:13:54.000000000 +0000
+++ xfs-1.0.1/difs/main.c 2006-04-29 16:07:41.000000000 +0000
@@ -69,9 +69,7 @@
Cache serverCache;
-#ifndef DEFAULT_CONFIG_FILE
-#define DEFAULT_CONFIG_FILE "/usr/lib/X11/fs/config"
-#endif
+#define DEFAULT_CONFIG_FILE "/etc/X11/fs/config"
#define SERVER_CACHE_SIZE 10000 /* for random server cacheables
*/
