[02:10] <willdeberry> what tool would yall recommend for pulling down latest ubuntu sources, to merge say, into a version of the deb package I am maintaining locally?
[02:36] <tsimonq2> willdeberry: pull-lp-source PACKAGENAME RELEASE
[02:36] <tsimonq2> willdeberry: Example: pull-lp-source vc zesty
[02:37] <tsimonq2> willdeberry: It just has to be the source package, not the binary package from what I remember
[02:37] <willdeberry> ok kewl
[02:37] <willdeberry> and that pulls just raw source, no applied patches or anything?
[02:39] <tsimonq2> Nope, applies the quilt patches
[02:40] <willdeberry> doesn't applying the quilt patches like that break the build process if I were to build the deb from those sources?
[02:42] <tsimonq2> Nope.
[02:43] <willdeberry> so if i am storing in source control, would you recommend keeping the patches applied or undo first? I would assume without the quilt patches applied makes for easier merging
[02:48] <tsimonq2> Unapplied.
[02:56] <willdeberry> tsimonq2: question about https://merges.ubuntu.com/p/procinfo/REPORT
[02:57] <tsimonq2> willdeberry: yeah
[02:57] <willdeberry> i am trying to resolve that issue and am finding that the changes to Makefile.in are still required to resolve build issues. but what i am being stumped on is, shouln't those changes be in a patch file and not to the Makefile.in directly?
[02:57] <willdeberry> was originally addressed: https://bugs.launchpad.net/ubuntu/+source/procinfo/+bug/771106
[02:57] <ubottu> Launchpad bug 771106 in procinfo (Ubuntu Oneiric) "procinfo version 1:2.0.304-1 failed to build on amd64 with GCC-4.6/oneiric" [High,Fix released]
[02:57] <tsimonq2> What's the output of debian/source/format?
[02:57] <tsimonq2> If it's anything but "3.0 (quilt)" then no
[02:57] <willdeberry> 3.0 quilt
[02:58] <tsimonq2> But if it's that, then yeah...
[02:58] <tsimonq2> hmmm
[02:58] <willdeberry> reason i bring this up is that when i run merge-buildpackage, it complains about local changes
[02:58] <tsimonq2> Yeah, that's interesting...
[02:58] <willdeberry> and i've always been under the impression that you don't touch anything outside the debian directory for quilt packages
[02:58] <tsimonq2> huh
[02:58]  * tsimonq2 gets the package locally instead of speculating :P
[02:58] <willdeberry> lol
[02:59] <Unit193> dpkg-source: info: upstream files that have been modified:  procinfo-2.0.304/Makefile.in
[02:59] <willdeberry> i cam migrate the change to upstream to be a proper quily patch, just wanting to make sure i am not missing somethign
[02:59] <Unit193> No source/format, so yeah.
[03:00] <tsimonq2> Ahhhhhh ok ic
[03:00] <Unit193> (Implied 1.0)
[03:00] <tsimonq2> We followed Debian by having a non-quilt source
[03:00] <tsimonq2> Debian didn't have changes but we did
[03:00] <tsimonq2> So when we apply Debian's change to quilt, we need to put our changes in a patch
[03:01] <tsimonq2> willdeberry: If that makes sense?
[03:01] <willdeberry> so basically move the changes to a patch file and add the new patch to the series file right?
[03:02] <tsimonq2> Yep.
[03:02] <willdeberry> kewl, easy enough
=== _ruben_ is now known as _ruben
[22:09] <willdeberry> ok, so i am stumped at fixing the merge for procinfo. no matter if i just adjust debian's previous patch file or add a new one and add to series file, i get errors about local changes: https://pastebin.com/spFyzpZf
[22:10] <willdeberry> i can fix the MoM conflict and just use the debian side and everything works fine with i run merge-buildpackage
[22:59] <teward> willdeberry: which package/patch/bug?
[23:01] <teward> *grabs MoM*
[23:03] <Unit193> willdeberry: Does the patch match that of the tmpfile?  It could also be that the patch is applied, it doesn't think so, thus changes.
[23:06] <teward> Unit193: what's the default package type, native or quilt?
[23:06] <teward> because I didn't see a quilt format directive in the package
[23:06] <Unit193> teward: 1.0
[23:10] <teward> mmm
[23:11] <Unit193> Ubuntu's 1.0 is slightly different than Debian's, though both should actually be fine with local changes..
[23:11] <teward> Unit193: i have a quilt patch that 'works' - there's no quilt patches in this package by default, so that's my guess as why it's exploding
[23:11] <teward> Unit193: i've always been told to use quilt :P
[23:11] <Unit193> teward: Well yes, of course.  3.0 (quilt) is what you *should* be using.
[23:16] <teward> how hard is it to convert, just create a quilt patch, and go?
[23:16] <teward> i don't see a format file so hence my asking
[23:20] <willdeberry> teward: sry, was grabbing dinner. this is for procinfo
[23:21] <willdeberry> and after i run grab-merge, i do see a debian/source/format with 3.0 (quilt)
[23:21] <willdeberry> i assume that is Ubuntu delta since it doesn't seem to be in the debian source
[23:23] <willdeberry> Unit193: the tmpfile is actually the opposite of the quilt patch
[23:24] <Unit193> willdeberry: Right, so patch -p1 -R -i /tmp/proc*  and try to build, you'll see the patch you have in the output as 'applying foo.patch'.
[23:25] <Unit193> The paste you gave doesn't contain applying the patch, as you see.
[23:26] <Unit193> So, 1. The state is wrong and it thinks the patch is applied when it isn't.  2. d/p/series doesn't contain the patch.
[23:41] <willdeberry> yea i don't see anything about patches in the working merge-buildpackage too
[23:42] <willdeberry> even though it says it is using quilt format
[23:53] <willdeberry> working: https://pastebin.com/XxZGQzh8
[23:53] <willdeberry> i don't get it :/
[23:54] <Unit193> `sudo`?
[23:54] <willdeberry> blame Windows bash
[23:54] <willdeberry> there is no fakeroot
[23:55] <willdeberry> too lazy to spin up VM xD
[23:55] <Unit193> Nice.