| *** lizardo has quit IRC | 00:05 | |
| *** BCMM has joined #maemo-ssu | 00:14 | |
| *** rd has joined #maemo-ssu | 00:39 | |
| rd | MohammadAG, thanks for merging the freetype patch _and_ noticing that I missed to commit the debian/rules change. Would have been difficult to debug.... | 00:39 |
|---|---|---|
| *** MohammadAG has quit IRC | 00:53 | |
| *** _NIN has quit IRC | 00:59 | |
| *** rd has quit IRC | 01:08 | |
| *** Sc0rpius has quit IRC | 01:37 | |
| *** Sc0rpius has joined #maemo-ssu | 01:58 | |
| *** trbs has quit IRC | 02:28 | |
| *** ZogG has quit IRC | 03:05 | |
| *** ZogG has joined #maemo-ssu | 03:18 | |
| *** Dhraakellian has joined #maemo-ssu | 03:36 | |
| *** Aranel has quit IRC | 03:46 | |
| *** mveplus has joined #maemo-ssu | 05:05 | |
| *** mveplus has quit IRC | 05:20 | |
| *** BCMM has quit IRC | 05:29 | |
| *** maninc has joined #maemo-ssu | 06:06 | |
| *** the_lord has joined #maemo-ssu | 06:31 | |
| *** crashanddie has quit IRC | 06:55 | |
| *** DocScrutinizer has quit IRC | 07:31 | |
| *** DocScrutinizer has joined #maemo-ssu | 07:31 | |
| *** the_lord has quit IRC | 07:36 | |
| *** ThePing has joined #maemo-ssu | 07:36 | |
| *** ThePing has left #maemo-ssu | 07:36 | |
| *** MohammadAG has joined #maemo-ssu | 09:33 | |
| *** andre__ has joined #maemo-ssu | 09:34 | |
| *** m0use has joined #maemo-ssu | 10:55 | |
| *** m0use has quit IRC | 10:57 | |
| *** crashanddie has joined #maemo-ssu | 11:21 | |
| *** lardman|home has joined #maemo-ssu | 11:54 | |
| *** m0use has joined #maemo-ssu | 12:05 | |
| *** trbs has joined #maemo-ssu | 13:06 | |
| *** lizardo has joined #maemo-ssu | 13:44 | |
| *** NIN101 has joined #maemo-ssu | 14:03 | |
| *** BCMM has joined #maemo-ssu | 14:13 | |
| *** crashanddie has quit IRC | 14:46 | |
| *** zaleb has joined #maemo-ssu | 15:21 | |
| *** the_lord has joined #maemo-ssu | 15:31 | |
| *** NIN101 has quit IRC | 15:59 | |
| *** lardman|home has quit IRC | 16:13 | |
| *** frozen_de has joined #maemo-ssu | 17:35 | |
| *** zaleb has quit IRC | 18:02 | |
| *** maninc_ has joined #maemo-ssu | 18:16 | |
| *** maninc has quit IRC | 18:18 | |
| *** BCMM has quit IRC | 18:19 | |
| *** maninc has joined #maemo-ssu | 18:20 | |
| *** rd has joined #maemo-ssu | 18:21 | |
| *** maninc_ has quit IRC | 18:22 | |
| *** lizardo has quit IRC | 18:23 | |
| *** lizardo has joined #maemo-ssu | 18:25 | |
| *** Kaptenen has quit IRC | 18:28 | |
| rd | MohammadAG, I just noticed that in my freetype commit not only the rules file was missing, also the changelog was not committed. Did you update the changelog as well? | 18:33 |
| rd | http://pastebin.ca/2064799 showst the changes I forgot to commit. | 18:34 |
| rd | without the changelog commit, the version number of the *.deb is not updated (I think). | 18:35 |
| rd | If you have not updated the changelog, I can issue another merge request. | 18:35 |
| merlin1991 | no he didn't update the changelog | 18:40 |
| *** lardman is now known as lardman|gone | 18:45 | |
| rd | ok, to be on the safe side, I created another merge request. Feel free to accept or reject it. | 18:48 |
| *** the_lord has quit IRC | 18:50 | |
| *** the_lord has joined #maemo-ssu | 18:51 | |
| * merlin1991 can't do that, only MohammadAG :) | 18:53 | |
| merlin1991 | ah wait | 18:53 |
| merlin1991 | I can actually do that, not going to though | 18:53 |
| rd | ok | 18:53 |
| rd | please make sure, that the patch is not applied twice in the rules file. But I asume git is clever enough to avoid that. | 18:54 |
| * merlin1991 checks the merge request | 18:55 | |
| merlin1991 | rd: with the current merge request the patch to debian rules would get applied twice | 18:56 |
| merlin1991 | I guess git would raise a conflict on merge, but initially it will try to apply the patch to debian/rules again | 18:57 |
| rd | I think cvs would detect that it is already applied and not apply it again. | 19:02 |
| rd | How do you want to deal with it? | 19:02 |
| rd | I need to leave for two hours. | 19:02 |
| merlin1991 | I'd suggest you rebase your work onto of the current commit from MohhamadAG thus creating a new commit that only has the changelog change and edit your mergerequest to the new commit | 19:04 |
| *** rd has quit IRC | 19:19 | |
| *** rd has joined #maemo-ssu | 19:20 | |
| *** Kaptenen has joined #maemo-ssu | 19:22 | |
| *** frozen_de has quit IRC | 19:27 | |
| *** rd has quit IRC | 19:38 | |
| *** BCMM has joined #maemo-ssu | 19:49 | |
| *** BCMM has quit IRC | 20:15 | |
| *** BCMM has joined #maemo-ssu | 20:17 | |
| *** m0use has quit IRC | 20:34 | |
| *** BCMM has quit IRC | 21:12 | |
| *** I-C-Wiener has joined #maemo-ssu | 21:28 | |
| merlin1991 | MohammadAG: ping | 22:44 |
| MohammadAG | merlin1991, pong | 22:44 |
| *** rd has joined #maemo-ssu | 23:04 | |
| *** BCMM has joined #maemo-ssu | 23:05 | |
| *** Aranel has joined #maemo-ssu | 23:09 | |
| *** m0use has joined #maemo-ssu | 23:12 | |
| *** MohammadAG has quit IRC | 23:43 | |
| *** Mohammad- has joined #maemo-ssu | 23:43 | |
| *** MohammadAG has joined #maemo-ssu | 23:43 | |
| *** MohammadAG has quit IRC | 23:44 | |
| *** Mohammad- is now known as MohammadAG | 23:44 | |
| *** MohammadAG_ has joined #maemo-ssu | 23:45 | |
| *** xnt14 has joined #maemo-ssu | 23:45 | |
| *** MohammadAG has quit IRC | 23:47 | |
| *** MohammadAG has joined #maemo-ssu | 23:47 | |
Generated by irclog2html.py 2.15.1 by Marius Gedminas - find it at mg.pov.lt!