[X2Go-Commits] [nx-libs] 49/54: debian/*: Debianize package inclusion of nxdialog (ships with nxagent bin:pkg for now).

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository nx-libs.

commit 00f8d49a3c34b7a050edf352f03a29558525c205
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Mar 1 15:23:49 2019 +0100

    debian/*: Debianize package inclusion of nxdialog (ships with nxagent bin:pkg for now).
---
 debian/control                                 |  5 ++++-
 debian/nxagent.install                         |  2 ++
 debian/patches/2003_nxdialog-use-python3.patch | 11 +++++++++++
 debian/patches/series                          |  1 +
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 98c143d..1c1a6d3 100644
--- a/debian/control
+++ b/debian/control
@@ -330,9 +330,12 @@ Depends:
  libnx-x11-6 (= ${binary:Version}),
  libxcomp3 (= ${binary:Version}),
  libxcompshad3 (= ${binary:Version}),
+ python3,
+ python3-gi,
+ gir1.2-gtk-3.0,
  x11-xkb-utils,
  ${misc:Depends},
- ${shlibs:Depends}
+ ${shlibs:Depends},
 Recommends: xfonts-base, xkb-data
 Breaks: libxcompext3 (<< 2:3.5.99.3~), nxauth
 Replaces: libxcompext3, nxauth
diff --git a/debian/nxagent.install b/debian/nxagent.install
index 402b3b5..1f2a796 100644
--- a/debian/nxagent.install
+++ b/debian/nxagent.install
@@ -1,7 +1,9 @@
 etc/nxagent/keystrokes.cfg
 usr/bin/nxagent
+usr/bin/nxdialog
 usr/lib/*/nx/X11/
 usr/share/man/man1/nxagent.1*
+usr/share/man/man1/nxdialog.1*
 usr/share/nx/VERSION.nxagent
 usr/share/pixmaps/nxagent.xpm
 # FIXME: compatibility symlink, drop for 3.6.0 release
diff --git a/debian/patches/2003_nxdialog-use-python3.patch b/debian/patches/2003_nxdialog-use-python3.patch
new file mode 100644
index 0000000..08c2995
--- /dev/null
+++ b/debian/patches/2003_nxdialog-use-python3.patch
@@ -0,0 +1,11 @@
+Description: Enforce usage of Python3
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+
+--- a/nxdialog/bin/nxdialog
++++ b/nxdialog/bin/nxdialog
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ #
+ # ^^^ This is working with python2 and python3 so we choose a shebang
+ #     that will find either version.
diff --git a/debian/patches/series b/debian/patches/series
index 79df365..e1ec9c5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 2001_nx-X11_install-location.debian.patch
 2002_xserver-xext_set-securitypolicy-path.debian.patch
+2003_nxdialog-use-python3.patch

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git