This shows you the differences between two versions of the page.
Next revision | Previous revision | ||
wiki:libs:nx-libs [2011/11/12 10:56] sunweaver created |
wiki:libs:nx-libs [2013/03/08 13:31] (current) |
||
---|---|---|---|
Line 1: | Line 1: | ||
- | ====== | + | ====== |
- | The package '' | + | Compared to other NX based projects X2Go has changed the strategy |
- | ===== Update " | + | We have discovered that the functionality of the libxcomp* packages is mid-heavily broken if they (probably esp. the libxcompext package) are not built against NoMachine' |
- | * get '' | + | Thus, we have set up the nx-libs.git project on the X2Go Git site: |
- | < | + | http:// |
- | $ git clone ssh://x2go@code.x2go.org:32032/srv/ | + | |
- | 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 '' | + | History: we (X2Go upstream) had tremendous problems with crashing |
- | ==== Create " | + | |
- | * unpack old upstream source | + | The source tree of nx-libs.git shows the structure of the new package strategy. All NX tarballs are placed into one big source tree and then build--depending on each other during the build process. |
- | * get current GIT version | + | |
- | < | + | With the new build method X2Go has incremented the .deb package |
- | $ git clone ssh:// | + | |
- | </ | + | |
- | * backup/ | + | |
- | < | + | |
- | mv .git ../ | + | Also: as we pull several NoMachine upstream source projects into one big source package, we are not able to fully map the version |
- | </ | + | |
- | * create " | + | |
- | < | + | nxcompext |
- | diff -rupN nx-X11/ x2goagent/ > x2goagent.patch | + | ... |
- | </ | + | |
- | after that you can remove both nx-x11 and x2goagent directories | + | will all be pulled into Debian source package |
- | ==== Patch new upstream | + | |
- | * unpack | + | |
- | | + | |
- | < | + | What packages with what exact version |
- | $ cd nx-X11 | + | |
- | $ patch -p1 < ../x2goagent.patch | + | As a side product, the nx-libs project also builds nxauth and nxagent. |
- | </ | + | |
- | | + | |
- | * move .git_backup to x2goagent | + | |
- | < | + | |
- | $ mv .git_backup x2goagent/.git | + | |
- | </ | + | |
- | ==== Push to GIT ==== | + | |
- | * Release old version | + | |
- | | + | |
- | < | + | |
- | $ git tag -s 3.5.0-1 -m " | + | |
- | $ git push | + | |
- | $ git push --tags | + | |
- | </ | + | |
- | | + | |
- | < | + | |
- | x2goagent (3.5.0.5-0~x2go1) UNRELEASED; urgency=low | + | |
- | [ Oleksandr Shneyder] | + | |
- | * New upstream | + | |
- | -- 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" | ||