summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/_base/applications/system/smartcardauth/debian/control2
-rwxr-xr-xdebian/_base/applications/system/smartcardauth/debian/rules15
-rw-r--r--ubuntu/_base/applications/system/smartcardauth/debian/control2
-rwxr-xr-xubuntu/_base/applications/system/smartcardauth/debian/rules15
4 files changed, 4 insertions, 30 deletions
diff --git a/debian/_base/applications/system/smartcardauth/debian/control b/debian/_base/applications/system/smartcardauth/debian/control
index 97c6fb93e..d1d2e04eb 100644
--- a/debian/_base/applications/system/smartcardauth/debian/control
+++ b/debian/_base/applications/system/smartcardauth/debian/control
@@ -2,7 +2,7 @@ Source: smartcardauth
Section: tde
Priority: extra
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, pkg-config, libpkcs11-helper1-dev, libgnutls-dev | libgnutls28-dev | libgnutls30-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, pkg-config, libpkcs11-helper1-dev, libgnutls-dev | libgnutls28-dev | libgnutls30-dev
Standards-Version: 3.8.4
Package: smartcardauth
diff --git a/debian/_base/applications/system/smartcardauth/debian/rules b/debian/_base/applications/system/smartcardauth/debian/rules
index 14ccf6018..97c83eb02 100755
--- a/debian/_base/applications/system/smartcardauth/debian/rules
+++ b/debian/_base/applications/system/smartcardauth/debian/rules
@@ -1,26 +1,13 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
+-include /usr/share/cdbs/1/class/tde.mk
DEB_BUILD_OPTIONS := nostrip
export DEB_BUILD_OPTIONS = debug nostrip
CFLAGS=-g -Wall -fPIC
-DEB_MAKE_INSTALL_TARGET := install DESTDIR="$(DEB_DESTDIR)"
-DEB_INSTALL_DOCS_ALL :=
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
- sed -e "s|.*version ||" -e "s| .*||" | \
- xargs -r dpkg --compare-versions 1.17.0 lt \
- && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
- && echo xz || echo bzip2)
-endif
-
DEB_DH_SHLIBDEPS_ARGS_ALL=--dpkg-shlibdeps-params=--ignore-missing-info
DEB_CMAKE_EXTRA_FLAGS := \
diff --git a/ubuntu/_base/applications/system/smartcardauth/debian/control b/ubuntu/_base/applications/system/smartcardauth/debian/control
index 97c6fb93e..d1d2e04eb 100644
--- a/ubuntu/_base/applications/system/smartcardauth/debian/control
+++ b/ubuntu/_base/applications/system/smartcardauth/debian/control
@@ -2,7 +2,7 @@ Source: smartcardauth
Section: tde
Priority: extra
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, pkg-config, libpkcs11-helper1-dev, libgnutls-dev | libgnutls28-dev | libgnutls30-dev
+Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, pkg-config, libpkcs11-helper1-dev, libgnutls-dev | libgnutls28-dev | libgnutls30-dev
Standards-Version: 3.8.4
Package: smartcardauth
diff --git a/ubuntu/_base/applications/system/smartcardauth/debian/rules b/ubuntu/_base/applications/system/smartcardauth/debian/rules
index 14ccf6018..97c83eb02 100755
--- a/ubuntu/_base/applications/system/smartcardauth/debian/rules
+++ b/ubuntu/_base/applications/system/smartcardauth/debian/rules
@@ -1,26 +1,13 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
+-include /usr/share/cdbs/1/class/tde.mk
DEB_BUILD_OPTIONS := nostrip
export DEB_BUILD_OPTIONS = debug nostrip
CFLAGS=-g -Wall -fPIC
-DEB_MAKE_INSTALL_TARGET := install DESTDIR="$(DEB_DESTDIR)"
-DEB_INSTALL_DOCS_ALL :=
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
- sed -e "s|.*version ||" -e "s| .*||" | \
- xargs -r dpkg --compare-versions 1.17.0 lt \
- && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
- && echo xz || echo bzip2)
-endif
-
DEB_DH_SHLIBDEPS_ARGS_ALL=--dpkg-shlibdeps-params=--ignore-missing-info
DEB_CMAKE_EXTRA_FLAGS := \