=== dholbach_ is now known as dholbach === schmidtm__ is now known as schmidtm === Asylo40876 is now known as CaptPizzle === cprov-afk is now known as cprov [16:55] ahem [16:59] *cough* *cough* [16:59] huh [17:00] Hi all [17:00] hi james_w :) [17:01] Is it my session now? [17:01] the floor is yours ... [17:01] sorry, I'm a bit lost, I've just been in a meeting [17:01] Yep it's you [17:01] cool [17:01] let's get started [17:01] who's here for some bzr love? [17:02] indeed [17:02] bizar love sounds funny, I'm in [17:03] cool [17:03] hi everyone, thanks for coming [17:03] my name is James Westby, I'm going to talk about using bzr for your packaging work [17:04] I'm going to go over some of the basics, and you can play along at home [17:04] if you're interested in bzr for packaging then there will be loads of cool stuff happening over the next few months, so keep an eye out [17:05] if I'm going to fast, or I don't explain something well enough then please yell and let me know [17:05] first of all we need to install the necessary tools [17:05] what release of Ubuntu is everyone running? [17:06] Hardy [17:06] 8.04 [17:06] 810 [17:06] hardy [17:06] if you are on Intrepid then "sudo aptitude install bzr-builddeb" is enough [17:06] 8.04 [17:06] if you on Hardy then "sudo aptitude install bzr" [17:06] and you will need my PPA enabled to get the bzr-builddeb I will be using in the demonstration. [17:07] < Serdar> +QUESTION: what does bzr stand for? There is lack of information about that at https://wiki.ubuntu.com/UbuntuDeveloperWeek# [17:07] Serdar: bzr is a version control system, if you want to find out more then you can read bobbo's session from yesterday on bzr [17:08] those on Hardy will want https://edge.launchpad.net/~james-w/+archive [17:08] install bzr-builddeb - 2.0~ppa1~hardy1 from there [17:09] Serdar: https://wiki.ubuntu.com/MeetingLogs/devweek0809/BazaarIntro [17:09] deb http://ppa.launchpad.net/james-w/ubuntu hardy main [17:10] that's the sources.list line for hardy users [17:10] then "sudo aptitude update; sudo aptitude install bzr-builddeb=2.0~ppa1~hardy1" [17:10] then remove the line from your sources.list again so you don't accidentally install something else from there [17:11] on Monday the unstoppable dholbach gave a Packaging 101 session where he looked at the hello-debhelper package [17:11] you can find the log of the session at https://wiki.ubuntu.com/MeetingLogs/devweek0809/Package [17:11] I've prepared a small branch of this package for us to play with today [17:12] so once you have all of the tools installed then please run "bzr branch lp:~james-w/+junk/hello-debhelper" [17:12] you will get a new directory called "hello-debhelper" if you look in there you will see all of the files of the package [17:13] if you run "bzr log" in the directory you can see that this is a bzr branch with a couple of revisions [17:13] shout out once you've got that [17:13] Jep, got that [17:13] * Oli`` shouts [17:13] got it [17:13] nice work [17:15] right, I've just pushed a new revision to my branch for us to play with, so please run "bzr pull" from the hello-debhelper directory [17:16] it should tell you that you have a new revision [17:16] if you run "bzr log" now you will see an extra revision [17:16] to look at the change that I made run "bzr diff -r2..3" [17:16] which means "show me the changes between revisions 2 and 3" [17:16] you'll see that I made a small change to the packaging [17:17] now, it's your turn [17:18] open "src/hello.c" in your favourite editor [17:18] and find the bit that prints "Hello, world!" in a box [17:18] line 115 [17:18] and edit it to say hello to you instead [17:18] win 14 [17:19] oops [17:19] QUESTION: bzr pull returned: No revisions to pull. [17:19] chombium: what does "bzr revno" say for you? [17:19] 3 [17:20] but I got revision 2 and 3 with bzr log [17:20] seems it's ok [17:21] chombium: that's ok, you just grabbed the branch after I had done the push, it won't make a difference [17:21] once you've changed the greeting to say hello to you then save the file and run [17:21] bzr commit [17:21] this will open an editor window in which you should type your commit message [17:21] something like [17:22] Changed the greeting to say "hello" to me [17:22] give me a shout once you've done it [17:22] ok [17:22] done [17:22] done [17:22] ok [17:22] done [17:22] !!! [17:22] done [17:22] !!! [17:22] done [17:23] great [17:23] at this point you could push your work to launchpad, but it's not necessary for this demonstration so we won't [17:23] done [17:23] instead I've got a change to the package that I propose you make in your branch [17:24] I've put this on launchpad for you to look at [17:24] so, you can "merge" this change, and review it, and decide if it is good or not [17:24] if you run "bzr merge lp:~james-w/+junk/hello-debhelper-proposed" [17:24] it will download my changes and try and merge them in to yours [17:25] < mok0> +QUESTION: what would happen if we push the new version? [17:25] mok0: you wouldn't be able to push to the location that you got the code from as only I can [17:26] ok [17:26] you could push to a location that you own, and then either ask me to merge your changes, or simply keep a branch of your own to experiment with for a while [17:27] I see some of you have done the merge and have noticed a conflict [17:28] if you run bzr diff you will be able to see my changes [17:28] at the bottom you can see that I added a message about bzr. [17:29] as you didn't change anything in this area there was no problem in making that change in your tree, so it didn't cause a conflict [17:29] however, I changed the message to say my name, and you did the same [17:30] so we tried to do two different things to the same line, and bzr can't work out what to do [17:30] so it asks for our help [17:30] to do that it marks the area conflicted [17:30] if you try and run "bzr commit" now it won't let you, it tells us to resolve the conflicts first [17:31] open src/hello.c in your editor again, and find the same line as before [17:32] you will see your change, with mine below it [17:32] and <<<<<<<<<< above both >>>>>>>>> below them and ================== in the middle [17:32] these are "conflict markers" [17:32] we need to leave the text how we want, and without these markers [17:33] so you can delete my change, and all of the markers [17:33] or you could delete yours and leave mine [17:33] or you could change the message to say hello to both of us [17:33] or do whatever you want, it's your choice [17:34] so, fix the conflict however you like, and then save the file and run "bzr diff" [17:34] if you pastebin the output I will review it for you [17:35] what about the new hello.c.* files? [17:35] ktenney: we'll deal with those in a moment [17:36] http://paste.ubuntu.com/43096/ [17:37] nice work nasam [17:37] http://pastebin.com/m54562949 [17:38] azmodie: you kept your change [17:38] ? [17:38] yeah [17:39] great, so it's not shown in "bzr diff" as those lines are the same as in the last revision you committed [17:39] ok, so the last step is to tell bzr we are happy with the state of the files now [17:39] run "bzr resolve src/hello.c" [17:40] I kept your change [17:40] the hello.c.* files that ktenney mentioned should now be automatically removed for you, and you will be allowed to commit [17:41] "bzr resolve" will resolve all the files that no longer have conflict markers, so that can be quicker [17:41] once you've done that please commit [17:42] whenever you do a merge you should review the changes, as even when bzr doesn't mark any files conflicted you may not want all of the changes [17:42] now we can try building the package [17:42] that's why we installed bzr-builddeb, as it makes this easy [17:43] run "bzr builddeb" or "bzr bd" for short and you should see it get to work [17:44] there's more you can do, but now you know how to pass changes to packages around, merge them, deal with conflicts, and then build the packages [17:44] that's all I wanted to talk about today [17:44] are there any questions? [17:44] see -chat ... [17:45] Yeah a few of us are getting "bzr: ERROR: A Debian packaging error occurred: Could not find upstream tarball at ../tarballs/hello-debhelper_2.2.orig.tar.gz" [17:45] that's a bug in bzr-builddeb that I think I have since fixed [17:45] can you all try running the command again? [17:45] Now it works [17:46] if it doesn't work second time then it's a new bug [17:46] ok, thanks, that'll be fixed in the next release [17:46] dpkg-buildpackage: failure: fakeroot debian/rules binary gave error exit status 2 [17:46] make[1]: *** No rule to make target `distclean'. Stop. [17:46] m [17:47] i had same error but adding the deb source ppa solved it. trying to download origional src ppa: deb-src http://ppa.launchpad.net/james-w/ubuntu hardy main [17:47] they sound like problems with the package [17:47] Let's fix it, then [17:47] I'm not the person to teach you about packaging :-) [17:48] ls [17:49] mok0: I'm not sure why that's failing the build, it should be a non-fatal error [17:49] yeah [17:51] < norsetto> +QUESTION: can bzr bd work with pbuilder? [17:51] if you use plain pbuilder then "bzr bd --builder pdebuild" might do what you want [17:52] I need to work out how to make it play better with things like pbuilder-dist and sbuild though [17:52] what I do for now is build a source package ("bzr bd -S") and then call pbuilder-dist myself [17:52] < kaaloo> +QUESTION : You would still have to update the changelog beforehand ? [17:53] kaaloo: yes, you still have to do the changelog stuff yourself. [17:53] < mok0> +QUESTION: Is there a manpage for bzr bd? [17:54] mok0: no, but "bzr help bd" might help [17:54] also check /usr/share/doc/bzr-builddeb/ for the user manual [17:54] any last questions, as we are almost out of time [17:54] * dholbach hugs james_w [17:54] hey dholbach, I wondered where you were [17:54] * james_w hugs dholbach [17:55] < mok0> +QUESTION: is bzr bd and bzr-buildpackage the same program being run? [17:55] mok0: yes, bzr-buildpackage just execs "bzr bd", it's there more to try and help people find the command [17:56] ok [17:56] right, thanks all [17:56] if you want more then you can talk to me at any time [17:56] thank you james [17:56] and remember [17:56] bzr rocks [17:56] Thanks james_w!! [17:57] well done, james_w :) [17:57] thanks james_w [17:57] thanks james_w! [17:57] thanks james_w! [17:57] thanks james_w [17:57] thanks! [17:58] thanks all [17:58] next up is norsetto himself I believe [17:58] thanks james_w, very enlightening talk! [17:59] lets start then, while the iron is still hot ... [17:59] norsetto: \o/ [17:59] welcome everybody, I'm gonna talk about how to make a package update [18:00] in particular, "all you wanted to know about whats next after dch -i" (at least I hope) [18:00] hi sebner [18:00] do we all know what we mean by a package upgrade? [18:01] no i dont [18:01] anyone ... don't feel shy ... [18:01] upgrading to a new upstream release? [18:01] bobbo: yes [18:01] bobbo: thx [18:01] \o/ [18:02] we do have a package in our repository, foo-1, and upstream just released a new shiny foo-2 [18:02] normally, we would get the update from debian, but there are cases when we don't [18:02] for instance, if debian is in a freeze, or the package is orphaned, or its a native ubuntu package [18:03] or we simply need it urgently, and then pass the result back to debian [18:03] so far so good? please stop me if something is not clear, or I'm too slow/fast [18:04] + QUESTION: If i package a new package for Ubuntu should we notify debian so they get it? [18:04] Coper: yes, definetively [18:05] how? [18:05] ok, so, we now know we have a new upstream version, first thing to do is to get it [18:05] Coper: file a bug in Debian BTS [18:06] Coper: you need to open a RFP or ITP bug in the bts, and submit the package to mentors.debian.net [18:06] Good topic for a lesson! [18:06] we can get the tarball manually, using http or wget [18:06] if there is a watch file in the current package, we can use that [18:07] just check if there is a debian/watch file, or give the command "uscan" at the source tree root [18:08] uscan --verbose just gives you some more info about what it is trying to do [18:08] finally, there could be a get-orig-source target in debian/rules that we can use [18:08] for instance you can do "make -f debian/rules get-orig-source" to execute it [18:09] be carefull to read changelog, copyright and README.Source, the previous packager might mention few things to be doing on the upstream tarball [18:10] like, removing non distributable content, or repackaging [18:10] ok, now that we have an upstream tarball, we need to rename it in accordance to our policy [18:11] foo-2.tar.gz will become foo_2.orig.tar.gz [18:11] like as we would do for a shiny new package [18:12] now, the simplest case is if there are no changes to packaging and no changes outside of debian [18:13] just untar your tarball, copy the old debian dir to the new source tree [18:13] and finally add the new changelog entry [18:13] I wish all updates were this simple :-) [18:13] you still with me? [18:14] ok, more difficult if in the previous package there were changes outside of debian [18:15] for instance the previous packager made inline changes instead of using a patch system, you can check this by checking the old diff.gz [18:16] in this case just copying debian won't be enough, we have to make all those changes outside of debian too [18:16] you can do that manually, or using patch [18:16] for instance "zcat ../foo-1.diff.gz | patch -p1" (given at the src tree root) [18:17] here we can already have some pain, as some of the old changes might not apply anymore, or not apply correctly [18:18] all the above procedure can be automated by using uupdate [18:18] again in the src tree root of the old package, give the comman uupdate ../foo_2.orig.tar.gz and all these steps will be automatically performed [18:19] now, as you should have guessed already, before doing all this we need to know what has changed in the new upstream tarball, and we need to check what the previous packager did with the old package [18:20] any idea how we can check what is the difference between the old tarball and the new ? [18:20] + QUESTION: What's the difference between uscan and uupdate? [18:21] norsetto: diff? [18:21] diff -r old new [18:21] mok0: uscan just check and eventually download upstream tarball, uupdate do the update [18:21] mok0: uscan can also do the update, depend on what it is in the watch file [18:22] sebner: mok0: yes, diff is our friend [18:22] I personally like diff -Nurb [18:22] once you have the diff, you should check line by line and see what has changed upstream [18:22] norsetto: uscan does the update if you add 'debian uupdate' in the watchfile right? [18:23] RoAkSoAx: perfect [18:23] tedious perhpas, but its really necessary [18:24] ok, some example of the things that might have changed upstream and that needs to be considered in the packaging [18:24] one important thing is license [18:24] sometime upstream changes the licensing of their packages, or add new file with new licenses [18:25] there is a tool you can use to help you detect these changes [18:25] its called licensecheck and is in the devscripts package [18:25] licensecheck -r --copyright [18:26] will check all files in all subdirs and also check copyrights [18:26] just an example, you may want to check bug 257664 [18:27] https://bugs.launchpad.net/ubuntu/+source/picard/+bug/257664 since ubottu is on strike [18:27] Launchpad bug 257664 in picard "picard crashed with SIGSEGV in memset()" [Medium,Fix released] [18:27] thanks ubot5, I love you [18:28] thanks for no link :-) [18:28] lol [18:28] you may want to download the old and the new package and see the diff [18:29] as you can see from the changelog I detected some changes in the licensing, and updated debian/copyright [18:29] another example is https://bugs.launchpad.net/ubuntu/+source/source-highlight/+bug/243692 [18:30] Launchpad bug 243692 in source-highlight "web pages with ~ do not underline correctly" [Undecided,Fix released] [18:30] as you can see in this case the license was changed from gpl-2 to gpl-3 [18:31] ok, any other things we should check? ideas? [18:31] what about patches? [18:31] norsetto: update patches to match new files ? [18:32] norsetto: another dependencies or newer versions [18:32] RoAkSoAx: yes, does the old package have patches? Are they still needed anymore? Do they still apply correctly? [18:33] sebner: yes, do we need new build-deps for instance [18:33] sebner: this is usually reported in upstream ChnageLog, but sometime you only discover it by looking at upstream autoconf files (or Makefile) [18:34] another thing to check, if the package includes a man page, check if there are upstream changes that needs to go in there [18:34] and don't forget to update the man page date if you do that ;-) [18:35] any change in file locations? Maybe upstream now isntall files differently, we may need to change our packaging [18:35] will this new upstream version close an bug open in LP? [18:36] if so, close it from the changelog [18:36] is upstream web page changed? [18:36] report the change in control and copyright [18:37] is upstream now shipping a .desktop file, or new icons? [18:37] make sure you install those [18:37] maybe you need to remove those in the old package if they are obsolete [18:38] sometime upstream changes few things which need you to change compilation flags [18:38] for instance, some plugin which are now ON while you used OFF or viceversa [18:38] if upstream is a library particular care has to be taken [18:39] check if API/ABI change is reflected in SONAME/version [18:39] you can use check-symbols or icheck to help you with that [18:40] you may need a library transition, which involves perhpas rebuilding many packages already in the archive [18:40] ok, perhaps at this point it is better to go together through an example [18:40] anyone is working on an update at the moment? [18:41] norsetto: FF :P [18:41] o/ [18:41] nxvl: do you want to tell us which package? [18:41] norsetto: terminator [18:42] but it's not a good example since i maintain it on upstream bzr [18:42] :D [18:42] * bobbo just did three... [18:42] bobbo, ok, sounds good, bug numer? [18:43] bug #249997 [18:43] ubot5: hop hop hop [18:43] Factoid 'hop hop hop' not found [18:44] ok, we also have the new upstream tarball in there :-) [18:44] lets download the old package, create a htop directory and download it with "apt-get source htop" [18:44] (https://bugs.edge.launchpad.net/ubuntu/+source/htop/+bug/249997) [18:44] Launchpad bug 249997 in htop "Package is outdated " [Wishlist,Fix released] [18:45] bobbo: ok your version is in the rchive already :) [18:45] bug 256439 [18:45] https://bugs.launchpad.net/ubuntu/+source/ao40tlmview/+bug/256439 [18:45] Launchpad bug 256439 in ao40tlmview "Please update ao40tlmview to 1.04" [Wishlist,Confirmed] [18:46] ooh, didnt know that, sorry! [18:46] bobbo: no probelm :-) [18:46] ok, lets check this one [18:46] create an ao40tlmview dir and download teh src package in tehre with apt-get source ao40tlmview [18:47] have we all got the current package? [18:48] nobody? [18:49] ok lets check the new upstream tarball [18:49] there is no watch file, no link in the bug report [18:50] we can check copyright and see what is the download location there [18:50] which will give us this location: http://wwwhome.cs.utwente.nl/~ptdeboer/ham/ao40/ao40tlmview-1.04.tgz [18:51] lets get it with wget: "wget http://wwwhome.cs.utwente.nl/~ptdeboer/ham/ao40/ao40tlmview-1.04.tgz" [18:51] now we have to rename it so that its compliant with out policy [18:51] what would the correct name be? [18:52] norsetto: ao40tlmview_1.04.orig.tgz [18:52] sebner: indeed [18:52] lets see what is the diff between these two upstream version [18:52] lets untar the new tarball: tar xzvf ao40tlmview_1.04.orig.tar.gz [18:53] and teh old one: tar xzvf ao40tlmview_1.03.orig.tar.gz [18:54] now we can check the diff: diff -Nurb ao40tlmview_1.03.orig.tar.gz ao40tlmview_1.04.orig.tar.gz > ao40tlmview_1.04.diff [18:54] sorry: diff -Nurb ao40tlmview-1.03 ao40tlmview-1.04 > ao40tlmview_1.04.diff [18:55] as you can see there is only one interesting change [18:56] norsetto: makefile one? [18:56] yes, this has no impact on us however [18:56] so, its a very simple update [18:57] if you check the old package, you will see that there are no changes outside of debian [18:57] so, we just cipy the old debian dir and we add a new changelog entry [18:58] we then rebuild the package [18:58] norsetto: though we have to change maintainer and that stuff [18:59] if the rebuild is ok, we attach the new diff.gz to the bug report and ask a sponsor to upload it [18:59] sebner: yes, if the package was not already an ubuntu package [18:59] sebner: debuild will tell us anyhow ;-) [18:59] ^^ true [18:59] norsetto: and .dsc is not needed at the bug report? [18:59] as you can see this is exactly what RoAkSoAx did, even if he added a coupld of additional changes [19:00] sebner: no [19:00] norsetto: but it was once afaik!? [19:00] ok, thats about it then [19:00] sebner: no, as far as i know it was never required [19:00] O_o [19:00] ok [19:00] norsetto: thanks for this great session :D [19:01] sebner: you may remember interdiff, but that is gone [19:01] norsetto: for an update, we should update the standards-version? [19:01] albert23: you shouldn't in general, unless there is a change that warrants it [19:01] albert23: but adding the watch file is a nice addition [19:02] norsetto: ah yes, interdiff [19:02] any other question before I leave the floor to the next lecture? [19:02] norsetto: sebner@ubuntu:~/merges/ao40tlmview/ao40tlmview-1.03$ uupdate ../ao40tlmview_1.04.orig.tgz [19:02] uupdate: new version number not recognized from given filename [19:02] Please run uupdate with the -v option [19:03] sebner: yes, thats because of the tgz extension [19:03] norsetto: ah only working with tar.gz? [19:04] sebner: it should be ao40tlmview_1.04.orig.tar.gz or ao40tlmview-1.04.tgz (even though I'm not sure the latter will work) [19:04] norsetto: kk :) and shouldn it be licensecheck -r . ? [19:04] sebner: yes, or * [19:04] who is the next lecturer? [19:04] norsetto: kk because you were using --copyright ^^ [19:05] * mathiaz waves at norsetto [19:05] sebner: yes, --copyright also gives you the cipyright it finds in the headers [19:05] hi mathiaz! [19:05] norsetto: hi :) [19:05] so, unless there are further q we can leave the floor to mathiaz, I can asnwer questions in ubuntu-motu anyway [19:06] mathiaz: its all your! [19:07] norsetto: thanks ! [19:08] After this technical session on packaging, I'd like to give an overview about the Ubuntu Server Team, who we are, how you can get involved (and put in practice what norsetto just taught you) and how we work [19:08] Who are we ? [19:09] We are a group of people that have an interest in server related software. [19:09] Most of the information can be found under our wiki pages at: [19:09] https://wiki.ubuntu.com/ServerTeam [19:09] As an extension we tend also to deal with setups found in corporate [19:09] environments, such as directory services (ldap, AD) web services or network [19:10] authentication. [19:10] Some of us are working for Canonical in the Server team. Others have services [19:10] running on Ubuntu and are interested in fixing bugs. [19:10] The Canonical server team is lead by Rick Clark (dendrobates) and composed of: [19:10] Chuck Short - zul, Dustin Kirkland - kirkland, Mathias Gug - mathiaz, Thierry [19:10] Carrez - Koon, they have a generalist profile. [19:11] Soren Hansen - soren, our virtualization specialist. [19:11] Kees Cook - kees and Jamie Strandboge - jdstrand, are member of the Ubuntu [19:11] Security Team. They will make a presentation about the Security team later this [19:11] week. [19:11] Nick Barcet - nijaba, is also working for Canonical as the Ubuntu Server product manager. [19:11] Regular contributors takes on important tasks and lead them to completion. [19:12] some of them include (listed in alphabetical order): [19:12] Adam Sommer - sommer - our documentation guru. He's taken the task to review [19:12] and update the Server Guide. Thus he is in contact with the Documentation team. [19:12] Ante Karamatić - ivoks - another long time contributor to the Server Team. Also [19:12] a member of MOTU, he has looked over the apache package and improved the bacula [19:12] package. [19:13] Neal McBurnett - nealmcb - he has multiple interest: documentation, [19:13] virtualization. [19:13] Nicolas Valcárcel - nxvl - lots of work in bug triagging and packaging. [19:13]