| === satellit_ is now known as satellit_afk | ||
| === satellit_afk is now known as satellit_ | ||
| lfaraone | Morning. | 14:05 |
|---|---|---|
| kandarpk | lfaraone: good morning. | 14:08 |
| lfaraone | hallo kandarpk | 14:08 |
| kandarpk | lfaraone: FYI you've added self to uploaders list in connect and memorize, but didn't do that in poll. | 14:09 |
| kandarpk | lfaraone: isn't that required ? | 14:10 |
| lfaraone | kandarpk: to have *me* in uploaders? it's not required, just useful if I'm to have your package sponsored. | 14:13 |
| kandarpk | lfaraone: Ok. | 14:14 |
| kandarpk | lfaraone: I pulled master branch of connect, made changes and pushed, but its failing to push pristine-tar and upstream | 14:17 |
| lfaraone | kandarpk: okay. did you pull upstream and pristine-tar first? | 14:18 |
| lfaraone | kandarpk: pull them and try pushing again. | 14:19 |
| kandarpk | lfaraone: No :( | 14:19 |
| kandarpk | lfaraone: pulling now, and pushing straight away is leading to conflicts | 14:19 |
| kandarpk | lfaraone: we only need to add 'CDBS_BUILD_DEPENDS_class_python-autotools_python = python$(cdbs_python_nondefault_version)' to debian/rules to override ? | 14:36 |
| kandarpk | *I'll be back in 5min. | 14:39 |
| lfaraone | CDBS_BUILD_DEPENDS_class_python-sugar_python = python$(cdbs_python_nondefault_version), but he's already gone. | 14:40 |
| dipankar | lfaraone, around? | 14:57 |
| dipankar | dfarning, good morning | 14:57 |
| dipankar | kandarpk, hi | 14:57 |
| dfarning | dipankar, good morning | 14:58 |
| dfarning | how are you? | 14:58 |
| dipankar | dfarning, I am good. How are you? | 14:59 |
| kandarpk | dipankar: Hi | 14:59 |
| kandarpk | dfarning: good morning. | 14:59 |
| dfarning | dipankar, great | 14:59 |
| dfarning | kandarpk, good morning.... It looks like you are making good progress. | 14:59 |
| dipankar | dfarning, I seem to have lost track of packaging somehow. | 14:59 |
| dipankar | what are we actually doing now? | 15:00 |
| kandarpk | dfarning: thanks, our team is working well. | 15:00 |
| dfarning | dipankar, :) | 15:00 |
| dfarning | dipankar, can you send me that question in an email? I'll send an email tonight with the big picture. | 15:01 |
| dfarning | dipankar, kandarpk do you have tasks for today? | 15:02 |
| lfaraone | dipankar: yes. | 15:02 |
| dipankar | dfarning, the whole thing got mixed up when I couldn't follow last week | 15:02 |
| dipankar | dfarning, I am trying to understand what Luke has mentioned in the devel-olpc | 15:03 |
| dipankar | *through e-mail | 15:03 |
| kandarpk | lfaraone: we need to change debian/rules only to override dependency on python-... ? | 15:04 |
| dipankar | yup that part | 15:04 |
| kandarpk | by adding the line I mentioned before ? | 15:04 |
| dfarning | dipankar, I have lost track of the technical stuff you guys are doing several weeks ago:) you guys know much more than I do. | 15:04 |
| dfarning | need to run | 15:05 |
| dipankar | kandarpk, I am getting a variety of warning while buildinga package. | 15:06 |
| lfaraone | kandarpk: yes. the rule you want is "CDBS_BUILD_DEPENDS_class_python-sugar_python = python$(cdbs_python_nondefault_version)" | 15:06 |
| === satellit_ is now known as satellit_afk | ||
| kandarpk | lfaraone: I've made that change to the three packages I've packaged before. | 15:07 |
| kandarpk | lfaraone: Please let me know if there's anything wrong after you review them. | 15:07 |
| lfaraone | kandarpk: okay, did you add the python-sugar or python-autotools rule? | 15:08 |
| dipankar | kandarpk, lfaraone : here are the two things required: http://git.debian.org/?p=collab-maint/sugar-log-activity.git;a=blob;f=debian/rules;h=5151f39fdd41e9f31d82a1c4dff01ec79a90bb21;hb=89893508c370cf5c27a6eb69fecf4bd72920f3e3 | 15:08 |
| dipankar | http://paste.ubuntu.com/469356/ | 15:08 |
| kandarpk | lfaraone: let me see. | 15:08 |
| lfaraone | dipankar: that's because you didn't fix the package deps wrt sugar versions. | 15:09 |
| dipankar | lfaraone, are all the warnings related to the fix you have told? | 15:09 |
| kandarpk | lfaraone: I added the autotools rule, will need to change that I think | 15:11 |
| lfaraone | dipankar: no. line 3 is due to a missing debsrc declaration (in debian/source/format) | 15:12 |
| dipankar | lfaraone, this is weird. I didn't delete anything | 15:13 |
| lfaraone | dipankar: yes, it needs to be added. | 15:13 |
| dipankar | lfaraone, is it the one: " gedit debian/format" | 15:13 |
| dipankar | 3.0 | 15:13 |
| dipankar | ? | 15:13 |
| dipankar | * Sorry I forgot the exact command | 15:14 |
| lfaraone | dipankar: add "3.0 (quilt)" to debian/source/format and add the file to git's repo. | 15:15 |
| === satellit_afk is now known as satellit_ | ||
| kandarpk | lfaraone: getting error while commit | 15:23 |
| kandarpk | http://paste.ubuntu.com/469361/ | 15:23 |
| kandarpk | lfaraone: this is because I pulled pristine-tar and upstream after making changes in master | 15:24 |
| kandarpk | how do I correct it ? | 15:24 |
| * lfaraone will be back in 15. | 15:25 | |
| lfaraone | kandarpk: well, this is because you have unresolved conflicts in pristine-tar, and you need to fix them before committing. | 15:48 |
| kandarpk | lfaraone: how do I do that ? | 15:49 |
| kandarpk | lfaraone: should undo last three commits ? | 15:52 |
| kandarpk | 1) edit rules, 2) build 3) debuild clean | 15:52 |
| kandarpk | lfaraone: these were the three commits after pulling master | 15:53 |
| lfaraone | kandarpk: well, you could do that. | 16:03 |
| lfaraone | kandarpk: or you could follow http://www.kernel.org/pub/software/scm/git/docs/user-manual.html#resolving-a-merge | 16:03 |
| kandarpk | lfaraone: reading it. | 16:04 |
| kandarpk | thanks | 16:04 |
| kandarpk | lfaraone: git diff gives : | 16:15 |
| kandarpk | * Unmerged path sugar-connect-activity_22.orig.tar.gz.delta | 16:15 |
| kandarpk | * Unmerged path sugar-connect-activity_22.orig.tar.gz.id | 16:15 |
| kandarpk | lfaraone: what should I do ? | 16:17 |
| lfaraone | kandarpk: hm. you could delete the local pristine-tar branch and readd it. | 16:19 |
| lfaraone | since you really want the one that's on remote. | 16:19 |
| kandarpk | lfaraone: Ok. | 16:19 |
| * ankur says hi to all | 16:27 | |
| ankur | lfaraone, around? | 16:27 |
| kandarpk | lfaraone: http://paste.ubuntu.com/469381/ | 16:35 |
| kandarpk | deleting and pulling pristine is resulting in conflicts | 16:35 |
| dipankar | lfaraone, I made the changes as required, but some problems are still coming. | 16:43 |
| dipankar | http://paste.ubuntu.com/469388/ | 16:43 |
| * dipankar is away: Be Right Back | 16:44 | |
| ankur | dipankar you would like to add -i tag to the lintian command to know more about the warning :) | 16:46 |
| lfaraone | ankur: I usually do "lintian -iIv" :) (turns on "informational" warnings too, can be ignored usually but can be useufl) | 16:55 |
| ankur | hi lfaraone :) | 16:56 |
| ankur | well today i sent a mail regarding etoys | 16:56 |
| ankur | it seems that i it was not giving warning in my local rep | 16:56 |
| ankur | but it was when i cloned it again | 16:56 |
| ankur | dont know , there was nothing to commit and push as well | 16:56 |
| ankur | anyways , i made changes to cloned one , i.e. the one i cloned from git | 16:57 |
| ankur | and when i built the package after making changes in rules file | 16:57 |
| ankur | while building the package , | 16:57 |
| ankur | i got lintian warning regarding no-arch-any | 16:57 |
| ankur | but when i ran lintian on deb file , it didn't showed any | 16:58 |
| ankur | so what should i believe on? | 16:58 |
| ankur | Am i online? | 17:02 |
| kandarpk | bernie: Around ? | 18:04 |
| manusheel | lfaraone: Hi Luke. Around? | 19:42 |
| bernie | hello | 20:29 |
| bernie | if someone can get hold of kandarpk, I'm now available | 20:29 |
| * lfaraone waves at manusheel | 22:18 | |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!