The branch, master has been updated via 608bbb6d9e6d978a12dff1d22bca9a58c6c63e2f (commit) via eb069a4e64dd5d1fe6fe5509158c8c03f62085c7 (commit) from 85e87ab6c7612d014ed90aa91fc0f08fa9e89890 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 608bbb6d9e6d978a12dff1d22bca9a58c6c63e2f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Dec 31 16:24:02 2011 +0100 Fix linking of doc folders for nxcomp*-dev. commit eb069a4e64dd5d1fe6fe5509158c8c03f62085c7 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Dec 31 16:22:46 2011 +0100 grammar fix in pre-build-nx.sh ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/libxcomp-dev.links | 2 +- debian/libxcompext-dev.links | 2 +- debian/libxcompshad-dev.links | 2 +- debian/pre-build-nx.sh | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 16a6180..6bd313d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -73,6 +73,7 @@ nx-libs (2:3.5.0-2) UNRELEASED; urgency=low * Remove patch: 104_nxagent_enable_debug.patch, as it breaks package build. * Add patch headers to all patch files, report most patches upstream. Waiting for feedback and quotable URLs from NoMachine. + * Fix linking of doc folders for nxcomp*-dev. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 28 Dec 2011 19:06:26 +0100 diff --git a/debian/libxcomp-dev.links b/debian/libxcomp-dev.links index ed40e89..85dd7d7 100644 --- a/debian/libxcomp-dev.links +++ b/debian/libxcomp-dev.links @@ -1 +1 @@ -usr/share/doc/libxcomp3 usr/share/doc/libxcomp3-dev +usr/share/doc/libxcomp3 usr/share/doc/libxcomp-dev diff --git a/debian/libxcompext-dev.links b/debian/libxcompext-dev.links index 2346289..9d513e9 100644 --- a/debian/libxcompext-dev.links +++ b/debian/libxcompext-dev.links @@ -1 +1 @@ -usr/share/doc/libxcompext3 usr/share/doc/libxcompext3-dev +usr/share/doc/libxcompext3 usr/share/doc/libxcompext-dev diff --git a/debian/libxcompshad-dev.links b/debian/libxcompshad-dev.links index adeb7ec..32701d2 100644 --- a/debian/libxcompshad-dev.links +++ b/debian/libxcompshad-dev.links @@ -1,2 +1,2 @@ -usr/share/doc/libxcompshad3 usr/share/doc/libxcompshad3-dev +usr/share/doc/libxcompshad3 usr/share/doc/libxcompshad-dev diff --git a/debian/pre-build-nx.sh b/debian/pre-build-nx.sh index bb18ebe..59a8a47 100755 --- a/debian/pre-build-nx.sh +++ b/debian/pre-build-nx.sh @@ -1,6 +1,6 @@ #!/bin/sh -# create copies of upstream changelog whose names apply to Debian policy... +# create copies of upstream changelogs so that names apply to Debian policy... cp -a nx-X11/CHANGELOG nx-X11/changelog cp -a nxcomp/CHANGELOG nxcomp/changelog cp -a nxcompext/CHANGELOG nxcompext/changelog hooks/post-receive -- nx-libs.git (NX libraries) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nx-libs.git" (NX libraries).