From 71a469d933b65f3ef17981f6d31855ef4c1201b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 18 Nov 2012 17:25:13 +0100 Subject: [PATCH] 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 (cherry picked from commit 4cfcb3723c113b840e13e198e33a3a512b55169f) --- debian/lenny/kdetoys/debian/amor-trinity.install | 2 +- debian/lenny/kdetoys/debian/cdbs/debian-qt-kde.mk | 8 ++++++-- debian/lenny/kdetoys/debian/cdbs/kde.mk | 4 +++- debian/lenny/kdetoys/debian/kmoon-trinity.install | 2 +- debian/lenny/kdetoys/debian/rules | 4 ++-- debian/squeeze/kdetoys/debian/amor-trinity.install | 2 +- debian/squeeze/kdetoys/debian/cdbs/debian-qt-kde.mk | 8 ++++++-- debian/squeeze/kdetoys/debian/cdbs/kde.mk | 4 +++- debian/squeeze/kdetoys/debian/kmoon-trinity.install | 2 +- debian/squeeze/kdetoys/debian/rules | 4 ++-- ubuntu/maverick/kdetoys/debian/amor-trinity.install | 2 +- ubuntu/maverick/kdetoys/debian/cdbs/debian-qt-kde.mk | 8 ++++++-- ubuntu/maverick/kdetoys/debian/cdbs/kde.mk | 4 +++- ubuntu/maverick/kdetoys/debian/kmoon-trinity.install | 2 +- ubuntu/maverick/kdetoys/debian/rules | 4 ++-- 15 files changed, 39 insertions(+), 21 deletions(-) diff --git a/debian/lenny/kdetoys/debian/amor-trinity.install b/debian/lenny/kdetoys/debian/amor-trinity.install index bbe82967c..50d346773 100644 --- a/debian/lenny/kdetoys/debian/amor-trinity.install +++ b/debian/lenny/kdetoys/debian/amor-trinity.install @@ -1,5 +1,5 @@ debian/tmp/opt/trinity/bin/amor -debian/tmp/opt/trinity/include/kde/AmorIface.h +debian/tmp/opt/trinity/include/AmorIface.h debian/tmp/opt/trinity/share/apps/amor debian/tmp/opt/trinity/share/applications/kde/amor.desktop debian/tmp/opt/trinity/share/doc/tde/HTML/en/amor/*.bz2 diff --git a/debian/lenny/kdetoys/debian/cdbs/debian-qt-kde.mk b/debian/lenny/kdetoys/debian/cdbs/debian-qt-kde.mk index d135c4257..f8b76cb04 100644 --- a/debian/lenny/kdetoys/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/kdetoys/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/lenny/kdetoys/debian/cdbs/kde.mk b/debian/lenny/kdetoys/debian/cdbs/kde.mk index 918490180..023886fc8 100644 --- a/debian/lenny/kdetoys/debian/cdbs/kde.mk +++ b/debian/lenny/kdetoys/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/kde" +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/lenny/kdetoys/debian/kmoon-trinity.install b/debian/lenny/kdetoys/debian/kmoon-trinity.install index d8af4fa2f..818d57926 100644 --- a/debian/lenny/kdetoys/debian/kmoon-trinity.install +++ b/debian/lenny/kdetoys/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/debian/lenny/kdetoys/debian/rules b/debian/lenny/kdetoys/debian/rules index db356ba14..29c4bf046 100755 --- a/debian/lenny/kdetoys/debian/rules +++ b/debian/lenny/kdetoys/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/kde +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/kde" --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=kdetoys-trinity-dbg diff --git a/debian/squeeze/kdetoys/debian/amor-trinity.install b/debian/squeeze/kdetoys/debian/amor-trinity.install index bbe82967c..50d346773 100644 --- a/debian/squeeze/kdetoys/debian/amor-trinity.install +++ b/debian/squeeze/kdetoys/debian/amor-trinity.install @@ -1,5 +1,5 @@ debian/tmp/opt/trinity/bin/amor -debian/tmp/opt/trinity/include/kde/AmorIface.h +debian/tmp/opt/trinity/include/AmorIface.h debian/tmp/opt/trinity/share/apps/amor debian/tmp/opt/trinity/share/applications/kde/amor.desktop debian/tmp/opt/trinity/share/doc/tde/HTML/en/amor/*.bz2 diff --git a/debian/squeeze/kdetoys/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/kdetoys/debian/cdbs/debian-qt-kde.mk index d135c4257..f8b76cb04 100644 --- a/debian/squeeze/kdetoys/debian/cdbs/debian-qt-kde.mk +++ b/debian/squeeze/kdetoys/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/kdetoys/debian/cdbs/kde.mk b/debian/squeeze/kdetoys/debian/cdbs/kde.mk index 918490180..023886fc8 100644 --- a/debian/squeeze/kdetoys/debian/cdbs/kde.mk +++ b/debian/squeeze/kdetoys/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/kde" +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/kdetoys/debian/kmoon-trinity.install b/debian/squeeze/kdetoys/debian/kmoon-trinity.install index d8af4fa2f..818d57926 100644 --- a/debian/squeeze/kdetoys/debian/kmoon-trinity.install +++ b/debian/squeeze/kdetoys/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/debian/squeeze/kdetoys/debian/rules b/debian/squeeze/kdetoys/debian/rules index f8acbaee6..4edb05ead 100755 --- a/debian/squeeze/kdetoys/debian/rules +++ b/debian/squeeze/kdetoys/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/kde +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/kde" --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=kdetoys-trinity-dbg diff --git a/ubuntu/maverick/kdetoys/debian/amor-trinity.install b/ubuntu/maverick/kdetoys/debian/amor-trinity.install index bbe82967c..50d346773 100644 --- a/ubuntu/maverick/kdetoys/debian/amor-trinity.install +++ b/ubuntu/maverick/kdetoys/debian/amor-trinity.install @@ -1,5 +1,5 @@ debian/tmp/opt/trinity/bin/amor -debian/tmp/opt/trinity/include/kde/AmorIface.h +debian/tmp/opt/trinity/include/AmorIface.h debian/tmp/opt/trinity/share/apps/amor debian/tmp/opt/trinity/share/applications/kde/amor.desktop debian/tmp/opt/trinity/share/doc/tde/HTML/en/amor/*.bz2 diff --git a/ubuntu/maverick/kdetoys/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdetoys/debian/cdbs/debian-qt-kde.mk index d135c4257..f8b76cb04 100644 --- a/ubuntu/maverick/kdetoys/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/maverick/kdetoys/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/kdetoys/debian/cdbs/kde.mk b/ubuntu/maverick/kdetoys/debian/cdbs/kde.mk index 918490180..023886fc8 100644 --- a/ubuntu/maverick/kdetoys/debian/cdbs/kde.mk +++ b/ubuntu/maverick/kdetoys/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/kde" +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/kdetoys/debian/kmoon-trinity.install b/ubuntu/maverick/kdetoys/debian/kmoon-trinity.install index d8af4fa2f..818d57926 100644 --- a/ubuntu/maverick/kdetoys/debian/kmoon-trinity.install +++ b/ubuntu/maverick/kdetoys/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/kdetoys/debian/rules b/ubuntu/maverick/kdetoys/debian/rules index f8acbaee6..4edb05ead 100755 --- a/ubuntu/maverick/kdetoys/debian/rules +++ b/ubuntu/maverick/kdetoys/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/kde +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/kde" --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=kdetoys-trinity-dbg