[02:29] <Noskcaj> I've merged manpages from debian. Can someone review it please?
[02:29] <Noskcaj> https://code.launchpad.net/~noskcaj/ubuntu/saucy/manpages/merge3.51-1
[02:31] <Logan_> Noskcaj: If you hit the "Propose for merging" link, it will be added to the sponsorship queue.
[02:32] <Noskcaj> oops, i forgot that bit. *facepalm*
[03:23] <Noskcaj> What's happened with the "file" package. The debian bzr branch in launchpad is two years old and the version in saucy is different to the version in the saucy bzr branch
[03:25] <Logan_> Noskcaj: The Bazaar branch is out of date. You can see all of these outdated branches at http://package-import.ubuntu.com/ .
[03:25] <ScottK> Noskcaj: These kinds of things are why, personally, I just ignore the branches and work from the actual archive.
[03:26] <Logan_> ScottK: Embrace the future! ;P
[03:26] <ScottK> I've seen the future and it's the past.
[03:26] <Noskcaj> ok. It seems more difficult going through the archives though, and slightly outdated
[03:26] <Logan_> Plus, bzr branch warns you if a branch is out date.
[03:26] <Logan_> of
[03:26] <ScottK> UDD is umaintained now, so I don't see it getting better.
[03:27] <Logan_> Noskcaj: grab-merge is pretty simple to use.
[03:27] <Logan_> I personally use UDD wherever possible, but it's been getting more, uh, unreliable recently.
[03:29]  * Noskcaj read documentation for grab-merge and MoM
[03:29] <ScottK> I've seen the future and it's the past.
[03:29] <Noskcaj> *reads
[03:31] <Logan_> Noskcaj: https://wiki.ubuntu.com/UbuntuDevelopment/Merging is a good read for that sort of thing.
[03:31] <Noskcaj> thanks
[04:33] <Logan_> Noskcaj: Hey, are you around?
[04:33] <Noskcaj> Logan_, yeah
[04:34] <Logan_> Noskcaj: Soooo. Squid3.
[04:34] <Logan_> You're just starting out with merges, right?
[04:34] <Noskcaj> yeah. I attempted various things, i don't know if they worked or how to get pbuilder to work (the wiki page is far from intuitive)
[04:35] <Logan_> Okay. Here's my advice. Stay away from huge packages like that, especially with active maintainers. I tried to merge your changes, and I got a bunch of conflicts.
[04:35] <Logan_> Get yourself more comfortable with smaller merges (with fewer conflicts), and you'll gradually be able to work your way up.
[04:35] <Noskcaj> ok, thanks. I'd not even found the merge.ubuntu page when i did that one
[04:36] <Logan_> Even I wouldn't touch a package like that, and I've done a crapton of merges (ask anyone).
[04:36] <Noskcaj> ok. I'm looking at dnsmasq now. It's smaller, but i still don;t really know what i'm doing
[04:36] <jbicha> Noskcaj: yeah, you're definitely going to have to figure out how to build stuff before proposing uploads
[04:36] <jbicha> maybe https://wiki.ubuntu.com/SimpleSbuild will help, if you still have trouble getting a build environment set up, you can ask here
[04:37] <Noskcaj> ok
[04:37] <Logan_> You should always makes sure packages build locally, at least on your architecture, before you propose them.
[04:37] <Logan_> Also, I recommend this guide: http://developer.ubuntu.com/packaging/html/
[04:38] <Logan_> It's very intuitive and up-to-date when it comes to getting set up, etc. I don't mean to scare you away from this, but it gets difficult with bigger packages. You can definitely tackle smaller merges, though.
[04:38] <Noskcaj> Ok, thanks for all that.
[04:38] <Logan_> Please let us know in this channel if you need any help. That's what we're here for. :)
[04:39] <Logan_> I asked questions constantly when I was starting out. No regrets whatsoever.
[05:02] <Noskcaj> Logan_, can ou have a look at https://code.launchpad.net/~noskcaj/ubuntu/saucy/plasma-widget-quickaccess/upstream-merge/+merge/174529
[05:02] <Noskcaj> I think i've finally done one right
[05:03] <Logan_> Noskcaj: I think I've reached my quota for tonight. Going to sleep soon. However, I'll take a look when I get the chance.
[05:03] <Noskcaj> ok. thanks
[05:04] <Logan_> No problem/
[05:04] <Logan_> *
[05:04] <Logan_> .
[05:04] <Logan_> Typing is hard.
[05:04] <Noskcaj> :)
[05:11] <Noskcaj> After running "grab-merge dnsmasq" i get a list of conflicts. how do i fix them?
[05:11] <ScottK> Noskcaj: That particular package has been worked on my by the Kubuntu team.  I would suggest asking in #kubuntu-devel for review/sponsorship.
[05:11] <Noskcaj> i did last time, repeating
[05:12] <ScottK> OK.
[05:12] <ScottK> Personally, I'm slightly uncomfortable with it because it's not done by the same upstream as the last release.
[05:13] <ScottK> To resolve merges, you go through the files with merges and figure out what you need/throw away.
[05:13] <ScottK> (usually it's keep ubuntu's change, drop Debian's, but sometimes it's the other way around.
[05:13] <ScottK> sometimes it's a mix of the two.)
[05:14] <ScottK> Conflict resolution is a case where you really need to understand what's going on in the package.
[05:15] <ScottK> Since Ubuntu and Debian use dnsmasq somewhat differently, it may not be a great one to work on either.
[05:15]  * ScottK is off to bed too.
[05:15] <Noskcaj> ScottK, ok. Any recommendations? also, how do i tell what parts of the files are the conflicts?
[05:16] <ScottK> If you look in the files, there are conflict markers that show what's from Ubuntu and what's from Debian.
[05:18] <Noskcaj> ok
[07:20] <Noskcaj> It seems something is wrong with step 4 on https://wiki.ubuntu.com/SimpleSbuild
[07:21] <Noskcaj> It crashes when i run sbuild-update --keygen
[16:16] <Unit193> cjwatson: Hey, so have you seen https://bugs.launchpad.net/ubuntu/+source/grub2/+bug/898110 ?  By default it'd still show the same as it does now, it'd just be easier for users to change and show all.
[16:18] <TheLordOfTime> Unit193:  if you don't mind me giving my opinion, I quite like the new "Previous LInux Versions" submenu, and I like it that way because at any given time i have 6 kernels and Windows, and not having that submenu takes a *while* to get to Windows for when I need to boot to it (which is of course rare but happens)
[16:18] <TheLordOfTime> and while it could be tweaked so it's useful
[16:19] <TheLordOfTime> such as adding the kernel version to the main menu of what it's going to load, i would rather have the sub menu than deal with however many entries before I get to the OS i want to boot to.
[16:20] <Unit193> TheLordOfTime: And this would leave that as default, so nothing would actually change for you.  The problem I have, is I still keep the generic kernel installed, but also have other(s), and "Ubuntu" doesn't tell me what's acually going to boot.  Changing GRUB_ENABLE_SUBMENU to false would be much, much easier and nicer, while leaving the defaults as is.
[16:53] <Unit193> TheLordOfTime: Did you look at comment 6 and the patch?
[17:44] <cjwatson> Unit193: Perhaps somebody should send that upstream.  Our patch stack is getting a bit wobbly for me to want to add more Ubuntu-specific options (which I might later have to cope with being added upstream under different names).
[17:45] <Unit193> Awwh, dangit.  I noticed grub2 source package had quite a few patches, though.
[17:45] <cjwatson> Sure, but they aren't all equal.  I think a lot harder about ones that add new configuration surface, as a general rule.
[17:47] <cjwatson> The only such thing right now is GRUB_RECORDFAIL_TIMEOUT, and there was pressing reason for that since it was causing unrecoverable failures on remote headless servers.
[17:47] <cjwatson> I won't add new configuration surface in a packaging-specific patch just because people don't like the current shape of the menu.  But you may well find grub-devel receptive.
[17:49] <Unit193> Well, for me it was more that 10_linux isn't easy to figure out, but point about new config well taken.  Thanks for giving me an answer!
[17:50] <cjwatson> It's got kind of complex, yes.  Another reason I get increasingly reluctant with each patch people ask for :-)
[17:51] <Unit193> Understandable, that's why I rely on others too.
[19:02] <obounaim> Hi everybody
[19:02] <obounaim> How to discard the last bzr commit in order to drop the last ubuntu changes
[19:03] <obounaim> then do a merge from Debian
[19:03] <jtaylor> so you want to sync from debian?
[19:03] <jtaylor> and drop all ubuntu changes?
[19:05] <obounaim> no I want to drop just the last ubuntu changes
[19:07] <obounaim> I want to drop the last changes in Ubuntu of "bitmeter"
[19:07] <jtaylor> then how you do it depends on personal preference and what kind of changes there are
[19:07] <jtaylor> if they are small its often simpler to just take the debian package and readd the changes to keep from the ubuntu package with e.g. meld
[19:08] <jbicha> you can't just drop a bzr commit if you're trying to use the lp:ubuntu/bitmeter branch
[19:10] <obounaim> So I will not be able to use UDD in this case right?
[19:10] <jtaylor> you can
[19:10] <jtaylor> but a bzr revert might do to much
[19:10] <jtaylor> like reverting the changelog
[19:12] <obounaim> Is it a problem to revert the changelog?
[19:13] <jtaylor> somewhat
[19:13] <jtaylor> its not the end of the world (one loses it on a sync anyway) but its better to keep it
[19:14] <jtaylor> it can be very important when trying to understand the history of a merge
[19:15] <obounaim> would please take a look in the case of bitmeter. I think reverting the changelog in this case should not be a problem
[19:16] <jtaylor> keeping the changelog is easy, just don't use bzr revert and use patch -p1 -R on a fragment
[19:19] <jtaylor> do we still need any of the bitmeter changes?
[19:30] <jtaylor> bitscope is satisfied by all supported releases, jackd1 and 2 are  > 0.50 and -lm is in debian
[20:10] <obounaim> When making a patch do we need to modify both Makefile.am and Makefile.in ?
[22:13] <Noskcaj> When running "mk-sbuild saucy" i get the error http://paste.ubuntu.com/5872370/ What am i doing wrong?
[22:20] <jbicha> Noskcaj: the wiki guide is a bit too complex
[22:20] <jbicha> just a guess, but maybe you should undo step 3
[22:20] <Noskcaj> ok
[22:23] <Noskcaj> i'll try that
[22:48] <Noskcaj> jbicha, that fixed it, thanks