[Chinese-commits] [fqterm] 31/34: Switch buildsystem: cdbs -> debhelper, Qt4 -> Qt5.

Boyuan Yang hosiet-guest at moszumanska.debian.org
Tue Nov 1 06:06:08 UTC 2016


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

hosiet-guest pushed a commit to branch master
in repository fqterm.

commit 8b72581f15b8d560a58776b8674f73bc07df630d
Author: Boyuan Yang <073plan at gmail.com>
Date:   Sat Oct 29 15:58:56 2016 +0800

    Switch buildsystem: cdbs -> debhelper, Qt4 -> Qt5.
    
    * cdbs -> debhelper v10.
    * Qt4 -> Qt5.
    * full security hardening and -Wl,--as-needed.
---
 debian/changelog | 13 +++++++++++++
 debian/control   |  6 ++++--
 debian/rules     | 26 +++++++++++++++++++++-----
 3 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index db3dc01..049cdff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+fqterm (0.9.8.3.r4+git20161029-1) unstable; urgency=medium
+
+  * New upstream snapshot.
+    - Various buildsystem cleanup.
+    - Add new function: raw packet capture.
+    - Fix FTBFS with OpenSSL 1.1.0. (Closes: #828302)
+  * Bump debhelper compat to v10.
+  * Fix Vcs-Git typo.
+  * Switch buildsystem: cdbs -> debhelper v10.
+  * Switch to build against Qt5.
+
+ -- Boyuan Yang <073plan at gmail.com>  Sat, 29 Oct 2016 15:58:36 +0800
+
 fqterm (0.9.8.3.r4-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 18679d1..39a8e16 100644
--- a/debian/control
+++ b/debian/control
@@ -5,13 +5,15 @@ Maintainer: Debian Chinese Team <chinese-developers at lists.alioth.debian.org>
 Uploaders:
  Boyuan Yang <073plan at gmail.com>,
 Build-Depends:
- cdbs,
  cmake,
  debhelper (>= 10),
  libglib2.0-dev,
- libqt4-dev,
  libssl-dev,
  libx11-dev,
+ qtbase5-dev,
+ qtbase5-dev-tools,
+ qtmultimedia5-dev,
+ qtscript5-dev,
 Standards-Version: 3.9.8
 Homepage: https://github.com/mytbk/fqterm
 Vcs-Browser: https://anonscm.debian.org/git/chinese/fqterm.git
diff --git a/debian/rules b/debian/rules
index 213e1c8..4814b1f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,26 @@
 #!/usr/bin/make -f
+# -*- makefile -*-
+# Uncomment this to turn on verbose mode.
+# export DH_VERBOSE=1
 
-DEB_CLEAN_EXCLUDE = res/userconf/address.cfg.orig res/userconf/fqterm.cfg.orig res/userconf/language.cfg.orig
-  
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
+# see FEATURE AREAS in dpkg-buildflags(1)
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+export QT_SELECT := 5
 
-install/fqterm::
+%:
+	dh $@
+
+override_dh_auto_configure:
+	dh_auto_configure -- -DUSE_QT5=1
+
+override_dh_auto_install:
+	dh_auto_install --
 	rm -f debian/fqterm/usr/share/FQTerm/fqterm.sh
 	rm -f debian/fqterm/usr/share/FQTerm/fqterm.desktop.in
+
+override_dh_clean:
+	dh_clean \
+	    -Xaddress.cfg.orig \
+	    -Xfqterm.cfg.orig  \
+	    -Xlanguage.cfg.orig --

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/chinese/fqterm.git



More information about the Chinese-commits mailing list