Package: gconf
Version: 1.0.9-7.1
Severity: normal
Tags: patch
I'm making a 0-day NMU for the bugsquash party this weekend. Here's
the patch for this NMU.
-- System Information:
Debian Release: testing/unstable
Architecture: amd64 (x86_64)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.12-1-amd64-k8
Locale: LANG=en, LC_CTYPE=en (charmap=UTF-8) (ignored: LC_ALL set to
en_US.UTF-8)
Versions of packages gconf depends on:
ii libc6 2.3.5-6 GNU C Library: Shared libraries an
ii libdb3 3.2.9-22 Berkeley v3 Database Libraries [ru
ii libgconf11 1.0.9-7.1 GNOME configuration database syste
ii libglib1.2 1.2.10-10 The GLib library of C routines
ii liboaf0 0.6.10-3 The GNOME Object Activation Framew
ii liborbit0 0.5.17-11.1 Libraries for ORBit - a CORBA ORB
ii libpopt0 1.7-5 lib for parsing cmdline parameters
ii libwrap0 7.6.dbs-8 Wietse Venema's TCP wrappers libra
ii libxml1 1:1.8.17-10 GNOME XML library
ii oaf 0.6.10-3 The GNOME Object Activation Framew
ii zlib1g 1:1.2.3-4 compression library - runtime
gconf recommends no packages.
-- no debconf information
--
Daniel Schepler "Please don't disillusion me. I
[EMAIL PROTECTED] haven't had breakfast yet."
-- Orson Scott Card
diff -urN gconf-1.0.9.old/backends/bdb.c gconf-1.0.9/backends/bdb.c
--- gconf-1.0.9.old/backends/bdb.c 2001-10-16 20:43:01.000000000 -0700
+++ gconf-1.0.9/backends/bdb.c 2005-09-03 16:35:27.000000000 -0700
@@ -331,7 +331,7 @@
/* } */
-static guint32
+guint32
get_dir_id (BDB_Store * bdb, const char *dir)
{
int ret;
@@ -405,7 +405,7 @@
/* { Functions to create directories and maintain the dir hierarchy */
-static guint32
+guint32
get_or_create_dir (BDB_Store * bdb, const char *dir)
{
guint32 parent_id;
diff -urN gconf-1.0.9.old/debian/changelog gconf-1.0.9/debian/changelog
--- gconf-1.0.9.old/debian/changelog 2005-09-03 16:29:15.000000000 -0700
+++ gconf-1.0.9/debian/changelog 2005-09-03 16:31:15.000000000 -0700
@@ -1,3 +1,10 @@
+gconf (1.0.9-7.1) unstable; urgency=low
+
+ * NMU during bugsquash party.
+ * Fix FTBFS with gcc-4.0. Closes: #305524.
+
+ -- Daniel Schepler <[EMAIL PROTECTED]> Sat, 3 Sep 2005 16:31:15 -0700
+
gconf (1.0.9-7) unstable; urgency=low
* GNOME Team Upload.
