obounaim | Hello everybody | 07:49 |
---|---|---|
obounaim | When I was trying to merge honeyd from Debian I had a conflict that I am a bit confused about it, if someone can take a look and tell what I will be very thankful. conflicts at line 71 and 85 http://paste.ubuntu.com/1325802/ | 07:54 |
dupondje | obounaim: it needs to be merged ? | 08:15 |
obounaim | dupondje, according to http://qa.ubuntuwire.org/bugs/rcbugs/raring/ | 08:16 |
dupondje | ah libevent1 bp | 08:17 |
dupondje | bd | 08:17 |
dupondje | well if you merge it, the only difference should be the libevent1-dev change in debian/control & debian/changelog | 08:18 |
dupondje | otherwise it should be 100% the same as debian version:) | 08:18 |
obounaim | so concerning the conflicts in ltmain.sh I should keep the debian version right? | 08:20 |
obounaim | You can take look at http://paste.ubuntu.com/1325802/ line 71 and 85 | 08:21 |
dupondje | I would take the debian versions yep :) | 08:21 |
dupondje | btw, it really needs to bd on libevent1 ? FTBFS with libevent-dev ? | 08:22 |
obounaim | Ok thank you dupondje, | 08:24 |
=== Quintasan_ is now known as Quintasan | ||
=== Ursinha-afk is now known as Ursinha | ||
=== Tonio__ is now known as Tonio_aw | ||
=== Tonio_aw is now known as Tonio__ | ||
=== Ursinha is now known as Ursinha-afk | ||
=== Tonio_ is now known as Tonio_aw | ||
=== Tonio_aw is now known as Tonio_ | ||
=== Tonio_ is now known as Tonio_aw | ||
=== Tonio_aw is now known as Tonio_ | ||
=== Tonio_ is now known as Tonio_aw | ||
=== Ursinha is now known as Ursinha-afk | ||
=== Tonio_aw is now known as Tonio_ | ||
=== Ursinha-afk is now known as Ursinha | ||
=== Tonio_ is now known as Tonio_aw | ||
=== Ursinha is now known as Ursinha-afk | ||
=== yofel_ is now known as yofel | ||
=== udsslayer is now known as shadeslayer | ||
murrayc | I've branched a package via "bzr branch lp:debian/thepackage". | 18:32 |
murrayc | And I've made a change and bzr committed it. | 18:32 |
murrayc | I'm sure I've used "bzr push" before to put a new branch up on lp, but it's not working for me now: | 18:33 |
murrayc | $ bzr push lp:~murrayc/libxml++2.6/with-tests | 18:33 |
murrayc | bzr: ERROR: Permission denied: "~murrayc/libxml++2.6/with-tests/": : Project 'libxml++2.6' does not exist. | 18:33 |
murrayc | What am I doing wrong? | 18:33 |
murrayc | Thats what this page suggests: | 18:35 |
murrayc | http://doc.bazaar.canonical.com/beta/en/tutorials/using_bazaar_with_launchpad.html | 18:35 |
jbicha | murrayc: launchpad won't let you push there unless the libxml++2.6 project were created, in other words if https://launchpad.net/libxml++2.6 were a valid page | 18:39 |
murrayc | Ah. So what should I do? | 18:39 |
Laney | you probably mean something like lp:~murrayc/debian/sid/libxml++2.6/with-tests | 18:39 |
murrayc | Ahaha. | 18:39 |
Laney | I can't remember the exact format though | 18:39 |
murrayc | I wonder if there's some way to use the lp:debian shorthand for that. | 18:40 |
murrayc | And I wonder how I can get that documentation fixed. | 18:41 |
Laney | the documentation is right, it's the UDD stuff that is special | 18:41 |
murrayc | UDD? | 18:41 |
Laney | the imported package branches | 18:41 |
Laney | I believe it's documented in the ubuntu packaging guide on developer.ubuntu.com | 18:42 |
murrayc | Ah, yes, I must find the other page that said the same thing but talked about the imported branches. | 18:42 |
murrayc | Thanks. | 18:42 |
murrayc | Laney: That's a very useful document. Thanks. | 18:49 |
Laney | no worries | 18:49 |
murrayc | Laney: Is there any sense in proposing a merge to the lp:debian branch? Wouldn't it need to become an ubuntu branch first? | 18:53 |
Laney | those branches are read only | 18:53 |
Laney | you can propose a merge to the Ubuntu branch though if you want it to be uploaded here | 18:53 |
murrayc | Will there be an Ubuntu branch? Do all the packages have Ubuntu branches? | 18:55 |
Laney | well, modulo bugs the ubuntu branch will be at lp:ubuntu/package | 18:55 |
Laney | got to go catch a train | 18:56 |
Laney | bye! | 18:57 |
murrayc | Laney: Great. Thanks. | 18:57 |
murrayc | https://code.launchpad.net/~ubuntu-branches/ubuntu/quantal/libxml++/quantal | 18:57 |
murrayc | I made my change (and merge request) against raring. If I had done it against quantal, is there any automatic thing that would merge the quantal changes into raring? | 19:35 |
murrayc | Or is that just up to the package maintainer when he accepts the merge? | 19:35 |
micahg | murrayc: no, you'd need to repropose against raring | 19:38 |
murrayc | OK. Thanks. | 19:38 |
=== Tonio_aw is now known as Tonio_ | ||
=== Tonio_ is now known as Tonio_aw | ||
=== Tonio_aw is now known as Tonio_ | ||
=== jbicha is now known as Guest21787 | ||
=== Guest21787 is now known as jbicha_ | ||
Laney | phew, all home | 22:10 |
dupondje | Some question. Lets say we want to build an RDP client (GUI). What SDK is preferred? | 22:16 |
=== yofel_ is now known as yofel | ||
dupondje | GTK? QT? What else? | 22:16 |
=== Tonio_ is now known as Tonio_aw | ||
=== Tonio_aw is now known as Tonio_ |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!