diff options
Diffstat (limited to 'ubuntu')
6 files changed, 40 insertions, 84 deletions
diff --git a/ubuntu/maverick/applications/dolphin/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/dolphin/debian/cdbs/debian-qt-kde.mk index 2dff59226..60310a01a 100644 --- a/ubuntu/maverick/applications/dolphin/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/maverick/applications/dolphin/debian/cdbs/debian-qt-kde.mk @@ -10,6 +10,16 @@ _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 +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) @@ -94,6 +104,16 @@ 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 | \ + 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 +endif rm -f debian/stamp-cvs-make endif diff --git a/ubuntu/maverick/applications/dolphin/debian/cdbs/kde.mk b/ubuntu/maverick/applications/dolphin/debian/cdbs/kde.mk index f5d237249..80176d63e 100644 --- a/ubuntu/maverick/applications/dolphin/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/dolphin/debian/cdbs/kde.mk @@ -35,7 +35,9 @@ else DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) endif -# include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +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/" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: @@ -70,12 +72,12 @@ 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-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/dolphin/debian/control b/ubuntu/maverick/applications/dolphin/debian/control index eff20f68f..f8285a5b6 100644 --- a/ubuntu/maverick/applications/dolphin/debian/control +++ b/ubuntu/maverick/applications/dolphin/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com> -Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, tdebase-trinity-dev, docbook2x, docbook-xml, libtool, libltdl-dev, cmake +Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, cmake, tdelibs14-trinity-dev, libkonq4-trinity-dev, tdebase-trinity-dev Standards-Version: 3.8.4 Package: dolphin-trinity diff --git a/ubuntu/maverick/applications/dolphin/debian/dolphin.1 b/ubuntu/maverick/applications/dolphin/debian/dolphin.1 deleted file mode 100644 index 3f2814bbf..000000000 --- a/ubuntu/maverick/applications/dolphin/debian/dolphin.1 +++ /dev/null @@ -1,62 +0,0 @@ -.TH dolphin 1 "December 7, 2006" -.SH NAME -dolphin \- File manager for TDE focusing on usability -.SH SYNOPSIS -.B dolphin -.RI [Qt-options] [TDE-options] [URL] -.SH DESCRIPTION - dolphin is not intended to be a competitor to Konqueror, the default TDE - file manager: Konqueror acts as universal viewer being able to show HTML - pages, text documents, directories and a lot more, whereas dolphin focuses - on being only a file manager. This approach allows to optimize the user - interface for the task of file management. -.PP -.SH FEATURES -.PP -* Navigation bar (breadcrumbs) -.PP -* View properties remembered for each folder -.PP -* Split views -.PP -* Network transparency -.PP -* Undo/redo functionality -.PP -* Renaming of a variable number of selected items in one step. -.PP -.SH OPTIONS -.SS -.SS Generic Options: -.TP -.B --help -Show help about options -.TP -.B --help-qt -Show Qt specific options -.TP -.B --help-tde -Show TDE specific options -.TP -.B --help-all -Show all options -.TP -.B --author -Show author information -.TP -.B -v, --version -Show version information -.TP -.B --license -Show license information -.SS -.SS Arguments: -.TP -.B URL -Document to open -.PP -.SH HOMEPAGE -Homepage: http://enzosworld.gmxhome.de/ -.SH AUTHOR -This manual page was written by Varun Hiremath <varunhiremath@gmail.com>, -for the Debian project (but may be used by others). diff --git a/ubuntu/maverick/applications/dolphin/debian/manpages b/ubuntu/maverick/applications/dolphin/debian/manpages deleted file mode 100644 index 8b02277f2..000000000 --- a/ubuntu/maverick/applications/dolphin/debian/manpages +++ /dev/null @@ -1 +0,0 @@ -debian/dolphin.1 diff --git a/ubuntu/maverick/applications/dolphin/debian/rules b/ubuntu/maverick/applications/dolphin/debian/rules index 7b4528041..c5872f434 100755 --- a/ubuntu/maverick/applications/dolphin/debian/rules +++ b/ubuntu/maverick/applications/dolphin/debian/rules @@ -1,27 +1,24 @@ #!/usr/bin/make -f -# 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/patchsys-quilt.mk -include /usr/share/cdbs/1/rules/utils.mk include debian/cdbs/debian-qt-kde.mk -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" \ --DCMAKE_BUILD_TYPE=RelWithDebInfo - DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" + binary-install/dolphin-trinity:: - mkdir -p debian/dolphin-trinity/opt/trinity/bin - ln -s d3lphin debian/dolphin-trinity/opt/trinity/bin/dolphin - mv debian/dolphin-trinity/usr/share/man debian/dolphin-trinity/opt/trinity/share/ + mkdir -p debian/$(cdbs_curpkg)/opt/trinity/bin + ln -s d3lphin debian/$(cdbs_curpkg)/opt/trinity/bin/dolphin |