From 1b538786c95311caa20921f619312ae3f8627cf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 16 Dec 2018 11:31:49 +0100 Subject: DEB kvpnc: Switch to cmake. The man page has been moved to the main tree. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 5b58ede56969785946045c8516bb8298e3ce9d1d) --- ubuntu/maverick/applications/kvpnc/debian/control | 2 +- .../applications/kvpnc/debian/kvpnc-trinity.1 | 69 ---------------------- ubuntu/maverick/applications/kvpnc/debian/rules | 38 ++++-------- ubuntu/maverick/applications/kvpnc/debian/watch | 2 - 4 files changed, 13 insertions(+), 98 deletions(-) delete mode 100644 ubuntu/maverick/applications/kvpnc/debian/kvpnc-trinity.1 delete mode 100644 ubuntu/maverick/applications/kvpnc/debian/watch (limited to 'ubuntu/maverick') diff --git a/ubuntu/maverick/applications/kvpnc/debian/control b/ubuntu/maverick/applications/kvpnc/debian/control index 40fbcf617..4b8d1b19c 100644 --- a/ubuntu/maverick/applications/kvpnc/debian/control +++ b/ubuntu/maverick/applications/kvpnc/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson Uploaders: Fathi Boudra , Mark Purcell -Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, tdelibs14-trinity-dev, libgcrypt11-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev, libgcrypt20-dev | libgcrypt11-dev Standards-Version: 3.8.4 Package: kvpnc-trinity diff --git a/ubuntu/maverick/applications/kvpnc/debian/kvpnc-trinity.1 b/ubuntu/maverick/applications/kvpnc/debian/kvpnc-trinity.1 deleted file mode 100644 index 48c475084..000000000 --- a/ubuntu/maverick/applications/kvpnc/debian/kvpnc-trinity.1 +++ /dev/null @@ -1,69 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH KVPNC 1 "novembre 16, 2005" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -kvpnc \- vpn clients frontend for TDE -.SH SYNOPSIS -.B kvpnc -.RI [ options ] -.br -.SH DESCRIPTION -.\" TeX users may be more comfortable with the \fB\fP and -.\" \fI\fP escape sequences to invode bold face and italics, -.\" respectively. -\fBkvpnc\fP is a TDE frontend for various vpn clients. -.br -It supports : -.br - * Cisco-compatible VPN client (vpnc) -.br - * IPSec (freeswan, openswan, racoon) -.br - * Point-to-Point Tunneling Protocol (PPTP) client (pptp-linux) -.br - * Virtual Private Network daemon (openvpn) -.SH OPTIONS -All TDE and Qt programs accept some common command\-line options. -.br -Kvpnc has no application\-specific options. -.PP -.TP -\fB\-\-help\fR -Show help about options -.TP -\fB\-\-help\-qt\fR -Show Qt specific options -.TP -\fB\-\-help\-tde\fR -Show TDE specific options -.TP -\fB\-\-help\-all\fR -Show all options -.TP -\fB\-\-author\fR -Show author information -.TP -\fB\-v\fR, \fB\-\-version\fR -Show version information -.TP -\fB\-\-license\fR -Show license information -.SH AUTHOR -kvpnc was written by Christoph Thielecke . -.PP -This manual page was written by Fathi Boudra , -for the Debian project (but may be used by others). diff --git a/ubuntu/maverick/applications/kvpnc/debian/rules b/ubuntu/maverick/applications/kvpnc/debian/rules index 1a67e871b..18b1c07e2 100755 --- a/ubuntu/maverick/applications/kvpnc/debian/rules +++ b/ubuntu/maverick/applications/kvpnc/debian/rules @@ -1,34 +1,20 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include debian/cdbs/debian-qt-kde.mk +include /usr/share/cdbs/1/class/cmake.mk #include /usr/share/cdbs/1/rules/patchsys-quilt.mk -include /usr/share/cdbs/1/rules/utils.mk - -DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" -DEB_INSTALL_MANPAGES_kvpnc-trinity := debian/kvpnc-trinity.1 - -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info +include debian/cdbs/debian-qt-kde.mk DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -install/kvpnc-trinity:: - # fix script-not-executable - chmod 0755 debian/kvpnc-trinity/opt/trinity/share/apps/kvpnc/ping_check.sh - - # remove uneeded dir - rm -rf debian/kvpnc-trinity/opt/trinity/share/doc/tde/HTML/kvpnc - - # install desktop file in applications - install -D -p -m0644 src/kvpnc.desktop \ - debian/kvpnc-trinity/opt/trinity/share/applications/tde/kvpnc.desktop - -binary-post-install/kvpnc-trinity:: - rm -rf debian/kvpnc-trinity/opt/trinity/share/applnk/ - -clean:: - find . -type f -name '*.gmo' | xargs rm -f +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" diff --git a/ubuntu/maverick/applications/kvpnc/debian/watch b/ubuntu/maverick/applications/kvpnc/debian/watch deleted file mode 100644 index 5c0ec1d76..000000000 --- a/ubuntu/maverick/applications/kvpnc/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://download.gna.org/kvpnc/kvpnc-(0.*)\.tar\.bz2 debian svn-upgrade -- cgit v1.2.1