[X2Go-Commits] [x2gokdriveclient] 19/26: debian/rules: switch to most of what X2Go Client uses, minus the Qt switching mechanism.

[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 x2gokdriveclient.

commit 7cc86980f91903e098cfd516214539f318639897
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Feb 24 16:17:44 2023 +0100

    debian/rules: switch to most of what X2Go Client uses, minus the Qt switching mechanism.
    
    We would need a lot more work for that.
---
 debian/changelog |  2 ++
 debian/rules     | 17 ++++++-----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 98271db..323d6d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -88,6 +88,8 @@ x2gokdriveclient (0.0.0.1-0x2go1) UNRELEASED; urgency=medium
   * debian/rules:
     * Let qmake add general Qt {C{,XX},L}FLAGS instead of overriding them.
       Especially needed for C++11 support.
+    + Switch to most of what X2Go Client uses, minus the Qt switching
+      mechanism. We would need a lot more work for that.
   * debian/copyright:
     - Change the source license to GPL-3+.
     - Change license for debian/* to GPL-3+ as well, after asking Mike Gabriel
diff --git a/debian/rules b/debian/rules
index 6d63344..d7c0b0a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,14 +16,15 @@ include /usr/share/dpkg/buildflags.mk
 export QT_SELECT=qt5
 
 %:
-	dh $@
+	dh $@ --parallel
 
 override_dh_auto_configure:
-	lrelease x2gokdriveclient.pro
+	cp debian/changelog res/txt/changelog
+	if [ -f ChangeLog.gitlog ]; then cp ChangeLog.gitlog res/txt/git-info; fi
 	dh_auto_configure
 
 override_dh_auto_build:
-	qmake QMAKE_CFLAGS+="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS+="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS+="${LDFLAGS}" x2gokdriveclient.pro
+	dh_auto_build
 
 override_dh_install:
 	mkdir -p $(CURDIR)/debian/x2gokdriveclient/usr/bin/
@@ -31,11 +32,5 @@ override_dh_install:
 	dh_install
 
 override_dh_clean:
-	-dh_clean
-	rm -f *.o x2gokdriveclient_*.qm
-	rm -f moc_*.cpp moc_*.h
-	rm -f .qmake.stash
-	rm -f qmake_qmake_immediate.qrc
-	rm -f qrc_qmake_qmake_immediate.cpp
-	rm -f ui_dlg.h
-	rm -f x2gokdriveclient
+	dh_auto_clean
+	rm -f res/txt/changelog

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