summaryrefslogtreecommitdiffstats
path: root/ubuntu/_base/applications/system/tdepowersave
diff options
context:
space:
mode:
Diffstat (limited to 'ubuntu/_base/applications/system/tdepowersave')
-rw-r--r--ubuntu/_base/applications/system/tdepowersave/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/system/tdepowersave/debian/compat2
-rw-r--r--ubuntu/_base/applications/system/tdepowersave/debian/control2
-rw-r--r--ubuntu/_base/applications/system/tdepowersave/debian/docs3
-rwxr-xr-xubuntu/_base/applications/system/tdepowersave/debian/rules3
-rw-r--r--ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.linda4
-rw-r--r--ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.lintian2
-rw-r--r--ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.postinst13
8 files changed, 11 insertions, 25 deletions
diff --git a/ubuntu/_base/applications/system/tdepowersave/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/tdepowersave/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/system/tdepowersave/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/system/tdepowersave/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/ubuntu/_base/applications/system/tdepowersave/debian/compat b/ubuntu/_base/applications/system/tdepowersave/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/system/tdepowersave/debian/compat
+++ b/ubuntu/_base/applications/system/tdepowersave/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/system/tdepowersave/debian/control b/ubuntu/_base/applications/system/tdepowersave/debian/control
index 4a715d99b..b0b75e675 100644
--- a/ubuntu/_base/applications/system/tdepowersave/debian/control
+++ b/ubuntu/_base/applications/system/tdepowersave/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Michael Biebl <biebl@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libdbus-1-dev (>= 0.6), libdbus-1-tqt-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libdbus-1-dev (>= 0.6), libdbus-1-tqt-dev
Standards-Version: 3.8.4
Homepage: http://sourceforge.net/projects/powersave/
diff --git a/ubuntu/_base/applications/system/tdepowersave/debian/docs b/ubuntu/_base/applications/system/tdepowersave/debian/docs
new file mode 100644
index 000000000..76c3076c9
--- /dev/null
+++ b/ubuntu/_base/applications/system/tdepowersave/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+README.md
+TODO
diff --git a/ubuntu/_base/applications/system/tdepowersave/debian/rules b/ubuntu/_base/applications/system/tdepowersave/debian/rules
index 01e5357b6..58af3504b 100755
--- a/ubuntu/_base/applications/system/tdepowersave/debian/rules
+++ b/ubuntu/_base/applications/system/tdepowersave/debian/rules
@@ -4,8 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
include debian/cdbs/debian-tde.mk
-DEB_INSTALL_DOCS_ALL := AUTHORS NEWS
-
DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
-DCMAKE_INSTALL_PREFIX="/opt/trinity" \
@@ -20,4 +18,3 @@ DEB_CMAKE_EXTRA_FLAGS := \
install/tdepowersave-trinity::
install -p -D -m644 debian/tdepowersave-trinity.lintian debian/tdepowersave-trinity/usr/share/lintian/overrides/tdepowersave-trinity
- install -p -D -m644 debian/tdepowersave-trinity.linda debian/tdepowersave-trinity/usr/share/linda/overrides/tdepowersave-trinity
diff --git a/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.linda b/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.linda
deleted file mode 100644
index ff5153632..000000000
--- a/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.linda
+++ /dev/null
@@ -1,4 +0,0 @@
-Tag: lib-not-in-shlibs
-
-Tag: no-shlib-file
-Data: /usr/trinity/lib/libtdeinit_*.so
diff --git a/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.lintian b/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.lintian
index e27c64261..f89a3be85 100644
--- a/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.lintian
+++ b/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.lintian
@@ -1,5 +1,3 @@
tdepowersave-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdepowersave.so
tdepowersave-trinity: package-name-doesnt-match-sonames libtdeinit-tdepowersave
-tdepowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so
-tdepowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so
diff --git a/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.postinst b/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.postinst
deleted file mode 100644
index a00246bd9..000000000
--- a/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for tdepowersave-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
- # force ldconfig due to tdeinit library
- ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0