* Now talking on #lubuntu-devel
* Topic for #lubuntu-devel is: Lubuntu QA/Development | Wiki: https://wiki.ubuntu.com/Lubuntu/QA | Support: #lubuntu | Offtopic Chat: #lubuntu-offtopic | Now Testing: Yakkety Yak Alpha 2 milestone due 28 July | Upcoming: https://wiki.ubuntu.com/Lubuntu/ReleaseSchedules
* Topic for #lubuntu-devel set by tsimonq2!simonquigl@ubuntu/member/tsimonq2 (Thu Jul 28 02:01:12 2016)
-ChanServ- [#lubuntu-devel] Welcome to #lubuntu-devel. This channel is logged. Use of this channel implies acceptance of terms at https://wiki.ubuntu.com/IRC/TermsOfService
<sudodus> tsimonq2: o/
<tsimonq2> sudodus: hello :)
<tsimonq2> sudodus: how are you?
<sudodus> I'm fine, how are you :-)
<tsimonq2> great :)
<sudodus> tsimonq2: Are you ready to go ahead with mkusb and git?
<tsimonq2> sudodus: sure :)
<sudodus> I suggest that you start ...
<tsimonq2> great
<tsimonq2> where is your code now?
<sudodus> I have it in my computer (talking about the code, that is changed since you edited the git branches)
<sudodus> part of it is also uploaded to ppa:mkusb/unstable (the bash scripts and help files), but maybe not the control files
<tsimonq2> alright, let's do this
<sudodus> My current version is 11.0.1
<tsimonq2> have you cloned https://github.com/tsimonq2/mkusb.git locally?
<sudodus> I have done nothing with git, nothing at all.
<tsimonq2> alright
<tsimonq2> sudodus: is it installed?
<sudodus> (only read your tutorial mail)
<tsimonq2> sudodus: do the following in your terminal: git clone https://github.com/tsimonq2/mkusb.git && mkusb
<sudodus> yes
<sudodus> the program git is installed
<tsimonq2> alright
<tsimonq2> sudodus: can you do that above command?
<sudodus> well. mkusb want to be run with the command 'sudo -H mkusb'
<sudodus> where was it unpacked?
<tsimonq2> sudodus: you talking about the git source?
<sudodus> OK in my home directory, but I don't want it there. Let me change the location ...
<tsimonq2> alright
<sudodus> now an mkusb directory is located in my 'data' partition in a separate drive
<tsimonq2> alright, cd into that
<sudodus> done
<tsimonq2> cool, so this is where you should store and work on your actual source code
<sudodus> OK
<tsimonq2> sudodus: apply all of your changes that you made in 11.0.1 and copy everything over to this directory *except* for the debian dir
<sudodus> I'll try with rsync ...
<sudodus> done
<tsimonq2> alright, run git status
<tsimonq2> it should show that there are changes, right?
<sudodus> yes
<tsimonq2> so now you can do "git add *" to track all the changes
<tsimonq2> this is so Git knows to pay attention to them
<sudodus> I should remove the files q.txt, show-q (because they are 'local' help files)
<tsimonq2> alright
<sudodus> now there are 2 changed files 3 removed files and 2 new files (comparing my mkusb directory and the git)
<tsimonq2> sudodus: do those changes look correct?
<sudodus> "git add *
<tsimonq2> did you change two files, remove 3 files, and add 2 new files?
<sudodus> git status says the same after git add *
<tsimonq2> well it's fine
<tsimonq2> but did you make those changes from the code you had in the stable PPA to now?
<tsimonq2> (if you want to look at the diff, "git diff --cached")
<sudodus> I corrected the command, and now it worked
<sudodus> the changes are green and the removals are red, if that tells you something
<tsimonq2> sudodus: well like I said, look at the git diff --cached and see if you made all of those changes
<sudodus> what do you mean how? I edited with geany :-P
<tsimonq2> sudodus: is the directory up-to-date with how you want it for 11.0.1 ?
<tsimonq2> that's what I want to know
<tsimonq2> sudodus: if they are, git commit -am "Released mkusb 11.0.1"
<sudodus> The differences were entered into less and I could browse them.
<tsimonq2> yep
<tsimonq2> those are the changes that will be applied by committing if you choose
<sudodus> let us try that - (there were so many changes, that I cannot easily see if everything is OK)
<sudodus> According to rsync it should be OK locally, if that is what you mean
<tsimonq2> yep
<tsimonq2> that's what I meant
<sudodus> Have you changed anything in these files (excluding those in the debian directory)?
<tsimonq2> nope
<tsimonq2> sudodus: all I did was remove the debian/ directory
<sudodus> Are we ready to sync the git with this local directory now? Or was it done already by what we did?
<tsimonq2> did you commit?
<sudodus> no, I have not used any command containing 'commit'
<tsimonq2> git commit -am "Released mkusb 11.0.1"
<tsimonq2> sudodus: so basically, when you used rsync, you had to tell git to pay attention to them (git add *), then now, you have to put them in the repo
<sudodus> done
<sudodus> I used rsync locally - not to the git
<tsimonq2> sudodus: could you create an account here and let me know what your username is?
<sudodus> what do you mean by 'here'? I have an account at Launchpad, which is used to upload to ppa:mkusb. Is that what you mean?
<tsimonq2> whops I'm sorry https://github.com/join
<sudodus> OK, I'll do it ...
<tsimonq2> *whoops
<sudodus> 1 Completed. 2 Choose your plan (what is that)?
<tsimonq2> sudodus: free
<tsimonq2> or skip if possible
<sudodus> trying to skip
<tsimonq2> sudodus: wait, just keep it at the default bullet point
<tsimonq2> sudodus: "Unlimited public repositories for free."
<sudodus> I am at 'Read the guide' and 'Start a project' now, so I guess successful
<tsimonq2> great! :)
<tsimonq2> sudodus: what's your username?
<sudodus> sudodus
<tsimonq2> alright
<sudodus> Should I try to log in now - in that case where?
<tsimonq2> hold on now
<tsimonq2> sudodus: accept the invite https://github.com/tsimonq2/mkusb/invitations
<sudodus> email verified
<tsimonq2> invite accepted?
<sudodus> I have accepted the invitation
<tsimonq2> great :)
<tsimonq2> sudodus: go back to your terminal in that directory and type: git push origin master
<sudodus> "You now have access to the tsimonq2/mkusb repository." 
<tsimonq2> \o/
<tsimonq2> sudodus: do what I said above :)
<tsimonq2> sudodus: then type in your GitHub username and password
<sudodus> I seems to work.
<tsimonq2> great :)
<tsimonq2> there we go! look at https://github.com/tsimonq2/mkusb
<sudodus> To https://github.com/tsimonq2/mkusb.git
<sudodus> d06b214..e63a7db  master -> master
<tsimonq2> sudodus: that's your commit https://github.com/tsimonq2/mkusb/commit/e63a7dbf82175a60784e92d656852240ea7c05a9
<tsimonq2> sudodus: GitHub has a GUI that shows all of your changes in between commits
<tsimonq2> it's pretty awesome :D
<sudodus> I see my three hands avatar too. So I seem to be in :-)
<tsimonq2> sudodus: so, do you understand that process? when you want to make a change, edit the source code in that directory, and when you have done something worth noting, git add *, git commit -am "DESCRIBE WHAT YOU JUST DID", git push origin master
#
###############################################################################
#
# when you want to make a change, edit the source code in that directory,
# and when you have done something worth noting (in /media/multimed-2/mkusb)
git add *
git commit -am "DESCRIBE WHAT YOU JUST DID"
git push --tags origin master  # fungerade inte alls
git push --tags origin ppa     # fungerade kanske
git tag 11.1.2         # update to the current version lyckades inte
#
###############################################################################
#
<sudodus> Well, at my age, the brain is not as fast as it used to be ;-) I think I can go back and look at the log (in the hexchat window) and learn the details
<tsimonq2> sudodus: great, let's move on to the next step :)
<tsimonq2> sudodus: anyways, let me show you how to properly release, not just edit and commit, if you are ready?
<sudodus> Yes
<tsimonq2> sudodus: git tag 11.0.1
<tsimonq2> sudodus: that creates the appropriate tag
<tsimonq2> sudodus: then: git push --tags origin master
<tsimonq2> sudodus: as long as you have committed, that will set up a release
<tsimonq2> let me know when that's done
<sudodus> Total 0 (delta 0), reused 0 (delta 0)
<sudodus> To https://github.com/tsimonq2/mkusb.git
<tsimonq2> sudodus: perfect! :)
<sudodus>  * [new tag]         11.0.1 -> 11.0.1
<tsimonq2> sudodus: you can also now write release notes here: https://github.com/tsimonq2/mkusb/releases/new?tag=11.0.1
<sudodus> So this was a 'dummy' job just repeating what was done, or was it doing something new?
<tsimonq2> sudodus: I got there by selecting Releases -> 11.0.1 -> Edit tag
<tsimonq2> sudodus: no this is for real
<tsimonq2> sudodus: so write up the release, what did you do? :D
<tsimonq2> sudodus: (basically describe what you told me in a recent email)
<sudodus> I see. What kind of release notes. Something like here:
<sudodus> https://help.ubuntu.com/community/mkusb/v11
<tsimonq2> sudodus: perfect! in fact, I would just put a link to those
<sudodus> I pressed the button :-P
<tsimonq2> sudodus: so after you did that step (creating the tag, pushing the tag, and setting the release notes) let me know so I can update the Debian package
<tsimonq2> sudodus: but now let me show you how to update the PPA package
<sudodus> Can you inspect it and verify, that I got it right?
<tsimonq2> ok, hold on
<tsimonq2> sudodus: notice this here :) https://github.com/tsimonq2/mkusb/releases
<tsimonq2> sudodus: it's big and it has a link to a zip and a tar :D
<tsimonq2> sudodus: iirc you can also set like beta releases and such if you want them
<tsimonq2> sudodus: but otherwise, looks good :)
<sudodus> Ok
<tsimonq2> ready to move on now?
<sudodus> I think there is more to do now - to make it really separated, so that the compiled code is separate and not included in the package for the version, that should be proposed for an official repository.
<tsimonq2> sudodus: well if you just let me know what parts are nonfree, I'll remove those in the debian branch
<tsimonq2> sudodus: but for right now, you should update your PPA :)
<tsimonq2> sudodus: git remote add launchpad git+ssh://git.launchpad.net/mkusb    <-- that's a one-time command
<tsimonq2> sudodus: then: git checkout -b ppa (remove the -b in the future)
<tsimonq2> sudodus: after that: git pull launchpad ppa
<tsimonq2> sudodus: then do the usual changes that update the Debian package, dch -i etc.
<tsimonq2> let me know when that's done
<sudodus> usb-pack-efi with usb-pack_sdir/usb-pack_efi.tar.gz, and it should be removed from the control file. There is also debian/usb-pack-efi.install 
<sudodus> as described in the attached file 'todo.txt' in a mail to you
<tsimonq2> ahh yes I remember, sorry
<sudodus> I can update the ppa now ...
<sudodus> The authenticity of host 'git.launchpad.net (162.213.33.96)' can't be established.
<sudodus> RSA key fingerprint is SHA256:UNOzlP66WpDuEo34Wgs8mewypV0UzqHLsIFoqwe8dYo.
<sudodus> is this the usual sftp checkpoint?
<tsimonq2> yes I think it's fine
<sudodus> There is a problem. I am not logged in as sudodus. Is there a way to remote log in a 'sudodus@something' instead of just 'something'?
<sudodus> and default to my current user id?
<tsimonq2> git remote remove launchpad && git remote add launchpad git+ssh://sudodus@git.launchpad.net/mkusb
<sudodus> That command was accepted without any feedback.
<tsimonq2> it shouldn't have any feedback, it's fine
<tsimonq2> sudodus: now try again
<sudodus> try what
<tsimonq2> (try the step you were on before again)
<tsimonq2> sudodus: where were you at?
<sudodus> do you mean 'git remote remove launchpad && git remote add launchpad git+ssh://sudodus@git.launchpad.net/mkusb'
<sudodus> or some step further back?
<tsimonq2> further
<sudodus> please be more specific!
<tsimonq2> where were you before 'git remote remove launchpad && git remote add launchpad git+ssh://sudodus@git.launchpad.net/mkusb' ?
<sudodus> in the bash history I can see these commands (wait for a few lines)
<sudodus> git push origin master
<sudodus> git tag 11.0.1
<sudodus> git push --tags origin master
<sudodus> git remote add launchpad git+ssh://git.launchpad.net/mkusb # which should be replaced by
<sudodus> git remote add launchpad git+ssh://sudodus@git.launchpad.net/mkusb
<sudodus> git checkout -b ppa  # I seem to have run this one but before the correct command with sudodus explicit
<sudodus> git pull launchpad ppa  # I seem to have run this one but before the correct command with sudodus explicit
<sudodus> Should I repeat these two last commands?
<tsimonq2> no, it's fine
<tsimonq2> sudodus: try: git branch
<tsimonq2> it shows that you are in the PPA branch, correct?
<sudodus>   master
<sudodus> * ppa
<tsimonq2> good
<tsimonq2> sudodus: now do dch -i and whatever else to update the PPA to 11.0.1
<tsimonq2> (in the debian/ directory)
<tsimonq2> like splitting the two packages, etc.
<sudodus> locally I guess
<tsimonq2> yep
<tsimonq2> sudodus: all of this is local unless you git pull/push
<sudodus> You mean in my old location, where I have the debian directory, or should I create a new debian directory?
<sudodus> I guess it is wise to create a new directory and not mess with the old one
<tsimonq2> no no no
<tsimonq2> keep the one you have
<tsimonq2> sudodus: restore it from the other directory, restore your edits
<sudodus> The one that belongs to the directory, where I can upload directly to the ppa?
<tsimonq2> yep
<tsimonq2> sudodus: this is sorta uploading to the PPA
<tsimonq2> sudodus: except the stable one instead of unstable
<sudodus> OK, but I don't want to destroy what is working. I'll make a copy.
<tsimonq2> sudodus: well all you have to do is copy the debian/ directory from the unstable PPA to this directory, it will be fine, just edit accordingly
<tsimonq2> or maybe if you want to get the debian tar from the stable PPA and update that, that would be good too
<tsimonq2> sudodus: just infd a way to update your PPA with this release
<tsimonq2> *find
<sudodus> I am ready for dch now (have not used the -i option before), is it OK with my previous commands?
<tsimonq2> yeah totally
<sudodus> dch done.
<sudodus> What next? Do you mean I should edit the control file now, or just use the same files again, now only prepare for uploading with
<sudodus> debuild -S
<sudodus> cd ..
<tsimonq2> sudodus: use the files you got from GitHub, prepare it as you would a normal release with the files you have
<sudodus> dput  ppa:mkusb/unstable mkusb_1...
<sudodus> What files from github?
<tsimonq2> the files you already have merged
<tsimonq2> it's fine
<sudodus> You wanted me to have a separate debian directory. Should I point the debian files across the filesystem to the current files in my new mkusb directory?
<sudodus> I could also create links (maybe even hard links) to avoid pointing acreoss the filesystem
<sudodus> across
<tsimonq2> I'm working in Debian now
<tsimonq2> I'll handle Debian
<tsimonq2> (until I have a stable workflow)
<sudodus> In that case we can say that I'm ready with the 'source files'. Only the control file etc in the debian directory may need editing.
<sudodus> I'm waiting for you ...
<tsimonq2> so wait
<tsimonq2> let's get on the same page here
<tsimonq2> you have the PPA branch locally and merged with 11.0.1
<tsimonq2> you just merged the code
<tsimonq2> now you need to update the debian files
<tsimonq2> you just have to update the debian files to release, like you would normally do
<tsimonq2> imagine you just edited the code
<sudodus> Then I will normally only edit only one file in the debian directory, the changelog file (via dch). The other files in debian remain the same for long periods.
<tsimonq2> alright
<tsimonq2> sudodus: when you are done with the changelog, don't do anything with Git, just get me the debian/changelog file in a pastebin. I made a big mistake when giving you instructions that I'm gonna fix myself.
<tsimonq2> sudodus: and please, feel free to publish to the PPA :D
<sudodus> I sent changelog.gz via email
<sudodus> Do you mean to continue publishing in the future like I did before, but now via git? Or do you mean now? In that case with what command? I usually upload to the unstable ppa, and after some testing copy it to the stable one 'ppa:mkusb/ppa'
<tsimonq2> sudodus: I'll tell you later, I'm really sorry, I have to go
<sudodus> OK, please suggest a new time via mail.
