diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2021-05-10 02:57:11 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2021-05-12 13:03:27 +0200 |
| commit | c6979fb7acfb6e35a0a197af99500e06645d3e30 (patch) | |
| tree | 83f1f1e5afd95de92666a0d89ead68417daa7bb0 /debian/_base/core/tdewebdev | |
| parent | b61211a0480af41249bc9072c1d5c8dd1eca00f3 (diff) | |
| download | tde-packaging-c6979fb7acfb6e35a0a197af99500e06645d3e30.tar.gz tde-packaging-c6979fb7acfb6e35a0a197af99500e06645d3e30.zip | |
DEB: Swith cmake builds to use ninja-build.
Cleaning automake dependencies.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit ad1898f6e2ef733686f2c03e19e3f320cab8ef13)
Diffstat (limited to 'debian/_base/core/tdewebdev')
4 files changed, 1 insertions, 42 deletions
diff --git a/debian/_base/core/tdewebdev/debian/control b/debian/_base/core/tdewebdev/debian/control index 846b1fa6d..5aca033ec 100644 --- a/debian/_base/core/tdewebdev/debian/control +++ b/debian/_base/core/tdewebdev/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Adeodato Sim <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Armin Berres <trigger+debian@space-based.de>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, tqt3-doc, libreadline-dev | libreadline6-dev | libreadline5-dev, libxml2-dev, libxslt1-dev, libicu-dev, libcvsservice-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, ninja-build, tdelibs14-trinity-dev, tqt3-doc, libreadline-dev | libreadline6-dev | libreadline5-dev, libxml2-dev, libxslt1-dev, libicu-dev, libcvsservice-trinity-dev Standards-Version: 3.8.4 Homepage: http://trinity.pearsoncomputing.net diff --git a/debian/_base/core/tdewebdev/debian/patches/common/README b/debian/_base/core/tdewebdev/debian/patches/common/README deleted file mode 100644 index 9e81cc359..000000000 --- a/debian/_base/core/tdewebdev/debian/patches/common/README +++ /dev/null @@ -1,14 +0,0 @@ -Common patches across TDE Debian packages -========================================= - - These directory should contain patches to the admin/ subdir of TDE - modules that are meant to be applied to all packaged modules. As the - admin/ subdir is shared across modules (and so, it's identical for all - modules at a certain version), I think it makes sense to have these - patches in a central location, and update them here. - - The script update.sh takes care of automatically updating the patches - that update autotools and libtool. You need to pass the location of an - admin/ directory as the first argument. - - -- Adeodato Simó, 2005-02-26 diff --git a/debian/_base/core/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff b/debian/_base/core/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff deleted file mode 100644 index 28c95742b..000000000 --- a/debian/_base/core/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff +++ /dev/null @@ -1,26 +0,0 @@ ---- kde/admin/cvs.sh 2005-11-26 02:42:02.000000000 +0000 -+++ kde/admin/cvs.sh 2005-11-26 02:42:26.000000000 +0000 -@@ -537,6 +537,8 @@ - if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi - export EXTRACTRC PREPARETIPS - -+kdepotpath=/usr/include/tde/tde.pot -+ - for subdir in $dirs; do - test -z "$VERBOSE" || echo "Making messages in $subdir" - (cd $subdir -@@ -554,10 +556,10 @@ - fi - perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile - -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot -- if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot -- fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot -+# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot -+# fi - - $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ - XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages diff --git a/debian/_base/core/tdewebdev/debian/patches/series b/debian/_base/core/tdewebdev/debian/patches/series index 8f8f0bd6b..e69de29bb 100644 --- a/debian/_base/core/tdewebdev/debian/patches/series +++ b/debian/_base/core/tdewebdev/debian/patches/series @@ -1 +0,0 @@ -common/kubuntu_01_kdepot.diff |