diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2019-04-03 23:02:46 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2019-04-03 23:02:46 +0900 |
commit | fcad8b8d150fb9f508973e3044a103de74ec3877 (patch) | |
tree | ca34a8cf3bfbe08335d40c47863b4901e1d19609 /ubuntu/maverick/applications/kiosktool/debian | |
parent | 5d8ed1fab813d86b04383f7fcf8ab2c994cbea30 (diff) | |
download | tde-packaging-fcad8b8d150fb9f508973e3044a103de74ec3877.tar.gz tde-packaging-fcad8b8d150fb9f508973e3044a103de74ec3877.zip |
DEB: use _base folder for a distro instead of specific distros (squeeze and maverick).
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'ubuntu/maverick/applications/kiosktool/debian')
13 files changed, 0 insertions, 555 deletions
diff --git a/ubuntu/maverick/applications/kiosktool/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kiosktool/debian/cdbs/debian-qt-kde.mk deleted file mode 100644 index 60310a01a..000000000 --- a/ubuntu/maverick/applications/kiosktool/debian/cdbs/debian-qt-kde.mk +++ /dev/null @@ -1,119 +0,0 @@ -ifndef _cdbs_bootstrap -_cdbs_scripts_path ?= /usr/lib/cdbs -_cdbs_rules_path ?= /usr/share/cdbs/1/rules -_cdbs_class_path ?= /usr/share/cdbs/1/class -endif - -ifndef _cdbs_class_debian-qt-kde -_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 -endif -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) - -ifndef _cdbs_rules_patchsys_quilt -DEB_PATCHDIRS := debian/patches/common debian/patches -endif - -DEB_KDE_ENABLE_FINAL := yes -DEB_INSTALL_DOCS_ALL := - -DEB_DH_MAKESHLIBS_ARGS_ALL := -V -DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) - -ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb - ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) - cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) - else - cdbs_kde_enable_final = - endif -endif - -common-build-arch:: debian/stamp-man-pages -debian/stamp-man-pages: - if ! test -d debian/man/out; then mkdir -p debian/man/out; fi - for f in $$(find debian/man -name '*.sgml'); do \ - docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ - done - for f in $$(find debian/man -name '*.man'); do \ - soelim -I debian/man $$f \ - > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ - done - touch debian/stamp-man-pages - -common-binary-indep:: - ( set -e; \ - tmpf=`mktemp debian/versions.XXXXXX`; \ - perl debian/cdbs/versions.pl >$$tmpf; \ - for p in $(DEB_INDEP_PACKAGES); do \ - cat $$tmpf >>debian/$$p.substvars; \ - done; \ - rm -f $$tmpf ) - -common-binary-arch:: - ( set -e; \ - tmpf=`mktemp debian/versions.XXXXXX`; \ - perl debian/cdbs/versions.pl >$$tmpf; \ - for p in $(DEB_ARCH_PACKAGES); do \ - cat $$tmpf >>debian/$$p.substvars; \ - done; \ - rm -f $$tmpf ) - -clean:: - rm -rf debian/man/out - -rmdir debian/man - rm -f debian/stamp-man-pages - rm -rf debian/shlibs-check - -$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: - if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi - if test -e debian/$(cdbs_curpkg).lintian; then \ - install -p -D -m644 debian/$(cdbs_curpkg).lintian \ - debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ - fi - if test -e debian/$(cdbs_curpkg).presubj; then \ - install -p -D -m644 debian/$(cdbs_curpkg).presubj \ - debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ - fi - -binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: - set -e; \ - for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ - pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ - echo Building $$pkg HTML docs...; \ - mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ - cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ - /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ - done - for pkg in $(DOC_HTML_PRUNE) ; do \ - rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ - 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 | \ - xargs --no-run-if-empty rm -f; \ - rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ - configure configure.files configure.in stamp-h.in \ - subdirs; \ - fi -endif - rm -f debian/stamp-cvs-make - -endif diff --git a/ubuntu/maverick/applications/kiosktool/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kiosktool/debian/cdbs/kde.mk deleted file mode 100644 index 80176d63e..000000000 --- a/ubuntu/maverick/applications/kiosktool/debian/cdbs/kde.mk +++ /dev/null @@ -1,91 +0,0 @@ -# -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> -# Description: A class for KDE packages; sets KDE environment variables, etc -# -# 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_class_kde -_cdbs_class_kde := 1 - -# for dh_icons -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) - -include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) - -ifdef _cdbs_tarball_dir -DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) -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 -export kde_htmldir = \$${datadir}/doc/tde/HTML - -ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) - cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) -endif - -ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) - cdbs_kde_enable_final = - cdbs_kde_enable_debug = --enable-debug=yes -else - cdbs_kde_enable_debug = --disable-debug -endif - -ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) - cdbs_kde_enable_debug = --enable-debug=full -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" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el - -$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: - if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi - -cleanbuilddir:: - -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) - -common-build-arch common-build-indep:: debian/stamp-kde-apidox -debian/stamp-kde-apidox: - $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) - touch $@ - -common-install-arch common-install-indep:: common-install-kde-apidox -common-install-kde-apidox:: - $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) - -clean:: - rm -f debian/stamp-kde-apidox - -# This is a convenience target for calling manually. It's not part of -# the build process. -buildprep: clean apply-patches - $(MAKE) -f admin/Makefile.common dist - debian/rules clean - -endif diff --git a/ubuntu/maverick/applications/kiosktool/debian/cdbs/versions.pl b/ubuntu/maverick/applications/kiosktool/debian/cdbs/versions.pl deleted file mode 100644 index 1b110f7af..000000000 --- a/ubuntu/maverick/applications/kiosktool/debian/cdbs/versions.pl +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env perl - -use strict; -use warnings; - -my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; -my ($version3, $version3_next); -my ($version2, $version2_next); - -($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; -($version2 = $version3) =~ s/\.[^.]+$//; - -($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; -($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; - -print "TDE-Version3=$version3\n"; -print "TDE-Version2=$version2\n"; -print "TDE-Next-Version3=$version3_next\n"; -print "TDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/maverick/applications/kiosktool/debian/changelog b/ubuntu/maverick/applications/kiosktool/debian/changelog deleted file mode 100644 index 550c04bb0..000000000 --- a/ubuntu/maverick/applications/kiosktool/debian/changelog +++ /dev/null @@ -1,92 +0,0 @@ -kiosktool-trinity (1.0-2.0ubuntu0) maverick; urgency=low - - * Trinity rebuild - - -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 15 Oct 2011 04:19:00 -0600 - -kiosktool (1.0-1.1ubuntu6) hardy; urgency=low - - * Rebuild with recent g++ compiler version. - - -- Matthias Klose <doko@ubuntu.com> Thu, 03 Apr 2008 11:24:40 +0000 - -kiosktool (1.0-1.1ubuntu5) gutsy; urgency=low - - * Add kubuntu_03_sudo_support.diff to support sudo - * Add depend on tdesudo - * Move maintainer to XSBC-Original-Maintainer: - - -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 20 Jul 2007 16:57:11 +0100 - -kiosktool (1.0-1.1ubuntu4) edgy; urgency=low - - * Rebuild so it doesnt depend on libgamin0 - - -- Sarah Hobbs <hobbsee@ubuntu.com> Tue, 25 Jul 2006 13:25:55 +1000 - -kiosktool (1.0-1.1ubuntu3) dapper; urgency=low - - * Add kubuntu_02_kmenu.diff use the correct menu file - - -- Jonathan Riddell <jriddell@ubuntu.com> Sun, 18 Dec 2005 15:46:35 +0000 - -kiosktool (1.0-1.1ubuntu2) dapper; urgency=low - - * Add automake1.9 build-dep - - -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 14 Dec 2005 17:43:36 +0000 - -kiosktool (1.0-1.1ubuntu1) dapper; urgency=low - - * Rebuild for libstdc++ transition - * Add kubuntu_01_kdepot.diff for .pot generation - - -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 14 Dec 2005 11:35:56 +0000 - -kiosktool (1.0-1.1) unstable; urgency=medium - - * Non-maintainer upload. - * Trigger rebuild for the Qt/KDE transition, no source changes needed. - (Closes: #327996) - - -- Adeodato Simó <asp16@alu.ua.es> Tue, 27 Sep 2005 16:07:52 +0200 - -kiosktool (1.0-1) unstable; urgency=low - - * Released kiosktool 1.0 - - -- Pedro Jurado Maqueda <melenas@kdehispano.org> Tue, 26 Apr 2005 22:38:16 +0200 - -kiosktool (0.9-2) unstable; urgency=low - - * Solved a problem with upstream sources due to some messages translated to Spanish - * Changed description - * First Debian upload, closes: #267595 - * Erased line Categories=Qt;TDE;System in kiosktool.desktop because this file is installed in Utilities category - - -- Pedro Jurado Maqueda <melenas@kdehispano.org> Wed, 5 Jan 2005 15:18:17 +0100 - -kiosktool (0.9-1) unstable; urgency=low - - * Released kiosktool 0.9 - - -- Pedro Jurado Maqueda <melenas@kdehispano.org> Wed, 13 Oct 2004 14:57:28 +0200 - -kiosktool (0.8-1) unstable; urgency=low - - * First use of cdbs for packaging - * Created a man page with kdemangen.pl (thanks to Dominique Devriese) - - -- Pedro Jurado Maqueda <melenas@kdehispano.org> Mon, 23 Aug 2004 11:53:37 +0200 - -kiosktool (0.7-1) unstable; urgency=low - - * Correct a semantic error in description - - -- Pedro Jurado Maqueda <melenas@kdehispano.org> Wed, 7 Jul 2004 15:19:42 +0200 - -kiosktool (0.6-1) unstable; urgency=low - - * Initial release - - -- Pedro Jurado Maqueda <melenas@kdehispano.org> Wed, 7 Jul 2004 15:19:42 +0200 diff --git a/ubuntu/maverick/applications/kiosktool/debian/compat b/ubuntu/maverick/applications/kiosktool/debian/compat deleted file mode 100644 index 7f8f011eb..000000000 --- a/ubuntu/maverick/applications/kiosktool/debian/compat +++ /dev/null @@ -1 +0,0 @@ -7 diff --git a/ubuntu/maverick/applications/kiosktool/debian/control b/ubuntu/maverick/applications/kiosktool/debian/control deleted file mode 100644 index 1f7d50230..000000000 --- a/ubuntu/maverick/applications/kiosktool/debian/control +++ /dev/null @@ -1,17 +0,0 @@ -Source: kiosktool-trinity -Section: tde -Priority: optional -Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> -XSBC-Original-Maintainer: Pedro Jurado Maqueda <melenas@kdehispano.org> -Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, cmake, tdelibs14-trinity-dev -Standards-Version: 3.8.4 - -Package: kiosktool-trinity -Architecture: any -Depends: ${shlibs:Depends}, tdesudo-trinity -Replaces: kiosktool-trinity (<< 4:14.0.0~) -Breaks: kiosktool-trinity (<< 4:14.0.0~) -Description: tool to configure the TDE kiosk framework - A Point&Click tool for system administrators to enable - TDE's KIOSK features or otherwise preconfigure TDE for - groups of users. diff --git a/ubuntu/maverick/applications/kiosktool/debian/copyright b/ubuntu/maverick/applications/kiosktool/debian/copyright deleted file mode 100644 index a88b1d8d2..000000000 --- a/ubuntu/maverick/applications/kiosktool/debian/copyright +++ /dev/null @@ -1,29 +0,0 @@ -This package was debianized by Pedro Jurado Maqueda <melenas@kdehispano.org> on -Fri, 14 Jul 2004 12:49:42 +0200. - -It was downloaded from ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/admin - -Upstream Author: Waldo Bastian <waldo@kde.org> - -Copyright: - 2003, 2004 Waldo Bastian <bastian@kde.org> - 2004 Martijn Klingens <klingens@kde.org> - -License: - This package 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; version 2 dated June, 1991. - - This package 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 package; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. - -On Debian systems, the complete text of the GNU General Public License -version 2 can be found in `/usr/share/common-licenses/GPL-2'. - diff --git a/ubuntu/maverick/applications/kiosktool/debian/docs b/ubuntu/maverick/applications/kiosktool/debian/docs deleted file mode 100644 index 724e08449..000000000 --- a/ubuntu/maverick/applications/kiosktool/debian/docs +++ /dev/null @@ -1,2 +0,0 @@ -README -TODO diff --git a/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff b/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff deleted file mode 100644 index 1ee900501..000000000 --- a/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff +++ /dev/null @@ -1,157 +0,0 @@ ---- kiosktool/kiosktool/kioskrun.h 2005-04-25 10:46:33.000000000 +0100 -+++ kiosktool/kiosktool/kioskrun.h 2007-07-18 17:47:04.000000000 +0100 -@@ -37,6 +37,18 @@ - - class KioskGui; - -+class NETACCESS { -+ public: -+ static bool exists(const KURL &url, bool source, TQWidget *window); -+ static bool mkdir(const KURL &url, TQWidget *window, int permissions=-1); -+ static TQString lastErrorString(); -+ static int lastError(); -+ static bool file_copy (const KURL &src, const KURL &dest, int permissions=-1, bool overwrite=false, bool resume=false, TQWidget *window=0L); -+ static bool del(const KURL &url, TQWidget *window); -+ static bool file_move(const KURL &src, const KURL &target, int permissions=-1, bool overwrite=false, bool resume=false, TQWidget *window=0L); -+ static bool copy(const KURL &src, const KURL &target, TQWidget *window); -+}; -+ - class KioskRun : public TQObject - { - friend class KioskGui; ---- kiosktool/kiosktool/kioskrun.cpp 2005-04-25 10:46:33.000000000 +0100 -+++ kiosktool/kiosktool/kioskrun.cpp 2007-07-20 16:56:07.000000000 +0100 -@@ -28,6 +28,7 @@ - - #include <tqdir.h> - #include <tqfile.h> -+#include <tqprocess.h> - - #include <tdeapplication.h> - #include <tdecmdlineargs.h> -@@ -45,10 +46,124 @@ - #include "kiosksync.h" - - #include <tdeio/netaccess.h> --#define NETACCESS TDEIO::NetAccess -+// Kiosktool wants to use fish://root@localhost/... which won't work on Kubuntu because we don't run ssh by default, we don't allow ssh to do root logins and root doesn't even have a password, so implement the functions here for local copies using tdesu instead -+// #define NETACCESS TDEIO::NetAccess - - #undef DEBUG_ENTRIES - -+bool NETACCESS::exists(const KURL &url, bool source, TQWidget *window) -+{ -+ if (url.protocol() == "fish" && url.host() == "localhost") { -+ bool exists = TQFile::exists(url.path()); -+ return exists; -+ } else { -+ bool result = TDEIO::NetAccess::exists(url, source, window); -+ return result; -+ } -+} -+ -+bool NETACCESS::mkdir(const KURL &url, TQWidget *window, int permissions) -+{ -+ if (url.protocol() == "fish" && url.host() == "localhost") { -+ TQProcess proc; -+ proc.addArgument("tdesudo"); -+ proc.addArgument("mkdir " + url.path()); -+ TQByteArray buffer; -+ proc.launch(buffer); -+ while (!proc.normalExit()) { -+ TDEApplication::kapp->processEvents(); -+ } -+ bool exists = TQFile::exists(url.path()); -+ return exists; -+ } else { -+ bool result = TDEIO::NetAccess::mkdir(url, window, permissions); -+ return result; -+ } -+} -+ -+TQString NETACCESS::lastErrorString() -+{ -+ return "Error in Kiosktool Kubuntu modifications"; -+} -+ -+int NETACCESS::lastError() -+{ -+ return 0; -+} -+ -+bool NETACCESS::file_copy(const KURL &src, const KURL &dest, int permissions, bool overwrite, bool resume, TQWidget *window) -+{ -+ if (dest.protocol() == "fish" && dest.host() == "localhost") { -+ TQProcess proc; -+ proc.addArgument("tdesudo"); -+ proc.addArgument("cp " + src.path() + " " + dest.path()); -+ TQByteArray buffer; -+ proc.launch(buffer); -+ while (!proc.normalExit()) { -+ TDEApplication::kapp->processEvents(); -+ } -+ -+ TQProcess proc2; -+ proc2.addArgument("tdesudo"); -+ proc2.addArgument("chmod 0644 " + dest.path()); -+ proc2.launch(buffer); -+ while (!proc2.normalExit()) { -+ TDEApplication::kapp->processEvents(); -+ } -+ -+ bool exists = TQFile::exists(dest.path()); -+ return exists; -+ } else { -+ bool result = TDEIO::NetAccess::file_copy(src, dest, permissions, overwrite, resume, window); -+ return result; -+ } -+} -+ -+bool NETACCESS::del(const KURL &url, TQWidget *window) -+{ -+ if (url.protocol() == "fish" && url.host() == "localhost") { -+ TQProcess proc; -+ proc.addArgument("tdesudo"); -+ proc.addArgument("rm " + url.path()); -+ TQByteArray buffer; -+ proc.launch(buffer); -+ while (!proc.normalExit()) { -+ TDEApplication::kapp->processEvents(); -+ } -+ bool exists = !TQFile::exists(url.path()); -+ return exists; -+ } else { -+ bool result = TDEIO::NetAccess::del(url, window); -+ return result; -+ } -+} -+ -+bool NETACCESS::file_move(const KURL &src, const KURL &target, int permissions, bool overwrite, bool resume, TQWidget *window) -+{ -+ if (target.protocol() == "fish" && target.host() == "localhost") { -+ TQProcess proc; -+ proc.addArgument("tdesudo"); -+ proc.addArgument("mv " + src.path() + " " + target.path()); -+ TQByteArray buffer; -+ proc.launch(buffer); -+ while (!proc.normalExit()) { -+ TDEApplication::kapp->processEvents(); -+ } -+ -+ bool exists = TQFile::exists(target.path()); -+ return exists; -+ } else { -+ bool result = TDEIO::NetAccess::file_move(src, target, permissions, overwrite, resume, window); -+ return result; -+ } -+} -+ -+//only used for local files -+bool NETACCESS::copy(const KURL &src, const KURL &target, TQWidget *window) -+{ -+ return TDEIO::NetAccess::copy(src, target, window); -+} -+ - KioskRun *KioskRun::s_self = 0; - - KioskRun::KioskRun( TQObject* parent, const char* name) diff --git a/ubuntu/maverick/applications/kiosktool/debian/patches/series b/ubuntu/maverick/applications/kiosktool/debian/patches/series deleted file mode 100644 index f6cd6dac1..000000000 --- a/ubuntu/maverick/applications/kiosktool/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -kubuntu_03_sudo_support.diff diff --git a/ubuntu/maverick/applications/kiosktool/debian/rules b/ubuntu/maverick/applications/kiosktool/debian/rules deleted file mode 100755 index 18b1c07e2..000000000 --- a/ubuntu/maverick/applications/kiosktool/debian/rules +++ /dev/null @@ -1,20 +0,0 @@ -#!/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/debian-qt-kde.mk - -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - -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/kiosktool/debian/source/format b/ubuntu/maverick/applications/kiosktool/debian/source/format deleted file mode 100644 index 163aaf8d8..000000000 --- a/ubuntu/maverick/applications/kiosktool/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/ubuntu/maverick/applications/kiosktool/debian/source/options b/ubuntu/maverick/applications/kiosktool/debian/source/options deleted file mode 100644 index 72f1f5450..000000000 --- a/ubuntu/maverick/applications/kiosktool/debian/source/options +++ /dev/null @@ -1,6 +0,0 @@ -# Use xz instead of gzip -compression = "xz" -compression-level = 9 - -# Don't run differences -diff-ignore = .* |