From 083184438bae1187cba892642120abd2a3248fc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 8 Aug 2020 22:05:53 +0200 Subject: [PATCH] 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. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 9d01b57af3673cc0e594a74fe0c12a4d3d9a59a3) --- .../tde-systemsettings/debian/control | 2 +- .../tde-systemsettings/debian/rules | 57 ++------ .../debian/systemsettings.1.docbook | 123 ------------------ .../debian/tde-settings-laptops.directory | 13 -- .../tde-systemsettings/debian/control | 2 +- .../tde-systemsettings/debian/rules | 57 ++------ .../debian/systemsettings.1.docbook | 123 ------------------ .../debian/tde-settings-laptops.directory | 13 -- 8 files changed, 24 insertions(+), 366 deletions(-) delete mode 100644 debian/_base/applications/tde-systemsettings/debian/systemsettings.1.docbook delete mode 100644 debian/_base/applications/tde-systemsettings/debian/tde-settings-laptops.directory delete mode 100644 ubuntu/_base/applications/tde-systemsettings/debian/systemsettings.1.docbook delete mode 100644 ubuntu/_base/applications/tde-systemsettings/debian/tde-settings-laptops.directory diff --git a/debian/_base/applications/tde-systemsettings/debian/control b/debian/_base/applications/tde-systemsettings/debian/control index c715064d4..363e24bb1 100644 --- a/debian/_base/applications/tde-systemsettings/debian/control +++ b/debian/_base/applications/tde-systemsettings/debian/control @@ -2,7 +2,7 @@ Source: tde-systemsettings-trinity Section: tde Priority: optional Maintainer: Timothy Pearson -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 diff --git a/debian/_base/applications/tde-systemsettings/debian/rules b/debian/_base/applications/tde-systemsettings/debian/rules index 14f491a3e..18aa16b96 100755 --- a/debian/_base/applications/tde-systemsettings/debian/rules +++ b/debian/_base/applications/tde-systemsettings/debian/rules @@ -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" diff --git a/debian/_base/applications/tde-systemsettings/debian/systemsettings.1.docbook b/debian/_base/applications/tde-systemsettings/debian/systemsettings.1.docbook deleted file mode 100644 index 33a640918..000000000 --- a/debian/_base/applications/tde-systemsettings/debian/systemsettings.1.docbook +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - Jonathan - Riddell - jriddell@ubuntu.com - - - 2005 - Jonathan Riddell - - - - 2005-06-09 - - - - systemsettings - 1 - - - systemsettings - TDE System Settings. - - - - systemsettings - - - - - - - - - - DESCRIPTION - - System Settings is a user friendly control centre for TDE. - - - - OPTIONS - - All TDE and Qt - programs accept a some common command-line options. - - - - Options: - - - Do not embed windows - - - - XDG menu to use (default is systemsettings) - - - - - - 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 Jonathan Riddell - jriddell@ubuntu.com for - Debian (but may be used by others). - Permission is granted to copy, distribute and/or modify this document - under either the terms of the GNU General Public License, - Version 2 or any later version published by the Free Software Foundation or - the GNU Free Documentation License 1.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/debian/_base/applications/tde-systemsettings/debian/tde-settings-laptops.directory b/debian/_base/applications/tde-systemsettings/debian/tde-settings-laptops.directory deleted file mode 100644 index 687a493c4..000000000 --- a/debian/_base/applications/tde-systemsettings/debian/tde-settings-laptops.directory +++ /dev/null @@ -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 diff --git a/ubuntu/_base/applications/tde-systemsettings/debian/control b/ubuntu/_base/applications/tde-systemsettings/debian/control index 2f9fe16c4..81d75d500 100644 --- a/ubuntu/_base/applications/tde-systemsettings/debian/control +++ b/ubuntu/_base/applications/tde-systemsettings/debian/control @@ -2,7 +2,7 @@ Source: tde-systemsettings-trinity Section: tde Priority: optional Maintainer: Timothy Pearson -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 diff --git a/ubuntu/_base/applications/tde-systemsettings/debian/rules b/ubuntu/_base/applications/tde-systemsettings/debian/rules index 14f491a3e..18aa16b96 100755 --- a/ubuntu/_base/applications/tde-systemsettings/debian/rules +++ b/ubuntu/_base/applications/tde-systemsettings/debian/rules @@ -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" diff --git a/ubuntu/_base/applications/tde-systemsettings/debian/systemsettings.1.docbook b/ubuntu/_base/applications/tde-systemsettings/debian/systemsettings.1.docbook deleted file mode 100644 index 33a640918..000000000 --- a/ubuntu/_base/applications/tde-systemsettings/debian/systemsettings.1.docbook +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - Jonathan - Riddell - jriddell@ubuntu.com - - - 2005 - Jonathan Riddell - - - - 2005-06-09 - - - - systemsettings - 1 - - - systemsettings - TDE System Settings. - - - - systemsettings - - - - - - - - - - DESCRIPTION - - System Settings is a user friendly control centre for TDE. - - - - OPTIONS - - All TDE and Qt - programs accept a some common command-line options. - - - - Options: - - - Do not embed windows - - - - XDG menu to use (default is systemsettings) - - - - - - 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 Jonathan Riddell - jriddell@ubuntu.com for - Debian (but may be used by others). - Permission is granted to copy, distribute and/or modify this document - under either the terms of the GNU General Public License, - Version 2 or any later version published by the Free Software Foundation or - the GNU Free Documentation License 1.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/_base/applications/tde-systemsettings/debian/tde-settings-laptops.directory b/ubuntu/_base/applications/tde-systemsettings/debian/tde-settings-laptops.directory deleted file mode 100644 index 687a493c4..000000000 --- a/ubuntu/_base/applications/tde-systemsettings/debian/tde-settings-laptops.directory +++ /dev/null @@ -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