[pkg-remote-commits] [x2goclient] 05/06: debian/{rules, *.install}: Use upstream's Makefile for installing files into the bin:packages.

[Mike Gabriel]

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

sunweaver pushed a commit to branch master
in repository x2goclient.

commit cc40f00fa66de28fb30aa96a82992787f08d3833
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Jun 28 12:53:41 2017 +0200

    debian/{rules,*.install}: Use upstream's Makefile for installing files into the bin:packages.
---
 debian/rules                       |  3 +++
 debian/x2goclient.install          | 19 ++++++++++---------
 debian/x2goplugin-provider.install |  5 +++--
 debian/x2goplugin.install          |  2 +-
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/debian/rules b/debian/rules
index e267fb8..a729382 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,9 @@ override_dh_auto_configure:
 	cp ChangeLog txt/changelog
 	dh_auto_configure
 
+override_dh_auto_install:
+	dh_auto_install -- PREFIX=/usr
+
 override_dh_auto_clean:
 	dh_auto_clean
 	# clean stray .qm files that are not handled by clean rule in upstream Makefile
diff --git a/debian/x2goclient.install b/debian/x2goclient.install
index 7d074d8..6fa0049 100644
--- a/debian/x2goclient.install
+++ b/debian/x2goclient.install
@@ -1,9 +1,10 @@
-client_build/x2goclient       usr/bin
-desktop/x2goclient.desktop    usr/share/applications/
-res/img/icons/x2goclient.xpm             usr/share/x2goclient/icons/
-res/img/icons/128x128/x2goclient.png     usr/share/x2goclient/icons/
-res/img/icons/128x128/x2gosession.png    usr/share/x2goclient/icons/
-res/img/icons/128x128/x2goclient.png     usr/share/icons/hicolor/128x128/apps/
-res/img/icons/16x16/x2goclient.png       usr/share/icons/hicolor/16x16/apps/
-res/img/icons/64x64/x2goclient.png       usr/share/icons/hicolor/64x64/apps/
-res/img/icons/32x32/x2goclient.png       usr/share/icons/hicolor/32x32/apps/
+usr/bin
+usr/share/applications/
+usr/share/x2goclient/icons/
+usr/share/x2goclient/icons/
+usr/share/x2goclient/icons/
+usr/share/icons/hicolor/128x128/apps/
+usr/share/icons/hicolor/16x16/apps/
+usr/share/icons/hicolor/64x64/apps/
+usr/share/icons/hicolor/32x32/apps/
+usr/share/man/
\ No newline at end of file
diff --git a/debian/x2goplugin-provider.install b/debian/x2goplugin-provider.install
index 8e79131..f6b9663 100644
--- a/debian/x2goplugin-provider.install
+++ b/debian/x2goplugin-provider.install
@@ -1,2 +1,3 @@
-provider/etc/x2goplugin-apache.conf etc/x2go/
-provider/share/x2goplugin.html etc/x2go/plugin-provider/
+etc/x2go/x2goplugin-apache.conf
+etc/x2go/plugin-provider/
+usr/share/x2go/plugin/x2goplugin.html
diff --git a/debian/x2goplugin.install b/debian/x2goplugin.install
index a3141b5..2d4917c 100644
--- a/debian/x2goplugin.install
+++ b/debian/x2goplugin.install
@@ -1 +1 @@
-plugin_build/libx2goplugin.so usr/lib/mozilla/plugins/
+usr/lib/mozilla/plugins/

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