diff options
8 files changed, 24 insertions, 302 deletions
diff --git a/debian/_base/applications/ksystemlog/debian/control b/debian/_base/applications/ksystemlog/debian/control index e17c1ed51..c078d1565 100644 --- a/debian/_base/applications/ksystemlog/debian/control +++ b/debian/_base/applications/ksystemlog/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson <[email protected]> XSBC-Original-Maintainer: Debian KDE Extras Team <[email protected]> Uploaders: Fathi Boudra <[email protected]>, Mark Purcell <[email protected]> -Build-Depends: cdbs, debhelper (>= 9~), quilt, tdelibs14-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: ksystemlog-trinity diff --git a/debian/_base/applications/ksystemlog/debian/ksystemlog.xml b/debian/_base/applications/ksystemlog/debian/ksystemlog.xml deleted file mode 100644 index 3261e6bf7..000000000 --- a/debian/_base/applications/ksystemlog/debian/ksystemlog.xml +++ /dev/null @@ -1,109 +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>Riddell</firstname> - <surname>Jonathan</surname> - <email>[email protected]</email> - </author> - <copyright> - <year>2005</year> - <holder>Jonathan Riddell</holder> - </copyright> - <!-- XXX IMPORTANT XXX --> - <!-- Keep this date up to date: --> - <date>2005-07-28</date> - <!-- ^^^^^^^^^^ --> - </refentryinfo> - <refmeta> - <refentrytitle>ksystemlog</refentrytitle> - <manvolnum>1</manvolnum> - </refmeta> - <refnamediv> - <refname>ksystemlog</refname> - <refpurpose>A System Log Viewer</refpurpose> - </refnamediv> - <refsynopsisdiv> - <cmdsynopsis> - <command>ksystemlog</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> - KSystemLog is an application to view system logs. - </para> - </refsect1> - <refsect1> - <title>OPTIONS</title> - <para> - All <productname>TDE</productname> and <productname>Qt</productname> - programs accept a some common command-line options. KSystemLog 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 Jonathan Riddell - <email>[email protected]</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/_base/applications/ksystemlog/debian/rules b/debian/_base/applications/ksystemlog/debian/rules index 4f6505558..18aa16b96 100755 --- a/debian/_base/applications/ksystemlog/debian/rules +++ b/debian/_base/applications/ksystemlog/debian/rules @@ -1,47 +1,19 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.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) - -DEB_INSTALL_MANPAGES_ksystemlog-trinity := ksystemlog.1 - -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde - DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -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 - -build/ksystemlog-trinity:: - /usr/bin/docbook2x-man debian/ksystemlog.xml - -binary-install/ksystemlog-trinity:: - mv debian/ksystemlog-trinity/usr/share/man debian/ksystemlog-trinity/opt/trinity/share/ - -binary-post-install/ksystemlog-trinity:: - rm -rf debian/ksystemlog/opt/trinity/share/applnk/ - -clean:: - rm -f ksystemlog.1 +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -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" diff --git a/debian/_base/applications/ksystemlog/debian/watch b/debian/_base/applications/ksystemlog/debian/watch deleted file mode 100644 index b15cf467b..000000000 --- a/debian/_base/applications/ksystemlog/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://ksystemlog.forum-software.org/archives/src/ksystemlog-(.*)\.tar\.bz2 debian svn-upgrade diff --git a/ubuntu/_base/applications/ksystemlog/debian/control b/ubuntu/_base/applications/ksystemlog/debian/control index 6ee35e09f..2871da2f4 100644 --- a/ubuntu/_base/applications/ksystemlog/debian/control +++ b/ubuntu/_base/applications/ksystemlog/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson <[email protected]> XSBC-Original-Maintainer: Debian KDE Extras Team <[email protected]> Uploaders: Fathi Boudra <[email protected]>, Mark Purcell <[email protected]> -Build-Depends: cdbs, debhelper (>= 9~), quilt, tdelibs14-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: ksystemlog-trinity diff --git a/ubuntu/_base/applications/ksystemlog/debian/ksystemlog.xml b/ubuntu/_base/applications/ksystemlog/debian/ksystemlog.xml deleted file mode 100644 index 3261e6bf7..000000000 --- a/ubuntu/_base/applications/ksystemlog/debian/ksystemlog.xml +++ /dev/null @@ -1,109 +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>Riddell</firstname> - <surname>Jonathan</surname> - <email>[email protected]</email> - </author> - <copyright> - <year>2005</year> - <holder>Jonathan Riddell</holder> - </copyright> - <!-- XXX IMPORTANT XXX --> - <!-- Keep this date up to date: --> - <date>2005-07-28</date> - <!-- ^^^^^^^^^^ --> - </refentryinfo> - <refmeta> - <refentrytitle>ksystemlog</refentrytitle> - <manvolnum>1</manvolnum> - </refmeta> - <refnamediv> - <refname>ksystemlog</refname> - <refpurpose>A System Log Viewer</refpurpose> - </refnamediv> - <refsynopsisdiv> - <cmdsynopsis> - <command>ksystemlog</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> - KSystemLog is an application to view system logs. - </para> - </refsect1> - <refsect1> - <title>OPTIONS</title> - <para> - All <productname>TDE</productname> and <productname>Qt</productname> - programs accept a some common command-line options. KSystemLog 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 Jonathan Riddell - <email>[email protected]</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/ubuntu/_base/applications/ksystemlog/debian/rules b/ubuntu/_base/applications/ksystemlog/debian/rules index 4f6505558..18aa16b96 100755 --- a/ubuntu/_base/applications/ksystemlog/debian/rules +++ b/ubuntu/_base/applications/ksystemlog/debian/rules @@ -1,47 +1,19 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.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) - -DEB_INSTALL_MANPAGES_ksystemlog-trinity := ksystemlog.1 - -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde - DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -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 - -build/ksystemlog-trinity:: - /usr/bin/docbook2x-man debian/ksystemlog.xml - -binary-install/ksystemlog-trinity:: - mv debian/ksystemlog-trinity/usr/share/man debian/ksystemlog-trinity/opt/trinity/share/ - -binary-post-install/ksystemlog-trinity:: - rm -rf debian/ksystemlog/opt/trinity/share/applnk/ - -clean:: - rm -f ksystemlog.1 +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -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" diff --git a/ubuntu/_base/applications/ksystemlog/debian/watch b/ubuntu/_base/applications/ksystemlog/debian/watch deleted file mode 100644 index b15cf467b..000000000 --- a/ubuntu/_base/applications/ksystemlog/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://ksystemlog.forum-software.org/archives/src/ksystemlog-(.*)\.tar\.bz2 debian svn-upgrade |