[X2Go-Commits] [x2godesktopsharing] 04/06: debian/*: Convert to DH packaging style. Build against Qt5.
git-admin at x2go.org
git-admin at x2go.org
Sat Nov 10 03:52:55 CET 2018
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2godesktopsharing.
commit e776854bc21c3498addb074f62dff143da5173a3
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Sat Nov 10 03:39:49 2018 +0100
debian/*: Convert to DH packaging style. Build against Qt5.
---
debian/changelog | 2 ++
debian/compat | 2 +-
debian/control | 6 ++--
debian/rules | 94 ++++++--------------------------------------------------
4 files changed, 16 insertions(+), 88 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7be2bc9..34f0411 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium
- x2godesktopsharing.pro: Define TARGET as x2godesktopsharing.
- simplelocalsocket.cpp: Stop using deprecated QString::toAscii() function
(replace it by toLatin1()).
+ * debian/*:
+ + Convert to DH packaging style. Build against Qt5.
-- X2Go Release Manager <git-admin at x2go.org> Wed, 15 Nov 2017 22:00:53 +0100
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 1db46b8..8b45ef6 100644
--- a/debian/control
+++ b/debian/control
@@ -7,9 +7,9 @@ Uploaders:
Mike Gabriel <mike.gabriel at das-netzwerkteam.de>,
Mihai Moldovan <ionic at ionic.de>,
Build-Depends:
- debhelper (>= 7),
- libqt4-dev,
- qt4-dev-tools,
+ debhelper (>= 9),
+ qtbase5-dev,
+ qttools5-dev-tools,
Standards-Version: 3.9.6
Homepage: http://code.x2go.org/releases/source/x2godesktopsharing
Vcs-Git: git://code.x2go.org/x2godesktopsharing.git
diff --git a/debian/rules b/debian/rules
index 5d1039c..2ce4f2c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,56 +9,20 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+export QT_SELECT=qt5
+%:
+ dh $@
-CFLAGS = -Wall -g
+override_dh_auto_build:
+ lrelease x2godesktopsharing.pro
+ qmake x2godesktopsharing.pro
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # Add here commands to configure the package.
- lrelease-qt4 x2godesktopsharing.pro
- qmake-qt4 x2godesktopsharing.pro
-
- touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp: configure-stamp
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE)
-
- touch $@
-
-clean: configure
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- # Add here commands to clean up after the build process.
- [ ! -f Makefile ] || $(MAKE) clean
- [ ! -f Makefile ] || $(MAKE) distclean
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean
- dh_installdirs
-
- # Add here commands to install the package into debian/x2godesktopsharing.
- strip x2godesktopsharing
+override_dh_install:
install -m 644 x2godesktopsharing $(CURDIR)/debian/x2godesktopsharing/usr/bin/
install -m 644 x2godesktopsharing.desktop $(CURDIR)/debian/x2godesktopsharing/usr/share/applications/
install -m 644 icons/x2godesktopsharing.xpm $(CURDIR)/debian/x2godesktopsharing/usr/share/x2godesktopsharing/icons/x2godesktopsharing.xpm
@@ -66,42 +30,4 @@ install: build
install -m 644 icons/16x16/x2godesktopsharing.png $(CURDIR)/debian/x2godesktopsharing/usr/share/icons/hicolor/16x16/apps/x2godesktopsharing.png
install -m 644 icons/64x64/x2godesktopsharing.png $(CURDIR)/debian/x2godesktopsharing/usr/share/icons/hicolor/64x64/apps/x2godesktopsharing.png
install -m 644 icons/32x32/x2godesktopsharing.png $(CURDIR)/debian/x2godesktopsharing/usr/share/icons/hicolor/32x32/apps/x2godesktopsharing.png
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
dh_install
- dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_python
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_perl
-# dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
More information about the x2go-commits
mailing list