00:21.29 | *** part/#maemo-ssu mkaindl (~mkaindl@ama-dablam.markus-kaindl.de) |
00:47.35 | *** join/#maemo-ssu aap (~drew@cpe-71-72-180-216.woh.res.rr.com) |
02:01.52 | *** join/#maemo-ssu silviof1 (~silviof@unaffiliated/silviof) |
02:35.33 | *** join/#maemo-ssu amiconn_ (quassel@rockbox/developer/amiconn) |
05:36.43 | *** join/#maemo-ssu dhbiker (~dhbiker@APN-122-201-107-gprs.simobil.net) |
05:51.21 | *** join/#maemo-ssu Roomer (~CLD@95-28-71-210.broadband.corbina.ru) |
06:58.11 | *** join/#maemo-ssu dhbiker (~dhbiker@APN-123-48-177-gprs.simobil.net) |
07:59.22 | *** join/#maemo-ssu Milhouse (~Milhouse@Maemo/community/contributor/Milhouse) |
08:25.37 | *** join/#maemo-ssu Raimu (rmaunula@tuomi.oulu.fi) |
08:35.57 | *** join/#maemo-ssu Roomer (~CLD@95-28-71-210.broadband.corbina.ru) |
08:40.47 | *** join/#maemo-ssu sixwheeledbeast (~paul@78.144.105.255) |
08:48.38 | *** join/#maemo-ssu Roomer (~CLD@95-28-71-210.broadband.corbina.ru) |
08:52.41 | *** join/#maemo-ssu LauRoman (~LauRoman@5-14-94-113.residential.rdsnet.ro) |
09:05.43 | *** join/#maemo-ssu eugene_42 (~eugene@109.188.124.136) |
09:13.35 | *** join/#maemo-ssu _rd (~rd@p57B48376.dip0.t-ipconnect.de) |
09:18.16 | *** join/#maemo-ssu _rd (~rd@p57B48376.dip0.t-ipconnect.de) |
09:21.33 | *** join/#maemo-ssu DrCode (~DrCode@gateway/tor-sasl/drcode) |
09:30.22 | *** join/#maemo-ssu M4rtinK (~M4rtinK@mail.melf.eu) |
10:16.51 | *** join/#maemo-ssu okias (~okias@berger.cust.centro-net.cz) |
10:35.58 | *** join/#maemo-ssu _rd (~rd@p57B48376.dip0.t-ipconnect.de) |
11:31.28 | *** join/#maemo-ssu _rd (~rd@p57B48376.dip0.t-ipconnect.de) |
11:50.05 | *** join/#maemo-ssu eugene_42 (~eugene@109.188.124.180) |
13:17.44 | *** join/#maemo-ssu arcean (~arcean@aacw181.neoplus.adsl.tpnet.pl) |
13:28.09 | *** join/#maemo-ssu sixwheeledbeast (~paul@2a01:348:6:860a:45be:cea0:7070:1191) |
13:59.43 | *** join/#maemo-ssu M4rtinK (~M4rtinK@mail.melf.eu) |
14:03.43 | *** join/#maemo-ssu sixwheeledbeast (~paul@2a01:348:6:860a:45be:cea0:7070:1191) |
14:52.41 | *** join/#maemo-ssu sixwheeledbeast (~paul@2a01:348:6:860a:45be:cea0:7070:1191) |
15:50.02 | freemangordon | sixwheeledbeast: hi! do you need any help? |
15:51.18 | sixwheeledbeast | freemangordon: well I wanted to check I was doing everything correctly and then try to release it. |
15:51.41 | freemangordon | so, do you need help or not? :) |
15:52.01 | freemangordon | sixwheeledbeast: BTW... |
15:52.07 | sixwheeledbeast | how do we go about testing it for general release |
15:52.20 | sixwheeledbeast | s/for/before/ |
15:52.38 | freemangordon | in order to be sure everything is set-up correctly, you can bring your own apt repo |
15:53.00 | freemangordon | on your PC that is, add that repo to your test device, etc. |
15:53.31 | freemangordon | also, I think merlin1991 has such repo set up already, but not sure |
15:53.57 | freemangordon | sixwheeledbeast: what will be included in that release? |
15:54.13 | freemangordon | what was devided on the last meeting? |
15:54.18 | freemangordon | *decided |
15:55.12 | sixwheeledbeast | freemangordon: the packages in the list from the meeting |
15:55.32 | freemangordon | (your own repo) - I have such test repo set up that I use before releasing -thumb updates |
15:55.48 | sixwheeledbeast | ok I'll do that first then. |
15:55.56 | sixwheeledbeast | Oh some questions... |
15:56.05 | freemangordon | it makes you feel confidednt you won;t gonna screw user's devices :) |
15:57.15 | freemangordon | what questions? |
15:58.49 | sixwheeledbeast | some of the packages have only package version differences between master and stable like clutter for example, why |
15:59.52 | sixwheeledbeast | clutter 0.8.2-0maemo66+0m5+0cssu0 and 0.8.2-0maemo67+0m5 seem to be the same thing |
16:00.00 | sixwheeledbeast | for example |
16:00.23 | freemangordon | goes to check |
16:00.44 | freemangordon | https://gitorious.org/community-ssu/clutter_0_8/commit/754de1d35bc316ce5d166785a09b8c17c9d6e95d |
16:01.21 | freemangordon | https://gitorious.org/community-ssu/clutter_0_8/commit/172befb5d3465313b8d6a6a9456224700345ff56 |
16:01.48 | sixwheeledbeast | thins is also true for freetype |
16:01.59 | sixwheeledbeast | s/thins/this/ |
16:02.52 | freemangordon | sixwheeledbeast: what version for clutter is now in -stabe? |
16:02.56 | freemangordon | *-stable |
16:03.14 | sixwheeledbeast | checks |
16:05.26 | freemangordon | freetype - same thing like clutter: |
16:05.30 | freemangordon | https://gitorious.org/community-ssu/freetype/commit/f0dcd3acbea40a48a93f74622ead1f3d995c815d |
16:05.37 | freemangordon | https://gitorious.org/community-ssu/freetype/commit/a2f3335caf287a73a7a32b6d90dc55a59d617693 |
16:06.12 | freemangordon | versions differ because merlin1991 has "sanitized" them to fit cssu versioning scheme |
16:06.21 | freemangordon | sixwheeledbeast: ^^^ |
16:07.39 | 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 |
16:07.49 | sixwheeledbeast | 0.8.2-0maemo66, so does this mean clutter is upto date on stable branch then? |
16:08.55 | freemangordon | no, because clutter on gitorious, branch stable is 0.8.2-0maemo66+0m5+0cssu0 |
16:10.40 | 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 |
16:11.52 | freemangordon | sixwheeledbeast: in general, versioning in cssu ie: |
16:12.04 | sixwheeledbeast | ah it's currently 0.8.2-0maemo66+0m5+0cssu0 actually |
16:12.54 | freemangordon | if we are upstream, then we increase the "base" version, like we do for hildon-desktop |
16:14.06 | freemangordon | well, then clutter in -stable is up-to-date |
16:15.50 | 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 |
16:16.10 | freemangordon | merlin1991 can elaborate more on that than me :) |
16:16.54 | freemangordon | sixwheeledbeast: what is the version of freetype in -stable? |
16:17.38 | freemangordon | hmm, libfreetype6 (>= 2.3.9-1osso2+0m5+0cssu1) |
16:18.02 | freemangordon | freetype (2.3.9-2osso2+0cssu1) unstable; urgency=low |
16:18.34 | sixwheeledbeast | scratches head |
16:18.36 | freemangordon | there is a difference |
16:18.38 | sixwheeledbeast | 2.3.9-1osso2+0m5+0cssu1 |
16:19.06 | freemangordon | ops |
16:19.08 | freemangordon | my bad |
16:19.15 | freemangordon | freetype (2.3.9-1osso2+0m5+0cssu1) unstable; urgency=low |
16:19.32 | freemangordon | so freetype is uptodate too |
16:20.28 | freemangordon | but pali's script listed it, because the version in -testing is not "sanitized) |
16:20.39 | sixwheeledbeast | oh. |
16:20.54 | sixwheeledbeast | so this is why |
16:21.02 | freemangordon | so those 2 can fall off the list imo. merlin1991 ^^^ ? |
16:21.09 | sixwheeledbeast | i think I understand a bit more now |
16:21.16 | freemangordon | good :) |
16:21.48 | sixwheeledbeast | let me find the pirtae pad with the note I made.... |
16:22.02 | freemangordon | sixwheeledbeast: did you try to merge clutter and freetype master->stable? |
16:22.20 | freemangordon | I guess it has failed. or rather said - merged nothing. |
16:22.24 | sixwheeledbeast | Err, yes |
16:22.34 | sixwheeledbeast | That was what was confusing me |
16:22.52 | freemangordon | that is normal, as it is already merged. and -stable branch is ahead of master |
16:23.47 | sixwheeledbeast | https://piratenpad.de/G4YLdvQN5k |
16:24.15 | freemangordon | sixwheeledbeast: great we make that clear. anything else you wanna ask? |
16:24.45 | freemangordon | hmm, what about that list on piratenpad? |
16:25.18 | sixwheeledbeast | err probably, but I can't think now :D I understand a bit better now. |
16:25.31 | freemangordon | great |
16:25.43 | freemangordon | ping me if anything |
16:25.59 | sixwheeledbeast | so 0.8.2-0maemo67+0m5 is the same as 0.8.2-0maemo66+0m5+0cssu0 |
16:26.18 | freemangordon | looks like |
16:26.26 | freemangordon | judjong by the commit log |
16:26.32 | sixwheeledbeast | and likewise for freetype, great. That really confused me. |
16:26.32 | freemangordon | *judging |
16:26.41 | freemangordon | yep, the same from freetype |
16:27.04 | freemangordon | you may want to send an email to merlin1991, just to be 100% sure |
16:27.12 | freemangordon | those are his commits after all :) |
16:27.53 | sixwheeledbeast | ok so I don't need to update them, I'll remove them changes in the mp then |
16:28.33 | freemangordon | you mean you'll revert the changes, right? |
16:28.37 | freemangordon | not remove :) |
16:29.09 | freemangordon | as now -mp wants the correct versions to be installd |
16:32.03 | 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? |
16:34.18 | freemangordon | git clone; git checkout stable |
16:34.37 | freemangordon | dpkg-buildpackage -rfakeroot -sa -us -uc -I.git |
16:35.01 | freemangordon | if you merge, don't forget to push back |
16:35.12 | 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. |
16:35.31 | freemangordon | downloaded the tarball? |
16:36.01 | freemangordon | where did you get it from, it is *YOU* that releases the tarballs in stable :P |
16:36.14 | sixwheeledbeast | What does the -I.git flag do? The tar from git on the web. |
16:36.26 | freemangordon | oh, I see |
16:36.43 | freemangordon | -I.git is to not include .git directory in the source package |
16:37.09 | sixwheeledbeast | ah great I couldn't find that |
16:38.10 | freemangordon | BTW I am not sure for -us -uc, no idea who and where signs the packages in CSSU |
16:38.37 | freemangordon | but aiui the packages are uploaded unsigned to repository.maemo.org |
16:38.50 | freemangordon | and there tham got signed |
16:38.54 | freemangordon | *them |
16:38.56 | sixwheeledbeast | cool I'll clean my files out and try everything again then try and setup a local apt, as you mention. |
16:38.58 | sixwheeledbeast | :nod: |
16:39.47 | sixwheeledbeast | Oh I think I have one last question.... |
16:39.48 | freemangordon | well, you may skip that for the next update |
16:40.05 | freemangordon | you can test the packages with dpkg -i as well |
16:40.08 | freemangordon | go on |
16:40.54 | sixwheeledbeast | hildon-application-manager 2.2.72-5 isn't tagged I want to make sure I rebase to the correct commit |
16:41.54 | sixwheeledbeast | I make it #abf64e2 |
16:43.37 | freemangordon | looks like the correct commit |
16:44.15 | sixwheeledbeast | great :D |
16:44.36 | freemangordon | https://gitorious.org/community-ssu/hildon-application-manager/commit/6bf3dfe986a13d0208b6a4aa4f1b07953622be72 |
16:44.55 | freemangordon | this is the second parent in https://gitorious.org/community-ssu/hildon-application-manager/commit/abf64e2af41a535d0b2033e479d5dd563e4c44e8 |
16:45.43 | freemangordon | wonders why this is not merged with keeping the history, but anyway :) |
16:46.06 | freemangordon | oh, "Conflicts: debian/changelog" |
16:46.52 | sixwheeledbeast | ok so I can merge stable to #abf64e2 |
16:47.01 | freemangordon | I think so |
16:47.32 | freemangordon | you may want to ask git to compare master/stable after that |
16:48.11 | freemangordon | you should have only my "speedyham" patches and pali's latest changes as a difference |
16:50.15 | sixwheeledbeast | :nod: "git diff" So would I normally merge or rebase when updating the stable branch? |
16:54.47 | freemangordon | I thinks so. keep in mind I've never been the -stable maintainer ;) |
16:55.04 | freemangordon | for -thumb I do git merge |
16:55.35 | sixwheeledbeast | ok |
17:27.08 | sixwheeledbeast | goes to check the other packages to make sure there's no more with the "sanitizing" issue |
17:28.50 | sixwheeledbeast | facepalms and releases he can use git diff |
18:04.17 | *** join/#maemo-ssu arcean (~arcean@aacw181.neoplus.adsl.tpnet.pl) |
18:04.19 | *** join/#maemo-ssu _rd (~rd@p57B48376.dip0.t-ipconnect.de) |
18:11.43 | *** join/#maemo-ssu arcean (~arcean@aafs193.neoplus.adsl.tpnet.pl) |
18:14.17 | sixwheeledbeast | freemangordon: I think gtk has different version numbers but package is the same http://privatepaste.com/02332615b3 |
18:15.59 | *** join/#maemo-ssu _rd (~rd@p57B48376.dip0.t-ipconnect.de) |
18:40.44 | sixwheeledbeast | hmm, does git normally act weird in scratchbox. |
18:46.15 | *** join/#maemo-ssu drathir (~kamiljk8@s51.linuxpl.com) |
19:00.00 | sixwheeledbeast | git clone; git checkout stable doesn't work :S |
19:06.27 | *** join/#maemo-ssu mkaindl (~mkaindl@ama-dablam.markus-kaindl.de) |
19:54.05 | *** join/#maemo-ssu M4rtinK (~M4rtinK@mail.melf.eu) |
19:59.33 | *** join/#maemo-ssu aap (~drew@cpe-71-72-180-216.woh.res.rr.com) |
20:04.14 | *** join/#maemo-ssu amiconn_ (amiconn@rockbox/developer/amiconn) |
20:21.16 | *** join/#maemo-ssu eugene_42 (~eugene@109.188.126.236) |
20:41.28 | *** join/#maemo-ssu _rd (~rd@p57B48376.dip0.t-ipconnect.de) |
21:12.04 | *** join/#maemo-ssu infobot (~infobot@rikers.org) |
21:12.04 | *** topic/#maemo-ssu is Maemo Community Seamless Software Update "CSSU" channel, http://wiki.maemo.org/Community_SSU | Known bugs: http://j.mp/communityssu-bugs | Channel logs: http://mg.pov.lt/maemo-ssu-irclog/ | Sources: http://gitorious.org/community-ssu/ | Latest version: Testing(2014-01-01): 21.2011.38-1Tmaemo9.1; Stable(2013-06-18): 21.2011.38-1Smaemo6.1 |
21:12.04 | *** mode/#maemo-ssu [+v infobot] by ChanServ |
21:18.59 | *** join/#maemo-ssu nox- (noident@freebsd/developer/nox) |
22:01.53 | *** join/#maemo-ssu LauRoman|Alt (~LauRoman@5-14-83-50.residential.rdsnet.ro) |
22:22.04 | freemangordon | sixwheeledbeast: yes |
22:22.25 | freemangordon | you should git clone, git checkout -b stable origin/stable |
22:22.30 | freemangordon | or similar |
22:23.50 | sixwheeledbeast | freemangordon: I did git clone and checkout then /scratchbox/login/ in the end |
22:24.03 | sixwheeledbeast | freemangordon: I am correct about gtk? |
22:25.44 | freemangordon | sixwheeledbeast: sorry, can't check right now. GF's calling me ;) |
22:25.54 | freemangordon | will do it tomorrow |
22:25.58 | sixwheeledbeast | have fun... |
23:11.17 | *** join/#maemo-ssu M4rtinK (~M4rtinK@mail.melf.eu) |