diff options
Diffstat (limited to 'ubuntu/_base/dependencies/libr')
| -rw-r--r-- | ubuntu/_base/dependencies/libr/debian/cdbs/debian-tde.mk | 7 | ||||
| -rw-r--r-- | ubuntu/_base/dependencies/libr/debian/compat | 2 | ||||
| -rw-r--r-- | ubuntu/_base/dependencies/libr/debian/control | 6 | ||||
| -rw-r--r-- | ubuntu/_base/dependencies/libr/debian/libr1.dirs (renamed from ubuntu/_base/dependencies/libr/debian/libr0.dirs) | 0 | ||||
| -rw-r--r-- | ubuntu/_base/dependencies/libr/debian/libr1.install (renamed from ubuntu/_base/dependencies/libr/debian/libr0.install) | 0 |
5 files changed, 10 insertions, 5 deletions
diff --git a/ubuntu/_base/dependencies/libr/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/libr/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/dependencies/libr/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/dependencies/libr/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/dependencies/libr/debian/compat b/ubuntu/_base/dependencies/libr/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/dependencies/libr/debian/compat +++ b/ubuntu/_base/dependencies/libr/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/dependencies/libr/debian/control b/ubuntu/_base/dependencies/libr/debian/control index 121049451..df44ba5b5 100644 --- a/ubuntu/_base/dependencies/libr/debian/control +++ b/ubuntu/_base/dependencies/libr/debian/control @@ -1,12 +1,12 @@ Source: libr Priority: extra Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, pkg-config, libglade2-dev, binutils-dev, doxygen +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, pkg-config, libgtk2.0-dev, binutils-dev, doxygen Standards-Version: 3.8.4 Section: libs Homepage: http://www.compholio.com/elficon/ -Package: libr0 +Package: libr1 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -16,6 +16,6 @@ Description: ELF binary resource library Package: libr-dev Section: libdevel Architecture: any -Depends: libr0 (= ${binary:Version}) +Depends: libr1 (= ${binary:Version}) Description: ELF binary resource library Store and retrieve resources from ELF binaries. diff --git a/ubuntu/_base/dependencies/libr/debian/libr0.dirs b/ubuntu/_base/dependencies/libr/debian/libr1.dirs index 68457717b..68457717b 100644 --- a/ubuntu/_base/dependencies/libr/debian/libr0.dirs +++ b/ubuntu/_base/dependencies/libr/debian/libr1.dirs diff --git a/ubuntu/_base/dependencies/libr/debian/libr0.install b/ubuntu/_base/dependencies/libr/debian/libr1.install index d0dbfd18a..d0dbfd18a 100644 --- a/ubuntu/_base/dependencies/libr/debian/libr0.install +++ b/ubuntu/_base/dependencies/libr/debian/libr1.install |