[maemo-commits] [maemo-commits] r12499 - in projects/haf/trunk/gconf2: . backends debian

[From: subversion at stage.maemo.org]

Author: richard
Date: 2007-06-27 11:52:55 +0300 (Wed, 27 Jun 2007)
New Revision: 12499

Modified:
   projects/haf/trunk/gconf2/ChangeLog
   projects/haf/trunk/gconf2/backends/Makefile.am
   projects/haf/trunk/gconf2/debian/changelog
Log:
Merge from upstream.

Modified: projects/haf/trunk/gconf2/ChangeLog
===================================================================
--- projects/haf/trunk/gconf2/ChangeLog	2007-06-27 08:24:27 UTC (rev 12498)
+++ projects/haf/trunk/gconf2/ChangeLog	2007-06-27 08:52:55 UTC (rev 12499)
@@ -1,5 +1,8 @@
 2007-06-27  Richard Hult  <richard at imendio.com>
 
+	* backends/Makefile.am: Keep in sync with upstream (fix
+	portability).
+
 	* gconf/gconf-database-dbus.c (database_handle_set_schema): Empty
 	schema name means unset.
 

Modified: projects/haf/trunk/gconf2/backends/Makefile.am
===================================================================
--- projects/haf/trunk/gconf2/backends/Makefile.am	2007-06-27 08:24:27 UTC (rev 12498)
+++ projects/haf/trunk/gconf2/backends/Makefile.am	2007-06-27 08:52:55 UTC (rev 12499)
@@ -10,7 +10,9 @@
 
 backend_LTLIBRARIES = libgconfbackend-xml.la libgconfbackend-oldxml.la $(EVOLDAP_BACKEND)
 
-libgconfbackend_oldxml_la_SOURCES = \
+noinst_LTLIBRARIES = libgconfbackend-oldxml-noinst.la
+
+libgconfbackend_oldxml_noinst_la_SOURCES = \
 	xml-cache.h		\
 	xml-cache.c		\
 	xml-dir.h		\
@@ -18,9 +20,13 @@
 	xml-entry.h		\
 	xml-entry.c		\
 	xml-backend.c
+libgconfbackend_oldxml_la_SOURCES =
 
 libgconfbackend_oldxml_la_LDFLAGS = -avoid-version -module -no-undefined
-libgconfbackend_oldxml_la_LIBADD  = $(DEPENDENT_WITH_XML_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la $(INTLLIBS)
+libgconfbackend_oldxml_la_LIBADD  = $(DEPENDENT_WITH_XML_LIBS) \
+	$(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la \
+	libgconfbackend-oldxml-noinst.la \
+	$(INTLLIBS)
 
 libgconfbackend_xml_la_SOURCES = 	\
 	markup-backend.c		\
@@ -36,7 +42,7 @@
 xml_test_LDADD = \
 	$(DEPENDENT_WITH_XML_LIBS) \
 	$(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la \
-	libgconfbackend-oldxml.la
+	libgconfbackend-oldxml-noinst.la
 
 bin_PROGRAMS = gconf-merge-tree
 gconf_merge_tree_SOURCES = gconf-merge-tree.c

Modified: projects/haf/trunk/gconf2/debian/changelog
===================================================================
--- projects/haf/trunk/gconf2/debian/changelog	2007-06-27 08:24:27 UTC (rev 12498)
+++ projects/haf/trunk/gconf2/debian/changelog	2007-06-27 08:52:55 UTC (rev 12499)
@@ -2,6 +2,7 @@
 
   * Partly fixes NB#56587, dh_gconf does not generate .postinst scripts
   * Fixes: NB#59161, Cannot unapply schema from gconf
+  * Sync with upstream (fix portability)
 
  -- Richard Hult <richard at imendio.com>  Tue, 26 Jun 2007 16:13:53 +0200