summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog7
-rw-r--r--backends/Makefile.am2
-rw-r--r--configure.in6
-rw-r--r--gconf/Makefile.am1
-rw-r--r--gconf/gconf-backend.c2
-rw-r--r--po/ca.po2
-rw-r--r--po/cs.po2
-rw-r--r--po/da.po2
-rw-r--r--po/de.po2
-rw-r--r--po/el.po2
-rw-r--r--po/fi.po2
-rw-r--r--po/fr.po2
-rw-r--r--po/ga.po2
-rw-r--r--po/ja.po2
-rw-r--r--po/no.po2
-rw-r--r--po/pt_BR.po2
-rw-r--r--po/ru.po2
-rw-r--r--po/sv.po2
-rw-r--r--po/tr.po2
-rw-r--r--po/uk.po2
20 files changed, 28 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog
index 73462e73..b3ebad6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-07-27 Havoc Pennington <hp@redhat.com>
+
+ * backends/Makefile.am (backenddir): backenddir is
+ pkglibdir/MAJOR_VERSION, not plain VERSION
+
+ * configure.in: Bump to 0.7
+
Wed Jul 26 12:40:45 2000 George Lebl <jirka@5z.com>
* gconf/gconf.c (gconf_key_is_below): Make sure that the segment
diff --git a/backends/Makefile.am b/backends/Makefile.am
index a8ea891b..911673c6 100644
--- a/backends/Makefile.am
+++ b/backends/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES= -I$(top_srcdir) -I$(top_builddir) -I$(top_builddir)/gconf \
$(GLIB_CFLAGS) $(OAF_CFLAGS) $(ORBIT_CFLAGS) $(XML_CFLAGS) \
-DGCONF_ENABLE_INTERNALS=1 -DG_LOG_DOMAIN=\"GConf-Backends\"
-backenddir = $(pkglibdir)/$(VERSION)
+backenddir = $(pkglibdir)/$(MAJOR_VERSION)
backend_LTLIBRARIES = libgconfbackend-xml.la
diff --git a/configure.in b/configure.in
index c6792714..715ce470 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ AC_INIT(gconf/gconf.h)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(GConf, 0.6)
+AM_INIT_AUTOMAKE(GConf, 0.7)
AM_MAINTAINER_MODE
@@ -33,7 +33,7 @@ AC_SUBST(SCMGCONF_AGE)
dnl libtool versioning for GConfClient wrapper
GCONFGTK_CURRENT=0
-GCONFGTK_REVISION=0
+GCONFGTK_REVISION=1
GCONFGTK_AGE=0
AC_SUBST(GCONFGTK_CURRENT)
@@ -47,7 +47,7 @@ GCONF_CURRENT=0
dnl increment any time the source changes; set to
dnl 0 if you increment CURRENT
-GCONF_REVISION=0
+GCONF_REVISION=1
dnl increment if any interfaces have been added; set to 0
dnl if any interfaces have been removed. removal has
diff --git a/gconf/Makefile.am b/gconf/Makefile.am
index 95e6c47f..3600687e 100644
--- a/gconf/Makefile.am
+++ b/gconf/Makefile.am
@@ -1,6 +1,7 @@
INCLUDES=-I$(top_srcdir) -I$(top_builddir) \
$(GLIB_CFLAGS) $(ORBIT_CFLAGS) $(XML_CFLAGS) $(OAF_CFLAGS) \
-DGCONF_SRCDIR=\""$(absolute_top_srcdir)"\" -DGCONF_CONFDIR=\""$(sysconfdir)/gconf/$(MAJOR_VERSION)"\" \
+ -DGCONF_BUILDDIR=\""$(builddir)"\" \
-DGCONF_BACKEND_DIR=\""$(pkglibdir)/$(MAJOR_VERSION)"\" -DVERSION=\""$(VERSION)"\" -DIID=\""OAFIID:gconfd:19991118"\" -DGCONF_ENABLE_INTERNALS=1
EFENCE=
diff --git a/gconf/gconf-backend.c b/gconf/gconf-backend.c
index 3dde811b..5dda786d 100644
--- a/gconf/gconf-backend.c
+++ b/gconf/gconf-backend.c
@@ -163,7 +163,7 @@ gconf_backend_file(const gchar* address)
gchar* dir;
g_free(retval);
- dir = g_strconcat(GCONF_SRCDIR, "/backends/.libs", NULL);
+ dir = g_strconcat(GCONF_BUILDDIR, "/backends/.libs", NULL);
retval = g_module_build_path(dir, file);
diff --git a/po/ca.po b/po/ca.po
index 65853e05..9c2b7c5a 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GConf 0.5\n"
-"POT-Creation-Date: 2000-07-27 13:55-0400\n"
+"POT-Creation-Date: 2000-07-27 19:40-0400\n"
"PO-Revision-Date: 2000-04-14 11:35+01:00\n"
"Last-Translator: Softcatala <linux@softcatala.org>\n"
"Language-Team: \n"
diff --git a/po/cs.po b/po/cs.po
index 29d2ec64..b1ad35eb 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gconf VERSION\n"
-"POT-Creation-Date: 2000-07-27 13:55-0400\n"
+"POT-Creation-Date: 2000-07-27 19:40-0400\n"
"PO-Revision-Date: 2000-03-09 14:58-0500\n"
"Last-Translator: George Lebl <jirka@5z.com>\n"
"Language-Team: czech <cs@li.org>\n"
diff --git a/po/da.po b/po/da.po
index 9614ec45..0715b444 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GConf\n"
-"POT-Creation-Date: 2000-07-27 13:55-0400\n"
+"POT-Creation-Date: 2000-07-27 19:40-0400\n"
"PO-Revision-Date: 2000-07-11 11:35+01:00\n"
"Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
"Language-Team: Danish <dansk@klid.dk>\n"
diff --git a/po/de.po b/po/de.po
index a4006da6..5d48758e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gConf 0.5\n"
-"POT-Creation-Date: 2000-07-27 13:55-0400\n"
+"POT-Creation-Date: 2000-07-27 19:40-0400\n"
"PO-Revision-Date: 2000-03-30 16:29+02:00\n"
"Last-Translator: Matthias Warkus <mawa@iname.com>\n"
"Language-Team: German <de@li.org>\n"
diff --git a/po/el.po b/po/el.po
index 468b0aca..5340cecb 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gconf 0.3\n"
-"POT-Creation-Date: 2000-07-27 13:55-0400\n"
+"POT-Creation-Date: 2000-07-27 19:40-0400\n"
"PO-Revision-Date: 2000-02-02 15:00+0200\n"
"Last-Translator: Sarantis Paskalis <paskalis@di.uoa.gr>\n"
"Language-Team: Greek <nls@tux.hellug.gr>\n"
diff --git a/po/fi.po b/po/fi.po
index 3be14e38..22f61612 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -17,7 +17,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GConf 0.5\n"
-"POT-Creation-Date: 2000-07-27 13:55-0400\n"
+"POT-Creation-Date: 2000-07-27 19:40-0400\n"
"PO-Revision-Date: 2000-30-03 11:25+0300\n"
"Last-Translator: Pauli Virtanen <pauli.virtanen@saunalahti.fi>\n"
"Language-Team: fi, out-of-team <fi@li.org>\n"
diff --git a/po/fr.po b/po/fr.po
index 68de9bb5..60dbfbd0 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gconf VERSION\n"
-"POT-Creation-Date: 2000-07-27 13:55-0400\n"
+"POT-Creation-Date: 2000-07-27 19:40-0400\n"
"PO-Revision-Date: 2000-02-15 17:50+0100\n"
"Last-Translator: Vincent Renardias <vincent@ldsol.com>\n"
"Language-Team: French\n"
diff --git a/po/ga.po b/po/ga.po
index 181af25d..251248ef 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GConf.pot\n"
-"POT-Creation-Date: 2000-07-27 13:55-0400\n"
+"POT-Creation-Date: 2000-07-27 19:40-0400\n"
"PO-Revision-Date: 2000-03-13 18:23+0000\n"
"Last-Translator: Alastair McKinstry <mckinstry@computer.org>\n"
"Language-Team: Irish <ga@li.org>\n"
diff --git a/po/ja.po b/po/ja.po
index c5c40d1d..c2df6fb8 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GConf 0.5\n"
-"POT-Creation-Date: 2000-07-27 13:55-0400\n"
+"POT-Creation-Date: 2000-07-27 19:40-0400\n"
"PO-Revision-Date: 2000-07-24 17:25+09:00\n"
"Last-Translator: Takeshi Aihana <aihana@muc.biglobe.ne.jp>\n"
"Language-Team: Japanese <translation@gnome.gr.jp>\n"
diff --git a/po/no.po b/po/no.po
index b17fd0c5..bb02f10a 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GConf 0.6\n"
-"POT-Creation-Date: 2000-07-27 13:55-0400\n"
+"POT-Creation-Date: 2000-07-27 19:40-0400\n"
"PO-Revision-Date: 2000-07-21 00:26+02:00\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Norwegian <no@li.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6f033147..bb723596 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gconf 0.5\n"
-"POT-Creation-Date: 2000-07-27 13:55-0400\n"
+"POT-Creation-Date: 2000-07-27 19:40-0400\n"
"PO-Revision-Date: 2000-07-09 11:46-03:00\n"
"Last-Translator: Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>\n"
"Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
diff --git a/po/ru.po b/po/ru.po
index d61fbf61..0cab8cd8 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GConf\n"
-"POT-Creation-Date: 2000-07-27 13:55-0400\n"
+"POT-Creation-Date: 2000-07-27 19:40-0400\n"
"PO-Revision-Date: 2000-07-20 15:32+00:00\n"
"Last-Translator: Valek Filippov <frob@df.ru>\n"
"Language-Team: Russian <ru@li.org>\n"
diff --git a/po/sv.po b/po/sv.po
index dd5897e7..e1afee19 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GConf VERSION\n"
-"POT-Creation-Date: 2000-07-27 13:55-0400\n"
+"POT-Creation-Date: 2000-07-27 19:40-0400\n"
"PO-Revision-Date: 2000-01-04 15:34+01:00\n"
"Last-Translator: andreas.hyden <andreas.hyden@telia.com>\n"
"Language-Team: Swedish <sv@li.org>\n"
diff --git a/po/tr.po b/po/tr.po
index c2481edf..5eb10fa0 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GConf 0.6\n"
-"POT-Creation-Date: 2000-07-27 13:55-0400\n"
+"POT-Creation-Date: 2000-07-27 19:40-0400\n"
"PO-Revision-Date: 2000-07-24 13:10+0200\n"
"Last-Translator: Fatih Demir <kabalak@gmx.net>\n"
"Language-Team: Turkish <tr@li.org>\n"
diff --git a/po/uk.po b/po/uk.po
index 81165a90..563a8df0 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gconf\n"
-"POT-Creation-Date: 2000-07-27 13:55-0400\n"
+"POT-Creation-Date: 2000-07-27 19:40-0400\n"
"PO-Revision-Date: 1999-12-29 12:36+0200\n"
"Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
"Language-Team: Ukrainian <uk@li.org>\n"
View Lorry Controller Status