From 9aa657bc9a6241d7cfe39c9ae04541fa0d372ea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 2 Oct 2018 00:54:40 +0200 Subject: DEB tdesudo: 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 (cherry picked from commit 738fe513310106a5112a2bd8be564b0f402a14d1) --- .../applications/tdesudo/debian/cdbs/buildvars.mk | 86 ----------- .../tdesudo/debian/cdbs/debian-qt-kde.mk | 6 +- .../applications/tdesudo/debian/cdbs/kde.mk | 4 +- .../applications/tdesudo/debian/cdbs/team-members | 16 -- .../applications/tdesudo/debian/cdbs/uploaders.mk | 29 ---- .../maverick/applications/tdesudo/debian/control | 2 +- ubuntu/maverick/applications/tdesudo/debian/docs | 3 + ubuntu/maverick/applications/tdesudo/debian/rules | 47 ++---- .../tdesudo/debian/tdesudo-trinity.1.docbook | 168 --------------------- 9 files changed, 24 insertions(+), 337 deletions(-) delete mode 100644 ubuntu/maverick/applications/tdesudo/debian/cdbs/buildvars.mk delete mode 100644 ubuntu/maverick/applications/tdesudo/debian/cdbs/team-members delete mode 100644 ubuntu/maverick/applications/tdesudo/debian/cdbs/uploaders.mk create mode 100644 ubuntu/maverick/applications/tdesudo/debian/docs delete mode 100644 ubuntu/maverick/applications/tdesudo/debian/tdesudo-trinity.1.docbook (limited to 'ubuntu/maverick') diff --git a/ubuntu/maverick/applications/tdesudo/debian/cdbs/buildvars.mk b/ubuntu/maverick/applications/tdesudo/debian/cdbs/buildvars.mk deleted file mode 100644 index 23d4709dc..000000000 --- a/ubuntu/maverick/applications/tdesudo/debian/cdbs/buildvars.mk +++ /dev/null @@ -1,86 +0,0 @@ -# -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2002,2003 Colin Walters -# Description: Defines some useful variables, but no rules -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2, or (at -# your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -# 02111-1307 USA. - -_cdbs_scripts_path ?= /usr/lib/cdbs -_cdbs_rules_path ?= /usr/share/cdbs/1/rules -_cdbs_class_path ?= /usr/share/cdbs/1/class - -ifndef _cdbs_rules_buildvars -_cdbs_rules_buildvars = 1 - -CDBS_VERSION = something - -# Common useful variables -DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':')) -DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ') -DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-) -DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//') -DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;') - -# Split into arch/indep packages -ifneq ($(DEB_INDEP_PACKAGES),cdbs) -DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep))) -DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same)))) -endif -# Split into normal and udeb packages -ifeq ($(DEB_UDEB_PACKAGES),) -DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) -DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) -else -DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) -endif -# Too much bother for now. If someone complains we'll fix it. -#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES)) -#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES)) -# A handy list of every package, udeb or not -DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES)) -DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES))) -DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES))) - -DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) - -# Some support for srcdir != builddir builds. -# These are relative to the root of the package -DEB_SRCDIR ?= . -DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR)) - -# Miscellaneous bits -DEB_ARCH = $(shell dpkg --print-architecture) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM) -DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU) -DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) -DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) -DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM) -DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU) -DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) -DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU) -DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS) - -ifeq ($(words $(DEB_ALL_PACKAGES)),1) - DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/ -else - DEB_DESTDIR = $(CURDIR)/debian/tmp/ -endif - -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1) - -endif diff --git a/ubuntu/maverick/applications/tdesudo/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/tdesudo/debian/cdbs/debian-qt-kde.mk index 9920696ce..32ba4acfb 100644 --- a/ubuntu/maverick/applications/tdesudo/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/maverick/applications/tdesudo/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,10 +19,11 @@ 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) -include debian/cdbs/uploaders.mk +#include debian/cdbs/uploaders.mk ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches @@ -103,6 +105,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 | \ @@ -111,6 +114,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/tdesudo/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tdesudo/debian/cdbs/kde.mk index 765560c89..023886fc8 100644 --- a/ubuntu/maverick/applications/tdesudo/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/tdesudo/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/tdesudo/debian/cdbs/team-members b/ubuntu/maverick/applications/tdesudo/debian/cdbs/team-members deleted file mode 100644 index 05761af6e..000000000 --- a/ubuntu/maverick/applications/tdesudo/debian/cdbs/team-members +++ /dev/null @@ -1,16 +0,0 @@ -Sune Vuorela -Ana Beatriz Guerrero Lopez -Fathi Boudra -Modestas Vainius -Josh Metzler -Isaac Clerencia -Adeodato Simó -Adeodato Simo -Christopher Martin -Daniel Schepler -Sarah Hobbs -Nacho Barrientos Arias -Ricardo Javier Cardenes Medina -Ricardo Cardenes -Armin Berres -Francesco Pedrini diff --git a/ubuntu/maverick/applications/tdesudo/debian/cdbs/uploaders.mk b/ubuntu/maverick/applications/tdesudo/debian/cdbs/uploaders.mk deleted file mode 100644 index 31adfe31e..000000000 --- a/ubuntu/maverick/applications/tdesudo/debian/cdbs/uploaders.mk +++ /dev/null @@ -1,29 +0,0 @@ - -MAINTAINER=Debian Qt/KDE Maintainers -UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//') - - -debian/control.tmp: - @if [ ! -e debian/control.in ] ; then \ - echo "this package is not yet prepared for using automatic update of uploaders"; \ - echo "Please do so."; \ - exit 1; \ - fi - @sed 's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in > debian/control.tmp - -check-uploaders: debian/control.tmp - @if ! diff -q debian/control debian/control.tmp ; then \ - echo "WARNING:: Control file differs from manually generated one" ; \ - echo "WARNING:: Please update it manually and check it afterwards" ; \ - echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\ - echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\ - fi - - -clean:: - rm -f debian/control.tmp - -update-uploaders: debian/control.tmp - @mv -f debian/control.tmp debian/control - -makebuilddir:: check-uploaders diff --git a/ubuntu/maverick/applications/tdesudo/debian/control b/ubuntu/maverick/applications/tdesudo/debian/control index a33e159db..fa506bda9 100644 --- a/ubuntu/maverick/applications/tdesudo/debian/control +++ b/ubuntu/maverick/applications/tdesudo/debian/control @@ -2,7 +2,7 @@ Source: tdesudo-trinity Section: tde Priority: optional Maintainer: Timothy Pearson -Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, tdelibs14-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, cmake, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: tdesudo-trinity diff --git a/ubuntu/maverick/applications/tdesudo/debian/docs b/ubuntu/maverick/applications/tdesudo/debian/docs new file mode 100644 index 000000000..ca0272abf --- /dev/null +++ b/ubuntu/maverick/applications/tdesudo/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +README +TODO diff --git a/ubuntu/maverick/applications/tdesudo/debian/rules b/ubuntu/maverick/applications/tdesudo/debian/rules index 46773edff..18b1c07e2 100755 --- a/ubuntu/maverick/applications/tdesudo/debian/rules +++ b/ubuntu/maverick/applications/tdesudo/debian/rules @@ -1,43 +1,20 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk #include /usr/share/cdbs/1/rules/patchsys-quilt.mk -include debian/cdbs/kde.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 --with-extra-includes=/opt/trinity/include/tde - -DEB_INSTALL_MANPAGES_tdesudo-trinity = tdesudo-trinity.1 +include debian/cdbs/debian-qt-kde.mk DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -build/tdesudo-trinity:: - docbook2x-man debian/tdesudo-trinity.1.docbook - mv tdesudo.1 tdesudo-trinity.1 - -clean:: - rm -f tdesudo-trinity.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/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/maverick/applications/tdesudo/debian/tdesudo-trinity.1.docbook b/ubuntu/maverick/applications/tdesudo/debian/tdesudo-trinity.1.docbook deleted file mode 100644 index 2a641f045..000000000 --- a/ubuntu/maverick/applications/tdesudo/debian/tdesudo-trinity.1.docbook +++ /dev/null @@ -1,168 +0,0 @@ - - - - - - Anthony - Mercatante - tonio@ubuntu.com - - - 2007 - Anthony Mercatante - - - - 2007-03-26 - - - - tdesudo - 1 - - - tdesudo - a sudo frontend for TDE - - - - tdesudo - - - - - - - - - - DESCRIPTION - - tdesudo is a frontend for sudo for the TDE desktop. - - - - 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 - - - - KdeSudo Options: - - - Specifies the command to run - - - - Specifies the target uid [default is root] - - - - Do not keep password - - - - Forgets all passwords - - - - Set priority value: between 0 and 100, 0 is lowest [default is 50] - - - - Let command use existing dcopserver - - - - Comment to display in the dialog box - - - - Do not display « ignore » button - - - - Specify icon to use in the password dialog - - - - Do not show the command to be run in the dialog - - - - Use realtime scheduling - - - - Use target UID if « file » is not writeable - - - - Enable terminal output (no password keeping) - - - - - - KdeSudo options: - - - Sets a runas user - - - - - - - COPYRIGHT - - This manual page was written by Anthony Mercatante - tonio@ubuntu.com 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. - - - -- cgit v1.2.1