Re: Minutes of the GNOME 2.0 Release Team Meeting - 2001/10/06

["R.I.P. Deaddog" <maddog linuxhall org>]

On 7 Oct 2001, jacob berkman wrote:

> > - Jacob is doing G2 autobuilds nightly basis for Red Hat, thus far no
> >   results or status.
>
> i am up to libbonoboui right now - should get the rest of the modules
> building on monday.

Attached a patch against libbonoboui for parallel install, somehow it is
lost when I send it first time. Is it ok? (The patch is against 1.103.0
tarball, not CVS, but should apply cleanly to CVS too)

Abel

diff -ur libbonoboui2-1.103.0-orig/samples/compound-doc/container/Makefile.am libbonoboui2-1.103.0/samples/compound-doc/container/Makefile.am
--- libbonoboui2-1.103.0-orig/samples/compound-doc/container/Makefile.am	Tue Aug 21 00:50:44 2001
+++ libbonoboui2-1.103.0/samples/compound-doc/container/Makefile.am	Mon Oct  8 01:50:24 2001
@@ -3,9 +3,9 @@
 	-I$(top_srcdir) 				\
 	$(BONOBOUI_CFLAGS)
 
-bin_PROGRAMS = sample-container
+bin_PROGRAMS = sample-container-2
 
-sample_container_SOURCES =	\
+sample_container_2_SOURCES =	\
 	container.c		\
 	container.h		\
 	component.c		\
@@ -19,7 +19,7 @@
 	doc-view.c		\
 	doc-view.h
 
-sample_container_LDADD =				\
+sample_container_2_LDADD =				\
 	$(top_builddir)/bonobo/libbonoboui-2.la		\
 	$(BONOBOUI_LIBS)				\
 	$(INTLLIBS)
diff -ur libbonoboui2-1.103.0-orig/samples/compound-doc/container/container-menu.c libbonoboui2-1.103.0/samples/compound-doc/container/container-menu.c
--- libbonoboui2-1.103.0-orig/samples/compound-doc/container/container-menu.c	Tue Jul 31 07:04:33 2001
+++ libbonoboui2-1.103.0/samples/compound-doc/container/container-menu.c	Mon Oct  8 01:52:39 2001
@@ -97,7 +97,7 @@
 		NULL
 	};
 
-	GtkWidget *about = gnome_about_new ("sample-container", VERSION,
+	GtkWidget *about = gnome_about_new ("sample-container-2", VERSION,
 					    "(C) 2000-2001 ÉRDI Gergõ, Mike Kestner, and Ximian, Inc",
 					    authors,
 					    "Bonobo sample container", NULL);
diff -ur libbonoboui2-1.103.0-orig/samples/controls/Bonobo_Sample_Controls.server libbonoboui2-1.103.0/samples/controls/Bonobo_Sample_Controls.server
--- libbonoboui2-1.103.0-orig/samples/controls/Bonobo_Sample_Controls.server	Thu Sep 27 06:27:01 2001
+++ libbonoboui2-1.103.0/samples/controls/Bonobo_Sample_Controls.server	Mon Oct  8 01:50:24 2001
@@ -1,7 +1,7 @@
 <oaf_info>
 
 <oaf_server iid="OAFIID:Bonobo_Sample_ControlFactory" type="exe"
-	location="bonobo-sample-controls">
+	location="bonobo-sample-controls-2">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:Bonobo/GenericFactory:1.0"/>
 	</oaf_attribute>
diff -ur libbonoboui2-1.103.0-orig/samples/controls/Bonobo_Sample_Controls.server.in libbonoboui2-1.103.0/samples/controls/Bonobo_Sample_Controls.server.in
--- libbonoboui2-1.103.0-orig/samples/controls/Bonobo_Sample_Controls.server.in	Thu Aug  9 06:14:27 2001
+++ libbonoboui2-1.103.0/samples/controls/Bonobo_Sample_Controls.server.in	Mon Oct  8 01:50:24 2001
@@ -1,7 +1,7 @@
 <oaf_info>
 
 <oaf_server iid="OAFIID:Bonobo_Sample_ControlFactory" type="exe"
-	location="bonobo-sample-controls">
+	location="bonobo-sample-controls-2">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:Bonobo/GenericFactory:1.0"/>
 	</oaf_attribute>
diff -ur libbonoboui2-1.103.0-orig/samples/controls/Makefile.am libbonoboui2-1.103.0/samples/controls/Makefile.am
--- libbonoboui2-1.103.0-orig/samples/controls/Makefile.am	Tue Aug 21 00:50:44 2001
+++ libbonoboui2-1.103.0/samples/controls/Makefile.am	Mon Oct  8 01:50:24 2001
@@ -1,14 +1,14 @@
-bin_PROGRAMS = bonobo-sample-controls
+bin_PROGRAMS = bonobo-sample-controls-2
 
 INCLUDES =	\
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
 	-I$(top_srcdir) 				\
 	$(BONOBOUI_CFLAGS)
 
-bonobo_sample_controls_SOURCES =			\
+bonobo_sample_controls_2_SOURCES =			\
 	bonobo-sample-controls.c
 
-bonobo_sample_controls_LDADD =				\
+bonobo_sample_controls_2_LDADD =			\
 	$(top_builddir)/bonobo/libbonoboui-2.la		\
 	$(BONOBOUI_LIBS)				\
 	$(INTLLIBS)
diff -ur libbonoboui2-1.103.0-orig/samples/controls/bonobo-sample-controls.c libbonoboui2-1.103.0/samples/controls/bonobo-sample-controls.c
--- libbonoboui2-1.103.0-orig/samples/controls/bonobo-sample-controls.c	Thu Aug  9 07:00:08 2001
+++ libbonoboui2-1.103.0/samples/controls/bonobo-sample-controls.c	Mon Oct  8 01:50:47 2001
@@ -71,6 +71,6 @@
 }
 
 BONOBO_OAF_FACTORY_MULTI ("OAFIID:Bonobo_Sample_ControlFactory",
-			  "bonobo-sample-controls", VERSION,
+			  "bonobo-sample-controls-2", VERSION,
 			  control_factory,
 			  NULL)