summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Kozadaev <denis@dilos.org>2020-01-30 22:13:12 +0300
committerSlávek Banko <slavek.banko@axis.cz>2020-02-16 15:47:28 +0100
commit83b680031c32ececd8824cd93681e579cab1b141 (patch)
tree444a8b625dca2e0438c66d799c13cf2009e0b4f2
parentb296a384cac5d4efa984bf1b59fa5832cebaad72 (diff)
downloadtde-packaging-83b680031c32ececd8824cd93681e579cab1b141.tar.gz
tde-packaging-83b680031c32ececd8824cd93681e579cab1b141.zip
restore original version generator
Signed-off-by: Denis Kozadaev <denis@dilos.org> (cherry picked from commit c5946cfcce59a0ba86f13f3244982c3697abda39)
-rw-r--r--dilos/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk12
-rwxr-xr-xdilos/dependencies/dbus-1-tqt/debian/rules3
2 files changed, 7 insertions, 8 deletions
diff --git a/dilos/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk b/dilos/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk
index 7a55130b2..e5b9a8be3 100644
--- a/dilos/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk
+++ b/dilos/dependencies/dbus-1-tqt/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/dbus-1-tqt/debian/rules b/dilos/dependencies/dbus-1-tqt/debian/rules
index d6cb1d4c6..1c6828deb 100755
--- a/dilos/dependencies/dbus-1-tqt/debian/rules
+++ b/dilos/dependencies/dbus-1-tqt/debian/rules
@@ -17,5 +17,4 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_APIDOX_HTML_DIRECTORY="usr/share/doc/libdbus-1-tqt/HTML" \
-DWITH_ALL_OPTIONS="ON" \
-DCMAKE_C_COMPILER=gcc \
- -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" \
- -DWITH_GCC_VISIBILITY="OFF"
+ -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)"