This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository nx-libs. from 72ecc24 CODE-REDUCTION_PRESERVE-SYMLINKED: fix Mesa builds on 32bit intel arch new f72fb34 silence lintian warning about licence file being a symlink new 912d62b Install upstream ChangeLogs into bin:packages. new 801dc1f fix typos in CODE-REDUCTION scripts The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 1 + debian/copyright | 2 +- debian/roll-tarballs.sh | 4 ++-- debian/rules | 11 +++++++++++ nx-libs.spec | 4 ++-- 5 files changed, 17 insertions(+), 5 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit f72fb34eb9941e935faf4c3f31324262a3f9b1a8 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jan 28 21:26:40 2015 +0100 silence lintian warning about licence file being a symlink --- debian/copyright | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/copyright b/debian/copyright index 7fc55b6..3b04eef 100644 --- a/debian/copyright +++ b/debian/copyright @@ -59,5 +59,5 @@ The files MD5.[ch] are copyright (C) 1999, 2000, 2002 Aladdin Enterprises. The packaging for Debian is copyright 2011 Mike Gabriel and is released under the GPL version 2. On Debian systems, the complete text of the GNU -General Public License can be found in `/usr/share/common-licenses/GPL'. +General Public License can be found in `/usr/share/common-licenses/GPL-2'. -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 912d62ba50086aa47f2365c19ffe6ae9b3cb45c6 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jan 28 21:28:04 2015 +0100 Install upstream ChangeLogs into bin:packages. --- debian/changelog | 1 + debian/rules | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index 30b2797..b1f84d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -61,6 +61,7 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium + Correctly link config files (etc/rgb, etc/nxagent.keyboard, etc/x2goagent.keyboard) before dh_auto_build. + Add to B-D: expat. + + Install upstream ChangeLogs into bin:packages. * nx-libs.spec: + The gpg-offline bin:package is not available in our SLE repo. We can do diff --git a/debian/rules b/debian/rules index a4f9257..d215394 100755 --- a/debian/rules +++ b/debian/rules @@ -38,6 +38,15 @@ override_dh_clean: if [ -f nxcomp/.VERSION.NoMachine ]; then mv nxcomp/.VERSION.NoMachine nxcomp/VERSION; fi dh_clean +override_dh_installchangelog: + + ### the doc/changelog file is the actual NX (redistributed) ChangeLog + #dh_installchangelog doc/changelog + + ### the nx-X11/CHANGELOG is an old upstream ChangeLog by NoMachine that prevents us from + ### being shouted at by lintian (while testing the package build scripts) + dh_installchangelog nx-X11/CHANGELOG + override_dh_install: # handle builds for Debian squeeze (non multi-arch) @@ -108,6 +117,8 @@ override_dh_auto_build: ln -s ../debian/rgb etc/rgb ln -s ../debian/nxagent.keyboard etc/nxagent.keyboard ln -s ../debian/x2goagent.keyboard etc/x2goagent.keyboard + mkdir -p doc/ + ln -s ../debian/changelog doc/changelog ln -sf debian/VERSION VERSION.x2goagent ln -sf ../debian/VERSION nxcomp/VERSION -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 801dc1fe85ef6a69ffe71aaa0d9c5cfa488a345a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jan 28 21:31:37 2015 +0100 fix typos in CODE-REDUCTION scripts --- debian/roll-tarballs.sh | 4 ++-- nx-libs.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index 4b4624f..9b63529 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -146,7 +146,7 @@ UNUSED_FOLDERS=`cat debian/CODE-REDUCTION_CLEANUP-UNUSED` CLEANUP_FOLDERS=`cat debian/CODE-REDUCTION_CLEANUP-BRUTAL` UNNEEDED_BACKUPS=`cat debian/CODE-REDUCTION_CLEANUP-BACKUPFILES` PRESERVE_SYMLINKED_FILES=`cat debian/CODE-REDUCTION_PRESERVE-SYMLINKED` -PRESERVE_INCLUDED_FILES=`cat debian/CODE-REDUCTION_PRESERVE-SYMLINKED` +PRESERVE_INCLUDED_FILES=`cat debian/CODE-REDUCTION_PRESERVE-INCLUDED` PRESERVE_NEEDED_FILES=`cat debian/CODE-REDUCTION_PRESERVE-NEEDED` # remove folders that we do not want to roll into the tarball @@ -164,7 +164,7 @@ for path in ${PRESERVE_SYMLINKED_FILES} ${PRESERVE_INCLUDED_FILES} ${PRESERVE_NE cp -av "$path" ".preserve/$path" done -for path in ${UNUSED_FOLDERS} ${CLEAN_FOLDERS} ${UNNEEDED_BACKUPS}; do +for path in ${UNUSED_FOLDERS} ${CLEANUP_FOLDERS} ${UNNEEDED_BACKUPS}; do rm -R "$path" done diff --git a/nx-libs.spec b/nx-libs.spec index a7a5ebd..c1b59ca 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -555,7 +555,7 @@ UNUSED_FOLDERS=`cat debian/CODE-REDUCTION_CLEANUP-UNUSED` CLEANUP_FOLDERS=`cat debian/CODE-REDUCTION_CLEANUP-BRUTAL` UNNEEDED_BACKUPS=`cat debian/CODE-REDUCTION_CLEANUP-BACKUPFILES` PRESERVE_SYMLINKED_FILES=`cat debian/CODE-REDUCTION_PRESERVE-SYMLINKED` -PRESERVE_INCLUDED_FILES=`cat debian/CODE-REDUCTION_PRESERVE-SYMLINKED` +PRESERVE_INCLUDED_FILES=`cat debian/CODE-REDUCTION_PRESERVE-INCLUDED` PRESERVE_NEEDED_FILES=`cat debian/CODE-REDUCTION_PRESERVE-NEEDED` mkdir -p .preserve/ for path in ${PRESERVE_SYMLINKED_FILES} ${PRESERVE_INCLUDED_FILES} ${PRESERVE_NEEDED_FILES}; do @@ -567,7 +567,7 @@ for path in ${PRESERVE_SYMLINKED_FILES} ${PRESERVE_INCLUDED_FILES} ${PRESERVE_NE mkdir -vp ".preserve/$path_dirname" cp -av "$path" ".preserve/$path" done -for path in ${UNUSED_FOLDERS} ${CLEAN_FOLDERS} ${UNNEEDED_BACKUPS}; do +for path in ${UNUSED_FOLDERS} ${CLEANUP_FOLDERS} ${UNNEEDED_BACKUPS}; do rm -R "$path" done -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
-
git-admin＠x2go.org