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/03 15:37] sunweaver |
wiki:development:nxlib-upstream [2011/11/12 10:56] sunweaver removed |
||
|---|---|---|---|
| Line 1: | Line 1: | ||
| ====== Updating NX libs from NoMachine Upstream ====== | ====== Updating NX libs from NoMachine Upstream ====== | ||
| - | The package '' | + | The package '' |
| ===== Update " | ===== Update " | ||
| - | * get nxcompext | + | * get '' |
| < | < | ||
| $ git clone ssh:// | $ git clone ssh:// | ||
| Line 17: | Line 17: | ||
| * Switch to " | * Switch to " | ||
| < | < | ||
| - | nxcompext$ git checkout upstream | + | nxcompshad$ git checkout upstream |
| Branch upstream set up to track remote branch upstream from origin. | Branch upstream set up to track remote branch upstream from origin. | ||
| Switched to a new branch ' | Switched to a new branch ' | ||
| </ | </ | ||
| - | * replace old source files with new version from nomachine | + | * replace old source files with new version from NoMachine upstream |
| * check changes with "git status", | * check changes with "git status", | ||
| * commit changes and tag new upstream version | * commit changes and tag new upstream version | ||
| Line 30: | Line 30: | ||
| git push --tags | git push --tags | ||
| </ | </ | ||
| - | * Switch to master branch | + | * Switch |
| < | < | ||
| - | nxcompext$ git checkout master | + | nxcompshad$ git checkout master |
| Switched to branch '' | Switched to branch '' | ||
| </ | </ | ||
| - | ===== Update '' | + | ===== 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" | ||
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