[03:09] dfarning, hello. [03:10] lfaraone, hello [03:10] dipankar, good morning [03:10] dipankar: hi. [03:10] dfarning, good evening :) [03:11] lfaraone, did you get a chance to review the flipsticks? [03:11] dipankar: not yet, apologies, I'm behind today [03:12] lfaraone, no worries. I tried them myself. [03:12] dipankar: are all of the acitivties you packaged up to date? [03:13] dipankar: iirc there is a newer Log out. [03:13] lfaraone, in flipsticks, the some files seem to have got modified somehow [03:14] lfaraone, just a sec I am pasting the debian/changelog [03:16] lfaraone, http://paste.ubuntu.com/461383/ [03:16] lfaraone, see at lines 36, 42, 48; [03:22] dfarning, it would be great if you could help too. You might have faced this similar problem :) [03:23] dipankar: i think I edited the changelog in one of my commits. [03:23] dipankar: and you did too before you pulled. [03:23] lfaraone, I went through the 'fast-forwarding' section in man page of git push [03:23] lfaraone, I guess yes [03:24] dipankar, a simple merge conflict. just delete the unwanted line manually and recommit. [03:24] dipankar: is log ready for review or should I wait? [03:24] lfaraone, I got confused with the log. Since the activity name was 'logviewer' initially, [03:25] dipankar: well, it's not a problem. just create a new changelog entry with "sugar-log-activity" and change all other mentions of logviewer to log. (but not in older entries of debian/changelog) [03:26] dfarning: can you do "/mode -t #ubuntu-sugarteam" so I can change the topic? [03:27] dfarning: you may need to "/msg ChanServ op dfarning" first. [03:28] lfaraone, so here is what I should do then: [03:28] (NB: current review queue s-flip-a, s-poll-a, s-connect-a) [03:28] - use git-import-orig -u '23' PATH/TO/ORIG TARBALL [03:28] lfaraone, - You are not authorized to perform this operation. [03:29] - Make a new debian/changelog [03:29] dipankar: /msg ChanServ op dfarning #sugarteam [03:29] ^^ not for me [03:29] I guess [03:29] * dfarning [03:29] Channel dfarning is not registered. [03:30] dfarning: swap the #sugarteam and dfarning then :) [03:30] dfarning: my IRC-fu is weak. [03:30] dipankar, see http://www.kernel.org/pub/software/scm/git/docs/user-manual.html#resolving-a-merge [03:30] dfarning: yep. although this may be a good time to write the debian/watch file so you can automate the package download phase. [03:31] ^^ That was for me I guess [03:31] dipankar: hehe, yes. [03:31] dipankar: this is a test of your agility. :P [03:31] dipankar: but seriously, here's an example of a watch file: http://git.debian.org/?p=users/ffm-guest/sugar-terminal-activity.git;a=blob;f=debian/watch; [03:32] lfaraone, I think I might have to log on from my desktop. [03:32] dipankar: rather, http://git.debian.org/?p=collab-maint/sugar-terminal-activity.git;a=blob;f=debian/watch [03:33] lfaraone, so, if I add the new repository to watch file, then the updating would take automatically?? [03:33] * new repo -> sugarlabs one. [03:34] dipankar: I mean the download location, at http://download.sugarlabs.org/sources/sucrose/fructose/Log/ [03:35] lfaraone, * I meant download location. Just accidentally used 'repo' [03:35] dipankar: if you replace the URL in the watch file example I gave you with "http://download.sugarlabs.org/sources/sucrose/fructose/Log/Log-(.*)\.tar\.bz2" then you can run "uscan --force-download --rename" and it'll automatically fetch the latest version and put it in .. [03:36] lfaraone, now I am again confused :( [03:36] lfaraone, which process should I use : watch file or creating a new local repository? [03:37] dipankar: if there are upstream release tarballs that are current (more recent or at the same level as) compared to what's in git, we prefer tarballs over git-built tarballs using get-orig-source. [03:38] *prefer upstream release tarballs [03:39] lfaraone, ok. [03:39] lfaraone, that means we take up the 'watch' files menthod [03:41] lfaraone, you are here till 0000 hrs I guess. [03:41] dipankar: probably. [03:42] lfaraone, I will be back in 15. [03:42] * dipankar is away: I'm not here [03:47] * dipankar is back (gone 00:05:29) [03:48] lfaraone, I seem to have screwed up my local repo for log. [03:48] lfaraone, will it be good to clone the repo from git alioth to a new directory? [03:48] dipankar: sure. [03:49] lfaraone, btw I couldn't understand the git pull --rebase. Could you explain it a bit? will be of great help. [03:50] dipankar: sorry, I've never had to use it. [03:51] lfaraone, actually I found it in the merge conflicts help. Never mind :P [04:03] lfaraone, in the watch file : shall I change the 'version=3' to 'version=23'? [04:03] dipankar: nonono. [04:03] dipankar: "version=" tells uscan which version of the uscan policy the watch file complies to. [04:04] lfaraone, ohk. I thought other way. :P so, each time it would take the latest upstream tar ball? [04:07] lfaraone, do I need to change the debian/changelog too before running the uscan command : ' Parameters are then read from those [04:07] control files and upstream ftp or http sites are inspected for newly available updates (as compared with [04:07] the upstream version number retrieved from the debian/changelog file in the same directory).' [04:07] ?? [04:16] dipankar: no, you don't. [04:17] dipankar: but uscan is used by automated tools such as DEHS to determine whether Debian packages are up to date. [04:17] dfarning: Poll reviewed. [04:17] lfaraone, great [04:18] lfaraone, ran uscan. what should be the next step? [04:18] dipankar: in http://git.debian.org/?p=collab-maint/sugar-flipsticks-activity.git;a=commitdiff;h=345139af686507595e3a4e2863f643d7498933a3 , you changed debian/control directly, rather than debian/control.in. That means your changes will get lost when somebody regenerates debian/control from debian/control.in. [04:19] lfaraone, ohk. [04:20] lfaraone, so thats where the problem lies. [04:20] dipankar: also, your commit message was "Rectified debian/control", but you modified a number of other files. In the future, please try to ensure that each change is in a separate commit. [04:21] dipankar: same with "changed : debian/copyright, debian/docs, debian/rules". Not only does that contain more than one logical change per commit, the description tells me nothing about what you actually did. [04:21] dipankar: commit messages are supposed to inform people as to what you did, not to what you did it. [04:22] lfaraone, ohk. Will keep that in mind. Sorry for this mistake :( [04:22] dipankar: not a problem, just telling you so you'll know in the future. [04:22] dipankar: also, I noticed on line 74 of http://git.debian.org/?p=collab-maint/sugar-flipsticks-activity.git;a=blob;f=debian/rules#l74 you said "rm -f debian/sugar-flipsticks-activity/usr/share/activities/FlipSticks.activity" [04:23] dipankar: this removed the entire FlipSticks.activity directory from the resulting package, and is almost certainly not what you want. Perhaps you meant "rm -f debian/sugar-flipsticks-activity/usr/share/activities/FlipSticks.activity/COPYING"? [04:23] dipankar: let me know if you'd rather I bundle this up in an email, I thought it just might be easier to tell you via IRC since there were only a few things. [04:25] lfaraone, I left out so many things! [04:25] dipankar: huh? [04:32] dipankar: what was your question about log? [04:33] lfaraone, logviewer-activity: I ran uscan and have the upstream tar ball [04:33] lfaraone, how should I proceed now? [04:34] dipankar: import it, push up, and I'll review it if you think it's ready for review. [04:34] lfaraone, what about the debian/changelog? You mentioned something about that [04:36] dipankar: yeah, you want to increment the debian revision with a new changelog entry. "dch -v NEW_VERSION-1" and say "initial upload to debian. Closes: BUGNUMBER" or something similar. [04:36] lfaraone, and the import command will be : git-import-orig? [04:37] dipankar: oh, before you import, rename the package to "sugar-log-activity" in debian/control. create the new changelog entry as I said, and change the package name in the first changelog entry too. [04:37] dipankar: and rename the tarball you downloaded from sugar-logviewer-activity_VERSION.orig.tar.gz to sugar-log-activity_VERSION.orig.tar.gz. [04:38] lfaraone, is it control.in or control? (I have to be careful with this from now on) [04:38] dipankar: sorry, control.in. [04:39] lfaraone, :P. Now I remember. In hurry I followed the irc logs and saw 'change debian/control' that caused the problem :P [04:39] lfaraone, Anything else before I continue? [04:39] * I have to leave in 20 minutes to somewhere. [04:39] dipankar: I don't think so. Just do that *before* you import the New Upstream Version. [04:40] lfaraone, I will email you when I am ready for review. You will find it in the morning (EST) only :) [04:41] mk. [04:42] lfaraone, good night. I must leave. [04:42] dfarning, goodnight. [04:42] * dipankar says goodbye to all. [04:42] dipankar, good night [04:42] bye dipankar [04:45] lfaraone, I am going to head to bed so I can get up early. [04:45] dfarning: good i dea. [05:37] lfaraone: Hi [05:38] lfaraone: thanks for the review, will make necessary amends and push the package soon [05:39] kandarpk: cool. I'll look at the other activity in my tomrorow. [05:39] lfaraone: sure, and thanks again [05:40] lfaraone: I'll try to correct that package first then [08:27] kandarpk: Hi Kandarp. [08:28] manusheel sir: Hello sir [08:28] kandarpk: Could you please summarize the updates for the last 24 hours. [08:29] manusheel sir: I've pushed poll-activity and connect-activity [08:29] lfaraone has reviewed the poll-activity, so right now making the necessary amends [08:29] kandarpk: Ok, great. [08:30] he'll review the connect-activity when he gets back [08:31] kandarpk: Great, Kandarp. [09:11] lfaraone: around ? [10:12] dipankar: around ? [10:12] kandarpk, yes, hi [10:13] kandarpk, I was just working on the review that Luke sent. [10:13] dipankar: how can I import changes that Luke has made ? [10:17] kandarpk, just go to your local repo and use : git pull [10:17] ok [10:18] dipankar, will it update all the files ? [10:19] kandarpk, it will pull in changes and merge your current files with the updated onces. [10:20] dipankar: ok, thanks [10:20] kandarpk, ni problem. [10:20] *no [10:21] dipankar: and how can I undo changes ? [10:22] *I've made some changes before updating [10:23] kandarpk, I don't remember that correctly, It was like ' rm git add' something like that. dipankar: ok. I'll leave now. will be back in 45 min. [12:25] dipankar: around ? [12:25] kandarpk, yup [12:26] kandarpk, I am stuck with a bad situation :( [12:26] what does "all lines in the package description should be wrapped at 72 characters." mean ? [12:26] *s/with/in [12:26] dipankar: oh, whats that ? [12:27] kandarpk, that means when you are writing description in control.in file, each line should contain 72 characters. But there can be any number of lines. [12:27] dipankar: exactly 72 or can it be lesser than this ? [12:28] kandarpk, can be less than that :) [12:28] ohk :) [12:28] what are you stuck with ? [12:28] kandarpk, can you please tell me the command of git-import-orig? I was getting an error related branch settings. :( [12:29] git-import-orig --pristine-tar -u ''87'' sugar-read-activity_87.orig.tar.gz [12:29] dipankar: what error are you getting ? [12:32] oops, I was missing the pristine-tar tag :P [12:33] kandarpk, here is the error: [12:33] Repository does not have branch 'upstream' for upstream sources. If there is none see [12:33] file:///usr/share/doc/git-buildpackage/manual-html/gbp.import.html#GBP.IMPORT.CONVERT [12:33] on howto create it otherwise use --upstream-branch to specify it. [12:34] dipankar: you need to run "git rm sugar-abc-activity_28.orig.tar.gz" [12:34] after git-import-orig [12:35] kandarpk, that error is when I run the git-import-orig command [12:35] oh, yes [12:35] I too got this error sometimes [12:36] did you try importing aain ? [12:36] kandarpk, :). I have tried making new local git repos [12:36] nothing is working :( [12:37] dipankar: were there any errors while running fakeroot debian/rules get-orig-source [12:38] nope [12:42] kandarpk, this is very confusing :( [12:42] kandarpk, here is some info related to the command http://honk.sigxcpu.org/projects/git-buildpackage/manual-html/gbp.import.html [12:56] lfaraone, you around? [13:14] good morning all [13:15] dfarning, Good Morning. You seem to be in very good mood :) [13:18] dipankar, Yep. I just woke up, poured a cup of coffee, and turned on IRC. The first thing I saw was that 18 Users are logged in #ubuntu-sugarteam [13:19] dfarning, :) [13:19] * dipankar will be back in 10 [13:19] * dipankar is away: I'm not here [13:19] * dipankar is back (gone 00:00:02) [13:20] * dipankar is away: I'm not here [13:33] * dipankar is back (gone 00:13:31) [13:35] dfarning, any idea when lfaraone will be around? [13:36] in 1.5 hours [13:37] dfarning, I need your help on the problem of git-import-orig [13:37] dfarning, here is the error: [13:37] dipankar@dipankar-laptop:~/work20/sugar-log-activity$ git-import-orig --pristine-tar -u ''23'' ~/work20/sugar-log-activity_23.orig.tar.bz2 [13:37] Repository does not have branch 'upstream' for upstream sources. If there is none see [13:37] file:///usr/share/doc/git-buildpackage/manual-html/gbp.import.html#GBP.IMPORT.CONVERT [13:37] on howto create it otherwise use --upstream-branch to specify it. [13:37] dipankar, I be back in a few minutes [13:39] dfarning, sure [13:43] dfarning: good morning [13:44] kandarpk, good morning - I am on the phone -- will be back shortly:) [13:44] *will be back in 60 min. [13:48] * dipankar is away: I'm not here [14:46] * dipankar is back (gone 00:58:56) [15:57] all: memorize-activity - up and running :) [15:57] neeraj: I've build memorize-activity :) [15:58] sir did u faced that error? [15:58] I was unable to find the cause for it? [15:58] kandarpk, or I was making some stupid mistake :( [15:58] * lfaraone pops his head up. Anything going on? [15:59] neeraj: lfaraone work-around helped [15:59] neeraj: what was "the error"? [15:59] I renamed the version to 34+git20091021.837e6c6b [16:00] and followed all the other steps as usual [16:00] kandarpk, please explain version number [16:01] lfaraone: I'll push it once it is a bit refined :) [16:01] lfaraone, lemme open previous log and find the paste bin link :) [16:01] neeraj: it contains of two parts [16:01] 20091021=2009/10/21 (yyyy/mm/dd) [16:02] date on which last commit was applied [16:02] 837e6c6b=commit ID [16:03] neeraj: please see here: [16:03] http://git.sugarlabs.org/projects/memorize/repos/mainline [16:03] for commit details [16:06] kandarpk, ok :) [16:08] lfaraone, this was the error which i faced even after running git rm .orig tarball file [16:08] http://paste.ubuntu.com/460367/ [16:17] lfaraone: sugar-memorize-activity.git exists [16:18] lfaraone: what should I do now ? [16:18] note I just installed USR20100628 on a 8 GB USB then drag dropped firefox-6 from ASLO and it works fine.....(experimental) [16:20] satellit__: thanks for reporting [16:21] nice replacement for browse....full firefox... [16:22] satellit__: I'll to give it a try :) [16:22] http://wiki.sugarlabs.org/go/Features/Soas_V4/ASLOxo_Activity_Test_Table will test some more applicaions [16:22] ASLO: have to search and use password for firefox [16:24] http://people.sugarlabs.org/Tgillard/ASLOxo-3ss.iso has all of them on .iso put on USB and drag drop into sugar journal [16:28] kandarpk: I use sugar-emulator -f as command for full screen of sugar... [16:33] kandarpk using sugar-emulator -f for full screen sugar should be standard setup....(an idea) [16:42] *I'll be back in 45 min [16:42] neeraj, are you here [16:42] ? [16:43] ankur, yes [16:43] do you know something about tagging? [16:43] well i am having a problem and i searched about it [16:43] it seems that it can be solved by tagging [16:44] ankur, sorry, i don't have ny idea about it. ;( [16:44] i think kandarp was also having same kind of prob some day back [16:44] never mind :) === satellitUSR-02e3 is now known as satellitUSR-628- [17:05] kandarpk: Hi Kandarp. Around? [17:10] lfaraone: Hi Luke. Around? [17:46] hello kandarpk [17:47] dfarning: Hi David. [17:47] Do you have a question regarding memorize? [17:47] manusheel_, hello [17:47] dfarning: Kandarp just send an e-mail to you and Luke. [17:48] kandarpk: around? [17:48] dfarning: hi [17:48] kandarpk: Let us discuss the question soon. [17:48] dfarning: I had build thememorize activity [17:49] but memorize.git repo. is already present [17:49] http://git.debian.org/?p=collab-maint/sugar-memorize-activity.git;a=summary [17:49] kandarpk, I would suggest deleting the existing memorize activity and replacing it with your own. [17:49] dfarning: can I do that ? [17:49] it was made by some one else [17:50] kandarpk, I belive that you have full read write autohrizte on all collab-maint projects? [17:51] dfarning: will it be ok to delete someone else's work ? [17:51] *though the last commit was in 2008 [17:51] since the package is so old, it does not use the recent packaging methods as the rest of sugar. [17:52] ok [17:53] dfarning: should I go on and delete the repo [17:53] ? [17:53] *if I have rights to do that [17:53] Since the package is so old, it can be considered abandoned. I wouldn't suggest just deleting it.... but deleting it replacing it with a more recent version is good:) [17:54] ok [17:56] dfarning, manusheel_ sir : replaced [17:57] kandarpk, great. another one for the review queue. [17:57] dfarning: its owner is still Patrick Winnertz ? [17:58] dfarning: that will take some time [17:58] *copyright file takes time [17:59] kandarpk, yes, that wen page probobly only refreshes every couple of minutes. [17:59] dfarning: ok, I'll wait. [18:00] Yes, the copy right is critical though. [18:01] dfarning. Kandarp is also working on - Delete sugar-activities from the ppa and remove sugar-activities as a dependancy so sugar can be installed and tested without sugar-activites being installed. [18:01] dfarning: I have USR20100628 on 8 GB USB drag dropped firefox-6 .xo from ASLO and it works fine.... [18:01] kandarpk: Any questions on this task? [18:02] kandarpk, we are providing/sell USR to schools, school districts, and ministries of education.... we want to be 100% confident of the ownership of what we ship. [18:02] also OooKids [18:02] how do we proceed with removing sugar-activity dependency [18:02] satellit__, that is great. [18:03] nice workaround for browse with full tabed browsing [18:04] dfarning: how can we know which modules are required by sugar [18:04] *modules which are present in sugar-activities [18:04] kandarpk, I belive that you will need to remove sugar-activities as a dependency in debian/control in the ubuntu-sugar-remix in the ppa. [18:06] dfarning: will sugar work without installing sugar-activities ? [18:06] satellit__, As activity central we are focusing on improving browse. Via Lucian's conversion to webkit and adding tabs. [18:06] ok Ooo4kids is nice also though large .xo [18:07] kandarpk, we will have to install the activities by hand when working from the ppa. [18:07] satellit__, Yes, based on your reminder, I need to take a closer look at ooo4kids. [18:08] dfarning: what purpose does removing sugar-activities from dependency list solve, if we need to install it anyway ? [18:08] very nice can configure it for easy thru advanced menus [18:10] http://wiki.sugarlabs.org/go/Features/Soas_V4/ASLOxo_Activity_Test_Table details drag-drop .xo files for sugar [18:10] kandarpk, Currently if we install the full collection of activites via sugar activites. We run into problems when install the .dep packages of the activities we are currently working on. [18:10] kandarpk, if two different packages try to install the same file dpkg gives an error. [18:10] hmmm [18:12] kandarpk, what we will do is create a meta package called sugar-activities. Which installs the activities we have packaged as proper .deb packages. [18:13] dfarning: getting some idea [18:15] kandarpk, we want to stop pulling in the activity bundle I made a couple of months ago and only automatically install the proper packages after they have passed lukes review and QA [18:16] dfarning: ok, you mean we are breaking the activities bundle into smaller single activity [18:17] kandarpk, exactly. [18:17] ok [18:22] dfarning, after breaking the activity bundle, will we still push it into ppa only or start pushing them on debian repository only [18:23] neeraj, we will start syncing packages from debian into the ppa. [18:24] dfarning, ok.. [18:38] dfarning: who is the author of memorize-activity ? [18:42] kandarpk, sorry I will look. [18:42] great. [18:46] http://git.sugarlabs.org/projects/memorize [18:46] kandarpk, looks like erikos [18:47] dfarning: Ok. [18:49] dfarning: the owner of memorize is still Patrick Winnertz [18:49] should I delete again ? [18:49] I think I didn't delete the directory [18:50] kandarpk, yes. [18:50] ok [18:53] neeraj, how are you doing? [19:04] dfarning: to remove sugar-activity from dependency, we just need to modify control file [19:04] ? [19:04] kandarpk, yes [19:04] dfarning: any package build required after that ? [19:05] kandarpk, since it is in the ppa all you will have to do is dput it and launchpad will take care of the rest. [19:05] dfarning: ok. [19:16] *logging into USR [19:36] dfarning: which package should I use ? [19:36] sugar-0.88 - 0.88.1-2ubuntu3+maverick [19:36] or [19:37] sugar-0.88 - 0.88.1-2ubuntu3 [19:38] kandarpk, the second one. maverick is ubuntu 10.10 [19:38] ok [20:01] dfarning: do I need to modify the rules file, as there is no direct listing of activities in control file ? [20:01] which package are you looking at? [20:02] sugar-0.88_0.88.1-2ubuntu3 [20:04] kandarpk, the sugar-activites package is listed as a depandcy in the Ubuntu-sugar-remix package [20:04] dfarning: ohk [20:30] dfarning, Hi, for dropping the sugar-activities, we have to only remove it from depends filed in debian/control file of usr mera package or we have to make ny change in rules file? [20:31] I think just the debian/control [20:31] Actually both me and kandarpk sir are little confused.. [20:32] neeraj, yes, [20:32] Ok, also can you please re-explain why we made changes in the rule file while dropping sucrose.. [20:33] I just got that we are changing it because while installing sugar,sucrose package was installing read and browse activity which were/are un-available [20:34] wish I had used the seeta channel while discussing this :) [20:34] had not* [20:38] neeraj, can I get back to you in a few minutes. I am on the phone. ping me if I forget:) [20:40] ok :) [20:54] neeraj, ok back. [20:56] neeraj, one reason this is confusing is that we are work in two repositories Debian and our ppa:( [20:57] neeraj, initially we had to remove read and write from sucrose because they are broken in Ubuntu. [20:58] ok [20:58] neeraj, but becuause I want to provide the seeta developers with some sample activites, I created the bundle, Now that we have a good understand in packaging, we can start individually add the .debs (which work) as dependanciesas [21:00] neeraj, s/want/wanted/ [21:00] neeraj, does that help? [21:01] dfarning, yes I guess i am getting it.. [21:02] So in debian read is working fine.. also browse to.. ain't they? [21:04] neeraj, I don't think so. As for browse we are in the process of rewriting it upstream to remove the dependency on xulrunner which was the problem. [21:05] neeraj, I have not dug into the problem with read yet. [21:06] dfarning, ok.. [21:06] neeraj, sometimes there are differences between ubuntu and debian due to the differences in the release cycle. [21:07] neeraj, ubuntu 9.10 was a long term release meaning Canonical promises to support it for three years. debian is currently in the development phase. [21:08] neeraj, because of questions/problems with the future of xulrunner. Ubuntu decided to drop it in favor of webkit. [21:10] dfarning, ok, thanks for telling this :) [21:10] neeraj, in this case debian is progressing in a normal evolutionary process.... where as ubuntu had to make a decision/guess about the state of xulrunner three years from now. [21:11] neeraj, glad it helped.