diff options
| author | Denis Kozadaev <[email protected]> | 2020-01-30 22:13:12 +0300 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2020-02-16 15:44:33 +0100 |
| commit | b296a384cac5d4efa984bf1b59fa5832cebaad72 (patch) | |
| tree | 5f5e74084ea876122e884db6ccf3ebb1cf5442d4 | |
| parent | 79d52977bb917367364b923616c1278af9a8bbf1 (diff) | |
| download | tde-packaging-b296a384cac5d4efa984bf1b59fa5832cebaad72.tar.gz tde-packaging-b296a384cac5d4efa984bf1b59fa5832cebaad72.zip | |
restore original version generator
Signed-off-by: Denis Kozadaev <[email protected]>
(cherry picked from commit 4515b4b5bc84f7ad69242d6b17e5bb5a974e0008)
| -rw-r--r-- | dilos/dependencies/arts/debian/cdbs/debian-tde.mk | 12 | ||||
| -rwxr-xr-x | dilos/dependencies/arts/debian/rules | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/dilos/dependencies/arts/debian/cdbs/debian-tde.mk b/dilos/dependencies/arts/debian/cdbs/debian-tde.mk index 7a55130b2..e5b9a8be3 100644 --- a/dilos/dependencies/arts/debian/cdbs/debian-tde.mk +++ b/dilos/dependencies/arts/debian/cdbs/debian-tde.mk @@ -69,7 +69,7 @@ DEB_KDE_ENABLE_FINAL := yes DEB_INSTALL_DOCS_ALL := DEB_DH_MAKESHLIBS_ARGS_ALL := -V -DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib/$(DEB_HOST_MULTIARCH)) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" @@ -178,15 +178,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: set -e; \ - for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + for doc in `cd $(DEB_DESTDIR)/usr/share/doc/tde/HTML/en; find . -name index.docbook`; do \ pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ echo Building $$pkg HTML docs...; \ - mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ - cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ - /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/tde/HTML/en/$$pkg; \ + /usr/bin/meinproc $(DEB_DESTDIR)/usr/share/doc/tde/HTML/en/$$pkg/index.docbook; \ done for pkg in $(DOC_HTML_PRUNE) ; do \ - rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/tde/HTML/en/$$pkg; \ done common-build-indep:: debian/stamp-kde-apidox diff --git a/dilos/dependencies/arts/debian/rules b/dilos/dependencies/arts/debian/rules index 3b6bb897f..f7707d9dc 100755 --- a/dilos/dependencies/arts/debian/rules +++ b/dilos/dependencies/arts/debian/rules @@ -20,7 +20,7 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DBUILD_ALL="ON" \ -DCMAKE_SKIP_RPATH="OFF" \ --DWITH_GCC_VISIBILITY="OFF" \ +-DWITH_GCC_VISIBILITY="ON" \ -DWITH_ALSA=OFF \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_C_COMPILER=gcc \ @@ -43,7 +43,7 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ PACKAGES_WITH_LIBS := libarts1c2a-trinity libartsc0-trinity DEB_DH_MAKESHLIBS_ARGS_ALL := -V -DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/opt/trinity/lib) +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib/$(DEB_HOST_MULTIARCH)) DEB_DH_MAKESHLIBS_ARGS_libarts1c2a-trinity := -V'libarts1c2a-trinity (>= 1.5.9)' DEB_DH_MAKESHLIBS_ARGS_libartsc0-trinity := -V'libartsc0-trinity (>= 1.5.9)' |