Fix potential kdiff3 FTBFS on Debian and Ubuntu

pull/3/head
Slávek Banko 11 years ago
parent c95176b234
commit 7ecb22ecd5

@ -4,6 +4,9 @@
# Uncomment this to turn on verbose mode. # Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1 #export DH_VERBOSE=1
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_PREFIX := /opt/trinity
@ -12,9 +15,6 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2) && echo xz || echo bzip2)
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
post-patches:: debian/stamp-bootstrap post-patches:: debian/stamp-bootstrap
debian/stamp-bootstrap: debian/stamp-bootstrap:

@ -4,6 +4,9 @@
# Uncomment this to turn on verbose mode. # Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1 #export DH_VERBOSE=1
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_PREFIX := /opt/trinity
@ -12,9 +15,6 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2) && echo xz || echo bzip2)
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
post-patches:: debian/stamp-bootstrap post-patches:: debian/stamp-bootstrap
debian/stamp-bootstrap: debian/stamp-bootstrap:

@ -4,6 +4,9 @@
# Uncomment this to turn on verbose mode. # Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1 #export DH_VERBOSE=1
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_PREFIX := /opt/trinity
@ -12,9 +15,6 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2) && echo xz || echo bzip2)
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
post-patches:: debian/stamp-bootstrap post-patches:: debian/stamp-bootstrap
debian/stamp-bootstrap: debian/stamp-bootstrap:

@ -4,6 +4,9 @@
# Uncomment this to turn on verbose mode. # Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1 #export DH_VERBOSE=1
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_PREFIX := /opt/trinity
@ -12,9 +15,6 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2) && echo xz || echo bzip2)
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
post-patches:: debian/stamp-bootstrap post-patches:: debian/stamp-bootstrap
debian/stamp-bootstrap: debian/stamp-bootstrap:

@ -4,6 +4,9 @@
# Uncomment this to turn on verbose mode. # Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1 #export DH_VERBOSE=1
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_PREFIX := /opt/trinity
@ -12,9 +15,6 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2) && echo xz || echo bzip2)
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
post-patches:: debian/stamp-bootstrap post-patches:: debian/stamp-bootstrap
debian/stamp-bootstrap: debian/stamp-bootstrap:

@ -4,6 +4,9 @@
# Uncomment this to turn on verbose mode. # Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1 #export DH_VERBOSE=1
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_PREFIX := /opt/trinity
@ -12,9 +15,6 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2) && echo xz || echo bzip2)
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
post-patches:: debian/stamp-bootstrap post-patches:: debian/stamp-bootstrap
debian/stamp-bootstrap: debian/stamp-bootstrap:

Loading…
Cancel
Save