From e747ba9c24732028ce543f6885900dbe513a4ffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Fri, 16 Nov 2012 03:48:08 +0100 Subject: Fix tdeutils build issues on Debian and Ubuntu Cdbs files modified to support both automake and cmake Removed unnecessary files installed into doc Include files moved to default location --- .../squeeze/tdeutils/debian/cdbs/debian-qt-kde.mk | 8 ++++-- debian/squeeze/tdeutils/debian/cdbs/kde.mk | 4 ++- .../squeeze/tdeutils/debian/kcalc-trinity.install | 4 +-- debian/squeeze/tdeutils/debian/rules | 2 +- .../tdeutils/debian/tdeutils-trinity-dev.install | 30 +++++++++++----------- 5 files changed, 27 insertions(+), 21 deletions(-) (limited to 'debian/squeeze') diff --git a/debian/squeeze/tdeutils/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/tdeutils/debian/cdbs/debian-qt-kde.mk index d135c4257..f8b76cb04 100644 --- a/debian/squeeze/tdeutils/debian/cdbs/debian-qt-kde.mk +++ b/debian/squeeze/tdeutils/debian/cdbs/debian-qt-kde.mk @@ -10,9 +10,11 @@ _cdbs_class_debian-qt-kde := 1 # Note: This _must_ be included before autotools.mk, or it won't work. common-configure-arch common-configure-indep:: debian/stamp-cvs-make debian/stamp-cvs-make: +ifndef _cdbs_class_cmake cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) @@ -75,11 +77,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi if test -e debian/$(cdbs_curpkg).lintian; then \ install -p -D -m644 debian/$(cdbs_curpkg).lintian \ - debian/$(cdbs_curpkg)/opt/trinity/share/lintian/overrides/$(cdbs_curpkg); \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ fi if test -e debian/$(cdbs_curpkg).presubj; then \ install -p -D -m644 debian/$(cdbs_curpkg).presubj \ - debian/$(cdbs_curpkg)/opt/trinity/share/bug/$(cdbs_curpkg)/presubj; \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: @@ -96,6 +98,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: done clean:: +ifndef _cdbs_class_cmake if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ cd $(DEB_SRCDIR); \ find . -name Makefile.in -print | \ @@ -104,6 +107,7 @@ clean:: configure configure.files configure.in stamp-h.in \ subdirs; \ fi +endif rm -f debian/stamp-cvs-make endif diff --git a/debian/squeeze/tdeutils/debian/cdbs/kde.mk b/debian/squeeze/tdeutils/debian/cdbs/kde.mk index 765560c89..023886fc8 100644 --- a/debian/squeeze/tdeutils/debian/cdbs/kde.mk +++ b/debian/squeeze/tdeutils/debian/cdbs/kde.mk @@ -35,7 +35,9 @@ else DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) endif +ifndef _cdbs_class_cmake include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif export kde_cgidir = \$${libdir}/cgi-bin export kde_confdir = \$${sysconfdir}/trinity @@ -59,7 +61,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/tdeutils/debian/kcalc-trinity.install b/debian/squeeze/tdeutils/debian/kcalc-trinity.install index 231afbf24..4d245f543 100644 --- a/debian/squeeze/tdeutils/debian/kcalc-trinity.install +++ b/debian/squeeze/tdeutils/debian/kcalc-trinity.install @@ -10,8 +10,8 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcalc/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcalc/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcalc/index.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcalc/commands.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcalc/kcalc_on_Aix.txt -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcalc/kcalc_on_OSF.txt +#debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcalc/kcalc_on_Aix.txt +#debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcalc/kcalc_on_OSF.txt debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kcalc.png debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kcalc.png debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kcalc.png diff --git a/debian/squeeze/tdeutils/debian/rules b/debian/squeeze/tdeutils/debian/rules index 0dfac3ab0..f0a8e0d00 100755 --- a/debian/squeeze/tdeutils/debian/rules +++ b/debian/squeeze/tdeutils/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info diff --git a/debian/squeeze/tdeutils/debian/tdeutils-trinity-dev.install b/debian/squeeze/tdeutils/debian/tdeutils-trinity-dev.install index ca7081194..17d66276d 100644 --- a/debian/squeeze/tdeutils/debian/tdeutils-trinity-dev.install +++ b/debian/squeeze/tdeutils/debian/tdeutils-trinity-dev.install @@ -1,18 +1,18 @@ -debian/tmp/opt/trinity/include/tde/kmultiformlistbox.h -debian/tmp/opt/trinity/include/tde/kmultiformlistboxentry.h -debian/tmp/opt/trinity/include/tde/kmultiformlistboxfactory.h -debian/tmp/opt/trinity/include/tde/ksim/chart.h -debian/tmp/opt/trinity/include/tde/ksim/common.h -debian/tmp/opt/trinity/include/tde/ksim/ksimconfig.h -debian/tmp/opt/trinity/include/tde/ksim/label.h -debian/tmp/opt/trinity/include/tde/ksim/led.h -debian/tmp/opt/trinity/include/tde/ksim/pluginglobal.h -debian/tmp/opt/trinity/include/tde/ksim/pluginloader.h -debian/tmp/opt/trinity/include/tde/ksim/pluginmodule.h -debian/tmp/opt/trinity/include/tde/ksim/progress.h -debian/tmp/opt/trinity/include/tde/ksim/themeloader.h -debian/tmp/opt/trinity/include/tde/ksim/themetypes.h -debian/tmp/opt/trinity/include/tde/kwidgetstreamer.h +debian/tmp/opt/trinity/include/kmultiformlistbox.h +debian/tmp/opt/trinity/include/kmultiformlistboxentry.h +debian/tmp/opt/trinity/include/kmultiformlistboxfactory.h +debian/tmp/opt/trinity/include/ksim/chart.h +debian/tmp/opt/trinity/include/ksim/common.h +debian/tmp/opt/trinity/include/ksim/ksimconfig.h +debian/tmp/opt/trinity/include/ksim/label.h +debian/tmp/opt/trinity/include/ksim/led.h +debian/tmp/opt/trinity/include/ksim/pluginglobal.h +debian/tmp/opt/trinity/include/ksim/pluginloader.h +debian/tmp/opt/trinity/include/ksim/pluginmodule.h +debian/tmp/opt/trinity/include/ksim/progress.h +debian/tmp/opt/trinity/include/ksim/themeloader.h +debian/tmp/opt/trinity/include/ksim/themetypes.h +debian/tmp/opt/trinity/include/kwidgetstreamer.h debian/tmp/opt/trinity/lib/libkcmlaptop.la debian/tmp/opt/trinity/lib/libkcmlaptop.so debian/tmp/opt/trinity/lib/libtdeinit_ark.la -- cgit v1.2.1