=== Logan_ is now known as [Live] [02:29] I've merged manpages from debian. Can someone review it please? [02:29] https://code.launchpad.net/~noskcaj/ubuntu/saucy/manpages/merge3.51-1 [02:31] Noskcaj: If you hit the "Propose for merging" link, it will be added to the sponsorship queue. [02:32] oops, i forgot that bit. *facepalm* [03:23] 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] Noskcaj: The Bazaar branch is out of date. You can see all of these outdated branches at http://package-import.ubuntu.com/ . [03:25] Noskcaj: These kinds of things are why, personally, I just ignore the branches and work from the actual archive. [03:26] ScottK: Embrace the future! ;P [03:26] I've seen the future and it's the past. [03:26] ok. It seems more difficult going through the archives though, and slightly outdated [03:26] Plus, bzr branch warns you if a branch is out date. [03:26] of [03:26] UDD is umaintained now, so I don't see it getting better. [03:27] Noskcaj: grab-merge is pretty simple to use. [03:27] 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] I've seen the future and it's the past. [03:29] *reads [03:31] Noskcaj: https://wiki.ubuntu.com/UbuntuDevelopment/Merging is a good read for that sort of thing. [03:31] thanks === Logan_ is now known as log === log is now known as Logan_ [04:33] Noskcaj: Hey, are you around? [04:33] Logan_, yeah [04:34] Noskcaj: Soooo. Squid3. [04:34] You're just starting out with merges, right? [04:34] 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] 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] Get yourself more comfortable with smaller merges (with fewer conflicts), and you'll gradually be able to work your way up. [04:35] ok, thanks. I'd not even found the merge.ubuntu page when i did that one [04:36] Even I wouldn't touch a package like that, and I've done a crapton of merges (ask anyone). [04:36] ok. I'm looking at dnsmasq now. It's smaller, but i still don;t really know what i'm doing [04:36] Noskcaj: yeah, you're definitely going to have to figure out how to build stuff before proposing uploads [04:36] 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] ok [04:37] You should always makes sure packages build locally, at least on your architecture, before you propose them. [04:37] Also, I recommend this guide: http://developer.ubuntu.com/packaging/html/ [04:38] 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] Ok, thanks for all that. [04:38] Please let us know in this channel if you need any help. That's what we're here for. :) [04:39] I asked questions constantly when I was starting out. No regrets whatsoever. [05:02] Logan_, can ou have a look at https://code.launchpad.net/~noskcaj/ubuntu/saucy/plasma-widget-quickaccess/upstream-merge/+merge/174529 [05:02] I think i've finally done one right [05:03] 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] ok. thanks [05:04] No problem/ [05:04] * [05:04] . [05:04] Typing is hard. [05:04] :) [05:11] After running "grab-merge dnsmasq" i get a list of conflicts. how do i fix them? [05:11] 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] i did last time, repeating [05:12] OK. [05:12] Personally, I'm slightly uncomfortable with it because it's not done by the same upstream as the last release. [05:13] To resolve merges, you go through the files with merges and figure out what you need/throw away. [05:13] (usually it's keep ubuntu's change, drop Debian's, but sometimes it's the other way around. [05:13] sometimes it's a mix of the two.) [05:14] Conflict resolution is a case where you really need to understand what's going on in the package. [05:15] 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] ScottK, ok. Any recommendations? also, how do i tell what parts of the files are the conflicts? [05:16] If you look in the files, there are conflict markers that show what's from Ubuntu and what's from Debian. [05:18] ok === elopio_ is now known as elopio [07:20] It seems something is wrong with step 4 on https://wiki.ubuntu.com/SimpleSbuild [07:21] It crashes when i run sbuild-update --keygen === lool- is now known as lool [16:16] 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:16] Launchpad bug 898110 in grub2 (Ubuntu) "please remove the "Previous Linux versions" sub-menu and display all kernels again" [Wishlist,Confirmed] [16:18] 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] and while it could be tweaked so it's useful [16:19] 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] 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] TheLordOfTime: Did you look at comment 6 and the patch? [17:44] 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] Awwh, dangit. I noticed grub2 source package had quite a few patches, though. [17:45] 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] 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] 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] 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] It's got kind of complex, yes. Another reason I get increasingly reluctant with each patch people ask for :-) [17:51] Understandable, that's why I rely on others too. === hggdh_ is now known as hggdh [19:02] Hi everybody [19:02] How to discard the last bzr commit in order to drop the last ubuntu changes [19:03] then do a merge from Debian [19:03] so you want to sync from debian? [19:03] and drop all ubuntu changes? [19:05] no I want to drop just the last ubuntu changes [19:07] I want to drop the last changes in Ubuntu of "bitmeter" [19:07] then how you do it depends on personal preference and what kind of changes there are [19:07] 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] you can't just drop a bzr commit if you're trying to use the lp:ubuntu/bitmeter branch [19:10] So I will not be able to use UDD in this case right? [19:10] you can [19:10] but a bzr revert might do to much [19:10] like reverting the changelog [19:12] Is it a problem to revert the changelog? [19:13] somewhat [19:13] its not the end of the world (one loses it on a sync anyway) but its better to keep it [19:14] it can be very important when trying to understand the history of a merge [19:15] 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] keeping the changelog is easy, just don't use bzr revert and use patch -p1 -R on a fragment === ssweeny` is now known as ssweeny [19:19] do we still need any of the bitmeter changes? [19:30] bitscope is satisfied by all supported releases, jackd1 and 2 are > 0.50 and -lm is in debian [20:10] When making a patch do we need to modify both Makefile.am and Makefile.in ? [22:13] When running "mk-sbuild saucy" i get the error http://paste.ubuntu.com/5872370/ What am i doing wrong? [22:20] Noskcaj: the wiki guide is a bit too complex [22:20] just a guess, but maybe you should undo step 3 [22:20] ok [22:23] i'll try that [22:48] jbicha, that fixed it, thanks