[pkg-remote-commits] [x2goserver] 06/15: rebase 1001

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository x2goserver.

commit d5e911140bd9091ccf2603c62e768a56cadb4003
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Dec 26 23:24:46 2016 +0100

    rebase 1001
---
 debian/control                      | 2 +-
 debian/rules                        | 3 ++-
 debian/x2goserver-x2goagent.install | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 9d9f566..91ac823 100644
--- a/debian/control
+++ b/debian/control
@@ -166,7 +166,7 @@ Description: X2Go server daemon scripts (printing)
  package on the CUPS server).
 
 Package: x2goserver-x2goagent
-Architecture: all
+Architecture: any
 Depends:
  nxagent (>= 3.5.99.3),
  ${misc:Depends},
diff --git a/debian/rules b/debian/rules
index 52dd0ae..f4881d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,8 +10,9 @@ include /usr/share/dpkg/buildflags.mk
 	PREFIX=/usr dh $@
 
 override_dh_auto_install:
-	PREFIX=/usr make -f Makefile build-arch
+	mkdir -p "debian/tmp/$(NXLIBDIR)/bin/"
 	ln -sf "nxagent" "debian/tmp/$(NXLIBDIR)/bin/x2goagent"
+	PREFIX=/usr make -f Makefile build-arch
 
 override_dh_auto_clean:
 	rm -fv x2gosqlitewrapper
diff --git a/debian/x2goserver-x2goagent.install b/debian/x2goserver-x2goagent.install
index 09c9f9a..ed7cd01 100644
--- a/debian/x2goserver-x2goagent.install
+++ b/debian/x2goserver-x2goagent.install
@@ -2,4 +2,5 @@ x2goserver-x2goagent/bin/x2goagent usr/bin/
 x2goserver-x2goagent/share/pixmaps/x2go.xpm usr/share/pixmaps/
 x2goserver-x2goagent/etc/* etc/x2go/
 x2goserver-x2goagent/share/x2go/x2gofeature.d/x2goserver-x2goagent.* usr/share/x2go/x2gofeature.d/
-x2goserver-x2goagent/VERSION.x2goserver-x2goagent usr/share/x2go/versions/
\ No newline at end of file
+x2goserver-x2goagent/VERSION.x2goserver-x2goagent usr/share/x2go/versions/
+usr/lib/*/nx/bin/x2goagent

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-remote/x2goserver.git