[X2Go-Commits] [x2goserver] 12/27: debian/*.install: Utilize install target rather than picking all files from the source tree ourselves.

git-admin at x2go.org git-admin at x2go.org
Tue Feb 20 09:30:45 CET 2018


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

x2go pushed a commit to branch master
in repository x2goserver.

commit c7393b68c0f317aab667e0368b8e7dd34438d5d8
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Feb 19 00:10:58 2018 +0100

    debian/*.install: Utilize install target rather than picking all files from the source tree ourselves.
---
 debian/changelog                      |  3 +++
 debian/libx2go-server-db-perl.install |  4 ++--
 debian/x2goserver-common.install      |  7 ++++---
 debian/x2goserver-common.manpages     |  2 +-
 debian/x2goserver-extensions.install  |  8 ++++----
 debian/x2goserver-extensions.manpages |  2 +-
 debian/x2goserver-fmbindings.install  |  8 +++++---
 debian/x2goserver-fmbindings.manpages |  2 +-
 debian/x2goserver-printing.install    |  6 +++---
 debian/x2goserver-printing.manpages   |  2 +-
 debian/x2goserver-xsession.install    |  7 ++++---
 debian/x2goserver-xsession.links      |  2 --
 debian/x2goserver.install             | 36 +++++++++++++++++++++++++++--------
 debian/x2goserver.manpages            | 25 +++++++++++++++++++++++-
 14 files changed, 81 insertions(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f131bcb..5e7a24e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,9 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
     + Make sure /var/spool/x2goprint is always created.
   * debian/rules:
     + Add dh-missing --fail-missing override.
+  * debian/*.{install,manpages}:
+    + Utilize install target rather than picking all files from the source
+      tree ourselves.
 
   [ Mihai Moldovan ]
   * New upstream version (4.1.0.1):
diff --git a/debian/libx2go-server-db-perl.install b/debian/libx2go-server-db-perl.install
index 69c5095..0b989ef 100644
--- a/debian/libx2go-server-db-perl.install
+++ b/debian/libx2go-server-db-perl.install
@@ -1,5 +1,5 @@
-libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper /usr/lib/x2go/
-libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper.pl /usr/lib/x2go/
+usr/lib/x2go/libx2go-server-db-sqlite3-wrapper
+usr/lib/x2go/libx2go-server-db-sqlite3-wrapper.pl
 usr/share/man/man3/X2Go::Server::DB.*
 usr/share/man/man3/X2Go::Server::DB::*
 usr/share/perl5/X2Go/Server/DB*
diff --git a/debian/x2goserver-common.install b/debian/x2goserver-common.install
index 8bde211..7914339 100644
--- a/debian/x2goserver-common.install
+++ b/debian/x2goserver-common.install
@@ -1,3 +1,4 @@
-x2goserver-common/VERSION.x2goserver-common    /usr/share/x2go/versions/
-x2goserver-common/etc/tmpfiles.d/x2go*         /etc/tmpfiles.d/
-x2goserver-common/etc/x2go*                    /etc/x2go/
+etc/x2go/x2goserver.conf
+etc/x2go/x2gosql/
+etc/tmpfiles.d/x2go*
+usr/share/x2go/versions/VERSION.x2goserver-common
diff --git a/debian/x2goserver-common.manpages b/debian/x2goserver-common.manpages
index 6d246c3..7a905b0 100644
--- a/debian/x2goserver-common.manpages
+++ b/debian/x2goserver-common.manpages
@@ -1 +1 @@
-x2goserver/man/man5/*
+usr/share/man/man5/x2goserver.conf.5*
diff --git a/debian/x2goserver-extensions.install b/debian/x2goserver-extensions.install
index 218869b..d0d841b 100644
--- a/debian/x2goserver-extensions.install
+++ b/debian/x2goserver-extensions.install
@@ -1,4 +1,4 @@
-x2goserver-extensions/VERSION.x2goserver-extensions      /usr/share/x2go/versions/
-x2goserver-extensions/bin/x2go*      /usr/bin/
-x2goserver-extensions/lib/*                              /usr/lib/x2go/
-x2goserver-extensions/share/x2gofeature.d/*              /usr/share/x2go/x2gofeature.d/
+usr/bin/x2goserver-run-extensions
+usr/lib/x2go/extensions/
+usr/share/x2go/versions/VERSION.x2goserver-extensions
+usr/share/x2go/x2gofeature.d/x2goserver-extensions.features
diff --git a/debian/x2goserver-extensions.manpages b/debian/x2goserver-extensions.manpages
index d37b382..9d8bbcd 100644
--- a/debian/x2goserver-extensions.manpages
+++ b/debian/x2goserver-extensions.manpages
@@ -1 +1 @@
-x2goserver-extensions/man/man8/*
+usr/share/man/man8/x2goserver-run-extensions.8*
diff --git a/debian/x2goserver-fmbindings.install b/debian/x2goserver-fmbindings.install
index e1b701d..09943af 100644
--- a/debian/x2goserver-fmbindings.install
+++ b/debian/x2goserver-fmbindings.install
@@ -1,3 +1,5 @@
-x2goserver-fmbindings/VERSION.x2goserver-fmbindings  usr/share/x2go/versions/
-x2goserver-fmbindings/bin/*                          usr/bin/
-x2goserver-fmbindings/share/*                        usr/share/
+usr/bin/x2gofm
+usr/share/applications/
+usr/share/mime/
+usr/share/x2go/versions/VERSION.x2goserver-fmbindings
+usr/share/x2go/x2gofeature.d/x2goserver-fmbindings.features
diff --git a/debian/x2goserver-fmbindings.manpages b/debian/x2goserver-fmbindings.manpages
index 9b5e477..6cacfe9 100644
--- a/debian/x2goserver-fmbindings.manpages
+++ b/debian/x2goserver-fmbindings.manpages
@@ -1 +1 @@
-x2goserver-fmbindings/man/man8/*
+usr/share/man/man8/x2gofm.8*
diff --git a/debian/x2goserver-printing.install b/debian/x2goserver-printing.install
index c3d87e7..72b44f5 100644
--- a/debian/x2goserver-printing.install
+++ b/debian/x2goserver-printing.install
@@ -1,3 +1,3 @@
-x2goserver-printing/VERSION.x2goserver-printing      /usr/share/x2go/versions/
-x2goserver-printing/bin/x2go*      /usr/bin/
-x2goserver-printing/share/x2gofeature.d/*           /usr/share/x2go/x2gofeature.d/
+usr/bin/x2goprint
+usr/share/x2go/versions/VERSION.x2goserver-printing
+usr/share/x2go/x2gofeature.d/x2goserver-printing.features
diff --git a/debian/x2goserver-printing.manpages b/debian/x2goserver-printing.manpages
index be68e26..b0fec09 100644
--- a/debian/x2goserver-printing.manpages
+++ b/debian/x2goserver-printing.manpages
@@ -1 +1 @@
-x2goserver-printing/man/man8/*
+usr/share/man/man8/x2goprint.8*
diff --git a/debian/x2goserver-xsession.install b/debian/x2goserver-xsession.install
index 6b16eeb..6bcb8f3 100644
--- a/debian/x2goserver-xsession.install
+++ b/debian/x2goserver-xsession.install
@@ -1,3 +1,4 @@
-x2goserver-xsession/VERSION.x2goserver-xsession         /usr/share/x2go/versions/
-x2goserver-xsession/etc/Xsession                        /etc/x2go/
-x2goserver-xsession/share/x2gofeature.d/*               /usr/share/x2go/x2gofeature.d/
+etc/x2go/Xresources
+etc/x2go/Xsession*
+usr/share/x2go/versions/VERSION.x2goserver-xsession
+usr/share/x2go/x2gofeature.d/x2goserver-xsession.features
diff --git a/debian/x2goserver-xsession.links b/debian/x2goserver-xsession.links
index 937529e..100c6ab 100644
--- a/debian/x2goserver-xsession.links
+++ b/debian/x2goserver-xsession.links
@@ -1,3 +1 @@
-etc/X11/Xresources etc/x2go/Xresources
-etc/X11/Xsession.d etc/x2go/Xsession.d
 etc/X11/Xsession.options etc/x2go/Xsession.options
diff --git a/debian/x2goserver.install b/debian/x2goserver.install
index b880fe6..b481ba6 100644
--- a/debian/x2goserver.install
+++ b/debian/x2goserver.install
@@ -1,8 +1,28 @@
-x2goserver/VERSION.x2goserver           /usr/share/x2go/versions/
-x2goserver/bin/x2go*                    /usr/bin/
-x2goserver/etc/logcheck/ignore.d.server/x2goserver /etc/logcheck/ignore.d.server/
-x2goserver/etc/sudoers.d/x2goserver     /etc/sudoers.d/
-x2goserver/etc/x2go_logout*             /etc/x2go/
-x2goserver/lib/x2go*                    /usr/lib/x2go/
-x2goserver/sbin/x2go*                   /usr/sbin/
-x2goserver/share/x2gofeature.d          /usr/share/x2go/
+etc/logcheck/ignore.d.server/x2goserver
+etc/sudoers.d/x2goserver
+etc/x2go/x2go_logout*
+usr/bin/x2gobasepath
+usr/bin/x2gocmdexitmessage
+usr/bin/x2gofeature
+usr/bin/x2gofeaturelist
+usr/bin/x2gogetapps
+usr/bin/x2gogetservers
+usr/bin/x2golistdesktops
+usr/bin/x2golistmounts
+usr/bin/x2golistsessions
+usr/bin/x2golistshadowsessions
+usr/bin/x2gomountdirs
+usr/bin/x2gopath
+usr/bin/x2goresume-session
+usr/bin/x2goruncommand
+usr/bin/x2gosessionlimit
+usr/bin/x2gosetkeyboard
+usr/bin/x2gostartagent
+usr/bin/x2gosuspend-session
+usr/bin/x2goterminate-session
+usr/bin/x2goumount-session
+usr/bin/x2goversion
+usr/lib/x2go/x2go*
+usr/sbin/x2go*
+usr/share/x2go/versions/VERSION.x2goserver
+usr/share/x2go/x2gofeature.d/x2goserver.features
diff --git a/debian/x2goserver.manpages b/debian/x2goserver.manpages
index d769eef..4e3c3cd 100644
--- a/debian/x2goserver.manpages
+++ b/debian/x2goserver.manpages
@@ -1 +1,24 @@
-x2goserver/man/man8/*
+usr/share/man/man8/x2gobasepath.8*
+usr/share/man/man8/x2gocmdexitmessage.8*
+usr/share/man/man8/x2godbadmin.8*
+usr/share/man/man8/x2gofeature.8*
+usr/share/man/man8/x2gofeaturelist.8*
+usr/share/man/man8/x2gogetapps.8*
+usr/share/man/man8/x2gogetservers.8*
+usr/share/man/man8/x2golistdesktops.8*
+usr/share/man/man8/x2golistmounts.8*
+usr/share/man/man8/x2golistsessions.8*
+usr/share/man/man8/x2golistsessions_root.8*
+usr/share/man/man8/x2golistshadowsessions.8*
+usr/share/man/man8/x2gomountdirs.8*
+usr/share/man/man8/x2gopath.8*
+usr/share/man/man8/x2goresume-session.8*
+usr/share/man/man8/x2goruncommand.8*
+usr/share/man/man8/x2gosessionlimit.8*
+usr/share/man/man8/x2gosetkeyboard.8*
+usr/share/man/man8/x2goshowblocks.8*
+usr/share/man/man8/x2gostartagent.8*
+usr/share/man/man8/x2gosuspend-session.8*
+usr/share/man/man8/x2goterminate-session.8*
+usr/share/man/man8/x2goumount-session.8*
+usr/share/man/man8/x2goversion.8*

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


More information about the x2go-commits mailing list