Browse Source

DEB tde-systemsettings: Switch to cmake.

The man page has been moved to the main tree.
Removed tde-settings-laptops.directory because
it seems more current in the main tree.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/67/head
Slávek Banko 1 month ago
parent
commit
9d01b57af3
Signed by: SlavekB GPG Key ID: 608F5293A04BE668
8 changed files with 24 additions and 366 deletions
  1. +1
    -1
      debian/_base/applications/tde-systemsettings/debian/control
  2. +11
    -46
      debian/_base/applications/tde-systemsettings/debian/rules
  3. +0
    -123
      debian/_base/applications/tde-systemsettings/debian/systemsettings.1.docbook
  4. +0
    -13
      debian/_base/applications/tde-systemsettings/debian/tde-settings-laptops.directory
  5. +1
    -1
      ubuntu/_base/applications/tde-systemsettings/debian/control
  6. +11
    -46
      ubuntu/_base/applications/tde-systemsettings/debian/rules
  7. +0
    -123
      ubuntu/_base/applications/tde-systemsettings/debian/systemsettings.1.docbook
  8. +0
    -13
      ubuntu/_base/applications/tde-systemsettings/debian/tde-settings-laptops.directory

+ 1
- 1
debian/_base/applications/tde-systemsettings/debian/control View File

@@ -2,7 +2,7 @@ Source: tde-systemsettings-trinity
Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 9~), quilt, patchutils (>= 0.2.25), tdelibs14-trinity-dev (>= 3.3), docbook2x, automake, autoconf, libtool, libltdl-dev
Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev
Standards-Version: 3.8.4

Package: tde-systemsettings-trinity


+ 11
- 46
debian/_base/applications/tde-systemsettings/debian/rules View File

@@ -1,54 +1,19 @@
#!/usr/bin/make -f

cdbs_kde_enable_debug = --disable-debug

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_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib

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

cleanbuilddir/tde-systemsettings-trinity::
rm -f systemsettings.1

build/tde-systemsettings-trinity::
docbook2x-man debian/systemsettings.1.docbook

install/tde-systemsettings-trinity::
# Don't clash files, just Use the ones from kcontrol
rm debian/tde-systemsettings-trinity/opt/trinity/share/desktop-directories/tde-settings-power.directory
rm debian/tde-systemsettings-trinity/opt/trinity/share/desktop-directories/tde-settings-system.directory
rm debian/tde-systemsettings-trinity/opt/trinity/share/applications/tde/kcmfontinst.desktop
rm debian/tde-systemsettings-trinity/opt/trinity/share/applications/tde/laptop.desktop
cp debian/tde-settings-laptops.directory debian/tde-systemsettings-trinity/opt/trinity/share/desktop-directories/

DEB_INSTALL_MANPAGES_tde-systemsettings-trinity = systemsettings.1

binary-install/tde-systemsettings-trinity::
mv debian/tde-systemsettings-trinity/usr/share/man debian/tde-systemsettings-trinity/opt/trinity/share/
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"

+ 0
- 123
debian/_base/applications/tde-systemsettings/debian/systemsettings.1.docbook View File

@@ -1,123 +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>Jonathan</firstname>
<surname>Riddell</surname>
<email>jriddell@ubuntu.com</email>
</author>
<copyright>
<year>2005</year>
<holder>Jonathan Riddell</holder>
</copyright>
<!-- XXX IMPORTANT XXX -->
<!-- Keep this date up to date: -->
<date>2005-06-09</date>
<!-- ^^^^^^^^^^ -->
</refentryinfo>
<refmeta>
<refentrytitle>systemsettings</refentrytitle>
<manvolnum>1</manvolnum>
</refmeta>
<refnamediv>
<refname>systemsettings</refname>
<refpurpose>TDE System Settings.</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
<command>systemsettings</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>
System Settings is a user friendly control centre for TDE.
</para>
</refsect1>
<refsect1>
<title>OPTIONS</title>
<para>
All <productname>TDE</productname> and <productname>Qt</productname>
programs accept a some common command-line options.
</para>
<para>
<variablelist>
<title>Options:</title>
<varlistentry>
<term> <option>-e, --noembed</option> </term>
<listitem> <para>Do not embed windows</para> </listitem>
</varlistentry>
<varlistentry>
<term> <option>--menu &gt;argument&lt;</option> </term>
<listitem> <para>XDG menu to use (default is systemsettings)</para> </listitem>
</varlistentry>
</variablelist>
</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>jriddell@ubuntu.com</email> for
<productname>Debian</productname> (but may be used by others).
Permission is granted to copy, distribute and/or modify this document
under either the terms of the <acronym>GNU</acronym> General Public License,
Version 2 or any later version published by the Free Software Foundation or
the <acronym>GNU</acronym> Free Documentation License 1.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>

+ 0
- 13
debian/_base/applications/tde-systemsettings/debian/tde-settings-laptops.directory View File

@@ -1,13 +0,0 @@
[Desktop Entry]
Encoding=UTF-8
Name=Laptops & Power
Name[br]=Gremm
Name[el]=Ισχύς
Name[it]=Energia
Name[mt]=Elettriku
Name[nl]=Energie
Name[pa]=ਊਰਜਾ(power)
Name[pt_BR]=Energia
Name[ru]=Управление питанием
Name[sv]=Effekt
Icon=energy

+ 1
- 1
ubuntu/_base/applications/tde-systemsettings/debian/control View File

@@ -2,7 +2,7 @@ Source: tde-systemsettings-trinity
Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 9~), quilt, patchutils (>= 0.2.25), tdelibs14-trinity-dev (>= 3.3), docbook2x, automake, autoconf, libtool, libltdl-dev
Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev
Standards-Version: 3.8.4

Package: tde-systemsettings-trinity


+ 11
- 46
ubuntu/_base/applications/tde-systemsettings/debian/rules View File

@@ -1,54 +1,19 @@
#!/usr/bin/make -f

cdbs_kde_enable_debug = --disable-debug

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_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib

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

cleanbuilddir/tde-systemsettings-trinity::
rm -f systemsettings.1

build/tde-systemsettings-trinity::
docbook2x-man debian/systemsettings.1.docbook

install/tde-systemsettings-trinity::
# Don't clash files, just Use the ones from kcontrol
rm debian/tde-systemsettings-trinity/opt/trinity/share/desktop-directories/tde-settings-power.directory
rm debian/tde-systemsettings-trinity/opt/trinity/share/desktop-directories/tde-settings-system.directory
rm debian/tde-systemsettings-trinity/opt/trinity/share/applications/tde/kcmfontinst.desktop
rm debian/tde-systemsettings-trinity/opt/trinity/share/applications/tde/laptop.desktop
cp debian/tde-settings-laptops.directory debian/tde-systemsettings-trinity/opt/trinity/share/desktop-directories/

DEB_INSTALL_MANPAGES_tde-systemsettings-trinity = systemsettings.1

binary-install/tde-systemsettings-trinity::
mv debian/tde-systemsettings-trinity/usr/share/man debian/tde-systemsettings-trinity/opt/trinity/share/
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"

+ 0
- 123
ubuntu/_base/applications/tde-systemsettings/debian/systemsettings.1.docbook View File

@@ -1,123 +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>Jonathan</firstname>
<surname>Riddell</surname>
<email>jriddell@ubuntu.com</email>
</author>
<copyright>
<year>2005</year>
<holder>Jonathan Riddell</holder>
</copyright>
<!-- XXX IMPORTANT XXX -->
<!-- Keep this date up to date: -->
<date>2005-06-09</date>
<!-- ^^^^^^^^^^ -->
</refentryinfo>
<refmeta>
<refentrytitle>systemsettings</refentrytitle>
<manvolnum>1</manvolnum>
</refmeta>
<refnamediv>
<refname>systemsettings</refname>
<refpurpose>TDE System Settings.</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
<command>systemsettings</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>
System Settings is a user friendly control centre for TDE.
</para>
</refsect1>
<refsect1>
<title>OPTIONS</title>
<para>
All <productname>TDE</productname> and <productname>Qt</productname>
programs accept a some common command-line options.
</para>
<para>
<variablelist>
<title>Options:</title>
<varlistentry>
<term> <option>-e, --noembed</option> </term>
<listitem> <para>Do not embed windows</para> </listitem>
</varlistentry>
<varlistentry>
<term> <option>--menu &gt;argument&lt;</option> </term>
<listitem> <para>XDG menu to use (default is systemsettings)</para> </listitem>
</varlistentry>
</variablelist>
</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>jriddell@ubuntu.com</email> for
<productname>Debian</productname> (but may be used by others).
Permission is granted to copy, distribute and/or modify this document
under either the terms of the <acronym>GNU</acronym> General Public License,
Version 2 or any later version published by the Free Software Foundation or
the <acronym>GNU</acronym> Free Documentation License 1.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>

+ 0
- 13
ubuntu/_base/applications/tde-systemsettings/debian/tde-settings-laptops.directory View File

@@ -1,13 +0,0 @@
[Desktop Entry]
Encoding=UTF-8
Name=Laptops & Power
Name[br]=Gremm
Name[el]=Ισχύς
Name[it]=Energia
Name[mt]=Elettriku
Name[nl]=Energie
Name[pa]=ਊਰਜਾ(power)
Name[pt_BR]=Energia
Name[ru]=Управление питанием
Name[sv]=Effekt
Icon=energy

Loading…
Cancel
Save