On Sun, 2008-01-06 at 17:37 +0100, Michael Biebl wrote: > Michael Biebl wrote: > > Dan Williams schrieb: > >> On Wed, 2008-01-02 at 05:37 +0100, Michael Biebl wrote: > > > >>> 3.) 03-nm-applet-make-clean-fixes.patch > >>> Remove autogenerated applet-marshal.[ch] on make clean. > >>> Required to pass "make distcheck". > >>> > >>> Please review and apply. > >> All committed, thanks! > >> > > > > Thanks a lot. > > > > Sorry for bothering you again, but looking at 3.) a second time, it > > seems a cleaner solution is, to use automake's BUILT_SOURCES > > consistently everywhere in NM and n-m-a. > > Because then it's unnecessary to declare explicit build dependencies. > > They are generated automatically, so the _OBJECTS: $(built_sources) > > lines become superfluous. > > I also cleaned up some stray and unused BUILT_SOURCES in > > src/dhcp-manager/Makefile.am and > > src/supplicant-manager/Makefile.am > > > > Setting -fPIC in libnm-util/Makefile.am is unnecessary, too. > > It's automatically set for libtool libraries. > > > > > > Please find the attached two patches for that. > > > > Hi Dan, > > could you please review this new patches for trunk again and apply if > appropriate? > > I also have some patches for the stable 0.6 branch which mostly bring > the stable branch in sync with trunk: > > 1.) readme_format.patch (same as the one for trunk)
Committed. > 2.) man_page_sh_name.patch > Add missing sh name stanza (already in trunk) Committed. > 3.) man_page_section.patch > After applying 2.), this patch fixes the sections (1->8) of > NetworkManager(Dispatcher) (already in trunk). > Please also do a > > cd man > svn mv NetworkManager.1.in NetworkManager.8.in > svn mv NetworkManagerDispatcher.1.in NetworkManagerDispatcher.8.in Committed. > 4.) no_gnome_disable_deprecated.patch > That's required to allow nm-vpn-properties to compile with gtk-2.12. > (already in trunk network-manager-applet) Committed. > Remains the most controversial patch > 5.) rfkill.patch > I already brought this topic up: hal changed the signature killswitch > dbus arguments from uint to int in hal_0.5.10. > You modified my original patch to first try with uint, then with int > (commit 3160). Unfortunately this doesn't work, as dbus will issue an > assert with hal_0.5.10 as the status int variable has the wrong type. > We could try to mess around with two status variables (int and uint), > but this is ugly imho. As we already require a very recent libnl, which > only up-to-date distros ship, I simply remove the support for hal < > 0.5.10 and bumped the build dependencies in configure.in accordingly. I committed r3226 in which I took your suggestion to have two different variables for the different calls. Could you test? I haven't run-tested it yet but it looks correct to me (though I've been wrong before :). Thanks! Dan > Please review and apply, > Michael > > P.S: What do you think about releasing a 0.6.6 version? If so I could > try to bug the Ubuntu NetworkManager maintainers. Maybe they have some > interesting patches that should be commited upstream. > _______________________________________________ NetworkManager-list mailing list [email protected] http://mail.gnome.org/mailman/listinfo/networkmanager-list
