Differences

This shows you the differences between two versions of the page.

--- wiki:development:nxlib-upstream [2011/10/03 15:40]
sunweaver
+++ wiki:development:nxlib-upstream [2011/11/02 22:29]
sunweaver wiki:development:nxlibupstream renamed to wiki:development:nxlib-upstream (Namespace cleanup)
@@ Line 36: / Line 36: @@
 </code>
-===== Update ''master'' branch =====
+===== Update ''master'' branch (x2goagent as example) =====
+==== Create "diff" file for old version ====
+  * unpack old upstream source (nx-X11, nxagent, nxauth)
+  * get current GIT version
+<code>
+$ git clone ssh://x2go@code.x2go.org:32032/srv/git/code.x2go.org/x2goagent.git
+</code>
+  * backup/remove ".git" directory from x2goagent to make clean diff
+<code>
+mv .git ../.git_backup
+</code>
+  * create "diff" file
+<code>
+diff -rupN nx-X11/ x2goagent/ > x2goagent.patch
+</code>
+after that you can remove both nx-x11 and x2goagent directories
+==== Patch new upstream version ====
+  * unpack new upstream version of nx-X11, nxagent and nxauth
+  * patch new upstream version with xgoagent.patch
+<code>
+$ cd nx-X11
+$ patch -p1 < ../x2goagent.patch
+</code>
+  * rename nx-X11 to x2goagent
+  * move .git_backup to x2goagent
+<code>
+$ mv .git_backup x2goagent/.git
+</code>
+==== Push to GIT  ====
+  * Release old version with dch -r
+  * Tag old version
+<code>
+$ git tag -s 3.5.0-1 -m "Upstream version 3.5.0-1"
+$ git push
+$ git push --tags
+</code>
+  * change debian/changelog with dch -i:
+<code>
+x2goagent (3.5.0.5-0~x2go1) UNRELEASED; urgency=low
+  [ Oleksandr Shneyder]
+  * New upstream version (3.5.0.5) - nx-X11-3.5.0-2 nxagent-3.5.0-5 nxauth-3.5.0-1
+ -- Oleksandr Shneyder <oleksandr.shneyder@treuchtlingen.de>  Tue, 04 Oct 2011 08:11:22 +0200
+</code>
+  * check changes with "git diff"
+  * check for files to add/remove with git status
+  * commit changes with debcommit -a
+  * push to git with "git push"

X2Go - everywhere@home

User Tools

Site Tools

Differences

Page Tools