Eickmeyer[m] | OvenWerks: The good news is that Ardour will be heading back to the repos. teward and I fixed it. | 01:52 |
---|---|---|
Eickmeyer[m] | I'll try to figure out if idjc can be salvaged. | 01:53 |
Eickmeyer[m] | Yeah, that's way over my head. I don't think I can get that one to patch properly. | 02:43 |
studiobot | <teward001> @Eickmeyer orrrrrrrrrr not | 03:47 |
studiobot | <teward001> Rejected: … File ardour_5.12.0-3ubuntu1.debian.tar.xz already exists in Primary Archive for Ubuntu, but uploaded version has different contents. See more information about this error in https://help.launchpad.net/Packaging/UploadErrors. … Files specified in DSC are broken or missing, skipping package unpack verification. | 03:47 |
studiobot | <teward001> sorry my mail died because my residential network exploded, I had to switch over to my business connection | 03:47 |
studiobot | <teward001> but yeah, I'm assuming you didn't version bump it | 03:47 |
studiobot | <teward001> so I'm going to version bump it | 03:47 |
studiobot | <teward001> which i'd have to do anyways thanks to doko's failures | 03:50 |
studiobot | <teward001> @Eickmeyer I've pushed the version change to the repo, can you tag it? | 03:54 |
studiobot | <teward001> assuming you do version tagging | 03:54 |
studiobot | <Eickmeyer> Yeah, I can. | 03:56 |
studiobot | <teward001> okay THAT looks better | 03:56 |
studiobot | <teward001> ```ardour (1:5.12.0-3ubuntu2) focal; urgency=medium … * This upload does NOT include the changes introduced in 1:5.12.0-3ubuntu1 … which is in focal-proposed due to those changes FTBFSing entirely and … requiring the changes applied here in -3ubuntu2. … * Update to waf 2.0.19, patch to build with python 3 … * 0010-waf.pa | 03:56 |
studiobot | tch updated by Erich Eickmeyer … * 0020-fix-wscripts.patch by Erich Eickmeyer, … code by David Runge (Ardour Developer) … * 0025-point-to-custom-autowaf.patch by Erich Eickmeyer … code by Robin Gareus (Ardour Developer) … * 0028-Patch-waf-to-actually-build-install-properly.patch … by Erich Eickmeyer, code by Robin Gare | 03:56 |
studiobot | us (Ardour Developer) … * Patch to build against fluidsynth 2 … * 0027-fluidsynth2.patch by Andreas Müller … * Drop wiimote support as recommended from upstream Ardour … Date: Fri, 24 Jan 2020 09:36:23 -0800 … Changed-By: Erich Eickmeyer <erich@ericheickmeyer.com> … Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> … Sig | 03:56 |
studiobot | ned-By: Thomas Ward <teward@thomas-ward.net> … https://launchpad.net/ubuntu/+source/ardour/1:5.12.0-3ubuntu2``` | 03:56 |
studiobot | <teward001> Accepted | 03:57 |
studiobot | <Eickmeyer> Probably a result of doko uploading a version that fully FTBFS due to the python 3 thing. #shocker | 03:57 |
studiobot | <Eickmeyer> Uhhh... you comitted the removal of libs/ardour/config_text.cc and libs/ardour/revision.cc. That might cause problems. | 03:58 |
studiobot | <Eickmeyer> @teward001 ^ | 03:58 |
studiobot | <teward001> 😐 | 03:58 |
studiobot | <teward001> okay that's a mistake | 03:58 |
studiobot | <teward001> i'll fix that | 03:59 |
studiobot | <teward001> git revert | 03:59 |
studiobot | <Eickmeyer> Yup. | 03:59 |
studiobot | <teward001> git revert then nitpick my changelog changes only | 03:59 |
studiobot | <teward001> :P | 03:59 |
studiobot | <teward001> please :) | 03:59 |
studiobot | <teward001> (including the note that it skipped -3ubuntu1 because that's a relevant note) | 03:59 |
studiobot | <teward001> (I did the git commit after the source build oops) | 03:59 |
studiobot | <Eickmeyer> Yeeep, but you're going to have to go 3ubuntu3 because you uploaded 3ubuntu2 and it was accepted. | 03:59 |
studiobot | <teward001> ... or we stage the changes for next upload | 04:00 |
studiobot | <teward001> -3ubuntu2 the removal of stuff was because of the sbuild run | 04:00 |
studiobot | <teward001> debuild run* | 04:00 |
studiobot | <Eickmeyer> Yeah, I know. I had to discard those changes EVERY time I ran debuild. | 04:00 |
studiobot | <Eickmeyer> Do you want to do the dirty work or should I? | 04:00 |
studiobot | <teward001> i've already reverted. | 04:02 |
studiobot | <Eickmeyer> Ok. I'll pull. | 04:02 |
studiobot | <teward001> just... tag it as -3ubuntu2 if you haven't already. | 04:02 |
studiobot | <teward001> then i'll pull and debuild -S it again. The commit of the removal wasn't intentional | 04:03 |
studiobot | <teward001> but debuild *does* remove the files during source vuild run so | 04:03 |
studiobot | <Eickmeyer> Yeah, but we don't want to screw that up. | 04:03 |
studiobot | <teward001> or are you saying that removal is 'bad" because debuild removed them and we need -3ubuntu3 anyways? | 04:03 |
studiobot | <teward001> E:UNCLEAR | 04:03 |
studiobot | <teward001> well, the git revert reverted the removals so 😜 | 04:03 |
studiobot | <teward001> the git commit was *after* I did the `debuild -S -sa` call | 04:04 |
studiobot | <teward001> sooooo | 04:04 |
studiobot | <teward001> that's probably the issue there | 04:04 |
studiobot | <Eickmeyer> Yeah, I'm not worried about it now, but I would be worried if something got angry about the files not being there to remove. | 04:04 |
studiobot | <Eickmeyer> You know, unexpected FTBFS and all due to two files not being able to be deleted. | 04:04 |
studiobot | <teward001> true, but the `clean` step is called anyways | 04:06 |
studiobot | <teward001> and it has `rm -f` | 04:06 |
studiobot | <teward001> which means whether it exists or not it won't error | 04:06 |
studiobot | <teward001> called during debuild -S and called during build time | 04:07 |
studiobot | <teward001> which is why it didn't FTBFS in local testing | 04:07 |
studiobot | <teward001> because it was already purged from the source package. | 04:07 |
studiobot | <teward001> https://git.launchpad.net/~ubuntustudio-dev/+git/ardour/tree/debian/rules#n96 | 04:08 |
studiobot | <teward001> and line 98 under it | 04:08 |
studiobot | <teward001> there's several clean calls it seems | 04:08 |
studiobot | <Eickmeyer> Ah, I guess I didn't see that. | 04:08 |
studiobot | <teward001> yeah it has multiple nasty clean calls in here | 04:08 |
studiobot | <teward001> but the clean phase purges the config_text.cc and version.cc files anyways | 04:08 |
studiobot | <teward001> i agree committing that change is *bad* | 04:08 |
studiobot | <teward001> but sbuild *will* clean those files | 04:08 |
studiobot | <teward001> debuild* | 04:09 |
studiobot | <Eickmeyer> Right, but we shouldn't be modifying the source files directly. I guess that's probably the biggest objection. | 04:09 |
studiobot | <teward001> as i said that's why git revert is helpful | 04:09 |
studiobot | <teward001> again | 04:09 |
studiobot | <Eickmeyer> Yeeep. | 04:09 |
studiobot | <teward001> this was just a minor misstep which we can fix because we didn't tag anything yet | 04:09 |
studiobot | <Eickmeyer> Right. | 04:09 |
studiobot | <teward001> extract the changelog bits, revise changelog, commit JUST that | 04:09 |
studiobot | <teward001> tag after that | 04:09 |
studiobot | <teward001> problem solved | 04:09 |
studiobot | <Eickmeyer> Yep. So, are we uploading 3ubuntu2 or 3 ubuntu 3? I just want to know what we're doing so as to version properly. | 04:12 |
studiobot | <Eickmeyer> @teward001 ? | 04:14 |
studiobot | <Eickmeyer> Nevermind. | 04:18 |
studiobot | <teward001> @Eickmeyer [Yep. So, are we uploading 3ubuntu2 or 3 ubuntu 3? I just want to know what we're …], 3ubuntu2 | 04:19 |
studiobot | <Eickmeyer> k | 04:19 |
studiobot | <teward001> because the .cc files would be removed anyways | 04:19 |
studiobot | <Eickmeyer> Right | 04:19 |
studiobot | <Eickmeyer> That's what occurred to me, hence the nevermind. | 04:19 |
RikMills | Eickmeyer: did you seed scribus-ng? if so I think you can go back to scribus normal package now so we can get rid of the ng one | 18:30 |
Eickmeyer[m] | RikMills: It's like you read my mind. I'm updating the seed now. haha | 18:34 |
RikMills | :) | 18:35 |
Eickmeyer[m] | Had to get some ardour stuff fixed in the meantime. | 18:35 |
Eickmeyer[m] | That's all sorted now. | 18:35 |
Eickmeyer[m] | Just didn't want to update the seed without ardour and raysession. | 18:35 |
RikMills | all cool. I was poked by the debian maintainer as they thought it was seeded somewhere | 18:44 |
Eickmeyer[m] | It was, is now not. | 18:50 |
RikMills | :) | 19:17 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!