From 4a379d7e407b8904fba80b45561c322e303fb7d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 17 Feb 2019 12:52:57 +0100 Subject: DEB katapult: Switch to cmake. The man page has been moved to the main tree. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- .../katapult/debian/cdbs/debian-qt-kde.mk | 4 + .../applications/katapult/debian/cdbs/kde.mk | 4 +- .../maverick/applications/katapult/debian/control | 2 +- ubuntu/maverick/applications/katapult/debian/docs | 1 + .../katapult/debian/katapult-trinity.lintian | 13 +++ .../katapult/debian/katapult.1.docbook | 112 --------------------- .../maverick/applications/katapult/debian/lintian | 8 -- ubuntu/maverick/applications/katapult/debian/rules | 57 +++-------- 8 files changed, 36 insertions(+), 165 deletions(-) create mode 100644 ubuntu/maverick/applications/katapult/debian/katapult-trinity.lintian delete mode 100644 ubuntu/maverick/applications/katapult/debian/katapult.1.docbook delete mode 100644 ubuntu/maverick/applications/katapult/debian/lintian (limited to 'ubuntu/maverick/applications/katapult') diff --git a/ubuntu/maverick/applications/katapult/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/katapult/debian/cdbs/debian-qt-kde.mk index 9f8f97776..60310a01a 100644 --- a/ubuntu/maverick/applications/katapult/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/maverick/applications/katapult/debian/cdbs/debian-qt-kde.mk @@ -10,6 +10,7 @@ _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 @@ -18,6 +19,7 @@ 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) @@ -102,6 +104,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 | \ @@ -110,6 +113,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/applications/katapult/debian/cdbs/kde.mk b/ubuntu/maverick/applications/katapult/debian/cdbs/kde.mk index 1ac26c4b7..80176d63e 100644 --- a/ubuntu/maverick/applications/katapult/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/katapult/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/applications/katapult/debian/control b/ubuntu/maverick/applications/katapult/debian/control index 1076ba6a6..2ae863c6a 100644 --- a/ubuntu/maverick/applications/katapult/debian/control +++ b/ubuntu/maverick/applications/katapult/debian/control @@ -2,7 +2,7 @@ Source: katapult-trinity Section: tde Priority: optional Maintainer: Timothy Pearson -Build-Depends: cdbs (>= 0.4.46ubuntu5), debhelper (>= 7.0.50~), quilt, tdelibs14-trinity-dev, docbook2x, libxi-dev, sharutils, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.46ubuntu5), debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev, libxi-dev, sharutils Standards-Version: 3.8.4 Package: katapult-trinity diff --git a/ubuntu/maverick/applications/katapult/debian/docs b/ubuntu/maverick/applications/katapult/debian/docs index 022850854..04f70e688 100644 --- a/ubuntu/maverick/applications/katapult/debian/docs +++ b/ubuntu/maverick/applications/katapult/debian/docs @@ -1,3 +1,4 @@ AUTHORS +README TODO diff --git a/ubuntu/maverick/applications/katapult/debian/katapult-trinity.lintian b/ubuntu/maverick/applications/katapult/debian/katapult-trinity.lintian new file mode 100644 index 000000000..d7fcffa7b --- /dev/null +++ b/ubuntu/maverick/applications/katapult/debian/katapult-trinity.lintian @@ -0,0 +1,13 @@ +katapult-trinity: desktop-file-in-wrong-dir opt/trinity/share/services/katapult_amarokcatalog.desktop +katapult-trinity: desktop-file-in-wrong-dir opt/trinity/share/services/katapult_bookmarkcatalog.desktop +katapult-trinity: desktop-file-in-wrong-dir opt/trinity/share/services/katapult_calculatorcatalog.desktop +katapult-trinity: desktop-file-in-wrong-dir opt/trinity/share/services/katapult_documentcatalog.desktop +katapult-trinity: desktop-file-in-wrong-dir opt/trinity/share/services/katapult_execcatalog.desktop +katapult-trinity: desktop-file-in-wrong-dir opt/trinity/share/services/katapult_glassdisplay.desktop +katapult-trinity: desktop-file-in-wrong-dir opt/trinity/share/services/katapult_googlecatalog.desktop +katapult-trinity: desktop-file-in-wrong-dir opt/trinity/share/services/katapult_o2display.desktop +katapult-trinity: desktop-file-in-wrong-dir opt/trinity/share/services/katapult_programcatalog.desktop +katapult-trinity: desktop-file-in-wrong-dir opt/trinity/share/services/katapult_puredisplay.desktop +katapult-trinity: desktop-file-in-wrong-dir opt/trinity/share/services/katapult_spellcatalog.desktop +katapult-trinity: desktop-file-in-wrong-dir opt/trinity/share/servicetypes/katapultdisplay.desktop +katapult-trinity: desktop-file-in-wrong-dir opt/trinity/share/servicetypes/katapultcatalog.desktop diff --git a/ubuntu/maverick/applications/katapult/debian/katapult.1.docbook b/ubuntu/maverick/applications/katapult/debian/katapult.1.docbook deleted file mode 100644 index c6f65759c..000000000 --- a/ubuntu/maverick/applications/katapult/debian/katapult.1.docbook +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - Falleri - Jean-Remy - jr.falleri@laposte.net - - - 2005 - Jean-Remy Falleri - - - - 2005-05-10 - - - - katapult - 1 - - - katapult - A TDE laucher - - - - katapult - - - - - - - - - - DESCRIPTION - - Katapult is a TDE laucher. - - - It uses text-based queries to launch a program, a bookmark or a directory. - - - - OPTIONS - - All TDE and Qt - programs accept a some common command-line options. Katapult has no - application-specific options. - - - - Generic options: - - - Show help about options - - - - Show Qt specific options - - - - Show TDE specific options - - - - Show all options - - - - Show author information - - - , - Show version information - - - - Show license information - - - - Indicates end of options - - - - - - - COPYRIGHT - - This manual page was written by Jean-Remy Falleri - jr.falleri@laposte.net for the - Ubuntu system (but may be used by others). - Permission is granted to copy, distribute and/or modify this document - under the terms of the GNU General Public License, - Version 2 or any later version published by the Free Software Foundation. - - - On Debian systems, the complete text of the GNU General Public - License can be found in - /usr/share/common-licenses/GPL. - - - diff --git a/ubuntu/maverick/applications/katapult/debian/lintian b/ubuntu/maverick/applications/katapult/debian/lintian deleted file mode 100644 index af70e7550..000000000 --- a/ubuntu/maverick/applications/katapult/debian/lintian +++ /dev/null @@ -1,8 +0,0 @@ -katapult-trinity: desktop-file-in-wrong-dir usr/share/servicetypes/katapultdisplay.desktop -katapult-trinity: desktop-file-in-wrong-dir usr/share/servicetypes/katapultcatalog.desktop -katapult-trinity: desktop-file-in-wrong-dir usr/share/services/katapult_programcatalog.desktop -katapult-trinity: desktop-file-in-wrong-dir usr/share/services/katapult_bookmarkcatalog.desktop -katapult-trinity: desktop-file-in-wrong-dir usr/share/services/katapult_documentcatalog.desktop -katapult-trinity: desktop-file-in-wrong-dir usr/share/services/katapult_glassdisplay.desktop -katapult-trinity binary: package-name-doesnt-match-sonames libkatapultdisplay0 libkatapultcatalog0 libkatapult0 - diff --git a/ubuntu/maverick/applications/katapult/debian/rules b/ubuntu/maverick/applications/katapult/debian/rules index defd35a7a..c8db4135e 100755 --- a/ubuntu/maverick/applications/katapult/debian/rules +++ b/ubuntu/maverick/applications/katapult/debian/rules @@ -1,53 +1,24 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include debian/cdbs/kde.mk +include /usr/share/cdbs/1/class/cmake.mk #include /usr/share/cdbs/1/rules/patchsys-quilt.mk - -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde -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) - -export KUBUNTU_DESKTOP_POT=extragear-utils_katapult -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +include debian/cdbs/debian-qt-kde.mk DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -cleanbuilddir/katapult-trinity:: - rm -f katapult.1 - -build/katapult-trinity:: - docbook2x-man debian/katapult.1.docbook - -DEB_INSTALL_MANPAGES_katapult-trinity = katapult.1 - -post-patches:: debian/stamp-bootstrap - -debian/stamp-bootstrap: -ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" - cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" - cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" - cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh -endif - cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in - - make -f admin/Makefile.common cvs - touch debian/stamp-bootstrap +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" install/katapult-trinity:: - rm -f $(CURDIR)/debian/katapult-trinity/opt/trinity/lib/libkatapult*.so - rm -f $(CURDIR)/debian/katapult-trinity/opt/trinity/lib/libkatapult*.la - dh_install $(DEB_SRCDIR)/debian/lintian opt/trinity/share/lintian/overrides/katapult -# dh_install $(DEB_SRCDIR)/katapult/katapult/katapult.desktop opt/trinity/share/autostart -# echo 'X-TDE-autostart-condition=katapultrc:General:Autostart:true' >> $(DEB_DESTDIR)/opt/trinity/share/autostart/katapult.desktop - -binary-install/katapult-trinity:: - mv debian/katapult-trinity/usr/share/man debian/katapult-trinity/opt/trinity/share/ + rm -f $(CURDIR)/debian/$(cdbs_curpkg)/opt/trinity/lib/libkatapult*.so + rm -f $(CURDIR)/debian/$(cdbs_curpkg)/opt/trinity/lib/libkatapult*.la -- cgit v1.2.1