From 06b35453ee5729c06f6ca4678d1ea74b4080ff38 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Sun, 6 Sep 2015 13:04:56 +0200 Subject: [PATCH] some improvements in debian $foo don't usde qterminal.install, use a override instead removed quilt build dependency cleanup source/options --- debian/control | 13 ++++++------- debian/qterminal.install | 2 -- debian/rules | 5 ++++- debian/source/options | 4 +--- 4 files changed, 11 insertions(+), 13 deletions(-) delete mode 100644 debian/qterminal.install diff --git a/debian/control b/debian/control index 8b183fe..819ee8e 100644 --- a/debian/control +++ b/debian/control @@ -7,13 +7,12 @@ Section: x11 Priority: optional Build-Depends: debhelper (>= 9), cmake (>= 3.0.2), - libqtermwidget5-0-dev (>= 0.6.0), - libqt5x11extras5-dev (>= 5.3), + libqtermwidget5-0-dev, + libqt5x11extras5-dev, libx11-dev, - qtbase5-private-dev (>= 5.3), - qttools5-dev (>= 5.3), - qttools5-dev-tools (>= 5.3), - quilt, + qtbase5-private-dev, + qttools5-dev, + qttools5-dev-tools Standards-Version: 3.9.6 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-lxqt/qterminal.git Vcs-Git: git://anonscm.debian.org/pkg-lxqt/qterminal.git @@ -23,7 +22,7 @@ Package: qterminal Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, -Description: QT-based multitab terminal emulator +Description: QT-based multitab terminal emulator Qterminal is a Qt-based multitab terminal forked from QTermWidget, it is lightweight, open-source, specially designed for LXQt desktop environment. . diff --git a/debian/qterminal.install b/debian/qterminal.install deleted file mode 100644 index eaf72e7..0000000 --- a/debian/qterminal.install +++ /dev/null @@ -1,2 +0,0 @@ -usr - diff --git a/debian/rules b/debian/rules index c7f6f45..aea6b92 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,10 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed %: - dh $@ --buildsystem cmake --parallel --with quilt + dh $@ --buildsystem cmake --parallel + +override_dh_auto_install: + dh_auto_install -- DESTDIR=$(CURDIR)/debian/qterminal override_dh_strip: dh_strip --dbg-package=qterminal-dbg diff --git a/debian/source/options b/debian/source/options index 391bc1c..112dfc8 100644 --- a/debian/source/options +++ b/debian/source/options @@ -1,3 +1 @@ -# dont put .xyz in the tarball -tar-ignore=.xyz -tar-ignore=.gitignore \ No newline at end of file +tar-ignore=.gitignore