*** juiceme has joined #maemo-ssu | 00:30 | |
*** juiceme has left #maemo-ssu | 00:31 | |
*** aap has quit IRC | 00:42 | |
*** aap has joined #maemo-ssu | 00:44 | |
*** nox- has joined #maemo-ssu | 01:06 | |
*** LauRoman|Laptop has joined #maemo-ssu | 01:10 | |
*** mkaindl has joined #maemo-ssu | 01:28 | |
*** _rd has joined #maemo-ssu | 01:37 | |
*** _rd has quit IRC | 01:38 | |
*** eugene_42 has quit IRC | 02:08 | |
*** M4rtinK has quit IRC | 03:14 | |
*** mkaindl has left #maemo-ssu | 03:21 | |
*** LauRoman has quit IRC | 03:41 | |
*** LauRoman|Laptop has quit IRC | 03:41 | |
*** aap has quit IRC | 03:46 | |
*** aap has joined #maemo-ssu | 03:47 | |
*** nox- has quit IRC | 04:10 | |
*** silviof1 has joined #maemo-ssu | 05:01 | |
*** silviof has quit IRC | 05:04 | |
*** amiconn has quit IRC | 05:35 | |
*** amiconn_ has joined #maemo-ssu | 05:35 | |
*** amiconn_ is now known as amiconn | 05:35 | |
*** dhbiker has joined #maemo-ssu | 08:36 | |
*** Roomer has joined #maemo-ssu | 08:51 | |
*** dhbiker has quit IRC | 09:41 | |
*** dhbiker has joined #maemo-ssu | 09:58 | |
*** Milhouse has quit IRC | 10:46 | |
*** Roomer has quit IRC | 10:50 | |
*** Milhouse has joined #maemo-ssu | 10:59 | |
*** Raimu has quit IRC | 11:24 | |
*** Raimu has joined #maemo-ssu | 11:25 | |
*** Roomer has joined #maemo-ssu | 11:35 | |
*** sixwheeledbeast has quit IRC | 11:40 | |
*** sixwheeledbeast has joined #maemo-ssu | 11:40 | |
*** Roomer has quit IRC | 11:41 | |
*** Roomer has joined #maemo-ssu | 11:48 | |
*** LauRoman has joined #maemo-ssu | 11:52 | |
*** eugene_42 has joined #maemo-ssu | 12:05 | |
*** eugene_42 has quit IRC | 12:06 | |
*** _rd has joined #maemo-ssu | 12:13 | |
*** _rd has quit IRC | 12:14 | |
*** DrCode has quit IRC | 12:17 | |
*** _rd has joined #maemo-ssu | 12:18 | |
*** DrCode has joined #maemo-ssu | 12:21 | |
*** _rd has quit IRC | 12:22 | |
*** M4rtinK has joined #maemo-ssu | 12:30 | |
*** okias has joined #maemo-ssu | 13:16 | |
*** _rd has joined #maemo-ssu | 13:35 | |
*** okias has quit IRC | 13:51 | |
*** _rd has quit IRC | 14:21 | |
*** _rd has joined #maemo-ssu | 14:31 | |
*** eugene_42 has joined #maemo-ssu | 14:50 | |
*** arcean has joined #maemo-ssu | 16:17 | |
*** sixwheeledbeast has quit IRC | 16:27 | |
*** sixwheeledbeast has joined #maemo-ssu | 16:28 | |
*** M4rtinK has quit IRC | 16:57 | |
*** M4rtinK has joined #maemo-ssu | 16:59 | |
*** sixwheeledbeast has quit IRC | 17:03 | |
*** sixwheeledbeast has joined #maemo-ssu | 17:03 | |
*** sixwheeledbeast has quit IRC | 17:52 | |
*** sixwheeledbeast has joined #maemo-ssu | 17:52 | |
freemangordon | sixwheeledbeast: hi! do you need any help? | 18:50 |
---|---|---|
sixwheeledbeast | freemangordon: well I wanted to check I was doing everything correctly and then try to release it. | 18:51 |
freemangordon | so, do you need help or not? :) | 18:51 |
freemangordon | sixwheeledbeast: BTW... | 18:52 |
sixwheeledbeast | how do we go about testing it for general release | 18:52 |
sixwheeledbeast | s/for/before/ | 18:52 |
infobot | sixwheeledbeast meant: how do we go about testing it before general release | 18:52 |
freemangordon | in order to be sure everything is set-up correctly, you can bring your own apt repo | 18:52 |
freemangordon | on your PC that is, add that repo to your test device, etc. | 18:53 |
freemangordon | also, I think merlin1991 has such repo set up already, but not sure | 18:53 |
freemangordon | sixwheeledbeast: what will be included in that release? | 18:53 |
freemangordon | what was devided on the last meeting? | 18:54 |
freemangordon | *decided | 18:54 |
sixwheeledbeast | freemangordon: the packages in the list from the meeting | 18:55 |
freemangordon | (your own repo) - I have such test repo set up that I use before releasing -thumb updates | 18:55 |
sixwheeledbeast | ok I'll do that first then. | 18:55 |
sixwheeledbeast | Oh some questions... | 18:55 |
freemangordon | it makes you feel confidednt you won;t gonna screw user's devices :) | 18:56 |
freemangordon | what questions? | 18:57 |
sixwheeledbeast | some of the packages have only package version differences between master and stable like clutter for example, why | 18:58 |
sixwheeledbeast | clutter 0.8.2-0maemo66+0m5+0cssu0 and 0.8.2-0maemo67+0m5 seem to be the same thing | 18:59 |
sixwheeledbeast | for example | 19:00 |
* freemangordon goes to check | 19:00 | |
*** eugene_42 has quit IRC | 19:00 | |
freemangordon | https://gitorious.org/community-ssu/clutter_0_8/commit/754de1d35bc316ce5d166785a09b8c17c9d6e95d | 19:00 |
freemangordon | https://gitorious.org/community-ssu/clutter_0_8/commit/172befb5d3465313b8d6a6a9456224700345ff56 | 19:01 |
sixwheeledbeast | thins is also true for freetype | 19:01 |
sixwheeledbeast | s/thins/this/ | 19:01 |
infobot | sixwheeledbeast meant: this is also true for freetype | 19:01 |
freemangordon | sixwheeledbeast: what version for clutter is now in -stabe? | 19:02 |
freemangordon | *-stable | 19:02 |
* sixwheeledbeast checks | 19:03 | |
freemangordon | freetype - same thing like clutter: | 19:05 |
freemangordon | https://gitorious.org/community-ssu/freetype/commit/f0dcd3acbea40a48a93f74622ead1f3d995c815d | 19:05 |
freemangordon | https://gitorious.org/community-ssu/freetype/commit/a2f3335caf287a73a7a32b6d90dc55a59d617693 | 19:05 |
freemangordon | versions differ because merlin1991 has "sanitized" them to fit cssu versioning scheme | 19:06 |
freemangordon | sixwheeledbeast: ^^^ | 19:06 |
*** arcean has quit IRC | 19:07 | |
freemangordon | if you look at commit log, you'll see that there are more commits in stable than in testing https://gitorious.org/community-ssu/freetype/commits/f0dcd3acbea40a48a93f74622ead1f3d995c815d | 19:07 |
sixwheeledbeast | 0.8.2-0maemo66, so does this mean clutter is upto date on stable branch then? | 19:07 |
freemangordon | no, because clutter on gitorious, branch stable is 0.8.2-0maemo66+0m5+0cssu0 | 19:08 |
freemangordon | sixwheeledbeast: you should get used to look at debian/changelog and commit log on gitorious, as we (the developers) try hard to not make changes without increasing the version | 19:10 |
freemangordon | sixwheeledbeast: in general, versioning in cssu ie: | 19:11 |
sixwheeledbeast | ah it's currently 0.8.2-0maemo66+0m5+0cssu0 actually | 19:12 |
freemangordon | if we are upstream, then we increase the "base" version, like we do for hildon-desktop | 19:12 |
freemangordon | well, then clutter in -stable is up-to-date | 19:14 |
freemangordon | (versioning) if we are not upstream, we add +0cssu0 for the first time the package gets released in cssu, and increase like 0cssu1, 0cssu2 etc | 19:15 |
freemangordon | merlin1991 can elaborate more on that than me :) | 19:16 |
freemangordon | sixwheeledbeast: what is the version of freetype in -stable? | 19:16 |
freemangordon | hmm, libfreetype6 (>= 2.3.9-1osso2+0m5+0cssu1) | 19:17 |
freemangordon | freetype (2.3.9-2osso2+0cssu1) unstable; urgency=low | 19:18 |
* sixwheeledbeast scratches head | 19:18 | |
freemangordon | there is a difference | 19:18 |
sixwheeledbeast | 2.3.9-1osso2+0m5+0cssu1 | 19:18 |
freemangordon | ops | 19:19 |
freemangordon | my bad | 19:19 |
freemangordon | freetype (2.3.9-1osso2+0m5+0cssu1) unstable; urgency=low | 19:19 |
freemangordon | so freetype is uptodate too | 19:19 |
freemangordon | but pali's script listed it, because the version in -testing is not "sanitized) | 19:20 |
sixwheeledbeast | oh. | 19:20 |
sixwheeledbeast | so this is why | 19:20 |
freemangordon | so those 2 can fall off the list imo. merlin1991 ^^^ ? | 19:21 |
sixwheeledbeast | i think I understand a bit more now | 19:21 |
freemangordon | good :) | 19:21 |
sixwheeledbeast | let me find the pirtae pad with the note I made.... | 19:21 |
freemangordon | sixwheeledbeast: did you try to merge clutter and freetype master->stable? | 19:22 |
freemangordon | I guess it has failed. or rather said - merged nothing. | 19:22 |
sixwheeledbeast | Err, yes | 19:22 |
sixwheeledbeast | That was what was confusing me | 19:22 |
freemangordon | that is normal, as it is already merged. and -stable branch is ahead of master | 19:22 |
sixwheeledbeast | https://piratenpad.de/G4YLdvQN5k | 19:23 |
freemangordon | sixwheeledbeast: great we make that clear. anything else you wanna ask? | 19:24 |
freemangordon | hmm, what about that list on piratenpad? | 19:24 |
sixwheeledbeast | err probably, but I can't think now :D I understand a bit better now. | 19:25 |
freemangordon | great | 19:25 |
freemangordon | ping me if anything | 19:25 |
sixwheeledbeast | so 0.8.2-0maemo67+0m5 is the same as 0.8.2-0maemo66+0m5+0cssu0 | 19:25 |
freemangordon | looks like | 19:26 |
freemangordon | judjong by the commit log | 19:26 |
sixwheeledbeast | and likewise for freetype, great. That really confused me. | 19:26 |
freemangordon | *judging | 19:26 |
freemangordon | yep, the same from freetype | 19:26 |
freemangordon | you may want to send an email to merlin1991, just to be 100% sure | 19:27 |
freemangordon | those are his commits after all :) | 19:27 |
sixwheeledbeast | ok so I don't need to update them, I'll remove them changes in the mp then | 19:27 |
freemangordon | you mean you'll revert the changes, right? | 19:28 |
freemangordon | not remove :) | 19:28 |
freemangordon | as now -mp wants the correct versions to be installd | 19:29 |
sixwheeledbeast | Yes. Revert :) back to version S6. oh what is the normal method of building the packages clone them on git and then build them? | 19:32 |
freemangordon | git clone; git checkout stable | 19:34 |
freemangordon | dpkg-buildpackage -rfakeroot -sa -us -uc -I.git | 19:34 |
freemangordon | if you merge, don't forget to push back | 19:35 |
sixwheeledbeast | I actually downloaded the tarball to scratchbox and built, Now I understand git a bit better make sense to pull them, build and push any changes to origin/stable. | 19:35 |
freemangordon | downloaded the tarball? | 19:35 |
freemangordon | where did you get it from, it is *YOU* that releases the tarballs in stable :P | 19:36 |
sixwheeledbeast | What does the -I.git flag do? The tar from git on the web. | 19:36 |
freemangordon | oh, I see | 19:36 |
freemangordon | -I.git is to not include .git directory in the source package | 19:36 |
sixwheeledbeast | ah great I couldn't find that | 19:37 |
freemangordon | BTW I am not sure for -us -uc, no idea who and where signs the packages in CSSU | 19:38 |
freemangordon | but aiui the packages are uploaded unsigned to repository.maemo.org | 19:38 |
freemangordon | and there tham got signed | 19:38 |
freemangordon | *them | 19:38 |
sixwheeledbeast | cool I'll clean my files out and try everything again then try and setup a local apt, as you mention. | 19:38 |
sixwheeledbeast | :nod: | 19:38 |
sixwheeledbeast | Oh I think I have one last question.... | 19:39 |
freemangordon | well, you may skip that for the next update | 19:39 |
freemangordon | you can test the packages with dpkg -i as well | 19:40 |
freemangordon | go on | 19:40 |
sixwheeledbeast | hildon-application-manager 2.2.72-5 isn't tagged I want to make sure I rebase to the correct commit | 19:40 |
sixwheeledbeast | I make it #abf64e2 | 19:41 |
freemangordon | looks like the correct commit | 19:43 |
sixwheeledbeast | great :D | 19:44 |
freemangordon | https://gitorious.org/community-ssu/hildon-application-manager/commit/6bf3dfe986a13d0208b6a4aa4f1b07953622be72 | 19:44 |
freemangordon | this is the second parent in https://gitorious.org/community-ssu/hildon-application-manager/commit/abf64e2af41a535d0b2033e479d5dd563e4c44e8 | 19:44 |
* freemangordon wonders why this is not merged with keeping the history, but anyway :) | 19:45 | |
freemangordon | oh, "Conflicts: debian/changelog" | 19:46 |
sixwheeledbeast | ok so I can merge stable to #abf64e2 | 19:46 |
freemangordon | I think so | 19:47 |
freemangordon | you may want to ask git to compare master/stable after that | 19:47 |
freemangordon | you should have only my "speedyham" patches and pali's latest changes as a difference | 19:48 |
sixwheeledbeast | :nod: "git diff" So would I normally merge or rebase when updating the stable branch? | 19:50 |
freemangordon | I thinks so. keep in mind I've never been the -stable maintainer ;) | 19:54 |
freemangordon | for -thumb I do git merge | 19:55 |
sixwheeledbeast | ok | 19:55 |
* sixwheeledbeast goes to check the other packages to make sure there's no more with the "sanitizing" issue | 20:27 | |
* sixwheeledbeast facepalms and releases he can use git diff | 20:28 | |
*** _rd has quit IRC | 20:59 | |
*** arcean has joined #maemo-ssu | 21:04 | |
*** _rd has joined #maemo-ssu | 21:04 | |
*** arcean has quit IRC | 21:09 | |
*** arcean has joined #maemo-ssu | 21:11 | |
sixwheeledbeast | freemangordon: I think gtk has different version numbers but package is the same http://privatepaste.com/02332615b3 | 21:14 |
*** _rd has quit IRC | 21:15 | |
*** _rd has joined #maemo-ssu | 21:15 | |
*** dhbiker has quit IRC | 21:26 | |
*** drathir has quit IRC | 21:38 | |
sixwheeledbeast | hmm, does git normally act weird in scratchbox. | 21:40 |
*** drathir has joined #maemo-ssu | 21:46 | |
sixwheeledbeast | git clone; git checkout stable doesn't work :S | 22:00 |
*** mkaindl has joined #maemo-ssu | 22:06 | |
*** M4rtinK has quit IRC | 22:13 | |
*** M4rtinK has joined #maemo-ssu | 22:54 | |
*** aap has quit IRC | 22:59 | |
*** aap has joined #maemo-ssu | 22:59 | |
*** arcean has quit IRC | 23:00 | |
*** amiconn has quit IRC | 23:04 | |
*** amiconn_ has joined #maemo-ssu | 23:04 | |
*** amiconn_ is now known as amiconn | 23:04 | |
*** eugene_42 has joined #maemo-ssu | 23:21 | |
*** _rd has quit IRC | 23:39 | |
*** _rd has joined #maemo-ssu | 23:41 |
Generated by irclog2html.py 2.15.1 by Marius Gedminas - find it at mg.pov.lt!