libgnome(ui) patches

[jacob berkman <jacob ximian com>]

here are the libgnome(ui) patches i have collected from my snapshot
builds.

libgnome-gconftool.patch:

    since gconf1 installs gconftool, and we don't want to depend on it,
    libgnome should not call it directly but call gconftool-2.
    
libgnome2-potfiles.patch:

    an alternative would be to include tests in SUBDIRS :)

libgnome2-x8n.patch:

    dist xml-i18n-tool files.

libgnomeui2-potfiles.patch:

    obvious fix.

libgnomeui2-test-xml.patch:

    obvious, again.

jacob
-- 

Index: libgnome/libgnome/Makefile.am
===================================================================
RCS file: /cvs/gnome/libgnome/libgnome/Makefile.am,v
retrieving revision 1.186
diff -u -r1.186 Makefile.am
--- libgnome/libgnome/Makefile.am	2001/10/10 01:33:25	1.186
+++ libgnome/libgnome/Makefile.am	2001/10/10 16:42:36
@@ -82,9 +82,9 @@
 libgnome-install-schema-data: $(schema_DATA)
 	for n in $+ ; do \
 		if test -e $$n ; then \
-			gconftool --install-schema-file=$$n ; \
+			gconftool-2 --install-schema-file=$$n ; \
 		else \
-			gconftool --install-schema-file=$(srcdir)/$$n ; \
+			gconftool-2 --install-schema-file=$(srcdir)/$$n ; \
 		fi ; \
 	done
 install-data-local: libgnome-install-schema-data

diff -Nrc -x *~ libgnome2-1.104.0.orig/po/POTFILES.in libgnome2-1.104.0/po/POTFILES.in
*** libgnome2-1.104.0.orig/po/POTFILES.in	Mon Sep  3 08:58:26 2001
--- libgnome2-1.104.0/po/POTFILES.in	Fri Oct  5 18:43:29 2001
***************
*** 6,9 ****
  libgnome/gnome-help.c
  libgnome/gnome-i18n.c
  libgnome/gnome-program.c
! tests/test-storage.c
--- 6,9 ----
  libgnome/gnome-help.c
  libgnome/gnome-i18n.c
  libgnome/gnome-program.c
! 

diff -Nrc -x *~ libgnome2-1.104.0.orig/Makefile.am libgnome2-1.104.0/Makefile.am
*** libgnome2-1.104.0.orig/Makefile.am	Tue Sep 18 14:25:55 2001
--- libgnome2-1.104.0/Makefile.am	Fri Oct  5 18:40:00 2001
***************
*** 1,4 ****
  SUBDIRS = libgnome po doc
  
! EXTRA_DIST = message-of-doom COPYING.LIB
  
--- 1,9 ----
  SUBDIRS = libgnome po doc
  
! EXTRA_DIST = \
! 	message-of-doom	\
! 	COPYING.LIB	\
! 	xml-i18n-extract.in	\
! 	xml-i18n-merge.in	\
! 	xml-i18n-update.in
  

diff -Nrc -x *~ libgnomeui2-1.104.0.orig/po/POTFILES.in libgnomeui2-1.104.0/po/POTFILES.in
*** libgnomeui2-1.104.0.orig/po/POTFILES.in	Thu Sep 27 08:02:39 2001
--- libgnomeui2-1.104.0/po/POTFILES.in	Tue Oct  9 12:46:52 2001
***************
*** 17,23 ****
  libgnomeui/gnome-dialog.c
  libgnomeui/gnome-entry.c
  libgnomeui/gnome-file-entry.c
- libgnomeui/gnome-font-picker.c
  libgnomeui/gnome-gconf-ui.c
  libgnomeui/gnome-icon-entry.c
  libgnomeui/gnome-icon-sel.c
--- 17,22 ----

diff -Nrc -x *~ libgnomeui2-1.104.0.orig/test-gnome/Makefile.am libgnomeui2-1.104.0/test-gnome/Makefile.am
*** libgnomeui2-1.104.0.orig/test-gnome/Makefile.am	Tue Sep  4 03:24:17 2001
--- libgnomeui2-1.104.0/test-gnome/Makefile.am	Tue Oct  9 13:02:27 2001
***************
*** 36,42 ****
  	testentry.c
  
  EXTRA_DIST = 		\
! 	bomb.xpm
  
  # the program has to be run from $srcdir to find its image files
  test: test-gnome
--- 36,43 ----
  	testentry.c
  
  EXTRA_DIST = 		\
! 	bomb.xpm	\
! 	testgnome.xml
  
  # the program has to be run from $srcdir to find its image files
  test: test-gnome