User Tools

Site Tools


wiki:development:nxlib-upstream

Differences

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

Link to this comparison view

Both sides previous revision Previous revision
Next revision
Previous revision
wiki:development:nxlib-upstream [2011/10/03 15:38]
sunweaver
— (current)
Line 1: Line 1:
-====== Updating NX libs from NoMachine Upstream ====== 
- 
-The package ''nxcompshad'' will be used for example... 
- 
-===== Update "upstream" branch ===== 
- 
-  * get ''nxcompshad.git'' from X2go Git: 
-<code> 
-$ git clone ssh://x2go@code.x2go.org:32032/srv/git/code.x2go.org/nxcompshad.git 
-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. 
-</code> 
-  * Switch to "upstream" branch 
-<code> 
-nxcompshad$ git checkout upstream 
-Branch upstream set up to track remote branch upstream from origin. 
-Switched to a new branch 'upstream' 
-</code> 
-  * replace old source files with new version from nomachine 
-  * check changes with "git status", if needed, add new files to upstream branch of Git project 
-  * commit changes and tag new upstream version 
-<code> 
-git commit -a -m "Imported upstream version <upstream-version>" 
-git push origin upstream 
-git tag -s <upstream-version> -m "Upstream version <upstream-version>" 
-git push --tags 
-</code> 
-  * Switch to master branch 
-<code> 
-nxcompshad$ git checkout master 
-Switched to branch ''master'' 
-</code> 
- 
-===== Update ''master'' branch ===== 
  
wiki/development/nxlib-upstream.1317656339.txt.gz ยท Last modified: 2013/03/08 13:31 (external edit)