From 9ba851f3e7db689327cbbe435d2f2fac42847d3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 22 Sep 2018 15:42:46 +0200 Subject: [PATCH] DEB kiosktool: 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 0d7bf314821cfb57fdd61033b855d70ef06bc3d7) --- .../kiosktool/debian/cdbs/debian-qt-kde.mk | 6 +- .../applications/kiosktool/debian/cdbs/kde.mk | 4 +- .../applications/kiosktool/debian/control | 2 +- .../lenny/applications/kiosktool/debian/docs | 2 + .../debian/kiosktool-tdedirs-trinity.1 | 146 ----------------- .../kiosktool/debian/kiosktool-trinity.1 | 150 ------------------ .../debian/kiosktool-trinity.manpages | 2 - .../lenny/applications/kiosktool/debian/rules | 36 ++--- .../kiosktool/debian/cdbs/debian-qt-kde.mk | 6 +- .../applications/kiosktool/debian/cdbs/kde.mk | 4 +- .../applications/kiosktool/debian/control | 2 +- .../applications/kiosktool/debian/docs | 2 + .../debian/kiosktool-tdedirs-trinity.1 | 146 ----------------- .../kiosktool/debian/kiosktool-trinity.1 | 150 ------------------ .../debian/kiosktool-trinity.manpages | 2 - .../applications/kiosktool/debian/rules | 36 ++--- .../kiosktool/debian/cdbs/debian-qt-kde.mk | 6 +- .../applications/kiosktool/debian/cdbs/kde.mk | 4 +- .../applications/kiosktool/debian/control | 2 +- .../applications/kiosktool/debian/docs | 2 + .../debian/kiosktool-tdedirs-trinity.1 | 146 ----------------- .../kiosktool/debian/kiosktool-trinity.1 | 150 ------------------ .../debian/kiosktool-trinity.manpages | 2 - .../applications/kiosktool/debian/rules | 36 ++--- 24 files changed, 69 insertions(+), 975 deletions(-) create mode 100644 debian/lenny/applications/kiosktool/debian/docs delete mode 100644 debian/lenny/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1 delete mode 100644 debian/lenny/applications/kiosktool/debian/kiosktool-trinity.1 delete mode 100644 debian/lenny/applications/kiosktool/debian/kiosktool-trinity.manpages create mode 100644 debian/squeeze/applications/kiosktool/debian/docs delete mode 100644 debian/squeeze/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1 delete mode 100644 debian/squeeze/applications/kiosktool/debian/kiosktool-trinity.1 delete mode 100644 debian/squeeze/applications/kiosktool/debian/kiosktool-trinity.manpages create mode 100644 ubuntu/maverick/applications/kiosktool/debian/docs delete mode 100644 ubuntu/maverick/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1 delete mode 100644 ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.1 delete mode 100644 ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages diff --git a/debian/lenny/applications/kiosktool/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kiosktool/debian/cdbs/debian-qt-kde.mk index 9920696ce..32ba4acfb 100644 --- a/debian/lenny/applications/kiosktool/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/kiosktool/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/debian/lenny/applications/kiosktool/debian/cdbs/kde.mk b/debian/lenny/applications/kiosktool/debian/cdbs/kde.mk index 765560c89..023886fc8 100644 --- a/debian/lenny/applications/kiosktool/debian/cdbs/kde.mk +++ b/debian/lenny/applications/kiosktool/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/kiosktool/debian/control b/debian/lenny/applications/kiosktool/debian/control index 7ad2ca2ad..1f7d50230 100644 --- a/debian/lenny/applications/kiosktool/debian/control +++ b/debian/lenny/applications/kiosktool/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Pedro Jurado Maqueda -Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, tdelibs14-trinity-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, cmake, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: kiosktool-trinity diff --git a/debian/lenny/applications/kiosktool/debian/docs b/debian/lenny/applications/kiosktool/debian/docs new file mode 100644 index 000000000..724e08449 --- /dev/null +++ b/debian/lenny/applications/kiosktool/debian/docs @@ -0,0 +1,2 @@ +README +TODO diff --git a/debian/lenny/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1 b/debian/lenny/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1 deleted file mode 100644 index 40cc5a987..000000000 --- a/debian/lenny/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1 +++ /dev/null @@ -1,146 +0,0 @@ -.\" This file was generated by kdemangen.pl -.TH KIOSKTOOL\-TDEDIRS 1 "Ago 2004" "Trinity Desktop Environment" "A tool to set $TDEDIRS according to the current user profile." -.SH NAME -kiosktool\-tdedirs -\- A tool to set $TDEDIRS according to the current user profile. -.SH SYNOPSIS -kiosktool\-tdedirs [Qt\-options] [TDE\-options] [options] -.SH DESCRIPTION - -.SH OPTIONS -.SS Options: -.TP -.B \-\-check -Output currently active prefixes -.SS Generic options: -.TP -.B \-\-help -Show help about options -.TP -.B \-\-help\-qt -Show Qt specific options -.TP -.B \-\-help\-tde -Show TDE specific options -.TP -.B \-\-help\-all -Show all options -.TP -.B \-\-author -Show author information -.TP -.B \-v, \-\-version -Show version information -.TP -.B \-\-license -Show license information -.TP -.B \-\- -End of options -.SS -.SS TDE options: -.TP -.B \-\-caption -Use 'caption' as name in the titlebar. -.TP -.B \-\-icon -Use 'icon' as the application icon. -.TP -.B \-\-miniicon -Use 'icon' as the icon in the titlebar. -.TP -.B \-\-config -Use alternative configuration file. -.TP -.B \-\-dcopserver -Use the DCOP Server specified by 'server'. -.TP -.B \-\-nocrashhandler -Disable crash handler, to get core dumps. -.TP -.B \-\-waitforwm -Waits for a WM_NET compatible windowmanager. -.TP -.B \-\-style