diff options
Diffstat (limited to 'debian')
16 files changed, 72 insertions, 330 deletions
diff --git a/debian/lenny/applications/katapult/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/katapult/debian/cdbs/debian-qt-kde.mk index 9f8f97776..60310a01a 100644 --- a/debian/lenny/applications/katapult/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/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/debian/lenny/applications/katapult/debian/cdbs/kde.mk b/debian/lenny/applications/katapult/debian/cdbs/kde.mk index 1ac26c4b7..80176d63e 100644 --- a/debian/lenny/applications/katapult/debian/cdbs/kde.mk +++ b/debian/lenny/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/debian/lenny/applications/katapult/debian/control b/debian/lenny/applications/katapult/debian/control index be8b09a09..702673cb6 100644 --- a/debian/lenny/applications/katapult/debian/control +++ b/debian/lenny/applications/katapult/debian/control @@ -2,7 +2,7 @@ Source: katapult-trinity Section: tde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> -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/debian/lenny/applications/katapult/debian/docs b/debian/lenny/applications/katapult/debian/docs index 022850854..04f70e688 100644 --- a/debian/lenny/applications/katapult/debian/docs +++ b/debian/lenny/applications/katapult/debian/docs @@ -1,3 +1,4 @@ AUTHORS +README TODO diff --git a/debian/lenny/applications/katapult/debian/katapult-trinity.lintian b/debian/lenny/applications/katapult/debian/katapult-trinity.lintian new file mode 100644 index 000000000..d7fcffa7b --- /dev/null +++ b/debian/lenny/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/debian/lenny/applications/katapult/debian/katapult.1.docbook b/debian/lenny/applications/katapult/debian/katapult.1.docbook deleted file mode 100644 index c6f65759c..000000000 --- a/debian/lenny/applications/katapult/debian/katapult.1.docbook +++ /dev/null @@ -1,112 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" -"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ -]> -<refentry> - <refentryinfo> - <author> - <firstname>Falleri</firstname> - <surname>Jean-Remy</surname> - <email>jr.falleri@laposte.net</email> - </author> - <copyright> - <year>2005</year> - <holder>Jean-Remy Falleri</holder> - </copyright> - <!-- XXX IMPORTANT XXX --> - <!-- Keep this date up to date: --> - <date>2005-05-10</date> - <!-- ^^^^^^^^^^ --> - </refentryinfo> - <refmeta> - <refentrytitle>katapult</refentrytitle> - <manvolnum>1</manvolnum> - </refmeta> - <refnamediv> - <refname>katapult</refname> - <refpurpose>A TDE laucher</refpurpose> - </refnamediv> - <refsynopsisdiv> - <cmdsynopsis> - <command>katapult</command> - <arg choice="opt"> - <option><replaceable>Qt-options</replaceable></option> - </arg> - <arg choice="opt"> - <option><replaceable>TDE-options</replaceable></option> - </arg> - </cmdsynopsis> - </refsynopsisdiv> - <refsect1> - <title>DESCRIPTION</title> - <para> - Katapult is a TDE laucher. - </para> - <para> - It uses text-based queries to launch a program, a bookmark or a directory. - </para> - </refsect1> - <refsect1> - <title>OPTIONS</title> - <para> - All <productname>TDE</productname> and <productname>Qt</productname> - programs accept a some common command-line options. Katapult has no - application-specific options. - </para> - <para> - <variablelist> - <title>Generic options:</title> - <varlistentry> - <term> <option>--help</option> </term> - <listitem> <para>Show help about options</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>--help-qt</option> </term> - <listitem> <para>Show Qt specific options</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>--help-tde</option> </term> - <listitem> <para>Show TDE specific options</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>--help-all</option> </term> - <listitem> <para>Show all options</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>--author</option> </term> - <listitem> <para>Show author information</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>-v</option>, <option>--version</option> </term> - <listitem> <para>Show version information</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>--license</option> </term> - <listitem> <para>Show license information</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>--</option> </term> - <listitem> <para>Indicates end of options</para> </listitem> - </varlistentry> - </variablelist> - <!-- TODO * add all the rest of the options, but maybe find an automated - way to keep it up to date --> - </para> - </refsect1> - <refsect1> - <title>COPYRIGHT</title> - <para> - This manual page was written by Jean-Remy Falleri - <email>jr.falleri@laposte.net</email> for the - <productname>Ubuntu</productname> system (but may be used by others). - Permission is granted to copy, distribute and/or modify this document - under the terms of the <acronym>GNU</acronym> General Public License, - Version 2 or any later version published by the Free Software Foundation. - </para> - <para> - On Debian systems, the complete text of the GNU General Public - License can be found in - <filename>/usr/share/common-licenses/GPL</filename>. - </para> - </refsect1> -</refentry> diff --git a/debian/lenny/applications/katapult/debian/lintian b/debian/lenny/applications/katapult/debian/lintian deleted file mode 100644 index af70e7550..000000000 --- a/debian/lenny/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/debian/lenny/applications/katapult/debian/rules b/debian/lenny/applications/katapult/debian/rules index 4dba18a5c..be381763c 100755 --- a/debian/lenny/applications/katapult/debian/rules +++ b/debian/lenny/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 diff --git a/debian/squeeze/applications/katapult/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/katapult/debian/cdbs/debian-qt-kde.mk index 9f8f97776..60310a01a 100644 --- a/debian/squeeze/applications/katapult/debian/cdbs/debian-qt-kde.mk +++ b/debian/squeeze/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/debian/squeeze/applications/katapult/debian/cdbs/kde.mk b/debian/squeeze/applications/katapult/debian/cdbs/kde.mk index 1ac26c4b7..80176d63e 100644 --- a/debian/squeeze/applications/katapult/debian/cdbs/kde.mk +++ b/debian/squeeze/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/debian/squeeze/applications/katapult/debian/control b/debian/squeeze/applications/katapult/debian/control index be8b09a09..702673cb6 100644 --- a/debian/squeeze/applications/katapult/debian/control +++ b/debian/squeeze/applications/katapult/debian/control @@ -2,7 +2,7 @@ Source: katapult-trinity Section: tde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> -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/debian/squeeze/applications/katapult/debian/docs b/debian/squeeze/applications/katapult/debian/docs index 022850854..04f70e688 100644 --- a/debian/squeeze/applications/katapult/debian/docs +++ b/debian/squeeze/applications/katapult/debian/docs @@ -1,3 +1,4 @@ AUTHORS +README TODO diff --git a/debian/squeeze/applications/katapult/debian/katapult-trinity.lintian b/debian/squeeze/applications/katapult/debian/katapult-trinity.lintian new file mode 100644 index 000000000..d7fcffa7b --- /dev/null +++ b/debian/squeeze/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/debian/squeeze/applications/katapult/debian/katapult.1.docbook b/debian/squeeze/applications/katapult/debian/katapult.1.docbook deleted file mode 100644 index c6f65759c..000000000 --- a/debian/squeeze/applications/katapult/debian/katapult.1.docbook +++ /dev/null @@ -1,112 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" -"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ -]> -<refentry> - <refentryinfo> - <author> - <firstname>Falleri</firstname> - <surname>Jean-Remy</surname> - <email>jr.falleri@laposte.net</email> - </author> - <copyright> - <year>2005</year> - <holder>Jean-Remy Falleri</holder> - </copyright> - <!-- XXX IMPORTANT XXX --> - <!-- Keep this date up to date: --> - <date>2005-05-10</date> - <!-- ^^^^^^^^^^ --> - </refentryinfo> - <refmeta> - <refentrytitle>katapult</refentrytitle> - <manvolnum>1</manvolnum> - </refmeta> - <refnamediv> - <refname>katapult</refname> - <refpurpose>A TDE laucher</refpurpose> - </refnamediv> - <refsynopsisdiv> - <cmdsynopsis> - <command>katapult</command> - <arg choice="opt"> - <option><replaceable>Qt-options</replaceable></option> - </arg> - <arg choice="opt"> - <option><replaceable>TDE-options</replaceable></option> - </arg> - </cmdsynopsis> - </refsynopsisdiv> - <refsect1> - <title>DESCRIPTION</title> - <para> - Katapult is a TDE laucher. - </para> - <para> - It uses text-based queries to launch a program, a bookmark or a directory. - </para> - </refsect1> - <refsect1> - <title>OPTIONS</title> - <para> - All <productname>TDE</productname> and <productname>Qt</productname> - programs accept a some common command-line options. Katapult has no - application-specific options. - </para> - <para> - <variablelist> - <title>Generic options:</title> - <varlistentry> - <term> <option>--help</option> </term> - <listitem> <para>Show help about options</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>--help-qt</option> </term> - <listitem> <para>Show Qt specific options</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>--help-tde</option> </term> - <listitem> <para>Show TDE specific options</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>--help-all</option> </term> - <listitem> <para>Show all options</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>--author</option> </term> - <listitem> <para>Show author information</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>-v</option>, <option>--version</option> </term> - <listitem> <para>Show version information</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>--license</option> </term> - <listitem> <para>Show license information</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>--</option> </term> - <listitem> <para>Indicates end of options</para> </listitem> - </varlistentry> - </variablelist> - <!-- TODO * add all the rest of the options, but maybe find an automated - way to keep it up to date --> - </para> - </refsect1> - <refsect1> - <title>COPYRIGHT</title> - <para> - This manual page was written by Jean-Remy Falleri - <email>jr.falleri@laposte.net</email> for the - <productname>Ubuntu</productname> system (but may be used by others). - Permission is granted to copy, distribute and/or modify this document - under the terms of the <acronym>GNU</acronym> General Public License, - Version 2 or any later version published by the Free Software Foundation. - </para> - <para> - On Debian systems, the complete text of the GNU General Public - License can be found in - <filename>/usr/share/common-licenses/GPL</filename>. - </para> - </refsect1> -</refentry> diff --git a/debian/squeeze/applications/katapult/debian/lintian b/debian/squeeze/applications/katapult/debian/lintian deleted file mode 100644 index af70e7550..000000000 --- a/debian/squeeze/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/debian/squeeze/applications/katapult/debian/rules b/debian/squeeze/applications/katapult/debian/rules index defd35a7a..c8db4135e 100755 --- a/debian/squeeze/applications/katapult/debian/rules +++ b/debian/squeeze/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 |