diff --git a/debian/lenny/kdesdk/debian/cdbs/debian-qt-kde.mk b/debian/lenny/kdesdk/debian/cdbs/debian-qt-kde.mk index d135c4257..f8b76cb04 100644 --- a/debian/lenny/kdesdk/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/kdesdk/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/kdesdk/debian/cdbs/kde.mk b/debian/lenny/kdesdk/debian/cdbs/kde.mk index 918490180..023886fc8 100644 --- a/debian/lenny/kdesdk/debian/cdbs/kde.mk +++ b/debian/lenny/kdesdk/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/kdesdk/debian/kbabel-trinity-dev.install b/debian/lenny/kdesdk/debian/kbabel-trinity-dev.install index a792b2b6d..4c2720936 100644 --- a/debian/lenny/kdesdk/debian/kbabel-trinity-dev.install +++ b/debian/lenny/kdesdk/debian/kbabel-trinity-dev.install @@ -1,24 +1,24 @@ -debian/tmp/opt/trinity/include/kde/kbabel/catalog.h -debian/tmp/opt/trinity/include/kde/kbabel/catalogfileplugin.h -debian/tmp/opt/trinity/include/kde/kbabel/catalogitem.h -debian/tmp/opt/trinity/include/kde/kbabel/catalogsettings.h -debian/tmp/opt/trinity/include/kde/kbabel/catalogview.h -debian/tmp/opt/trinity/include/kde/kbabel/dictchooser.h -debian/tmp/opt/trinity/include/kde/kbabel/dictionarymenu.h -debian/tmp/opt/trinity/include/kde/kbabel/editcmd.h -debian/tmp/opt/trinity/include/kde/kbabel/findoptions.h -debian/tmp/opt/trinity/include/kde/kbabel/itempart.h -debian/tmp/opt/trinity/include/kde/kbabel/kbabeldatatool.h -debian/tmp/opt/trinity/include/kde/kbabel/kbabeldictbox.h -debian/tmp/opt/trinity/include/kde/kbabel/kbabeldictiface.h -debian/tmp/opt/trinity/include/kde/kbabel/kbproject.h -debian/tmp/opt/trinity/include/kde/kbabel/kbprojectmanager.h -debian/tmp/opt/trinity/include/kde/kbabel/msgfmt.h -debian/tmp/opt/trinity/include/kde/kbabel/poinfo.h -debian/tmp/opt/trinity/include/kde/kbabel/projectsettings.h -debian/tmp/opt/trinity/include/kde/kbabel/regexpextractor.h -debian/tmp/opt/trinity/include/kde/kbabel/searchengine.h -debian/tmp/opt/trinity/include/kde/kbabel/tagextractor.h +debian/tmp/opt/trinity/include/kbabel/catalog.h +debian/tmp/opt/trinity/include/kbabel/catalogfileplugin.h +debian/tmp/opt/trinity/include/kbabel/catalogitem.h +debian/tmp/opt/trinity/include/kbabel/catalogsettings.h +debian/tmp/opt/trinity/include/kbabel/catalogview.h +debian/tmp/opt/trinity/include/kbabel/dictchooser.h +debian/tmp/opt/trinity/include/kbabel/dictionarymenu.h +debian/tmp/opt/trinity/include/kbabel/editcmd.h +debian/tmp/opt/trinity/include/kbabel/findoptions.h +debian/tmp/opt/trinity/include/kbabel/itempart.h +debian/tmp/opt/trinity/include/kbabel/kbabeldatatool.h +debian/tmp/opt/trinity/include/kbabel/kbabeldictbox.h +debian/tmp/opt/trinity/include/kbabel/kbabeldictiface.h +debian/tmp/opt/trinity/include/kbabel/kbproject.h +debian/tmp/opt/trinity/include/kbabel/kbprojectmanager.h +debian/tmp/opt/trinity/include/kbabel/msgfmt.h +debian/tmp/opt/trinity/include/kbabel/poinfo.h +debian/tmp/opt/trinity/include/kbabel/projectsettings.h +debian/tmp/opt/trinity/include/kbabel/regexpextractor.h +debian/tmp/opt/trinity/include/kbabel/searchengine.h +debian/tmp/opt/trinity/include/kbabel/tagextractor.h debian/tmp/opt/trinity/lib/libkbabelcommon.la debian/tmp/opt/trinity/lib/libkbabelcommon.so debian/tmp/opt/trinity/lib/libkbabeldictplugin.la diff --git a/debian/lenny/kdesdk/debian/kbabel-trinity.install b/debian/lenny/kdesdk/debian/kbabel-trinity.install index 2d6dede0c..a1b2c2cab 100644 --- a/debian/lenny/kdesdk/debian/kbabel-trinity.install +++ b/debian/lenny/kdesdk/debian/kbabel-trinity.install @@ -70,7 +70,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbabel/*.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbabel/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbabel/*.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbabel/*.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbabel/TODO +#debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbabel/TODO debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/catalogmanager.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kbabel.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kbabeldict.png diff --git a/debian/lenny/kdesdk/debian/kdesdk-misc-trinity.install b/debian/lenny/kdesdk/debian/kdesdk-misc-trinity.install index fc03d9907..9fbde2ecd 100644 --- a/debian/lenny/kdesdk/debian/kdesdk-misc-trinity.install +++ b/debian/lenny/kdesdk/debian/kdesdk-misc-trinity.install @@ -1,4 +1,4 @@ -debian/tmp/opt/trinity/include/kde/kprofilemethod.h +debian/tmp/opt/trinity/include/kprofilemethod.h debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.la debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.so debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.so diff --git a/debian/lenny/kdesdk/debian/kmtrace-trinity.install b/debian/lenny/kdesdk/debian/kmtrace-trinity.install index 119b5196d..a163246b9 100644 --- a/debian/lenny/kdesdk/debian/kmtrace-trinity.install +++ b/debian/lenny/kdesdk/debian/kmtrace-trinity.install @@ -2,7 +2,7 @@ debian/tmp/opt/trinity/bin/demangle debian/tmp/opt/trinity/bin/kminspector debian/tmp/opt/trinity/bin/kmmatch debian/tmp/opt/trinity/bin/kmtrace -debian/tmp/opt/trinity/include/kde/ktrace.h +debian/tmp/opt/trinity/include/ktrace.h debian/tmp/opt/trinity/lib/kmtrace/libktrace.la debian/tmp/opt/trinity/lib/kmtrace/libktrace.so debian/tmp/opt/trinity/lib/kmtrace/libktrace_s.a diff --git a/debian/lenny/kdesdk/debian/kspy-trinity.install b/debian/lenny/kdesdk/debian/kspy-trinity.install index 3b7d6d778..12523ee90 100644 --- a/debian/lenny/kdesdk/debian/kspy-trinity.install +++ b/debian/lenny/kdesdk/debian/kspy-trinity.install @@ -1,4 +1,4 @@ -debian/tmp/opt/trinity/include/kde/kspy.h +debian/tmp/opt/trinity/include/kspy.h debian/tmp/opt/trinity/lib/libkspy.la debian/tmp/opt/trinity/lib/libkspy.so debian/tmp/opt/trinity/lib/libkspy.so.1 diff --git a/debian/lenny/kdesdk/debian/kunittest-trinity.install b/debian/lenny/kdesdk/debian/kunittest-trinity.install index f002cd796..bf4cf0b5a 100644 --- a/debian/lenny/kdesdk/debian/kunittest-trinity.install +++ b/debian/lenny/kdesdk/debian/kunittest-trinity.install @@ -4,4 +4,4 @@ debian/tmp/opt/trinity/lib/libkunittestgui.la debian/tmp/opt/trinity/lib/libkunittestgui.so debian/tmp/opt/trinity/lib/libkunittestgui.so.0 debian/tmp/opt/trinity/lib/libkunittestgui.so.0.0.0 -debian/tmp/opt/trinity/include/kde/kunittest/runnergui.h +debian/tmp/opt/trinity/include/kunittest/runnergui.h diff --git a/debian/lenny/kdesdk/debian/libcvsservice-trinity-dev.install b/debian/lenny/kdesdk/debian/libcvsservice-trinity-dev.install index ee6134374..7cd1252e9 100644 --- a/debian/lenny/kdesdk/debian/libcvsservice-trinity-dev.install +++ b/debian/lenny/kdesdk/debian/libcvsservice-trinity-dev.install @@ -1,6 +1,6 @@ -debian/tmp/opt/trinity/include/kde/cvsjob_stub.h -debian/tmp/opt/trinity/include/kde/cvsservice_stub.h -debian/tmp/opt/trinity/include/kde/repository_stub.h +debian/tmp/opt/trinity/include/cvsjob_stub.h +debian/tmp/opt/trinity/include/cvsservice_stub.h +debian/tmp/opt/trinity/include/repository_stub.h debian/tmp/opt/trinity/lib/libcvsservice.la debian/tmp/opt/trinity/lib/libcvsservice.so debian/tmp/opt/trinity/lib/libkdeinit_cvsaskpass.la diff --git a/debian/lenny/kdesdk/debian/rules b/debian/lenny/kdesdk/debian/rules index 96387d687..97ed38d13 100755 --- a/debian/lenny/kdesdk/debian/rules +++ b/debian/lenny/kdesdk/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/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 diff --git a/debian/squeeze/kdesdk/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/kdesdk/debian/cdbs/debian-qt-kde.mk index d135c4257..f8b76cb04 100644 --- a/debian/squeeze/kdesdk/debian/cdbs/debian-qt-kde.mk +++ b/debian/squeeze/kdesdk/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/kdesdk/debian/cdbs/kde.mk b/debian/squeeze/kdesdk/debian/cdbs/kde.mk index 918490180..023886fc8 100644 --- a/debian/squeeze/kdesdk/debian/cdbs/kde.mk +++ b/debian/squeeze/kdesdk/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/kdesdk/debian/kbabel-trinity-dev.install b/debian/squeeze/kdesdk/debian/kbabel-trinity-dev.install index a792b2b6d..4c2720936 100644 --- a/debian/squeeze/kdesdk/debian/kbabel-trinity-dev.install +++ b/debian/squeeze/kdesdk/debian/kbabel-trinity-dev.install @@ -1,24 +1,24 @@ -debian/tmp/opt/trinity/include/kde/kbabel/catalog.h -debian/tmp/opt/trinity/include/kde/kbabel/catalogfileplugin.h -debian/tmp/opt/trinity/include/kde/kbabel/catalogitem.h -debian/tmp/opt/trinity/include/kde/kbabel/catalogsettings.h -debian/tmp/opt/trinity/include/kde/kbabel/catalogview.h -debian/tmp/opt/trinity/include/kde/kbabel/dictchooser.h -debian/tmp/opt/trinity/include/kde/kbabel/dictionarymenu.h -debian/tmp/opt/trinity/include/kde/kbabel/editcmd.h -debian/tmp/opt/trinity/include/kde/kbabel/findoptions.h -debian/tmp/opt/trinity/include/kde/kbabel/itempart.h -debian/tmp/opt/trinity/include/kde/kbabel/kbabeldatatool.h -debian/tmp/opt/trinity/include/kde/kbabel/kbabeldictbox.h -debian/tmp/opt/trinity/include/kde/kbabel/kbabeldictiface.h -debian/tmp/opt/trinity/include/kde/kbabel/kbproject.h -debian/tmp/opt/trinity/include/kde/kbabel/kbprojectmanager.h -debian/tmp/opt/trinity/include/kde/kbabel/msgfmt.h -debian/tmp/opt/trinity/include/kde/kbabel/poinfo.h -debian/tmp/opt/trinity/include/kde/kbabel/projectsettings.h -debian/tmp/opt/trinity/include/kde/kbabel/regexpextractor.h -debian/tmp/opt/trinity/include/kde/kbabel/searchengine.h -debian/tmp/opt/trinity/include/kde/kbabel/tagextractor.h +debian/tmp/opt/trinity/include/kbabel/catalog.h +debian/tmp/opt/trinity/include/kbabel/catalogfileplugin.h +debian/tmp/opt/trinity/include/kbabel/catalogitem.h +debian/tmp/opt/trinity/include/kbabel/catalogsettings.h +debian/tmp/opt/trinity/include/kbabel/catalogview.h +debian/tmp/opt/trinity/include/kbabel/dictchooser.h +debian/tmp/opt/trinity/include/kbabel/dictionarymenu.h +debian/tmp/opt/trinity/include/kbabel/editcmd.h +debian/tmp/opt/trinity/include/kbabel/findoptions.h +debian/tmp/opt/trinity/include/kbabel/itempart.h +debian/tmp/opt/trinity/include/kbabel/kbabeldatatool.h +debian/tmp/opt/trinity/include/kbabel/kbabeldictbox.h +debian/tmp/opt/trinity/include/kbabel/kbabeldictiface.h +debian/tmp/opt/trinity/include/kbabel/kbproject.h +debian/tmp/opt/trinity/include/kbabel/kbprojectmanager.h +debian/tmp/opt/trinity/include/kbabel/msgfmt.h +debian/tmp/opt/trinity/include/kbabel/poinfo.h +debian/tmp/opt/trinity/include/kbabel/projectsettings.h +debian/tmp/opt/trinity/include/kbabel/regexpextractor.h +debian/tmp/opt/trinity/include/kbabel/searchengine.h +debian/tmp/opt/trinity/include/kbabel/tagextractor.h debian/tmp/opt/trinity/lib/libkbabelcommon.la debian/tmp/opt/trinity/lib/libkbabelcommon.so debian/tmp/opt/trinity/lib/libkbabeldictplugin.la diff --git a/debian/squeeze/kdesdk/debian/kbabel-trinity.install b/debian/squeeze/kdesdk/debian/kbabel-trinity.install index 2d6dede0c..a1b2c2cab 100644 --- a/debian/squeeze/kdesdk/debian/kbabel-trinity.install +++ b/debian/squeeze/kdesdk/debian/kbabel-trinity.install @@ -70,7 +70,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbabel/*.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbabel/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbabel/*.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbabel/*.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbabel/TODO +#debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbabel/TODO debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/catalogmanager.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kbabel.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kbabeldict.png diff --git a/debian/squeeze/kdesdk/debian/kdesdk-misc-trinity.install b/debian/squeeze/kdesdk/debian/kdesdk-misc-trinity.install index fc03d9907..9fbde2ecd 100644 --- a/debian/squeeze/kdesdk/debian/kdesdk-misc-trinity.install +++ b/debian/squeeze/kdesdk/debian/kdesdk-misc-trinity.install @@ -1,4 +1,4 @@ -debian/tmp/opt/trinity/include/kde/kprofilemethod.h +debian/tmp/opt/trinity/include/kprofilemethod.h debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.la debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.so debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.so diff --git a/debian/squeeze/kdesdk/debian/kmtrace-trinity.install b/debian/squeeze/kdesdk/debian/kmtrace-trinity.install index 119b5196d..a163246b9 100644 --- a/debian/squeeze/kdesdk/debian/kmtrace-trinity.install +++ b/debian/squeeze/kdesdk/debian/kmtrace-trinity.install @@ -2,7 +2,7 @@ debian/tmp/opt/trinity/bin/demangle debian/tmp/opt/trinity/bin/kminspector debian/tmp/opt/trinity/bin/kmmatch debian/tmp/opt/trinity/bin/kmtrace -debian/tmp/opt/trinity/include/kde/ktrace.h +debian/tmp/opt/trinity/include/ktrace.h debian/tmp/opt/trinity/lib/kmtrace/libktrace.la debian/tmp/opt/trinity/lib/kmtrace/libktrace.so debian/tmp/opt/trinity/lib/kmtrace/libktrace_s.a diff --git a/debian/squeeze/kdesdk/debian/kspy-trinity.install b/debian/squeeze/kdesdk/debian/kspy-trinity.install index 3b7d6d778..12523ee90 100644 --- a/debian/squeeze/kdesdk/debian/kspy-trinity.install +++ b/debian/squeeze/kdesdk/debian/kspy-trinity.install @@ -1,4 +1,4 @@ -debian/tmp/opt/trinity/include/kde/kspy.h +debian/tmp/opt/trinity/include/kspy.h debian/tmp/opt/trinity/lib/libkspy.la debian/tmp/opt/trinity/lib/libkspy.so debian/tmp/opt/trinity/lib/libkspy.so.1 diff --git a/debian/squeeze/kdesdk/debian/kunittest-trinity.install b/debian/squeeze/kdesdk/debian/kunittest-trinity.install index f002cd796..bf4cf0b5a 100644 --- a/debian/squeeze/kdesdk/debian/kunittest-trinity.install +++ b/debian/squeeze/kdesdk/debian/kunittest-trinity.install @@ -4,4 +4,4 @@ debian/tmp/opt/trinity/lib/libkunittestgui.la debian/tmp/opt/trinity/lib/libkunittestgui.so debian/tmp/opt/trinity/lib/libkunittestgui.so.0 debian/tmp/opt/trinity/lib/libkunittestgui.so.0.0.0 -debian/tmp/opt/trinity/include/kde/kunittest/runnergui.h +debian/tmp/opt/trinity/include/kunittest/runnergui.h diff --git a/debian/squeeze/kdesdk/debian/libcvsservice-trinity-dev.install b/debian/squeeze/kdesdk/debian/libcvsservice-trinity-dev.install index ee6134374..7cd1252e9 100644 --- a/debian/squeeze/kdesdk/debian/libcvsservice-trinity-dev.install +++ b/debian/squeeze/kdesdk/debian/libcvsservice-trinity-dev.install @@ -1,6 +1,6 @@ -debian/tmp/opt/trinity/include/kde/cvsjob_stub.h -debian/tmp/opt/trinity/include/kde/cvsservice_stub.h -debian/tmp/opt/trinity/include/kde/repository_stub.h +debian/tmp/opt/trinity/include/cvsjob_stub.h +debian/tmp/opt/trinity/include/cvsservice_stub.h +debian/tmp/opt/trinity/include/repository_stub.h debian/tmp/opt/trinity/lib/libcvsservice.la debian/tmp/opt/trinity/lib/libcvsservice.so debian/tmp/opt/trinity/lib/libkdeinit_cvsaskpass.la diff --git a/debian/squeeze/kdesdk/debian/rules b/debian/squeeze/kdesdk/debian/rules index 29ed2222b..4a0920191 100755 --- a/debian/squeeze/kdesdk/debian/rules +++ b/debian/squeeze/kdesdk/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/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 diff --git a/ubuntu/maverick/kdesdk/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdesdk/debian/cdbs/debian-qt-kde.mk index d135c4257..f8b76cb04 100644 --- a/ubuntu/maverick/kdesdk/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/maverick/kdesdk/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/kdesdk/debian/cdbs/kde.mk b/ubuntu/maverick/kdesdk/debian/cdbs/kde.mk index 918490180..023886fc8 100644 --- a/ubuntu/maverick/kdesdk/debian/cdbs/kde.mk +++ b/ubuntu/maverick/kdesdk/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/kdesdk/debian/kbabel-trinity-dev.install b/ubuntu/maverick/kdesdk/debian/kbabel-trinity-dev.install index a792b2b6d..4c2720936 100644 --- a/ubuntu/maverick/kdesdk/debian/kbabel-trinity-dev.install +++ b/ubuntu/maverick/kdesdk/debian/kbabel-trinity-dev.install @@ -1,24 +1,24 @@ -debian/tmp/opt/trinity/include/kde/kbabel/catalog.h -debian/tmp/opt/trinity/include/kde/kbabel/catalogfileplugin.h -debian/tmp/opt/trinity/include/kde/kbabel/catalogitem.h -debian/tmp/opt/trinity/include/kde/kbabel/catalogsettings.h -debian/tmp/opt/trinity/include/kde/kbabel/catalogview.h -debian/tmp/opt/trinity/include/kde/kbabel/dictchooser.h -debian/tmp/opt/trinity/include/kde/kbabel/dictionarymenu.h -debian/tmp/opt/trinity/include/kde/kbabel/editcmd.h -debian/tmp/opt/trinity/include/kde/kbabel/findoptions.h -debian/tmp/opt/trinity/include/kde/kbabel/itempart.h -debian/tmp/opt/trinity/include/kde/kbabel/kbabeldatatool.h -debian/tmp/opt/trinity/include/kde/kbabel/kbabeldictbox.h -debian/tmp/opt/trinity/include/kde/kbabel/kbabeldictiface.h -debian/tmp/opt/trinity/include/kde/kbabel/kbproject.h -debian/tmp/opt/trinity/include/kde/kbabel/kbprojectmanager.h -debian/tmp/opt/trinity/include/kde/kbabel/msgfmt.h -debian/tmp/opt/trinity/include/kde/kbabel/poinfo.h -debian/tmp/opt/trinity/include/kde/kbabel/projectsettings.h -debian/tmp/opt/trinity/include/kde/kbabel/regexpextractor.h -debian/tmp/opt/trinity/include/kde/kbabel/searchengine.h -debian/tmp/opt/trinity/include/kde/kbabel/tagextractor.h +debian/tmp/opt/trinity/include/kbabel/catalog.h +debian/tmp/opt/trinity/include/kbabel/catalogfileplugin.h +debian/tmp/opt/trinity/include/kbabel/catalogitem.h +debian/tmp/opt/trinity/include/kbabel/catalogsettings.h +debian/tmp/opt/trinity/include/kbabel/catalogview.h +debian/tmp/opt/trinity/include/kbabel/dictchooser.h +debian/tmp/opt/trinity/include/kbabel/dictionarymenu.h +debian/tmp/opt/trinity/include/kbabel/editcmd.h +debian/tmp/opt/trinity/include/kbabel/findoptions.h +debian/tmp/opt/trinity/include/kbabel/itempart.h +debian/tmp/opt/trinity/include/kbabel/kbabeldatatool.h +debian/tmp/opt/trinity/include/kbabel/kbabeldictbox.h +debian/tmp/opt/trinity/include/kbabel/kbabeldictiface.h +debian/tmp/opt/trinity/include/kbabel/kbproject.h +debian/tmp/opt/trinity/include/kbabel/kbprojectmanager.h +debian/tmp/opt/trinity/include/kbabel/msgfmt.h +debian/tmp/opt/trinity/include/kbabel/poinfo.h +debian/tmp/opt/trinity/include/kbabel/projectsettings.h +debian/tmp/opt/trinity/include/kbabel/regexpextractor.h +debian/tmp/opt/trinity/include/kbabel/searchengine.h +debian/tmp/opt/trinity/include/kbabel/tagextractor.h debian/tmp/opt/trinity/lib/libkbabelcommon.la debian/tmp/opt/trinity/lib/libkbabelcommon.so debian/tmp/opt/trinity/lib/libkbabeldictplugin.la diff --git a/ubuntu/maverick/kdesdk/debian/kbabel-trinity.install b/ubuntu/maverick/kdesdk/debian/kbabel-trinity.install index 2d6dede0c..a1b2c2cab 100644 --- a/ubuntu/maverick/kdesdk/debian/kbabel-trinity.install +++ b/ubuntu/maverick/kdesdk/debian/kbabel-trinity.install @@ -70,7 +70,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbabel/*.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbabel/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbabel/*.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbabel/*.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbabel/TODO +#debian/tmp/opt/trinity/share/doc/tde/HTML/en/kbabel/TODO debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/catalogmanager.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kbabel.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kbabeldict.png diff --git a/ubuntu/maverick/kdesdk/debian/kdesdk-misc-trinity.install b/ubuntu/maverick/kdesdk/debian/kdesdk-misc-trinity.install index fc03d9907..9fbde2ecd 100644 --- a/ubuntu/maverick/kdesdk/debian/kdesdk-misc-trinity.install +++ b/ubuntu/maverick/kdesdk/debian/kdesdk-misc-trinity.install @@ -1,4 +1,4 @@ -debian/tmp/opt/trinity/include/kde/kprofilemethod.h +debian/tmp/opt/trinity/include/kprofilemethod.h debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.la debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.so debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.so diff --git a/ubuntu/maverick/kdesdk/debian/kmtrace-trinity.install b/ubuntu/maverick/kdesdk/debian/kmtrace-trinity.install index 119b5196d..a163246b9 100644 --- a/ubuntu/maverick/kdesdk/debian/kmtrace-trinity.install +++ b/ubuntu/maverick/kdesdk/debian/kmtrace-trinity.install @@ -2,7 +2,7 @@ debian/tmp/opt/trinity/bin/demangle debian/tmp/opt/trinity/bin/kminspector debian/tmp/opt/trinity/bin/kmmatch debian/tmp/opt/trinity/bin/kmtrace -debian/tmp/opt/trinity/include/kde/ktrace.h +debian/tmp/opt/trinity/include/ktrace.h debian/tmp/opt/trinity/lib/kmtrace/libktrace.la debian/tmp/opt/trinity/lib/kmtrace/libktrace.so debian/tmp/opt/trinity/lib/kmtrace/libktrace_s.a diff --git a/ubuntu/maverick/kdesdk/debian/kspy-trinity.install b/ubuntu/maverick/kdesdk/debian/kspy-trinity.install index 3b7d6d778..12523ee90 100644 --- a/ubuntu/maverick/kdesdk/debian/kspy-trinity.install +++ b/ubuntu/maverick/kdesdk/debian/kspy-trinity.install @@ -1,4 +1,4 @@ -debian/tmp/opt/trinity/include/kde/kspy.h +debian/tmp/opt/trinity/include/kspy.h debian/tmp/opt/trinity/lib/libkspy.la debian/tmp/opt/trinity/lib/libkspy.so debian/tmp/opt/trinity/lib/libkspy.so.1 diff --git a/ubuntu/maverick/kdesdk/debian/kunittest-trinity.install b/ubuntu/maverick/kdesdk/debian/kunittest-trinity.install index f002cd796..bf4cf0b5a 100644 --- a/ubuntu/maverick/kdesdk/debian/kunittest-trinity.install +++ b/ubuntu/maverick/kdesdk/debian/kunittest-trinity.install @@ -4,4 +4,4 @@ debian/tmp/opt/trinity/lib/libkunittestgui.la debian/tmp/opt/trinity/lib/libkunittestgui.so debian/tmp/opt/trinity/lib/libkunittestgui.so.0 debian/tmp/opt/trinity/lib/libkunittestgui.so.0.0.0 -debian/tmp/opt/trinity/include/kde/kunittest/runnergui.h +debian/tmp/opt/trinity/include/kunittest/runnergui.h diff --git a/ubuntu/maverick/kdesdk/debian/libcvsservice-trinity-dev.install b/ubuntu/maverick/kdesdk/debian/libcvsservice-trinity-dev.install index ee6134374..7cd1252e9 100644 --- a/ubuntu/maverick/kdesdk/debian/libcvsservice-trinity-dev.install +++ b/ubuntu/maverick/kdesdk/debian/libcvsservice-trinity-dev.install @@ -1,6 +1,6 @@ -debian/tmp/opt/trinity/include/kde/cvsjob_stub.h -debian/tmp/opt/trinity/include/kde/cvsservice_stub.h -debian/tmp/opt/trinity/include/kde/repository_stub.h +debian/tmp/opt/trinity/include/cvsjob_stub.h +debian/tmp/opt/trinity/include/cvsservice_stub.h +debian/tmp/opt/trinity/include/repository_stub.h debian/tmp/opt/trinity/lib/libcvsservice.la debian/tmp/opt/trinity/lib/libcvsservice.so debian/tmp/opt/trinity/lib/libkdeinit_cvsaskpass.la diff --git a/ubuntu/maverick/kdesdk/debian/rules b/ubuntu/maverick/kdesdk/debian/rules index 29ed2222b..4a0920191 100755 --- a/ubuntu/maverick/kdesdk/debian/rules +++ b/ubuntu/maverick/kdesdk/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/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