[X2Go-Commits] page changed: wiki:obsolete:nx-libs

wiki-admin at x2go.org wiki-admin at x2go.org
Tue Mar 12 21:02:51 CET 2013


A page in your DokuWiki was added or changed. Here are the details:

Date        : 2013/03/12 20:02
Browser     : Mozilla/5.0 (X11; Linux x86_64; rv:18.0) Gecko/20100101 Firefox/18.0 Iceweasel/18.0.1
IP-Address  : 46.142.148.41
Hostname    : 41-148-142-46.pool.kielnet.net
Old Revision: http://wiki.x2go.org/doku.php/wiki:obsolete:nx-libs?rev=1362749499
New Revision: http://wiki.x2go.org/doku.php/wiki:obsolete:nx-libs
Edit Summary: removed
User        : sunweaver

@@ -1,86 +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 upstream
-   * 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 back to master branch
- <code>
- nxcompshad$ git checkout master
- Switched to branch ''master''
- </code>
- 
- ===== 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 at 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"
  



-- 
This mail was generated by DokuWiki at
http://wiki.x2go.org/




More information about the x2go-commits mailing list