summaryrefslogtreecommitdiffstats
path: root/debian/_base/applications/development/kscope/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian/_base/applications/development/kscope/debian')
-rw-r--r--debian/_base/applications/development/kscope/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/development/kscope/debian/compat2
-rw-r--r--debian/_base/applications/development/kscope/debian/control2
-rw-r--r--debian/_base/applications/development/kscope/debian/docs2
-rw-r--r--debian/_base/applications/development/kscope/debian/patches/04_am_maintainer_mode.diff11
-rw-r--r--debian/_base/applications/development/kscope/debian/patches/06_disable_no_undefined.diff18
-rw-r--r--debian/_base/applications/development/kscope/debian/patches/series2
7 files changed, 10 insertions, 34 deletions
diff --git a/debian/_base/applications/development/kscope/debian/cdbs/debian-tde.mk b/debian/_base/applications/development/kscope/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/development/kscope/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/development/kscope/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/debian/_base/applications/development/kscope/debian/compat b/debian/_base/applications/development/kscope/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/development/kscope/debian/compat
+++ b/debian/_base/applications/development/kscope/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/development/kscope/debian/control b/debian/_base/applications/development/kscope/debian/control
index 24cae5f83..73542706b 100644
--- a/debian/_base/applications/development/kscope/debian/control
+++ b/debian/_base/applications/development/kscope/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, bison, flex, tdebase-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, bison, flex, tdebase-trinity-dev
Standards-Version: 3.8.0
Homepage: http://kscope.sourceforge.net
Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kscope/?op=log
diff --git a/debian/_base/applications/development/kscope/debian/docs b/debian/_base/applications/development/kscope/debian/docs
index 1333ed77b..76c3076c9 100644
--- a/debian/_base/applications/development/kscope/debian/docs
+++ b/debian/_base/applications/development/kscope/debian/docs
@@ -1 +1,3 @@
+AUTHORS
+README.md
TODO
diff --git a/debian/_base/applications/development/kscope/debian/patches/04_am_maintainer_mode.diff b/debian/_base/applications/development/kscope/debian/patches/04_am_maintainer_mode.diff
deleted file mode 100644
index 391a80285..000000000
--- a/debian/_base/applications/development/kscope/debian/patches/04_am_maintainer_mode.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/admin/configure.in.min
-+++ b/admin/configure.in.min
-@@ -38,6 +38,8 @@
- dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
-
-+AM_MAINTAINER_MODE
-+
- KDE_SET_PREFIX
-
- dnl generate the config header
diff --git a/debian/_base/applications/development/kscope/debian/patches/06_disable_no_undefined.diff b/debian/_base/applications/development/kscope/debian/patches/06_disable_no_undefined.diff
deleted file mode 100644
index 05c932c3c..000000000
--- a/debian/_base/applications/development/kscope/debian/patches/06_disable_no_undefined.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/admin/acinclude.m4.in
-+++ b/admin/acinclude.m4.in
-@@ -1689,15 +1689,6 @@
- KDE_USE_CLOSURE_TRUE="#"
- KDE_USE_CLOSURE_FALSE=""
- KDE_NO_UNDEFINED=""
-- case $host in
-- *-*-linux-gnu)
-- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
-- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
-- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
-- [KDE_NO_UNDEFINED=""])],
-- [KDE_NO_UNDEFINED=""])
-- ;;
-- esac
- fi
- AC_SUBST(KDE_USE_CLOSURE_TRUE)
- AC_SUBST(KDE_USE_CLOSURE_FALSE)
diff --git a/debian/_base/applications/development/kscope/debian/patches/series b/debian/_base/applications/development/kscope/debian/patches/series
index b8743ddd9..e69de29bb 100644
--- a/debian/_base/applications/development/kscope/debian/patches/series
+++ b/debian/_base/applications/development/kscope/debian/patches/series
@@ -1,2 +0,0 @@
-04_am_maintainer_mode.diff
-06_disable_no_undefined.diff