Fix tdetoys 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

5 files changed, 13 insertions, 7 deletions

diff --git a/ubuntu/maverick/tdetoys/debian/amor-trinity.install b/ubuntu/maverick/tdetoys/debian/amor-trinity.install
index 42a96abee..10653448d 100644
--- a/ubuntu/maverick/tdetoys/debian/amor-trinity.install
+++ b/ubuntu/maverick/tdetoys/debian/amor-trinity.install
@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/amor
-debian/tmp/opt/trinity/include/tde/AmorIface.h
+debian/tmp/opt/trinity/include/AmorIface.h
 debian/tmp/opt/trinity/share/apps/amor
 debian/tmp/opt/trinity/share/applications/tde/amor.desktop
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/amor/*.bz2
diff --git a/ubuntu/maverick/tdetoys/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdetoys/debian/cdbs/debian-qt-kde.mk
index d135c4257..f8b76cb04 100644
--- a/ubuntu/maverick/tdetoys/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdetoys/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/ubuntu/maverick/tdetoys/debian/cdbs/kde.mk b/ubuntu/maverick/tdetoys/debian/cdbs/kde.mk
index 765560c89..023886fc8 100644
--- a/ubuntu/maverick/tdetoys/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdetoys/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/ubuntu/maverick/tdetoys/debian/kmoon-trinity.install b/ubuntu/maverick/tdetoys/debian/kmoon-trinity.install
index d8af4fa2f..818d57926 100644
--- a/ubuntu/maverick/tdetoys/debian/kmoon-trinity.install
+++ b/ubuntu/maverick/tdetoys/debian/kmoon-trinity.install
@@ -4,7 +4,7 @@ debian/tmp/opt/trinity/share/apps/kicker/applets/kmoonapplet.desktop
 debian/tmp/opt/trinity/share/apps/kmoon
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmoon/*.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmoon/*.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmoon/carlosmail
+#debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmoon/carlosmail
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmoon/common
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kmoon.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kmoon.png
diff --git a/ubuntu/maverick/tdetoys/debian/rules b/ubuntu/maverick/tdetoys/debian/rules
index 57c3cf2c9..60a5a9cf4 100755
--- a/ubuntu/maverick/tdetoys/debian/rules
+++ b/ubuntu/maverick/tdetoys/debian/rules
@@ -5,14 +5,14 @@ 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
 
 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info"
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info"
 
 DEB_DH_STRIP_ARGS  := --dbg-package=tdetoys-trinity-dbg