diff options
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rwxr-xr-x | debian/rules | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 30b27972a..b1f84d2bc 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 a4f9257ff..d21539472 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 |