=== satellit_ is now known as satellit_afk
=== satellit_afk is now known as satellit_
kandarpklfaraone: good morning.14:08
lfaraonehallo kandarpk14:08
kandarpklfaraone: FYI you've added self to uploaders list in connect and memorize, but didn't do that in poll.14:09
kandarpklfaraone: isn't that required ?14:10
lfaraonekandarpk: to have *me* in uploaders? it's not required, just useful if I'm to have your package sponsored.14:13
kandarpklfaraone: Ok.14:14
kandarpklfaraone: I pulled master branch of connect, made changes and pushed, but its failing to push pristine-tar and upstream14:17
lfaraonekandarpk: okay. did you pull upstream and pristine-tar first?14:18
lfaraonekandarpk: pull them and try pushing again.14:19
kandarpklfaraone: No :(14:19
kandarpklfaraone: pulling now, and pushing straight away is leading to conflicts14:19
kandarpklfaraone: 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
lfaraoneCDBS_BUILD_DEPENDS_class_python-sugar_python = python$(cdbs_python_nondefault_version), but he's already gone.14:40
dipankarlfaraone, around?14:57
dipankardfarning, good morning14:57
dipankarkandarpk, hi14:57
dfarningdipankar, good morning14:58
dfarninghow are you?14:58
dipankardfarning, I am good. How are you?14:59
kandarpkdipankar: Hi14:59
kandarpkdfarning: good morning.14:59
dfarningdipankar, great14:59
dfarningkandarpk, good morning.... It looks like you are making good progress.14:59
dipankardfarning, I seem to have lost track of packaging somehow.14:59
dipankarwhat are we actually doing now?15:00
kandarpkdfarning: thanks, our team is working well.15:00
dfarningdipankar, :)15:00
dfarningdipankar, can you send me that question in an email?  I'll send an email tonight with the big picture.15:01
dfarningdipankar, kandarpk do you have tasks for today?15:02
lfaraonedipankar: yes.15:02
dipankardfarning, the whole thing got mixed up when I couldn't follow last week15:02
dipankardfarning, I am trying to understand what Luke has mentioned in the devel-olpc15:03
dipankar*through e-mail15:03
kandarpklfaraone: we need to change debian/rules only to override dependency on python-... ?15:04
dipankaryup that part15:04
kandarpkby adding the line I mentioned before ?15:04
dfarningdipankar, 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
dfarningneed to run15:05
dipankarkandarpk, I am getting a variety of warning while buildinga package.15:06
lfaraonekandarpk: 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
kandarpklfaraone: I've made that change to the three packages I've packaged before.15:07
kandarpklfaraone: Please let me know if there's anything wrong after you review them.15:07
lfaraonekandarpk: okay, did you add the python-sugar or python-autotools rule?15:08
dipankarkandarpk, 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=89893508c370cf5c27a6eb69fecf4bd72920f3e315:08
kandarpklfaraone: let me see.15:08
lfaraonedipankar: that's because you didn't fix the package deps wrt sugar versions.15:09
dipankarlfaraone, are all the warnings related to the fix you have told?15:09
kandarpklfaraone: I added the autotools rule, will need to change that I think15:11
lfaraonedipankar: no. line 3 is due to a missing debsrc declaration (in debian/source/format)15:12
dipankarlfaraone, this is weird. I didn't delete anything15:13
lfaraonedipankar: yes, it needs to be added.15:13
dipankarlfaraone, is it the one: " gedit debian/format"15:13
dipankar* Sorry I forgot the exact command15:14
lfaraonedipankar: 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_
kandarpklfaraone: getting error while commit15:23
kandarpklfaraone: this is because I pulled pristine-tar and upstream after making changes in master15:24
kandarpkhow do I correct it ?15:24
* lfaraone will be back in 15.15:25
lfaraonekandarpk: well, this is because you have unresolved conflicts in pristine-tar, and you need to fix them before committing.15:48
kandarpklfaraone: how do I do that ?15:49
kandarpklfaraone: should undo last three commits ?15:52
kandarpk1) edit rules, 2) build 3) debuild clean15:52
kandarpklfaraone: these were the three commits after pulling master15:53
lfaraonekandarpk: well, you could do that.16:03
lfaraonekandarpk: or you could follow http://www.kernel.org/pub/software/scm/git/docs/user-manual.html#resolving-a-merge16:03
kandarpklfaraone: reading it.16:04
kandarpklfaraone: git diff gives :16:15
kandarpk* Unmerged path sugar-connect-activity_22.orig.tar.gz.delta16:15
kandarpk* Unmerged path sugar-connect-activity_22.orig.tar.gz.id16:15
kandarpklfaraone: what should I do ?16:17
lfaraonekandarpk: hm. you could delete the local pristine-tar branch and readd it.16:19
lfaraonesince you really want the one that's on remote.16:19
kandarpklfaraone: Ok.16:19
* ankur says hi to all16:27
ankurlfaraone,  around?16:27
kandarpklfaraone: http://paste.ubuntu.com/469381/16:35
kandarpkdeleting and pulling pristine is resulting in conflicts16:35
dipankarlfaraone, I made the changes as required, but some problems are still coming.16:43
* dipankar is away: Be Right Back16:44
ankurdipankar you would like to add -i tag to the lintian command to know more about the warning :)16:46
lfaraoneankur: I usually do "lintian -iIv" :) (turns on "informational" warnings too, can be ignored usually but can be useufl)16:55
ankurhi lfaraone  :)16:56
ankurwell today i sent a mail regarding etoys16:56
ankurit seems that i it was not giving warning in my local rep16:56
ankurbut it was when i cloned it again16:56
ankurdont know , there was nothing to commit and push as well16:56
ankuranyways , i made changes to cloned one , i.e. the one i cloned from git16:57
ankurand when i built the package after making changes in rules file16:57
ankurwhile building the package ,16:57
ankuri got lintian warning regarding no-arch-any16:57
ankurbut when i ran lintian on deb file , it didn't showed any16:58
ankurso what should i believe on?16:58
ankurAm i online?17:02
kandarpkbernie: Around ?18:04
manusheellfaraone: Hi Luke. Around?19:42
bernieif someone can get hold of kandarpk, I'm now  available20:29
* lfaraone waves at manusheel 22:18

Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!