Re: [Rosegarden-devel] shall we merge the reorg branch ?

2006-11-26 Thread Pedro Lopez-Cabanillas
On Sunday, 26 November 2006 16:36, Guillaume Laurent wrote: On Friday 24 November 2006 11:38, Chris Cannam wrote: I think we need to start by merging from trunk - reorg the handful of fixes (a couple from Heikki spring to mind) and additional library files that were committed on trunk after

Re: [Rosegarden-devel] shall we merge the reorg branch ?

2006-11-26 Thread Chris Cannam
On Sunday 26 Nov 2006 16:19, Pedro Lopez-Cabanillas wrote: a) move trunk to branches/oldtrunk-before-reorg b) move branches/reorganisation to trunk I agree, except (b) should be a copy rather than a move. (Subversion doesn't actually duplicate the files in a copy.) I'm at a computer now --

Re: [Rosegarden-devel] shall we merge the reorg branch ?

2006-11-26 Thread Chris Cannam
On Sunday 26 Nov 2006 15:36, Guillaume Laurent wrote: This is done, AFAICT - Pedro did most of it and I've just finished committing a couple remaining bits. btw, some of these commits have reintroduced a few of the Rosegarden:: namespace selectors that were removed during the reorganise

Re: [Rosegarden-devel] shall we merge the reorg branch ?

2006-11-26 Thread D. Michael McIntyre
On Sunday 26 November 2006 12:37 pm, Chris Cannam wrote: I'm at a computer now -- I'll do it in a moment. Just for the merry hell of it, I'm going to find out what happens when I do an update in my old rosegarden/ directory that used to be trunk/ -- D. Michael McIntyre Author of Rosegarden

Re: [Rosegarden-devel] shall we merge the reorg branch ?

2006-11-26 Thread Chris Cannam
On Sunday 26 Nov 2006 17:50, D. Michael McIntyre wrote: On Sunday 26 November 2006 12:37 pm, Chris Cannam wrote: I'm at a computer now -- I'll do it in a moment. Just for the merry hell of it, I'm going to find out what happens when I do an update in my old rosegarden/ directory that used to

Re: [Rosegarden-devel] shall we merge the reorg branch ?

2006-11-26 Thread Guillaume Laurent
On Sunday 26 November 2006 18:52, Chris Cannam wrote: And I just tried exactly that -- it works! It really works. You can just svn up and it'll take away all the old stuff and replace it with all the new. It's still building so I don't know for certain, but it certainly looks like it did

Re: [Rosegarden-devel] shall we merge the reorg branch ?

2006-11-25 Thread D. Michael McIntyre
On Saturday 25 November 2006 4:13 am, Pedro Lopez-Cabanillas wrote: Because you configured WANT_LIRC=OFF, so the LIRC test wasn't performed. I've made now a modification to UserWarnings.cmake to tell you in this case: No LIRC support configured instead of nothing. OK, that makes sense. I was

Re: [Rosegarden-devel] shall we merge the reorg branch ?

2006-11-25 Thread D. Michael McIntyre
On Saturday 25 November 2006 10:26 am, D. Michael McIntyre wrote: Not that I'm bitching about a free build system. I should go read the stuff you've spent so long putting together, and see for myself just why LIRC doesn't fit the usual model. Because sound stuff doesn't fit the usual model

Re: [Rosegarden-devel] shall we merge the reorg branch ?

2006-11-24 Thread Guillaume Laurent
On Sunday 12 November 2006 12:58, Chris Cannam wrote: On Sunday 12 Nov 2006 10:38, Guillaume Laurent wrote: Anything preventing us from merging the reorg branch back to the trunk ? Yeah -- it isn't tested and has no build system. It has one now, hasn't it ? -- Guillaume.

Re: [Rosegarden-devel] shall we merge the reorg branch ?

2006-11-24 Thread Chris Cannam
On Friday 24 Nov 2006 10:27, Guillaume Laurent wrote: On Sunday 12 November 2006 12:58, Chris Cannam wrote: On Sunday 12 Nov 2006 10:38, Guillaume Laurent wrote: Anything preventing us from merging the reorg branch back to the trunk ? Yeah -- it isn't tested and has no build system.

Re: [Rosegarden-devel] shall we merge the reorg branch ?

2006-11-24 Thread Pedro Lopez-Cabanillas
On Friday, 24 November 2006 11:27, Guillaume Laurent wrote: On Sunday 12 November 2006 12:58, Chris Cannam wrote: On Sunday 12 Nov 2006 10:38, Guillaume Laurent wrote: Anything preventing us from merging the reorg branch back to the trunk ? Yeah -- it isn't tested and has no build

Re: [Rosegarden-devel] shall we merge the reorg branch ?

2006-11-24 Thread Chris Cannam
On Friday 24 Nov 2006 10:38, Chris Cannam wrote: Yes, and it seems we're happy enough with the build system Maybe I spoke too soon. I guess I hadn't tested it since the last update. Now when I run cmake . I get mostly meaningful output, but I also get a load of stuff like this: -- Program

Re: [Rosegarden-devel] shall we merge the reorg branch ?

2006-11-24 Thread Chris Cannam
On Friday 24 Nov 2006 15:52, Chris Cannam wrote: --static: unknown option --static: unknown option [...] OK, upgrading pkg-config from 0.15 to 0.17 fixed that. 0.17 is in Debian stable, so I don't think that's unreasonable. Sorry for the distraction. Chris

Re: [Rosegarden-devel] shall we merge the reorg branch ?

2006-11-24 Thread D. Michael McIntyre
On Friday 24 November 2006 9:52 am, Pedro Lopez-Cabanillas wrote: It is basically done now. The can be some minor details pending and undetected bugs, but I agree with the proposal of reorganisation branch becoming trunk. One thing I notice is there is no mention of LIRC status on this

Re: [Rosegarden-devel] shall we merge the reorg branch ?

2006-11-12 Thread Pedro Lopez-Cabanillas
On Sunday, 12 November 2006 11:38, Guillaume Laurent wrote: Anything preventing us from merging the reorg branch back to the trunk ? Please, don't do it until I finish the buildsystem setup. Regards, Pedro - Using Tomcat

Re: [Rosegarden-devel] shall we merge the reorg branch ?

2006-11-12 Thread Chris Cannam
On Sunday 12 Nov 2006 10:38, Guillaume Laurent wrote: Anything preventing us from merging the reorg branch back to the trunk ? Yeah -- it isn't tested and has no build system. Chris - Using Tomcat but need to do more?