ESphynx | xnox: ping =) | 01:02 |
---|---|---|
xnox | ESphynx: hola =) | 01:02 |
xnox | wait........ | 01:02 |
ESphynx | ¿Que tal? | 01:02 |
xnox | is this about building a very huge package? | 01:02 |
ESphynx | very huge package? | 01:02 |
ESphynx | who said anything about a huge package :P | 01:02 |
ESphynx | a tiny one perhaps... minuscule :) | 01:02 |
ESphynx | 'sup homies | 01:03 |
ESphynx | oops wrong chan | 01:03 |
ESphynx | :P | 01:03 |
ESphynx | don't drink and IRC. | 01:03 |
=== chilicuil_away is now known as chilicuil | ||
=== Tonio_ is now known as Tonio_aw | ||
=== chilicuil is now known as chilicuil_away | ||
dholbach | good morning | 08:00 |
obounaim | good morning dholbach | 08:00 |
dholbach | hi obounaim | 08:01 |
Rcart | good morning daniel o/ | 08:16 |
dholbach | hi Rcart | 08:19 |
Rcart | dholbach: I'm working on a package and want to import a patch, I do in the bzr branch: $ quilt import patch, then push and finally refresh | 08:20 |
Rcart | but quilt refresh the last applied patch | 08:21 |
Rcart | if I do bzr diff and cannot see the changes "made" by the imported patch | 08:22 |
Rcart | seems like if not applied at all :\ | 08:22 |
dholbach | the manpage says: | 08:22 |
dholbach | import [-p num] [-R] [-P patch] [-f] [-d {o|a|n}] patchfile ... | 08:22 |
dholbach | Import external patches. The patches will be inserted following | 08:22 |
dholbach | the current top patch, and must be pushed after import to apply | 08:22 |
dholbach | them. | 08:22 |
dholbach | maybe you forgot to push? | 08:22 |
Rcart | yes, I did push and then refresh | 08:23 |
obounaim | Maybe be the patch file should be in the debian/patches directory | 08:24 |
dholbach | aha! | 08:25 |
dholbach | try: bzr unknowns | 08:25 |
dholbach | it could be that you still need to 'bzr add <patch file>' | 08:25 |
dholbach | brb | 08:26 |
Rcart | dholbach: ok, thanks | 08:26 |
Rcart | obounaim: the patch is not there even after import -> push -> refresh | 08:27 |
obounaim | maybe you need to copy the patch manually and then import it | 08:27 |
Rcart | ok, let me try it | 08:28 |
obounaim | try "quilt series" to see if the patch has been correctly added to the series file. | 08:28 |
Rcart | yes, I did it and shows the imported patch | 08:29 |
Rcart | but.. | 08:29 |
Rcart | if after I do after importing $ quilt push | 08:30 |
Rcart | quilt says: "all series fully-applied" | 08:30 |
Rcart | but the patch is not applied | 08:31 |
Rcart | I'll import it manually, give me a sec | 08:32 |
obounaim | Try with a new branch, copy your patch to debian/patches directory import it, then do a push | 08:41 |
Rcart | obounaim: think that my patch is named 'mypatch' | 08:44 |
Rcart | I manually copied my patch to d/patches, then importing, and when I do $quilt series, it shows my patch | 08:46 |
Rcart | but when I do $ quilt push | 08:46 |
obounaim | good, now push it "quilt push" | 08:46 |
Rcart | File series fully applied, ends at patch fix-627426.patch | 08:47 |
Rcart | and that isn't 'mypatch.patch' | 08:47 |
Rcart | debian new maintainer guide says: | 08:48 |
obounaim | How did you create your patch? | 08:48 |
Rcart | d | 08:48 |
Rcart | d | 08:48 |
Rcart | The patches stored in the newer 3.0 (quilt) source format must be fuzz free. You can ensure this with | 08:49 |
obounaim | http://developer.ubuntu.com/packaging/html/patches-to-packages.html#adding-a-new-patch | 08:51 |
Rcart | obounaim: but that is for new patches AFAIK | 08:52 |
obounaim | yes, this not what you are trying to do? | 08:53 |
Rcart | yeah, but this is a imported patch | 08:53 |
obounaim | did you create the patch? | 08:53 |
Rcart | I wanna apply an existing patch from debian | 08:53 |
obounaim | what package are you trying to fix? | 08:54 |
Rcart | xpdf | 08:54 |
obounaim | What patch are trying to import? | 09:00 |
Rcart | http://bugs.debian.org/658264#49 | 09:01 |
ubottu | Debian bug 658264 in xpdf "possible memory corruption in GlobalParams" [Important,Open] | 09:01 |
Rcart | that bug is present since 11.10 | 09:03 |
Rcart | and I'm really interested in try to fix it | 09:04 |
Rcart | I think I'll do it without quilt import | 09:09 |
=== Tonio_aw is now known as Tonio_ | ||
=== Tonio_ is now known as Tonio_aw | ||
=== ricotz_ is now known as ricotz | ||
=== Tonio_aw is now known as Tonio_ | ||
highvoltage | good morning | 15:02 |
=== Daviey_ is now known as Daviey | ||
coolbhavi | good morning highvoltage | 15:47 |
=== Tonio_ is now known as Tonio_aw | ||
=== Tonio_aw is now known as Tonio_ | ||
=== Tonio_ is now known as Tonio_aw | ||
=== Tonio_aw is now known as Tonio_ | ||
=== didrocks1 is now known as didrocks | ||
jtaylor | anyone else getting nullpointer exceptions with ec2-describe-instances? | 17:53 |
jtaylor | on 12.04 | 17:53 |
=== yofel_ is now known as yofel | ||
Rcart | obounaim: I had to configure .quilrc to work properly for debian patches ^^ | 20:51 |
Rcart | obounaim: now $ quilt import patch.pathc -> push -> refresh works like a charm (: | 20:52 |
Rcart | sorry, ~/.quiltrc * | 20:52 |
obounaim | Rcart, happy to hear that. | 20:55 |
aboudreault | why would quilt push -a, works....... but not debuild -S -sd | 20:57 |
aboudreault | getting an error on applying a patch. | 20:58 |
=== Quintasan_ is now known as Quintasan | ||
jtaylor | micahg: anything more you want tested for bug 1074765 | 22:01 |
ubottu | Launchpad bug 1074765 in Quantal Backports "Please backport ipython 0.13.1-1 (universe) from raring" [Undecided,New] https://launchpad.net/bugs/1074765 | 22:01 |
jtaylor | I think I have all depends | 22:01 |
=== bschaefer is now known as bschaefer|lunch | ||
micahg | jtaylor: I'll have to look later (over weekend) | 22:01 |
bkerensa | any help making this build error go away? :) http://paste.ubuntu.com/1380618/ | 22:04 |
jtaylor | bkerensa: have you refreshed? | 22:05 |
bkerensa | jtaylor: yes | 22:05 |
jtaylor | try pop -a and delete the .pc folder | 22:06 |
bkerensa | jtaylor: No command 'pop' found, but there are 17 similar ones | 22:08 |
jtaylor | quilt pop -a | 22:08 |
bkerensa | ah | 22:08 |
bkerensa | :D | 22:08 |
bkerensa | jtaylor: yeah it stills give me an error on that patch | 22:10 |
jtaylor | bkerensa: is unpatched Makefile.am already modified compared to the orig tar? | 22:10 |
=== chilicuil_away is now known as chilicuil | ||
bkerensa | jtaylor: no they are the same size just different timestamps | 22:12 |
jtaylor | bkerensa: same size does not mean same | 22:12 |
bkerensa | jtaylor: they are identical in content | 22:13 |
=== bschaefer|lunch is now known as bschaefer | ||
achiang | bkerensa: maybe better to start from first principles... do you know what "patch fuzz" is? | 22:18 |
bkerensa | achiang: no | 22:19 |
bkerensa | achiang: if you could point me to a manual I will gladly rtfm though. | 22:19 |
achiang | bkerensa: trying to find a definitive source for you | 22:20 |
achiang | bkerensa: but in essence, it's when you have a patch and the target file doesn't *exactly* match up. say line numbers changed or something | 22:21 |
achiang | the patch still makes sense, but now you have fuzz | 22:21 |
achiang | bkerensa: i suggest you just go google for that a bit, and try to read about fuzz | 22:21 |
achiang | then the idea of timestamps changing on you and why refreshing a patch would make more sense | 22:21 |
jtaylor | bkerensa: does patch -p1 <patchfile give any messages beside "patching ..." | 22:22 |
achiang | bkerensa: http://en.wikipedia.org/wiki/Patch_(Unix) - you could try that, but i suggest reading a bit more too (although it's not a super complicated concept :) | 22:23 |
bkerensa | jtaylor: it just stalls | 22:27 |
bkerensa | jtaylor: no error or output | 22:27 |
jtaylor | bkerensa: what exactly did you type into the terminal? | 22:27 |
jtaylor | patchfile should be replaced with your patch | 22:27 |
bkerensa | jtaylor: patch -p1 9000-howtos.patch | 22:29 |
jtaylor | bkerensa: patch -p1 <9000-howtos.patch | 22:30 |
bkerensa | jtaylor: http://paste.ubuntu.com/1380671/ | 22:30 |
bkerensa | jtaylor: so looking at the output it appears its because a file no longer exists since the merge? | 22:31 |
jtaylor | bkerensa: the patch should not have succeeded at all when executed from debian/patches | 22:32 |
jtaylor | do you have something besides patches in there? | 22:32 |
* bkerensa looks | 22:32 | |
bkerensa | jtaylor: it appears there is a path /howtos | 22:33 |
bkerensa | jtaylor: and a file called series | 22:33 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!