wiki:development:nxlib-upstream
Differences
This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision Next revision | Previous revision | ||
|
wiki:development:nxlib-upstream [2011/10/17 18:54] h1 Page moved from nxlibupstream to wiki:nxlibupstream |
— (current) | ||
|---|---|---|---|
| Line 1: | Line 1: | ||
| - | ====== Updating NX libs from NoMachine Upstream ====== | ||
| - | |||
| - | The package '' | ||
| - | |||
| - | ===== Update " | ||
| - | |||
| - | * get '' | ||
| - | < | ||
| - | $ git clone ssh:// | ||
| - | Cloning into nxcompshad... | ||
| - | remote: Counting objects: 235, done. | ||
| - | remote: Compressing objects: 100% (222/222), done. | ||
| - | remote: Total 235 (delta 138), reused 0 (delta 0) | ||
| - | Receiving objects: 100% (235/235), 109.78 KiB, done. | ||
| - | Resolving deltas: 100% (138/138), done. | ||
| - | </ | ||
| - | * Switch to " | ||
| - | < | ||
| - | nxcompshad$ git checkout upstream | ||
| - | Branch upstream set up to track remote branch upstream from origin. | ||
| - | Switched to a new branch ' | ||
| - | </ | ||
| - | * replace old source files with new version from NoMachine upstream | ||
| - | * check changes with "git status", | ||
| - | * commit changes and tag new upstream version | ||
| - | < | ||
| - | git commit -a -m " | ||
| - | git push origin upstream | ||
| - | git tag -s < | ||
| - | git push --tags | ||
| - | </ | ||
| - | * Switch back to master branch | ||
| - | < | ||
| - | nxcompshad$ git checkout master | ||
| - | Switched to branch '' | ||
| - | </ | ||
| - | |||
| - | ===== Update '' | ||
| - | ==== Create " | ||
| - | * unpack old upstream source (nx-X11, nxagent, nxauth) | ||
| - | * get current GIT version | ||
| - | < | ||
| - | $ git clone ssh:// | ||
| - | </ | ||
| - | * backup/ | ||
| - | < | ||
| - | mv .git ../ | ||
| - | </ | ||
| - | * create " | ||
| - | < | ||
| - | diff -rupN nx-X11/ x2goagent/ > x2goagent.patch | ||
| - | </ | ||
| - | 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 | ||
| - | < | ||
| - | $ cd nx-X11 | ||
| - | $ patch -p1 < ../ | ||
| - | </ | ||
| - | * rename nx-X11 to x2goagent | ||
| - | * move .git_backup to x2goagent | ||
| - | < | ||
| - | $ mv .git_backup x2goagent/ | ||
| - | </ | ||
| - | ==== Push to GIT ==== | ||
| - | * Release old version with dch -r | ||
| - | * Tag old version | ||
| - | < | ||
| - | $ git tag -s 3.5.0-1 -m " | ||
| - | $ git push | ||
| - | $ git push --tags | ||
| - | </ | ||
| - | * change debian/ | ||
| - | < | ||
| - | 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 < | ||
| - | </ | ||
| - | |||
| - | * 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" | ||
wiki/development/nxlib-upstream.1318877663.txt.gz ยท Last modified: 2013/03/08 13:31 (external edit)
Imprint & Legal Disclaimer -
Data Protection & Privacy Statement
Except where otherwise noted, content on this wiki is licensed under the following license: GNU Free Documentation License 1.3