User Tools

Site Tools


wiki:development:nxlibs-repository

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
Next revision Both sides next revision
wiki:development:nxlibs-repository [2011/12/27 16:33]
sunweaver [Importing the old sources]
wiki:development:nxlibs-repository [2012/02/28 10:42]
ncryer [Create new patch]
Line 93: Line 93:
  
    - How to import pristine-tar data. Note that the git-import-orig dir strips the first directory member. This is usually sensible for sensible projects, but not for NX, which expects the sources to be unpacked in a very precise manner. Therefore, we need to pretty clumsily work with temporary subdirectories to capture this right. I have not investigated yet how to integrate this with pristine-tar    - How to import pristine-tar data. Note that the git-import-orig dir strips the first directory member. This is usually sensible for sensible projects, but not for NX, which expects the sources to be unpacked in a very precise manner. Therefore, we need to pretty clumsily work with temporary subdirectories to capture this right. I have not investigated yet how to integrate this with pristine-tar
 +   - Mike writes: after struggling with pristine-tar for more than a day now... I have reported a [[http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=653465|patch against pristine-tar to Debian BTS]]: With that patch applied to pristine-tar, it is possible to commit NX sources as pristine-tar objects (.delta, .id) to our Git.
  
  
 +===== Editing patches using quilt =====
 +==== Configure quilt ====
 +add to ~/.bashrc
 +<code>
 +alias dquilt="quilt --quiltrc=${HOME}/.quiltrc-dpkg"
 +</code>
 +
 +create ~/.quiltrc-dpkg
 +<code>
 +d=. ; while [ ! -d $d/debian -a `readlink -e $d` != / ]; do d=$d/..; done
 +if [ -d $d/debian ] && [ -z $QUILT_PATCHES ]; then
 +    # if in Debian packaging tree with unset $QUILT_PATCHES
 +    QUILT_PATCHES="debian/patches"
 +    QUILT_PATCH_OPTS="--reject-format=unified"
 +    QUILT_DIFF_ARGS="-p ab --no-timestamps --no-index --color=auto"
 +    QUILT_REFRESH_ARGS="-p ab --no-timestamps --no-index"
 +    QUILT_COLORS="diff_hdr=1;32:diff_add=1;34:diff_rem=1;31:diff_hunk=1;33:diff_ctx=35:diff_cctx=33"
 +    if ! [ -d $d/debian/patches ]; then mkdir $d/debian/patches; fi
 +fi
 +</code>
 +
 +==== modifying patches ====
 +get a source tree from git
 +<code>
 +git clone ssh://x2go@code.x2go.org:32032/srv/git/code.x2go.org/nx-libs.git
 +cd nx-libs
 +</code>
 +apply patches until you find patch you want to edit
 +<code>
 +dquilt push
 +</code>
 +edit files you want to change
 +
 +if you want to add new files to patch, you can make it with command:
 +<code>
 +dquilt add <new file>
 +</code>
 +after you are finished with editting, apply changes to patch
 +<code>
 +dquilt refresh --strip-trailing-whitespace
 +</code>
 +revoke all patches with
 +<code>
 +dquilt pop -a
 +</code>
 +check your changes with "git status" and "git diff". Edit changelog with "dch", make sure you keep changelog lines below 80 characters, for example:
 +<code>
 +* Update patch: 202_nx-x11_enable-xinerama.full.patch,
 +  <describe what you did...>.
 +</code>
 +commit your changes with "debcommit -a"
 +==== Create new patch ====
 +apply paches until you reach the code state where you want to begin with your new patch
 +<code>
 +dquilt push
 +</code>
 +create new patch NUMBER_NXCOMPONENT_DESCRIPTION.full.patch, for example:
 +<code>
 +dquilt new 203_nxagent_disable-rootless-exit.full.patch
 +</code>
 +add files, which you want to patch with
 +<code>
 +dquilt add DATEINAME
 +</code>
 +edit files, you want to patch and save the changes
 +<code>
 +dquilt refresh
 +</code>
 +revoke all patches with 
 +<code>
 +dquilt pop -a
 +</code>
 +check your changes with "git status" and "git diff". Edit changelog with "dch", make sure you keep changelog lines below 80 characters, for example:
 +<code>
 +* Create patch: 203_nxagent_disable-rootless-exit.full.patch,
 +  <describe what you did...>.
 +</code>
 +commit your changes with "debcommit -a"
wiki/development/nxlibs-repository.txt ยท Last modified: 2013/03/08 13:31 (external edit)