Re: NetworkManager and nm-applet inconsistences in 2.20 jhbuild moduleset

[Claudio Saavedra <csaavedra alumnos utalca cl>]

Szia Elijah,

On Fri, 2007-09-21 at 18:20 -0600, Elijah Newren wrote:
> On 9/21/07, Claudio Saavedra <csaavedra alumnos utalca cl> wrote:
> > On Mon, 2007-09-17 at 12:40 +0200, Rodrigo Moya wrote:
> > >
> > > you need to change it in jhbuild/modulesets/gnome-2.20.modules
> >
> > Oh, yes. I know. But the question is whether to use the nm-applet branch
> > officially in the module set or not.
> >
> > I'm locally using the branch, but haven't committed that change. It
> > seems the sane thing to do, though.
> 
> gnome-2.20.modules might be misleading; it's not "official modules in
> the release set" (that's what gnome-suites-2.20.modules is), but
> rather just "other cool and useful modules."  So I don't see any
> problem having nm-applet and NM in it.

Agreed.

> I'd say that we'd usually want to build stuff in gnome-2.20.modules
> from trunk/HEAD/whatever-development-is-called, unless the module
> isn't able to keep their development version dogfoodable and just
> introduces too many build problems.

I'd say, that given 2.20 is stable now, using the stable brach of
NM(-applet) is the right thing to do. I tried trunk branches for these
apps, and they are not dogfoodable to my taste, and probably more
appropriate for the 2.22 release set.

So, I'm installing the patch below in SVN. It is worth remembering that
current status in gnome-2.2x.modules won't allow nm-applet to be built,
and after this patch installation, it will.


Claudio


Index: modulesets/gnome-2.20.modules
===================================================================
--- modulesets/gnome-2.20.modules       (revision 1620)
+++ modulesets/gnome-2.20.modules       (working copy)
@@ -1092,7 +1092,7 @@
   </autotools>
 
  <autotools id="network-manager-applet">
-    <branch/>
+    <branch module="network-manager-applet/branches/network-manager-applet-0-6" checkoutdir="network-manager-applet"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="dbus-glib"/>
Index: modulesets/gnome-2.22.modules
===================================================================
--- modulesets/gnome-2.22.modules       (revision 1620)
+++ modulesets/gnome-2.22.modules       (working copy)
@@ -1076,7 +1076,7 @@
   </autotools>
 
   <autotools id="NetworkManager">
-    <branch module="NetworkManager/branches/NETWORKMANAGER_0_6_0_RELEASE" checkoutdir="NetworkManager"/>
+    <branch/>
     <dependencies>
       <dep package="glib"/>
       <dep package="dbus-glib"/>
Index: ChangeLog
===================================================================
--- ChangeLog   (revision 1620)
+++ ChangeLog   (working copy)
@@ -1,3 +1,10 @@
+2007-09-21  Claudio Saavedra  <csaavedra alumnos utalca cl>
+
+       * modulesets/gnome-2.20.modules: Use stable branch for NetworkManager and
+       network-manager-applet.
+       * modulesets/gnome-2.22.modules: Use trunk for NetworkManager and 
+       network-manager-applet.
+
 2007-09-21  Frederic Peters  <fpeters 0d be>
 
        * jhbuild/defaults.jhbuildrc, modulesets/gnome-2.22.modules,

-- 
Claudio Saavedra  <csaavedra alumnos utalca cl>

D�del Software Libre, Curic�   http://curico.diadelsoftwarelibre.cl