From 5cdf5fa3bc791ad559b8932c5539794334473451 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Nov 2011 17:29:49 -0600 Subject: [PATCH] Use standard CMake build system for kgtk-qt3 (cherry picked from commit bf4274f846984ab7df435aa9a67c4cd3123bca6d) --- .../kgtk-qt3/debian/cdbs/debian-qt-kde.mk | 23 +++++------ .../applications/kgtk-qt3/debian/cdbs/kde.mk | 8 ++-- .../applications/kgtk-qt3/debian/control.in | 24 ++++++++++++ .../lenny/applications/kgtk-qt3/debian/rules | 39 ++++++++++--------- .../kgtk-qt3/debian/cdbs/debian-qt-kde.mk | 23 +++++------ .../applications/kgtk-qt3/debian/cdbs/kde.mk | 8 ++-- .../applications/kgtk-qt3/debian/control.in | 24 ++++++++++++ .../applications/kgtk-qt3/debian/rules | 39 ++++++++++--------- .../kgtk-qt3/debian/cdbs/debian-qt-kde.mk | 23 +++++------ .../applications/kgtk-qt3/debian/cdbs/kde.mk | 8 ++-- .../applications/kgtk-qt3/debian/control.in | 24 ++++++++++++ .../applications/kgtk-qt3/debian/rules | 39 ++++++++++--------- 12 files changed, 180 insertions(+), 102 deletions(-) create mode 100644 debian/lenny/applications/kgtk-qt3/debian/control.in create mode 100644 debian/squeeze/applications/kgtk-qt3/debian/control.in create mode 100644 ubuntu/maverick/applications/kgtk-qt3/debian/control.in diff --git a/debian/lenny/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk index 47e83ef4a..856fa4932 100644 --- a/debian/lenny/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk @@ -10,9 +10,6 @@ _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: - 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; touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) @@ -96,14 +93,18 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: done clean:: - if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ - cd $(DEB_SRCDIR); \ - find . -name Makefile.in -print | \ - xargs --no-run-if-empty rm -f; \ - rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ - configure configure.files configure.in stamp-h.in \ - subdirs; \ - fi rm -f debian/stamp-cvs-make endif + +#common-build-indep:: debian/stamp-kde-apidox +#debian/stamp-kde-apidox: +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) +# touch $@ +# +#common-install-indep:: common-install-kde-apidox +#common-install-kde-apidox:: +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) +# +#clean:: +# rm -f debian/stamp-kde-apidox diff --git a/debian/lenny/applications/kgtk-qt3/debian/cdbs/kde.mk b/debian/lenny/applications/kgtk-qt3/debian/cdbs/kde.mk index 5b6508f8c..9dbcfbafd 100644 --- a/debian/lenny/applications/kgtk-qt3/debian/cdbs/kde.mk +++ b/debian/lenny/applications/kgtk-qt3/debian/cdbs/kde.mk @@ -35,7 +35,7 @@ else DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) endif -include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +# include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) export kde_cgidir = \$${libdir}/cgi-bin export kde_confdir = \$${sysconfdir}/trinity @@ -59,7 +59,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/%: @@ -70,7 +70,7 @@ cleanbuilddir:: common-build-arch common-build-indep:: debian/stamp-kde-apidox debian/stamp-kde-apidox: - $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) touch $@ common-install-prehook-impl:: @@ -82,7 +82,7 @@ common-install-prehook-impl:: common-install-arch common-install-indep:: common-install-kde-apidox common-install-kde-apidox:: - $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) clean:: rm -f debian/stamp-kde-apidox diff --git a/debian/lenny/applications/kgtk-qt3/debian/control.in b/debian/lenny/applications/kgtk-qt3/debian/control.in new file mode 100644 index 000000000..16ac663b7 --- /dev/null +++ b/debian/lenny/applications/kgtk-qt3/debian/control.in @@ -0,0 +1,24 @@ +Source: kgtk-qt3-trinity +Section: kde +Priority: optional +Maintainer: Timothy Pearson +XSBC-Original-Maintainer: @@@MAINTAINER@@@ +Uploaders: @@@UPLOADERS@@@ +Build-Depends: debhelper (>= 7), cdbs, kdelibs4-trinity-dev, libgtk2.0-dev, libtqtinterface-dev, cmake +Standards-Version: 3.8.4 +Homepage: http://trinity.pearsoncomputing.net + +Package: kgtk-qt3-trinity +Architecture: any +Depends: ${shlibs:Depends} +Replaces: kgtk-qt3-kde3 (<< 4:3.5.13) +Breaks: kgtk-qt3-kde3 (<< 4:3.5.13) +Conflicts: kgtk-config-bluefish, kgtk-config-eclipse, kgtk-config-firefox, kgtk-config-gimp, kgtk-config-inkscape, kgtk-config-kino, kgtk-config-openoffice, kgtk-config-opera-qt3, kgtk-config-opera-qt4, kgtk-config-scribus, kgtk-config-thunderbird, kubuntu-kgtk-trinity +Description: Use KDE dialogs in Gtk apps + This is an LD_PRELOAD hack that allows most GTK + applications to use Trinity's file dialogs when run under Trinity. + . + The Gtk file chooser functions have been overridden to communicate + with this KDE module/application. + . + This package includes the kqt3-wrapper diff --git a/debian/lenny/applications/kgtk-qt3/debian/rules b/debian/lenny/applications/kgtk-qt3/debian/rules index 333c9807f..cd79c71f9 100755 --- a/debian/lenny/applications/kgtk-qt3/debian/rules +++ b/debian/lenny/applications/kgtk-qt3/debian/rules @@ -1,31 +1,32 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function +# Also include the main Trinity path +ifeq ("$(LD_LIBRARY_PATH)", "") +LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib +else +LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib +endif +export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.mk +include debian/cdbs/debian-qt-kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info -DEB_CMAKE_CUSTOM_FLAGS := -DKGTK_KDE3=true -DKGTK_QT3=true - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_KDE_APIDOX := yes -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG) -configure/kgtk-qt3-trinity:: - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde cmake -D CMAKE_INSTALL_PREFIX=/opt/trinity . +DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -build/kgtk-qt3-trinity:: - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) +# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to +# never build in parallel, regardless of DEB_BUILD_OPTIONS. +DEB_BUILD_PARALLEL = true install/kgtk-qt3-trinity:: - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/kgtk-qt3-trinity + $(MAKE) install DESTDIR=$(CURDIR)/debian/kgtk-qt3-trinity mkdir -p $(CURDIR)/debian/kgtk-qt3-trinity/opt/trinity/share/kgtk/ cp -Rp $(CURDIR)/debian/preload $(CURDIR)/debian/kgtk-qt3-trinity/opt/trinity/share/kgtk/ + diff --git a/debian/squeeze/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk index 47e83ef4a..856fa4932 100644 --- a/debian/squeeze/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk +++ b/debian/squeeze/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk @@ -10,9 +10,6 @@ _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: - 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; touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) @@ -96,14 +93,18 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: done clean:: - if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ - cd $(DEB_SRCDIR); \ - find . -name Makefile.in -print | \ - xargs --no-run-if-empty rm -f; \ - rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ - configure configure.files configure.in stamp-h.in \ - subdirs; \ - fi rm -f debian/stamp-cvs-make endif + +#common-build-indep:: debian/stamp-kde-apidox +#debian/stamp-kde-apidox: +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) +# touch $@ +# +#common-install-indep:: common-install-kde-apidox +#common-install-kde-apidox:: +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) +# +#clean:: +# rm -f debian/stamp-kde-apidox diff --git a/debian/squeeze/applications/kgtk-qt3/debian/cdbs/kde.mk b/debian/squeeze/applications/kgtk-qt3/debian/cdbs/kde.mk index 5b6508f8c..9dbcfbafd 100644 --- a/debian/squeeze/applications/kgtk-qt3/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/kgtk-qt3/debian/cdbs/kde.mk @@ -35,7 +35,7 @@ else DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) endif -include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +# include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) export kde_cgidir = \$${libdir}/cgi-bin export kde_confdir = \$${sysconfdir}/trinity @@ -59,7 +59,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/%: @@ -70,7 +70,7 @@ cleanbuilddir:: common-build-arch common-build-indep:: debian/stamp-kde-apidox debian/stamp-kde-apidox: - $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) touch $@ common-install-prehook-impl:: @@ -82,7 +82,7 @@ common-install-prehook-impl:: common-install-arch common-install-indep:: common-install-kde-apidox common-install-kde-apidox:: - $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) clean:: rm -f debian/stamp-kde-apidox diff --git a/debian/squeeze/applications/kgtk-qt3/debian/control.in b/debian/squeeze/applications/kgtk-qt3/debian/control.in new file mode 100644 index 000000000..16ac663b7 --- /dev/null +++ b/debian/squeeze/applications/kgtk-qt3/debian/control.in @@ -0,0 +1,24 @@ +Source: kgtk-qt3-trinity +Section: kde +Priority: optional +Maintainer: Timothy Pearson +XSBC-Original-Maintainer: @@@MAINTAINER@@@ +Uploaders: @@@UPLOADERS@@@ +Build-Depends: debhelper (>= 7), cdbs, kdelibs4-trinity-dev, libgtk2.0-dev, libtqtinterface-dev, cmake +Standards-Version: 3.8.4 +Homepage: http://trinity.pearsoncomputing.net + +Package: kgtk-qt3-trinity +Architecture: any +Depends: ${shlibs:Depends} +Replaces: kgtk-qt3-kde3 (<< 4:3.5.13) +Breaks: kgtk-qt3-kde3 (<< 4:3.5.13) +Conflicts: kgtk-config-bluefish, kgtk-config-eclipse, kgtk-config-firefox, kgtk-config-gimp, kgtk-config-inkscape, kgtk-config-kino, kgtk-config-openoffice, kgtk-config-opera-qt3, kgtk-config-opera-qt4, kgtk-config-scribus, kgtk-config-thunderbird, kubuntu-kgtk-trinity +Description: Use KDE dialogs in Gtk apps + This is an LD_PRELOAD hack that allows most GTK + applications to use Trinity's file dialogs when run under Trinity. + . + The Gtk file chooser functions have been overridden to communicate + with this KDE module/application. + . + This package includes the kqt3-wrapper diff --git a/debian/squeeze/applications/kgtk-qt3/debian/rules b/debian/squeeze/applications/kgtk-qt3/debian/rules index 333c9807f..cd79c71f9 100755 --- a/debian/squeeze/applications/kgtk-qt3/debian/rules +++ b/debian/squeeze/applications/kgtk-qt3/debian/rules @@ -1,31 +1,32 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function +# Also include the main Trinity path +ifeq ("$(LD_LIBRARY_PATH)", "") +LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib +else +LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib +endif +export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.mk +include debian/cdbs/debian-qt-kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info -DEB_CMAKE_CUSTOM_FLAGS := -DKGTK_KDE3=true -DKGTK_QT3=true - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_KDE_APIDOX := yes -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG) -configure/kgtk-qt3-trinity:: - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde cmake -D CMAKE_INSTALL_PREFIX=/opt/trinity . +DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -build/kgtk-qt3-trinity:: - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) +# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to +# never build in parallel, regardless of DEB_BUILD_OPTIONS. +DEB_BUILD_PARALLEL = true install/kgtk-qt3-trinity:: - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/kgtk-qt3-trinity + $(MAKE) install DESTDIR=$(CURDIR)/debian/kgtk-qt3-trinity mkdir -p $(CURDIR)/debian/kgtk-qt3-trinity/opt/trinity/share/kgtk/ cp -Rp $(CURDIR)/debian/preload $(CURDIR)/debian/kgtk-qt3-trinity/opt/trinity/share/kgtk/ + diff --git a/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk index 47e83ef4a..856fa4932 100644 --- a/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk @@ -10,9 +10,6 @@ _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: - 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; touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) @@ -96,14 +93,18 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: done clean:: - if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ - cd $(DEB_SRCDIR); \ - find . -name Makefile.in -print | \ - xargs --no-run-if-empty rm -f; \ - rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ - configure configure.files configure.in stamp-h.in \ - subdirs; \ - fi rm -f debian/stamp-cvs-make endif + +#common-build-indep:: debian/stamp-kde-apidox +#debian/stamp-kde-apidox: +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) +# touch $@ +# +#common-install-indep:: common-install-kde-apidox +#common-install-kde-apidox:: +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) +# +#clean:: +# rm -f debian/stamp-kde-apidox diff --git a/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/kde.mk index 5b6508f8c..9dbcfbafd 100644 --- a/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/kde.mk @@ -35,7 +35,7 @@ else DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) endif -include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +# include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) export kde_cgidir = \$${libdir}/cgi-bin export kde_confdir = \$${sysconfdir}/trinity @@ -59,7 +59,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/%: @@ -70,7 +70,7 @@ cleanbuilddir:: common-build-arch common-build-indep:: debian/stamp-kde-apidox debian/stamp-kde-apidox: - $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) touch $@ common-install-prehook-impl:: @@ -82,7 +82,7 @@ common-install-prehook-impl:: common-install-arch common-install-indep:: common-install-kde-apidox common-install-kde-apidox:: - $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) clean:: rm -f debian/stamp-kde-apidox diff --git a/ubuntu/maverick/applications/kgtk-qt3/debian/control.in b/ubuntu/maverick/applications/kgtk-qt3/debian/control.in new file mode 100644 index 000000000..16ac663b7 --- /dev/null +++ b/ubuntu/maverick/applications/kgtk-qt3/debian/control.in @@ -0,0 +1,24 @@ +Source: kgtk-qt3-trinity +Section: kde +Priority: optional +Maintainer: Timothy Pearson +XSBC-Original-Maintainer: @@@MAINTAINER@@@ +Uploaders: @@@UPLOADERS@@@ +Build-Depends: debhelper (>= 7), cdbs, kdelibs4-trinity-dev, libgtk2.0-dev, libtqtinterface-dev, cmake +Standards-Version: 3.8.4 +Homepage: http://trinity.pearsoncomputing.net + +Package: kgtk-qt3-trinity +Architecture: any +Depends: ${shlibs:Depends} +Replaces: kgtk-qt3-kde3 (<< 4:3.5.13) +Breaks: kgtk-qt3-kde3 (<< 4:3.5.13) +Conflicts: kgtk-config-bluefish, kgtk-config-eclipse, kgtk-config-firefox, kgtk-config-gimp, kgtk-config-inkscape, kgtk-config-kino, kgtk-config-openoffice, kgtk-config-opera-qt3, kgtk-config-opera-qt4, kgtk-config-scribus, kgtk-config-thunderbird, kubuntu-kgtk-trinity +Description: Use KDE dialogs in Gtk apps + This is an LD_PRELOAD hack that allows most GTK + applications to use Trinity's file dialogs when run under Trinity. + . + The Gtk file chooser functions have been overridden to communicate + with this KDE module/application. + . + This package includes the kqt3-wrapper diff --git a/ubuntu/maverick/applications/kgtk-qt3/debian/rules b/ubuntu/maverick/applications/kgtk-qt3/debian/rules index 333c9807f..cd79c71f9 100755 --- a/ubuntu/maverick/applications/kgtk-qt3/debian/rules +++ b/ubuntu/maverick/applications/kgtk-qt3/debian/rules @@ -1,31 +1,32 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function +# Also include the main Trinity path +ifeq ("$(LD_LIBRARY_PATH)", "") +LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib +else +LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib +endif +export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.mk +include debian/cdbs/debian-qt-kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info -DEB_CMAKE_CUSTOM_FLAGS := -DKGTK_KDE3=true -DKGTK_QT3=true - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_KDE_APIDOX := yes -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG) -configure/kgtk-qt3-trinity:: - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde cmake -D CMAKE_INSTALL_PREFIX=/opt/trinity . +DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -build/kgtk-qt3-trinity:: - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) +# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to +# never build in parallel, regardless of DEB_BUILD_OPTIONS. +DEB_BUILD_PARALLEL = true install/kgtk-qt3-trinity:: - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/kgtk-qt3-trinity + $(MAKE) install DESTDIR=$(CURDIR)/debian/kgtk-qt3-trinity mkdir -p $(CURDIR)/debian/kgtk-qt3-trinity/opt/trinity/share/kgtk/ cp -Rp $(CURDIR)/debian/preload $(CURDIR)/debian/kgtk-qt3-trinity/opt/trinity/share/kgtk/ +