summaryrefslogtreecommitdiffstats
path: root/ubuntu/_base
diff options
context:
space:
mode:
Diffstat (limited to 'ubuntu/_base')
-rw-r--r--ubuntu/_base/applications/internet/ktorrent/debian/control2
-rw-r--r--ubuntu/_base/applications/office/tde-ebook-reader/debian/README.source9
-rw-r--r--ubuntu/_base/applications/office/tde-ebook-reader/debian/cdbs/debian-tde.mk251
-rw-r--r--ubuntu/_base/applications/office/tde-ebook-reader/debian/cdbs/versions.pl19
-rw-r--r--ubuntu/_base/applications/office/tde-ebook-reader/debian/changelog765
-rw-r--r--ubuntu/_base/applications/office/tde-ebook-reader/debian/compat1
-rw-r--r--ubuntu/_base/applications/office/tde-ebook-reader/debian/control83
-rw-r--r--ubuntu/_base/applications/office/tde-ebook-reader/debian/copyright578
-rw-r--r--ubuntu/_base/applications/office/tde-ebook-reader/debian/libzlcore-data-tqt.install6
-rw-r--r--ubuntu/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt-dev.install2
-rw-r--r--ubuntu/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt.install1
-rw-r--r--ubuntu/_base/applications/office/tde-ebook-reader/debian/libzltext-data-tqt.install1
-rw-r--r--ubuntu/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt-dev.install2
-rw-r--r--ubuntu/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt.install1
-rw-r--r--ubuntu/_base/applications/office/tde-ebook-reader/debian/patches/series0
-rwxr-xr-xubuntu/_base/applications/office/tde-ebook-reader/debian/rules18
-rw-r--r--ubuntu/_base/applications/office/tde-ebook-reader/debian/source/format1
-rw-r--r--ubuntu/_base/applications/office/tde-ebook-reader/debian/source/options6
-rw-r--r--ubuntu/_base/applications/office/tde-ebook-reader/debian/tde-ebook-reader.install2
-rw-r--r--ubuntu/_base/applications/settings/kmyfirewall/debian/dirs2
-rw-r--r--ubuntu/_base/applications/settings/kmyfirewall/debian/install2
-rw-r--r--ubuntu/_base/applications/settings/kmyfirewall/debian/kmfinstallerplugin.desktop44
-rw-r--r--ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.desktop35
-rw-r--r--ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.xpm369
-rw-r--r--ubuntu/_base/applications/system/polkit-agent-tde/debian/control2
-rw-r--r--ubuntu/_base/core/tdebase/debian/control2
-rw-r--r--ubuntu/_base/core/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff2
-rwxr-xr-xubuntu/_base/core/tdebase/debian/rules2
-rw-r--r--ubuntu/_base/core/tdebase/debian/twin-trinity.install14
-rw-r--r--ubuntu/_base/core/tdelibs/debian/control4
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/control4
-rw-r--r--ubuntu/_base/dependencies/tqt3/debian/control2
-rw-r--r--ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install335
-rw-r--r--ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install4
-rwxr-xr-xubuntu/_base/dependencies/tqt3/debian/rules2
-rw-r--r--ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.install2
36 files changed, 1927 insertions, 648 deletions
diff --git a/ubuntu/_base/applications/internet/ktorrent/debian/control b/ubuntu/_base/applications/internet/ktorrent/debian/control
index b19611be8..f999b4929 100644
--- a/ubuntu/_base/applications/internet/ktorrent/debian/control
+++ b/ubuntu/_base/applications/internet/ktorrent/debian/control
@@ -2,7 +2,7 @@ Source: ktorrent-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: debhelper (>= 10~), quilt, cdbs, tdelibs14-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, libavahi-tqt-dev, libgeoip-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 10~), quilt, cdbs, tdelibs14-trinity-dev, libx11-dev, libgmp3-dev, libavahi-tqt-dev, libgeoip-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: ktorrent-trinity
diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/README.source b/ubuntu/_base/applications/office/tde-ebook-reader/debian/README.source
new file mode 100644
index 000000000..dd31d8dd1
--- /dev/null
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/README.source
@@ -0,0 +1,9 @@
+This Debian package for tde-ebook-reader does not contain some of the original
+FBReader hyphenation patterns due to following license problems:
+
+el.pattern: no license
+fi.pattern: modification is not explicitly allowed
+tr.pattern: no license
+
+These files were removed from zlibrary/text/data/hyphenationPatterns.zip.
+
diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/tde-ebook-reader/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..aba508624
--- /dev/null
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/cdbs/debian-tde.mk
@@ -0,0 +1,251 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Copyright © 2019 TDE Team
+# Description: A class for TDE packages; sets TDE 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.
+
+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
+
+# for dh_icons
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
+
+# 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 $(_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
+
+ifdef _cdbs_class_cmake
+ifneq "$(wildcard /usr/bin/ninja)" ""
+MAKE = ninja -v
+DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
+DEB_MAKE_INSTALL_TARGET = install
+DEB_CMAKE_NORMAL_ARGS += -GNinja
+endif
+endif
+
+ifndef _cdbs_rules_patchsys_quilt
+DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
+
+export kde_cgidir = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+export kde_htmldir = \$${datadir}/doc/tde/HTML
+
+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)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
+
+# The default gzip compressor has been changed in dpkg >= 1.17.0.
+deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
+ sed -e "s|.*version ||" -e "s| .*||" | \
+ xargs -r dpkg --compare-versions 1.17.0 lt \
+ && echo xz || echo gzip)
+ifeq ($(deb_default_compress),gzip)
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+ && echo xz || echo bzip2)
+endif
+
+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
+
+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
+
+DEB_BUILD_PARALLEL ?= true
+
+cdbs_configure_flags += \
+ --with-qt-dir=/usr/share/qt3 \
+ --disable-rpath \
+ --with-xinerama \
+ $(cdbs_kde_enable_final) \
+ $(cdbs_kde_enable_debug)
+
+
+# This is a convenience target for calling manually.
+# It's not part of the build process.
+buildprep: clean apply-patches
+ifndef _cdbs_class_cmake
+ $(MAKE) -f admin/Makefile.common dist
+endif
+ debian/rules clean
+
+.tdepkginfo:
+ echo "# TDE package information" >.tdepkginfo
+ dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
+ dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
+ date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
+
+post-patches:: .tdepkginfo
+
+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 )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
+
+clean::
+ rm -rf debian/man/out
+ -rmdir debian/man
+ rm -f debian/stamp-man-pages
+ rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
+
+$(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
+ 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
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ 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
+
+common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+ $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+ touch $@
+
+common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+ $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
+
+cleanbuilddir::
+ -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+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 .tdepkginfo
+ rm -f debian/stamp-kde-apidox
+ rm -f debian/stamp-cvs-make
+
+endif
diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/cdbs/versions.pl b/ubuntu/_base/applications/office/tde-ebook-reader/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/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/_base/applications/office/tde-ebook-reader/debian/changelog b/ubuntu/_base/applications/office/tde-ebook-reader/debian/changelog
new file mode 100644
index 000000000..323f5d530
--- /dev/null
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/changelog
@@ -0,0 +1,765 @@
+tde-ebook-reader (0.99.6-debian) testing; urgency=low
+
+ * Ported to TQt3 and package renaming
+
+ -- Michele Calgaro <michele.calgaro@yahoo.it> Sat, 11 May 2024 23:04:00 +0900
+
+fbreader (0.99.4+dfsg-6) unstable; urgency=medium
+
+ * QA upload.
+
+ * Added d/gbp.conf to describe branch layout.
+ * Updated vcs in d/control to Salsa.
+ * Updated d/gbp.conf to enforce the use of pristine-tar.
+ * Updated Standards-Version from 4.2.1 to 4.7.0.
+ * Use wrap-and-sort -at for debian control files
+ * Replaced obsolete pkg-config build dependency with pkgconf.
+ * Corrected shared library SO version in lintian overrides.
+ * Added 1014-desktop-mime-type.patch to announce MIME type support in
+ XDG desktop (Closes: #601609, #601605, #813768).
+ * Bump debhelper from deprecated 9 to 12 and use debhelper-compat version
+ in Build-Depends.
+
+ -- Petter Reinholdtsen <pere@debian.org> Fri, 10 May 2024 13:19:06 +0200
+
+fbreader (0.99.4+dfsg-5.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition.
+
+ -- Michael Hudson-Doyle <mwhudson@debian.org> Thu, 29 Feb 2024 02:32:43 +0000
+
+fbreader (0.99.4+dfsg-5) unstable; urgency=medium
+
+ * QA upload.
+ * Prevent installing .so link in non-dev library pkgs.
+ * Fix Breaks/Replaces.
+ * Drop old NEWS.
+ * Drop non-functional debian/watch.
+
+ -- Bastian Germann <bage@debian.org> Thu, 07 Sep 2023 15:41:50 +0000
+
+fbreader (0.99.4+dfsg-4) unstable; urgency=medium
+
+ * QA upload.
+ * Install liblzui in fbreader.
+
+ -- Bastian Germann <bage@debian.org> Tue, 05 Sep 2023 10:24:23 +0000
+
+fbreader (0.99.4+dfsg-3) unstable; urgency=medium
+
+ * QA upload.
+ * Prevent the same files in two different packages.
+ * Drop libzlui-qt and itegrate its contents into fbreader.
+
+ -- Bastian Germann <bage@debian.org> Tue, 05 Sep 2023 00:39:53 +0200
+
+fbreader (0.99.4+dfsg-2) experimental; urgency=medium
+
+ * QA upload.
+ * fbreader: Fix Depends on libzlui-qt instead of dropped -qt4.
+
+ -- Bastian Germann <bage@debian.org> Mon, 04 Sep 2023 20:05:08 +0200
+
+fbreader (0.99.4+dfsg-1) experimental; urgency=medium
+
+ * QA upload.
+ * Drop unneeded quilt Build-Dependency.
+ * Update to new upstream version. (Closes: #765039)
+ * Build with Qt5 patch. (Closes: #967336)
+
+ -- Bastian Germann <bage@debian.org> Sat, 02 Sep 2023 11:40:44 +0000
+
+fbreader (0.12.10dfsg2-6) unstable; urgency=low
+
+ * QA upload.
+ * Fix FTBFS with GCC-11 (Closes: #984121)
+ - Add debian/patches/0014-fix-ftbfs-gcc11.patch
+
+ -- Ying-Chun Liu (PaulLiu) <paulliu@debian.org> Wed, 12 Jan 2022 23:06:22 +0800
+
+fbreader (0.12.10dfsg2-5) unstable; urgency=medium
+
+ * QA upload.
+ * Orphan package.
+ * debian/source/format: Convert to "3.0 (quilt)" source package.
+ * debian/control: Replace transitional package ttf-unifont with
+ fonts-unifont.
+
+ -- Boyuan Yang <byang@debian.org> Thu, 26 Aug 2021 23:14:08 -0400
+
+fbreader (0.12.10dfsg2-4) unstable; urgency=medium
+
+ * debian/control:
+ - Drop Qt4 UI (libzlui-qt4), as Qt4 is going away. (Closes: #874867)
+ * debian/patches:
+ - New patch 0013-fbreader-Makefile-make-linking-order-reproducible, by
+ Chris Lamb. (Closes: 861770)
+
+ -- Eugene V. Lyubimkin <jackyf@debian.org> Sun, 01 Sep 2019 10:59:46 +0200
+
+fbreader (0.12.10dfsg2-3) unstable; urgency=medium
+
+ * debian/patches:
+ - New patch 0011-zlibrary-unix-curl-avoid-duplicate-case-in-a-switch.
+ Fixes building with curl 7.62.0. Thanks to Adrian Bunk for the report
+ and the libcurl API change hint. (Closes: #913382)
+ - New patch 0012-makefiles-use-externally-passed-PKG_CONFIG-if-availa by
+ Helmut Grohne.
+ * debian/rules:
+ - Enable cross-architecture building. Patch by Helmut Grohne.
+ (Closes: #861422)
+ * debian/control:
+ - Updated Standards-Version to 4.2.1, no changes needed.
+ - Added Recommends on sensible-utils (as suggested by lintian).
+ * debian/source/format:
+ - Created (with '1.0' inside).
+ * debian/libzlcore-data.lintian-overrides:
+ - Removed a false positive override introduced in 0.12.10dfsg2-1,
+ apparently fixed in lintian since.
+
+ -- Eugene V. Lyubimkin <jackyf@debian.org> Sun, 09 Dec 2018 18:21:31 +0100
+
+fbreader (0.12.10dfsg2-2) unstable; urgency=medium
+
+ * debian/patches:
+ - New patch booksdb-avoid-converting-boolean-to-shared_ptr.patch. Fixes
+ building with GCC6. Patch by Robert Bihlmeyer. (Closes: #811676)
+ * debian/copyright:
+ - Updated my e-mail address.
+ - Removed obsolete statements for DocBook/XHTML entity files removed in
+ the previous upload. (Closes: #824393)
+
+ -- Eugene V. Lyubimkin <jackyf@debian.org> Sun, 24 Jul 2016 13:40:32 +0200
+
+fbreader (0.12.10dfsg2-1) unstable; urgency=medium
+
+ * debian/dfsg-repack:
+ - Also remove docbook- and XHTML entity files. (Closes: #807074)
+ * debian/patches:
+ - New patch fbreader-Makefile-do-not-try-to-install-empty-format.patch, so
+ upstream Makefile doesn't install unexisting XHTML entity files.
+ * debian/control:
+ - Updated Standards-Version to 3.9.6, no changes needed.
+ - Bumped debhelper build-dependency to >= 9.
+ * debian/rules:
+ - Modernized using dh overrides.
+ * debian/menu:
+ - Removed as suggested by lintian, since a .desktop-file is present.
+ * debian/libzlcore-data.lintian-overrides:
+ - Added to override a false positive about reproducibility of
+ usr/share/zlibrary/unicode.xml.gz.
+
+ -- Eugene V. Lyubimkin <jackyf@debian.org> Sun, 21 Feb 2016 10:46:49 +0100
+
+fbreader (0.12.10dfsg-10) unstable; urgency=low
+
+ * NMU acknowledged - thanks, Ondřej!
+ * debian/control:
+ - Bump ABI parts of libzlcore and libzltext package names for GCC5 C++11
+ ABI transition. For historical reasons these package name parts were
+ actually a bit off the SONAMEs, and now it's a good time to fix it.
+ (Closes: #763468)
+
+ -- Eugene V. Lyubimkin <jackyf@debian.org> Tue, 21 Jul 2015 20:52:34 +0300
+
+fbreader (0.12.10dfsg-9.1) unstable; urgency=medium
+
+ * Change B-D to libjpeg-dev to finish the transition to libjpeg-turbo
+
+ -- Ondřej Surý <ondrej@debian.org> Mon, 29 Sep 2014 14:04:47 +0200
+
+fbreader (0.12.10dfsg-9) unstable; urgency=low
+
+ * debian/control:
+ - Bumped Standards-Version to 3.9.4, no changes needed.
+ - Build-depend on libunibreak-dev instead of liblinebreak2-dev.
+ * debian/patches:
+ - New patch 950-link-to-libunibreak.patch.
+ - New patch 951-fix-calling-compiler.patch, which replaces old
+ 940-use-debian-compiler-flags.patch: reworked to not override compiler
+ flags by "target setup" instead of introducing DEBFLAGS, force verbose
+ compilation and introduce CPPFLAGS and CXXFLAGS where needed.
+ * debian/rules:
+ - Include dpkg's buildflags.mk if present to support hardening.
+ - Removed DEBFLAGS-hack.
+ - Removed obsolete commented Qt3-related line.
+
+ -- Eugene V. Lyubimkin <jackyf@debian.org> Fri, 21 Jun 2013 13:17:00 +0300
+
+fbreader (0.12.10dfsg-8) unstable; urgency=low
+
+ * debian/patches:
+ - New patch 600-fix-ftell-crash.patch, fixing a possible crash on
+ migration. (Closes: #689338)
+
+ -- Eugene V. Lyubimkin <jackyf@debian.org> Sat, 06 Oct 2012 12:33:58 +0300
+
+fbreader (0.12.10dfsg-7) unstable; urgency=medium
+
+ * debian/rules:
+ - Fixed FTFBS on binary-only builds. Report by Pino Toscano, patch by
+ Salvatore Bonaccorso. (Closes: #680657)
+ * debian/control:
+ - Bumped Standards-Version to 3.9.3, no changes needed.
+
+ -- Eugene V. Lyubimkin <jackyf@debian.org> Sun, 08 Jul 2012 12:05:01 +0300
+
+fbreader (0.12.10dfsg-6) unstable; urgency=medium
+
+ * debian/patches:
+ - New patch 910-zlui-qt4-links-to-QtCore.patch. Thanks to Stepan Golosunov
+ for the report. (Closes: #649612)
+
+ -- Eugene V. Lyubimkin <jackyf@debian.org> Sat, 26 Nov 2011 12:35:23 +0200
+
+fbreader (0.12.10dfsg-5) unstable; urgency=low
+
+ * debian/{control,rules}
+ - Don't build zlui-maemo anymore as its build-depends will be removed from
+ Debian repositories. (Closes: #643745)
+ * debian/patches:
+ - Dropped maemo-specific patches as not needed anymore.
+ * debian/NEWS:
+ - Set the version of really uploaded package.
+ Fixes a lintian warning 'debian-news-entry-has-unknown-version'.
+
+ -- Eugene V. Lyubimkin <jackyf@debian.org> Thu, 29 Sep 2011 19:25:10 +0300
+
+fbreader (0.12.10dfsg-4) unstable; urgency=low
+
+ * debian/control:
+ - Build-depend on liblinebreak{ -> 2}-dev.
+
+ -- Eugene V. Lyubimkin <jackyf@debian.org> Tue, 14 Jun 2011 19:38:15 +0300
+
+fbreader (0.12.10dfsg-3) unstable; urgency=medium
+
+ * debian/patches:
+ - New patch 030-use-pkgconfig-includes.patch from Steve Langasek.
+ (Closes: #620852)
+ - New patch 400-fix-building-with-gcc46.patch. Fixes FTBFS.
+ (Closes: #618051)
+ * debian/control:
+ - Bumped Standards-Version to 3.9.2, no changes needed.
+
+ -- Eugene V. Lyubimkin <jackyf@debian.org> Sat, 28 May 2011 14:01:16 +0300
+
+fbreader (0.12.10dfsg-2) unstable; urgency=low
+
+ * Upload to unstable. (Closes: #613902)
+
+ -- Eugene V. Lyubimkin <jackyf@debian.org> Sat, 19 Feb 2011 14:15:35 +0200
+
+fbreader (0.12.10dfsg-1) experimental; urgency=low
+
+ * New upstream release.
+ * debian/control:
+ - Added libjpeg8-dev build-dependency. (Closes: #598996)
+ - Bumped Standards-Version to 3.9.1, no changes needed.
+ - Reintroduced libzlui-maemo binary package and build dependencies.
+ * debian/rules:
+ - Reintroduced maemo actions.
+
+ -- Eugene V. Lyubimkin <jackyf@debian.org> Mon, 04 Oct 2010 19:47:39 +0300
+
+fbreader (0.12.9dfsg-1) experimental; urgency=low
+
+ * New upstream release.
+ * debian/NEWS:
+ - Added with notes about migration to 0.12.
+ * debian/control:
+ - Updated my mail address.
+ - Removed DMUA, it is not needed anymore.
+ - Added eReader to the list of supported formats.
+ - Temporarily removed libzlui-maemo binary package and build dependencies
+ for it until maemo support is ready.
+ - Dropped 'libzlui-qt' binary package.
+ - Bumped Standards-Version to 3.8.4, no changes needed.
+ - Changed the suffix of library packages from 0.10 to 0.12.
+ - Set minimum build-dependency libcurl version to 7.17 as per upstream
+ README.build.
+ - Added libsqlite3-dev build-dependency.
+ * debian/copyright:
+ - Updated copyright years.
+ * debian/patches:
+ - 930-use-shell-make-variable.patch: updated.
+ - 020-maemo-disable-libconic.patch: refreshed.
+ - 900-delete-useless-strip-flag.patch: refreshed.
+ - 930-use-shell-make-variable.patch: refreshed.
+ - 940-use-debian-compiler-flags.patch: refreshed.
+
+ -- Eugene V. Lyubimkin <jackyf@debian.org> Thu, 25 Mar 2010 19:58:30 +0200
+
+fbreader (0.10.7dfsg-4) unstable; urgency=medium
+
+ * debian/control:
+ - Use source:Version for dependencies on arch-independent packages.
+ Thanks to Julien Cristau for the report. Fixes FTBFS on BinNMUs.
+ (Closes: #596575)
+ - Updated my mail address.
+ - Removed DM-Upload-Allowed, not needed anymore.
+
+ -- Eugene V. Lyubimkin <jackyf@debian.org> Sun, 12 Sep 2010 21:23:29 +0300
+
+fbreader (0.10.7dfsg-3) unstable; urgency=low
+
+ * debian/control:
+ - Don't allow libzlui front-ends from previous series to be co-installed
+ with modern fbreader to prevent crashes. (Closes: #544138)
+ - Bumped Standards-Version to 3.8.3, no changes needed.
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com> Sun, 30 Aug 2009 14:23:49 +0300
+
+fbreader (0.10.7dfsg-2) unstable; urgency=low
+
+ * debian/control:
+ - Fixed misspelled choice 'libzlui-qt' (Qt3 UI) in Depends.
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com> Tue, 19 May 2009 11:21:39 +0300
+
+fbreader (0.10.7dfsg-1) unstable; urgency=low
+
+ * New upstream release, some changes:
+ - 0.10.7:
+ - A conflict between hyperlink clicks and touch scrolling has
+ been fixed.
+ - In maemo versions, empty menu items have been hidden.
+ - 0.10.6:
+ - A bug with images/css links in epub has been fixed. All the links
+ inside XHTML files were interpreted relative to the root OPF location
+ instead of XHTML file location. As a result, some images were not shown
+ in epub books.
+ - 0.10.5:
+ - The migration tool from version 0.8.* has been fixed. After an upgrade
+ from 0.8.* to this version, the first opening of your library will take
+ some time.
+ - A freeze (on some PDB books with more than one page and images, and
+ using small font size) has been fixed.
+ - Several text selection related issues have been fixed.
+ - 0.10.4:
+ - Maemo support is back.
+ - Multiple fixes in the epub format support.
+ * debian/control:
+ - Re-introduced libzlui-maemo binary package.
+ - Different minor versions of the same ui packages ('libzlui-*') are
+ incompatible between each other but have the same name, and it can cause
+ problems on upgrades. This is not a reliable behavior, so now
+ 'libzlui-*' packages don't provide 'libzlui' virtual package anymore.
+ Binary package 'fbreader' now strictly depends on same or newer binary
+ versions of one of 'libzlui-*' packages. (Closes: #521136)
+ - Bumped 'Standards-Version' to 3.8.1, no changes needed.
+ * debian/rules:
+ - Uncommented building maemo binaries.
+ * debian/dfsg-repack:
+ - Corrected to output usage when the parameter is not given.
+ * debian/patches:
+ - 005-maemo-makefile.patch: refreshed.
+ - New 020-maemo-disable-libconic.patch: disable libconic-related parts of
+ the maemo UI. Libconic depends on closed source, not even available
+ software.
+ - New 200-maemo-gtkentryparameter.patch: remove tuning-only hildon calls
+ that Debian GTK+ libraries cannot (yet?) satisfy.
+ - 930-use-shell-make-variable.patch: refreshed.
+ - debian/patches/940-use-debian-compiler-flags.patch: refreshed.
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com> Fri, 01 May 2009 00:28:06 +0300
+
+fbreader (0.10.3dfsg-1) experimental; urgency=low
+
+ * New upstream release, some changes:
+ - 0.10.3:
+ - Some issues related to multi-file tar, tar.gz and tar.bz2 archives
+ have been fixed.
+ - 0.10.2:
+ - Images order in mobipocket files has been corrected.
+ - Indonesian localization files have been updated.
+ * debian/dfsg-repack:
+ - Corrected to produce correct orig.tar.gz.
+ * debian/patches:
+ - 005-maemo-makefile.patch:
+ - Refreshed.
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com> Fri, 27 Feb 2009 21:26:25 +0200
+
+fbreader (0.10.1dfsg-1) experimental; urgency=low
+
+ * Repacked upstream tarball, removed non-DFSG hyphenation patterns (el, fi,
+ tr languages). See also README.source.
+ * debian/README.source:
+ - Added with reasons of excluding hyphenation patterns from upstream
+ tarball.
+ * debian/copyright:
+ - Renewed copyrights, thanks to Frank Lichtenheld.
+ - Fixed GPLv2 license path on Debian systems.
+ - Mentioned all Debian packaging contributors.
+ - Provided full license and copyright info for hyphenation patterns.
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com> Wed, 04 Feb 2009 22:59:58 +0200
+
+fbreader (0.10.1-1) experimental; urgency=low
+
+ * New upstream release, some changes:
+ - Fixed never-ending loop under certain conditions when operating with
+ library and settings.
+ * debian/patches:
+ - 200-typo-in-searchonnetworkaction.patch: removed, went upstream.
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com> Sun, 18 Jan 2009 16:06:20 +0200
+
+fbreader (0.10.0-1) experimental; urgency=low
+
+ * New upstream release, some changes:
+ - Searching and downloading books from www.feedbooks.com and
+ www.litres.ru.
+ - Partial CSS support for Epub files.
+ - Improved support for Epub and Mobipocket book formats.
+ - Added support for right-to-left languages and bidirectional text.
+ - Added Czech localization.
+ * debian/rules:
+ - Removed some old dh_makeshlibs magic for libzlcore and libzltext.
+ - Temporarily removed libzlui-maemo binary package until maemo support is
+ ready.
+ - Added build-deps: libfribidi-dev, libcurl4-gnutls-dev.
+ * debian/control:
+ - Bumped liblinebreak dependency version to 1.0.
+ - Made qt4 interface for fbreader the default one for new installs.
+ - Updated library binary package names '0.9' -> '0.10'.
+ - Removed some obsolete Conflicts and Replaces for libzlcore0.10 and
+ libzltext0.10.
+ - As GTK2 UI cannot substitute fonts, added Suggests on 'ttf-unifont'
+ for libzlui-gtk package. (Closes: #502040)
+ - Wrote up better short descriptions, modified a bit long description
+ for libzltext0.10. (Closes: #493616)
+ - Improved long description for the libzlcore-data package.
+ - Advanced fbreader long description according to new release.
+ - Added {misc:Depends} to Depends of all packages, fixing lintian
+ warnings.
+ - Removed duplicated 'Priority' fields from binary packages' entries.
+ - Divided architecture-independent data from package libzltext0.10 to its
+ own binary package (liblztext-data) as it leads to conflict problems
+ being in library package along .so files.
+ - Set DM-Upload-Allowed flag.
+ * debian/patches:
+ - 010-add-missing-headers.patch: deleted, went upstream.
+ - 100-fix-centering-with-margins.patch: deleted, went upstream.
+ - 910-remove-deprecated-fields-in-desktop-file.patch: deleted, went
+ upstream.
+ - New 200-typo-in-searchonnetworkaction.patch, cherry-picked from
+ upstream.
+ - Added comments to all Debian patches.
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com> Tue, 13 Jan 2009 22:19:32 +0200
+
+fbreader (0.8.17-12) unstable; urgency=low
+
+ * debian/patches:
+ - New patch 930-use-shell-make-variable.patch. It allows to do 'make -jN'.
+ - New patch 940-use-debian-compiler-flags.patch. It allows to build
+ package with debian-specific flags.
+ * debian/rules:
+ - Added support for 'parallel=n' in DEB_BUILD_OPTIONS.
+ - Added support for 'noopt' in DEB_BUILD_OPTIONS.
+ - Now package builds with '-D_REENTRANT' flag.
+ * debian/control:
+ - Added missing dependency: libzlui-qt4 on libzlcore.
+ - Included SONAME's to library packages' names:
+ - Renamed 'libzlcore' package to 'libzlcore0.9'.
+ - Renamed 'libzltext' package to 'libzltext0.9'.
+ - Split arch-independent stuff from 'libzlcore' to 'libzlcore-data'
+ package.
+ - Fixed dependency: 'libzltext-dev' depends on 'libzltext', not
+ 'libzlcore'.
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com> Sat, 12 Jul 2008 20:05:47 +0300
+
+fbreader (0.8.17-11) unstable; urgency=low
+
+ * debian/control:
+ - Enhanced all ZLibrary descriptions, not the main one.
+ - Done some renaming to use canonical names of libraries and toolkits in
+ decriptions, as suggested by developers-reference:
+ 'qt' -> 'Qt', 'gtk' -> 'GTK+', 'zlibrary' -> 'ZLibrary'.
+ - Bump 'Depends' on quilt to (>= 0.24).
+ * debian/rules:
+ - Included quilt makefile instead of quilt makefile instead
+ of copy&paste'ing it.
+ * debian/fbreader.links:
+ - Added this file to relay on dh_link's work instead of using 'ln -sf'
+ directly in the debian/rules.
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com> Tue, 17 Jun 2008 23:01:53 +0300
+
+fbreader (0.8.17-10) unstable; urgency=low
+
+ * Switched to quilt patching system.
+ * debian/control:
+ - Enhanced description for libzlcore binary package.
+ - Added 'quilt' to Build-Depends.
+ * debian/rules:
+ - Removed unnecessary 'binary-indep', 'clean' rules.
+ - Added 'patch' and 'unpatch' rules.
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com> Fri, 13 Jun 2008 14:01:27 +0300
+
+fbreader (0.8.17-9) unstable; urgency=low
+
+ * debian/control:
+ - Bump 'Standards-Version' to 3.8.0. No changes needed.
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com> Wed, 11 Jun 2008 21:44:43 +0300
+
+fbreader (0.8.17-8) unstable; urgency=low
+
+ * debian/rules:
+ - Added creating symbolic links to provide lowercase-only path for
+ fbreader. (Closes: #434689)
+
+ * Applied patch: removed obsolete 'Encoding' entry from fbreader desktop
+ file.
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com> Mon, 02 Jun 2008 01:25:10 +0300
+
+fbreader (0.8.17-7) unstable; urgency=low
+
+ * Applied patch: correct centering text honoring margins.
+ (Closes: #475696)
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com> Fri, 30 May 2008 03:13:20 +0300
+
+fbreader (0.8.17-6) unstable; urgency=low
+
+ * New maintainer. (Closes: #483257)
+ * debian/control:
+ - Updated "Maintainer:" field.
+ - Removed "Vcs-Git" field.
+ * debian/rules:
+ - Added empty 'binary-indep', 'clean' rules to satisfy lintian.
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com> Wed, 28 May 2008 23:16:09 +0300
+
+fbreader (0.8.17-5) unstable; urgency=low
+
+ * debhelper v7, rules file minimisation
+ * Orphaned the package.
+
+ -- Joey Hess <joeyh@debian.org> Tue, 27 May 2008 19:18:07 -0400
+
+fbreader (0.8.17-4) unstable; urgency=low
+
+ * Use a newer version of liblinebreak-dev, which will properly link into
+ libzltext on more picky architectures. Closes: #475095
+
+ -- Joey Hess <joeyh@debian.org> Tue, 08 Apr 2008 19:53:36 -0400
+
+fbreader (0.8.17-3) unstable; urgency=low
+
+ * Add b-d on liblinebreak-dev. Closes: #474805
+
+ -- Joey Hess <joeyh@debian.org> Tue, 08 Apr 2008 17:28:05 -0400
+
+fbreader (0.8.17-2) unstable; urgency=low
+
+ * Header fix for gcc 4.3. Closes: #474805
+
+ -- Joey Hess <joeyh@debian.org> Mon, 07 Apr 2008 17:47:04 -0400
+
+fbreader (0.8.17-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Joey Hess <joeyh@debian.org> Mon, 07 Apr 2008 12:29:01 -0400
+
+fbreader (0.8.15-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Joey Hess <joeyh@debian.org> Sun, 09 Mar 2008 17:50:31 -0400
+
+fbreader (0.8.14-2) unstable; urgency=low
+
+ * Fix missing include in maemo UI to allow building with gcc 4.3.
+ Closes: #466756
+
+ -- Joey Hess <joeyh@debian.org> Wed, 20 Feb 2008 18:24:32 -0500
+
+fbreader (0.8.14-1) unstable; urgency=low
+
+ * New Upstream Version
+
+ -- Joey Hess <joeyh@debian.org> Mon, 11 Feb 2008 12:07:34 -0500
+
+fbreader (0.8.13-1) unstable; urgency=low
+
+ * New Upstream Version. Closes: #461813
+ * Fixes orig tarball snafu. Closes: #462353
+
+ -- Joey Hess <joeyh@debian.org> Sat, 09 Feb 2008 13:31:33 -0500
+
+fbreader (0.8.12-3) unstable; urgency=low
+
+ * Add libzlui-maemo which allows using fbreader on the maemo platform, on
+ Debian. Thanks, Riku Voipio. Closes: #462299
+ * makefiles/arch/maemo.mk: Don't build with -thumb. (Riku)
+ * Loosen dependency versions some more, so it only depends on the current
+ upstream version or higher, ignoring the Debian revision.
+ * Use binary:Version instead of deprecated Source-Version.
+
+ -- Joey Hess <joeyh@debian.org> Wed, 23 Jan 2008 16:51:07 -0500
+
+fbreader (0.8.12-2) unstable; urgency=low
+
+ * Include dependency loosening changes.
+
+ -- Joey Hess <joeyh@debian.org> Tue, 22 Jan 2008 13:27:08 -0500
+
+fbreader (0.8.12-1) unstable; urgency=low
+
+ * New upstream version. Closes: #461813
+ * Didn't include upstream's dependency changes yet.
+
+ -- Joey Hess <joeyh@debian.org> Mon, 21 Jan 2008 12:59:59 -0500
+
+fbreader (0.8.11-1) stable; urgency=low
+
+ * new upstream version
+ * dependency rules have been changed
+
+ -- Nikolay Pultsin <geometer@fbreader.org> Sat, 12 Jan 2008 22:27:00 +0300
+
+fbreader (0.8.10-1) stable; urgency=low
+
+ * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org> Fri, 4 Jan 2008 20:53:00 +0300
+
+fbreader (0.8.9-1) unstable; urgency=low
+
+ * New Upstream Version
+
+ -- Joey Hess <joeyh@debian.org> Mon, 31 Dec 2007 11:40:17 -0500
+
+fbreader (0.8.8a-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Joey Hess <joeyh@debian.org> Tue, 18 Dec 2007 17:26:06 -0500
+
+fbreader (0.8.8-2) unstable; urgency=low
+
+ * Fix missing include to allow building with gcc 4.3. Closes: #456085
+
+ -- Joey Hess <joeyh@debian.org> Thu, 13 Dec 2007 01:47:01 -0500
+
+fbreader (0.8.8-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Joey Hess <joeyh@debian.org> Tue, 04 Dec 2007 12:51:45 -0500
+
+fbreader (0.8.7b-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Joey Hess <joeyh@debian.org> Thu, 15 Nov 2007 19:21:34 -0500
+
+fbreader (0.8.7-1) unstable; urgency=low
+
+ [ Nikolay Pultsin ]
+ * new upstream version
+
+ -- Joey Hess <joeyh@debian.org> Fri, 26 Oct 2007 04:57:02 -0400
+
+fbreader (0.8.6d-2) unstable; urgency=low
+
+ * Change %U to %F in menu file, as fbreader does not support URLs.
+ Closes: #447971
+
+ -- Joey Hess <joeyh@debian.org> Thu, 25 Oct 2007 13:36:19 -0400
+
+fbreader (0.8.6d-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Joey Hess <joeyh@debian.org> Sun, 09 Sep 2007 13:16:49 -0400
+
+fbreader (0.8.6c-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Joey Hess <joeyh@debian.org> Tue, 04 Sep 2007 20:22:41 -0400
+
+fbreader (0.8.6b-1) unstable; urgency=low
+
+ * Add real Homepage field. (Needs really new dpkg.)
+ * New upstream version. (Only Windows fixes.)
+
+ -- Joey Hess <joeyh@debian.org> Mon, 27 Aug 2007 13:17:47 -0400
+
+fbreader (0.8.6a-2) unstable; urgency=low
+
+ * Fix handling of nostrip build option. Closes: #436837
+
+ -- Joey Hess <joeyh@debian.org> Sat, 11 Aug 2007 20:30:25 -0400
+
+fbreader (0.8.6a-1) unstable; urgency=low
+
+ [ Nikolay Pultsin ]
+ * new upstream version
+ * added libzlibrary-dev package
+
+ [ Joey Hess ]
+ * Small changes to the new -dev packages.
+ * Upload to Debian.
+
+ -- Joey Hess <joeyh@debian.org> Wed, 08 Aug 2007 10:51:40 -0700
+
+fbreader (0.8.5c-1) unstable; urgency=low
+
+ * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org> Thu, 19 Jul 2007 15:20:00 +0400
+
+fbreader (0.8.5b-1) unstable; urgency=low
+
+ * new upstream version
+ * almost all changes from the previous change are now included into
+ the upstream version: zlibrary shared objects moving, rpath deletion,
+ and the man page.
+
+ -- Nikolay Pultsin <geometer@fbreader.org> Tue, 10 Jul 2007 21:50:00 +0400
+
+fbreader (0.8.5a-1) unstable; urgency=low
+
+ * First upload to Debian. Closes: #432274
+ * Misc debianisation changes.
+ * Move zlibrary shared object files to /usr/lib from /usr/share.
+ * Remove use of rpath.
+ * Use sensible-browser.
+ * Added a basic man page.
+
+ -- Joey Hess <joeyh@debian.org> Mon, 09 Jul 2007 15:04:31 -0400
+
+fbreader (0.8.5-1) stable; urgency=low
+
+ * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org> Sat, 7 Jul 2007 02:12:00 +0400
+
+fbreader (0.8.4zz-1) stable; urgency=low
+
+ * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org> Thu, 5 Jul 2007 03:17:00 +0400
+
+fbreader (0.8.4z-2) stable; urgency=low
+
+ * postinst/postrm scripts were added
+
+ -- Nikolay Pultsin <geometer@fbreader.org> Fri, 29 Jun 2007 21:23:00 +0400
+
+fbreader (0.8.4z-1) stable; urgency=low
+
+ * Initial release.
+
+ -- Nikolay Pultsin <geometer@fbreader.org> Fri, 29 Jun 2007 17:53:00 +0400
diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/compat b/ubuntu/_base/applications/office/tde-ebook-reader/debian/compat
new file mode 100644
index 000000000..f599e28b8
--- /dev/null
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/control b/ubuntu/_base/applications/office/tde-ebook-reader/debian/control
new file mode 100644
index 000000000..cd9f85394
--- /dev/null
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/control
@@ -0,0 +1,83 @@
+Source: tde-ebook-reader
+Section: text
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+XSBC-Original-Maintainer: Debian QA Group <packages@qa.debian.org>
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libtqtinterface-dev,
+ libbz2-dev, libexpat1-dev, libfribidi-dev,
+ libsqlite3-dev, libunibreak-dev, libz-dev, pkgconf
+Standards-Version: 4.7.0
+
+Package: tde-ebook-reader
+Architecture: any
+Multi-Arch: foreign
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: sensible-utils,
+Description: e-book reader for TDE
+ tde-ebook-reader is an e-book reader for TDE.
+ .
+ Main features:
+ * supports several open e-book formats: fb2, html, chm, plucker,
+ palmdoc, ztxt, tcr (psion text), rtf, oeb, openreader, non-DRM'ed
+ mobipocket, plain text, epub, eReader
+ * reads directly from tar, zip, gzip, bzip2 archives (you can have
+ several books in one archive)
+ * supports a structured view of your e-book collection
+ * automatically determines encodings
+ * automatically generates a table of contents
+ * keeps the last open book and the last read positions for all open books
+ between runs
+ * automatic hyphenation (patterns for several languages are included)
+ * searching and downloading books from www.feedbooks.com and www.litres.ru
+ * partial CSS support for epub files
+
+Package: libzlcore-tqt
+Section: libs
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}, libzlcore-data-tqt
+Description: ZLibrary TQt3-based development library (shared library)
+ This is the core of ZLibrary, the library that tde-ebook-reader is based on.
+
+Package: libzlcore-data-tqt
+Section: libs
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends},
+Description: ZLibrary TQt3-based development library (support files)
+ This package contains the support files for the core of ZLibrary, the library
+ that the fbreader e-book reader is based on.
+
+Package: libzltext-tqt
+Section: libs
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}, libzlcore-tqt, libzltext-data-tqt
+Description: ZLibrary TQt3-based text model/viewer part (shared library)
+ This package provides text model/viewer part of ZLibrary.
+
+Package: libzltext-data-tqt
+Section: libs
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends},
+Description: ZLibrary TQt3-based text model/viewer part (support files)
+ This package contains the support files for the text model/viewer part
+ of ZLibrary.
+
+Package: libzlcore-tqt-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: foreign
+Depends: ${shlibs:Depends}, ${misc:Depends}, libzlcore-tqt
+Description: ZLibrary TQt3-based development library (development files)
+ This package contains development files for the ZLibrary core.
+
+Package: libzltext-tqt-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: foreign
+Depends: ${shlibs:Depends}, ${misc:Depends}, libzltext-tqt
+Description: ZLibrary TQt3-based text model/viewer part (development files)
+ This package contains development files for the ZLibrary text model/viewer
+ library.
diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/copyright b/ubuntu/_base/applications/office/tde-ebook-reader/debian/copyright
new file mode 100644
index 000000000..5135a02bf
--- /dev/null
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/copyright
@@ -0,0 +1,578 @@
+This code was ported to TDE and packaged for Debian by:
+ Michele Calgaro <michele.calgaro@yahoo.it>
+and is based on the code downloaded from Debian Snapshot Archive at:
+ https://snapshot.debian.org/package/fbreader/0.99.4+dfsg-6
+
+Below is the original information from the Debian copyright file.
+-----------------------------------------------------------------
+
+This is the Debian prepackaged version of FBReader.
+
+It was originally Debianised by Nikolay Pultsin <geometer@fbreader.org>, and
+later modified and improved by Joey Hess <joeyh@debian.org> and
+Eugene V. Lyubimkin <jackyf@debian.org>.
+
+Sources are downloaded from its website at:
+
+ http://www.fbreader.org/
+
+It is copyright as follows:
+
+/*
+ * Copyright (C) 2004-2010 Geometer Plus <contact@geometerplus.com>
+ *
+ * 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+On Debian systems, the full text of the GPLv2 can be found in
+/usr/share/common-licenses/GPL-2.
+
+
+Hyphenation patterns (zlibrary/text/data/hyphenationPatterns.zip):
+
+Files fi.pattern, tr.pattern, el.pattern were removed from upstream tarball.
+Check README.source to see why. You can reproduce removing procedure by using
+script debian/dfsg-repack.
+
+
+Files: cs.pattern
+License: GPLv2+.
+
+Files: en.pattern
+License: specific (follows)
+
+% Unlimited copying and redistribution of this file are permitted as long
+% as this file is not modified. Modifications are permitted, but only if
+% the resulting file is not named hyphen.tex.
+
+Files: de-traditional.pattern
+License: Latex Project Public License 1+
+Copyrights:
+
+% Copyright (C) 1988,1991 Rechenzentrum der Ruhr-Universitaet Bochum
+% [german hyphen patterns]
+% Copyright (C) 1993,1994,1999 Bernd Raichle/DANTE e.V.
+% [macros, adaption for TeX 2]
+%
+
+Files: de.pattern
+License: Latex Project Public License 1+
+Copyrights:
+
+% Copyright (C) 1988,1991 Rechenzentrum der Ruhr-Universitaet Bochum
+% [german hyphen patterns]
+% Copyright (C) 1993,1994,1999 Bernd Raichle/DANTE e.V.
+% [macros, adaption for TeX 2]
+% Copyright (C) 1998-2001 Walter Schmidt
+% [adaption to new German orthography]
+%
+
+Files: eo.pattern
+License: Latex Project Public License 1+
+Copyrights: Copyright (C) 1999 Sergei B. Pokrovsky <pok@iis.nsk.su>
+
+Files: es.pattern
+License: Latex Project Public License
+Copyrights:
+
+% (c) Javier Bezos 1993 1997.
+% (c) Javier Bezos and CervanTeX 2001-2006
+% Some parts, (c) by Francesc Carmona
+
+Files: fr.pattern
+License: specific (follows)
+
+% This file is available for free and can used and redistributed
+% asis for free. Modified versions should have another name.
+
+Files: id.pattern
+License: GPLv2
+Copyrights: (c) Copyright 1996, 1997 J\"org Knappen and Terry Mart
+
+Files: it.pattern
+License: LGPLv2.1+
+Copyrights: Copyright 1998, 2007 Claudio Beccari
+
+Files: no.pattern:
+Copyrights: Copyright (C) 2004, 2005 Rune Kleveland, Ole Michael Selberg.
+License: specific (follows)
+
+% Copying and distribution of this file, with or without modification,
+% are permitted in any medium without royalty provided the copyright
+% notice and this notice are preserved.
+
+Files: pt.pattern:
+License: Latex Project Public License 1+
+Copyrights:
+
+% (C) 1996 by Pedro J. de Rezende (rezende@dcc.unicamp.br)
+% and J.Joao Dias Almeida (jj@di.uminho.pt)
+% Version: 1.2 Release date: 21/07/96
+%
+% (C) 1994 by Pedro J. de Rezende (rezende@dcc.unicamp.br)
+% Version: 1.1 Release date: 04/12/94
+%
+% (C) 1987 by Pedro J. de Rezende
+% Version: 1.0 Release date: 02/13/87
+
+Files: sv.pattern
+License: Latex Project Public License 1.2+
+Copyrights: Copyright 1994 by Jan Michael Rynning. All rights reserved.
+
+Files: uk.pattern
+License: Latex Project Public License 1+
+Copyrights: Copyright 1999 Andrij Shvaika
+
+Files: ru.pattern
+License: Latex Project Public License 1.2+
+Copyrights: Copyright 1999-2003 Alexander I. Lebedev <swan@scon155.phys.msu.su>
+
+
+The LaTeX Project Public License
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+LPPL Version 1.3c 2008-05-04
+
+Copyright 1999 2002-2008 LaTeX3 Project
+ Everyone is allowed to distribute verbatim copies of this
+ license document, but modification of it is not allowed.
+
+
+PREAMBLE
+========
+
+The LaTeX Project Public License (LPPL) is the primary license under
+which the LaTeX kernel and the base LaTeX packages are distributed.
+
+You may use this license for any work of which you hold the copyright
+and which you wish to distribute. This license may be particularly
+suitable if your work is TeX-related (such as a LaTeX package), but
+it is written in such a way that you can use it even if your work is
+unrelated to TeX.
+
+The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE',
+below, gives instructions, examples, and recommendations for authors
+who are considering distributing their works under this license.
+
+This license gives conditions under which a work may be distributed
+and modified, as well as conditions under which modified versions of
+that work may be distributed.
+
+We, the LaTeX3 Project, believe that the conditions below give you
+the freedom to make and distribute modified versions of your work
+that conform with whatever technical specifications you wish while
+maintaining the availability, integrity, and reliability of
+that work. If you do not see how to achieve your goal while
+meeting these conditions, then read the document `cfgguide.tex'
+and `modguide.tex' in the base LaTeX distribution for suggestions.
+
+
+DEFINITIONS
+===========
+
+In this license document the following terms are used:
+
+ `Work'
+ Any work being distributed under this License.
+
+ `Derived Work'
+ Any work that under any applicable law is derived from the Work.
+
+ `Modification'
+ Any procedure that produces a Derived Work under any applicable
+ law -- for example, the production of a file containing an
+ original file associated with the Work or a significant portion of
+ such a file, either verbatim or with modifications and/or
+ translated into another language.
+
+ `Modify'
+ To apply any procedure that produces a Derived Work under any
+ applicable law.
+
+ `Distribution'
+ Making copies of the Work available from one person to another, in
+ whole or in part. Distribution includes (but is not limited to)
+ making any electronic components of the Work accessible by
+ file transfer protocols such as FTP or HTTP or by shared file
+ systems such as Sun's Network File System (NFS).
+
+ `Compiled Work'
+ A version of the Work that has been processed into a form where it
+ is directly usable on a computer system. This processing may
+ include using installation facilities provided by the Work,
+ transformations of the Work, copying of components of the Work, or
+ other activities. Note that modification of any installation
+ facilities provided by the Work constitutes modification of the Work.
+
+ `Current Maintainer'
+ A person or persons nominated as such within the Work. If there is
+ no such explicit nomination then it is the `Copyright Holder' under
+ any applicable law.
+
+ `Base Interpreter'
+ A program or process that is normally needed for running or
+ interpreting a part or the whole of the Work.
+
+ A Base Interpreter may depend on external components but these
+ are not considered part of the Base Interpreter provided that each
+ external component clearly identifies itself whenever it is used
+ interactively. Unless explicitly specified when applying the
+ license to the Work, the only applicable Base Interpreter is a
+ `LaTeX-Format' or in the case of files belonging to the
+ `LaTeX-format' a program implementing the `TeX language'.
+
+
+
+CONDITIONS ON DISTRIBUTION AND MODIFICATION
+===========================================
+
+1. Activities other than distribution and/or modification of the Work
+are not covered by this license; they are outside its scope. In
+particular, the act of running the Work is not restricted and no
+requirements are made concerning any offers of support for the Work.
+
+2. You may distribute a complete, unmodified copy of the Work as you
+received it. Distribution of only part of the Work is considered
+modification of the Work, and no right to distribute such a Derived
+Work may be assumed under the terms of this clause.
+
+3. You may distribute a Compiled Work that has been generated from a
+complete, unmodified copy of the Work as distributed under Clause 2
+above, as long as that Compiled Work is distributed in such a way that
+the recipients may install the Compiled Work on their system exactly
+as it would have been installed if they generated a Compiled Work
+directly from the Work.
+
+4. If you are the Current Maintainer of the Work, you may, without
+restriction, modify the Work, thus creating a Derived Work. You may
+also distribute the Derived Work without restriction, including
+Compiled Works generated from the Derived Work. Derived Works
+distributed in this manner by the Current Maintainer are considered to
+be updated versions of the Work.
+
+5. If you are not the Current Maintainer of the Work, you may modify
+your copy of the Work, thus creating a Derived Work based on the Work,
+and compile this Derived Work, thus creating a Compiled Work based on
+the Derived Work.
+
+6. If you are not the Current Maintainer of the Work, you may
+distribute a Derived Work provided the following conditions are met
+for every component of the Work unless that component clearly states
+in the copyright notice that it is exempt from that condition. Only
+the Current Maintainer is allowed to add such statements of exemption
+to a component of the Work.
+
+ a. If a component of this Derived Work can be a direct replacement
+ for a component of the Work when that component is used with the
+ Base Interpreter, then, wherever this component of the Work
+ identifies itself to the user when used interactively with that
+ Base Interpreter, the replacement component of this Derived Work
+ clearly and unambiguously identifies itself as a modified version
+ of this component to the user when used interactively with that
+ Base Interpreter.
+
+ b. Every component of the Derived Work contains prominent notices
+ detailing the nature of the changes to that component, or a
+ prominent reference to another file that is distributed as part
+ of the Derived Work and that contains a complete and accurate log
+ of the changes.
+
+ c. No information in the Derived Work implies that any persons,
+ including (but not limited to) the authors of the original version
+ of the Work, provide any support, including (but not limited to)
+ the reporting and handling of errors, to recipients of the
+ Derived Work unless those persons have stated explicitly that
+ they do provide such support for the Derived Work.
+
+ d. You distribute at least one of the following with the Derived Work:
+
+ 1. A complete, unmodified copy of the Work;
+ if your distribution of a modified component is made by
+ offering access to copy the modified component from a
+ designated place, then offering equivalent access to copy
+ the Work from the same or some similar place meets this
+ condition, even though third parties are not compelled to
+ copy the Work along with the modified component;
+
+ 2. Information that is sufficient to obtain a complete,
+ unmodified copy of the Work.
+
+7. If you are not the Current Maintainer of the Work, you may
+distribute a Compiled Work generated from a Derived Work, as long as
+the Derived Work is distributed to all recipients of the Compiled
+Work, and as long as the conditions of Clause 6, above, are met with
+regard to the Derived Work.
+
+8. The conditions above are not intended to prohibit, and hence do not
+apply to, the modification, by any method, of any component so that it
+becomes identical to an updated version of that component of the Work as
+it is distributed by the Current Maintainer under Clause 4, above.
+
+9. Distribution of the Work or any Derived Work in an alternative
+format, where the Work or that Derived Work (in whole or in part) is
+then produced by applying some process to that format, does not relax or
+nullify any sections of this license as they pertain to the results of
+applying that process.
+
+10. a. A Derived Work may be distributed under a different license
+ provided that license itself honors the conditions listed in
+ Clause 6 above, in regard to the Work, though it does not have
+ to honor the rest of the conditions in this license.
+
+ b. If a Derived Work is distributed under a different license, that
+ Derived Work must provide sufficient documentation as part of
+ itself to allow each recipient of that Derived Work to honor the
+ restrictions in Clause 6 above, concerning changes from the Work.
+
+11. This license places no restrictions on works that are unrelated to
+the Work, nor does this license place any restrictions on aggregating
+such works with the Work by any means.
+
+12. Nothing in this license is intended to, or may be used to, prevent
+complete compliance by all parties with all applicable laws.
+
+
+NO WARRANTY
+===========
+
+There is no warranty for the Work. Except when otherwise stated in
+writing, the Copyright Holder provides the Work `as is', without
+warranty of any kind, either expressed or implied, including, but not
+limited to, the implied warranties of merchantability and fitness for a
+particular purpose. The entire risk as to the quality and performance
+of the Work is with you. Should the Work prove defective, you assume
+the cost of all necessary servicing, repair, or correction.
+
+In no event unless required by applicable law or agreed to in writing
+will The Copyright Holder, or any author named in the components of the
+Work, or any other party who may distribute and/or modify the Work as
+permitted above, be liable to you for damages, including any general,
+special, incidental or consequential damages arising out of any use of
+the Work or out of inability to use the Work (including, but not limited
+to, loss of data, data being rendered inaccurate, or losses sustained by
+anyone as a result of any failure of the Work to operate with any other
+programs), even if the Copyright Holder or said author or said other
+party has been advised of the possibility of such damages.
+
+
+MAINTENANCE OF THE WORK
+=======================
+
+The Work has the status `author-maintained' if the Copyright Holder
+explicitly and prominently states near the primary copyright notice in
+the Work that the Work can only be maintained by the Copyright Holder
+or simply that it is `author-maintained'.
+
+The Work has the status `maintained' if there is a Current Maintainer
+who has indicated in the Work that they are willing to receive error
+reports for the Work (for example, by supplying a valid e-mail
+address). It is not required for the Current Maintainer to acknowledge
+or act upon these error reports.
+
+The Work changes from status `maintained' to `unmaintained' if there
+is no Current Maintainer, or the person stated to be Current
+Maintainer of the work cannot be reached through the indicated means
+of communication for a period of six months, and there are no other
+significant signs of active maintenance.
+
+You can become the Current Maintainer of the Work by agreement with
+any existing Current Maintainer to take over this role.
+
+If the Work is unmaintained, you can become the Current Maintainer of
+the Work through the following steps:
+
+ 1. Make a reasonable attempt to trace the Current Maintainer (and
+ the Copyright Holder, if the two differ) through the means of
+ an Internet or similar search.
+
+ 2. If this search is successful, then enquire whether the Work
+ is still maintained.
+
+ a. If it is being maintained, then ask the Current Maintainer
+ to update their communication data within one month.
+
+ b. If the search is unsuccessful or no action to resume active
+ maintenance is taken by the Current Maintainer, then announce
+ within the pertinent community your intention to take over
+ maintenance. (If the Work is a LaTeX work, this could be
+ done, for example, by posting to comp.text.tex.)
+
+ 3a. If the Current Maintainer is reachable and agrees to pass
+ maintenance of the Work to you, then this takes effect
+ immediately upon announcement.
+
+ b. If the Current Maintainer is not reachable and the Copyright
+ Holder agrees that maintenance of the Work be passed to you,
+ then this takes effect immediately upon announcement.
+
+ 4. If you make an `intention announcement' as described in 2b. above
+ and after three months your intention is challenged neither by
+ the Current Maintainer nor by the Copyright Holder nor by other
+ people, then you may arrange for the Work to be changed so as
+ to name you as the (new) Current Maintainer.
+
+ 5. If the previously unreachable Current Maintainer becomes
+ reachable once more within three months of a change completed
+ under the terms of 3b) or 4), then that Current Maintainer must
+ become or remain the Current Maintainer upon request provided
+ they then update their communication data within one month.
+
+A change in the Current Maintainer does not, of itself, alter the fact
+that the Work is distributed under the LPPL license.
+
+If you become the Current Maintainer of the Work, you should
+immediately provide, within the Work, a prominent and unambiguous
+statement of your status as Current Maintainer. You should also
+announce your new status to the same pertinent community as
+in 2b) above.
+
+
+WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE
+======================================================
+
+This section contains important instructions, examples, and
+recommendations for authors who are considering distributing their
+works under this license. These authors are addressed as `you' in
+this section.
+
+Choosing This License or Another License
+----------------------------------------
+
+If for any part of your work you want or need to use *distribution*
+conditions that differ significantly from those in this license, then
+do not refer to this license anywhere in your work but, instead,
+distribute your work under a different license. You may use the text
+of this license as a model for your own license, but your license
+should not refer to the LPPL or otherwise give the impression that
+your work is distributed under the LPPL.
+
+The document `modguide.tex' in the base LaTeX distribution explains
+the motivation behind the conditions of this license. It explains,
+for example, why distributing LaTeX under the GNU General Public
+License (GPL) was considered inappropriate. Even if your work is
+unrelated to LaTeX, the discussion in `modguide.tex' may still be
+relevant, and authors intending to distribute their works under any
+license are encouraged to read it.
+
+A Recommendation on Modification Without Distribution
+-----------------------------------------------------
+
+It is wise never to modify a component of the Work, even for your own
+personal use, without also meeting the above conditions for
+distributing the modified component. While you might intend that such
+modifications will never be distributed, often this will happen by
+accident -- you may forget that you have modified that component; or
+it may not occur to you when allowing others to access the modified
+version that you are thus distributing it and violating the conditions
+of this license in ways that could have legal implications and, worse,
+cause problems for the community. It is therefore usually in your
+best interest to keep your copy of the Work identical with the public
+one. Many works provide ways to control the behavior of that work
+without altering any of its licensed components.
+
+How to Use This License
+-----------------------
+
+To use this license, place in each of the components of your work both
+an explicit copyright notice including your name and the year the work
+was authored and/or last substantially modified. Include also a
+statement that the distribution and/or modification of that
+component is constrained by the conditions in this license.
+
+Here is an example of such a notice and statement:
+
+ %% pig.dtx
+ %% Copyright 2005 M. Y. Name
+ %
+ % This work may be distributed and/or modified under the
+ % conditions of the LaTeX Project Public License, either version 1.3
+ % of this license or (at your option) any later version.
+ % The latest version of this license is in
+ % http://www.latex-project.org/lppl.txt
+ % and version 1.3 or later is part of all distributions of LaTeX
+ % version 2005/12/01 or later.
+ %
+ % This work has the LPPL maintenance status `maintained'.
+ %
+ % The Current Maintainer of this work is M. Y. Name.
+ %
+ % This work consists of the files pig.dtx and pig.ins
+ % and the derived file pig.sty.
+
+Given such a notice and statement in a file, the conditions
+given in this license document would apply, with the `Work' referring
+to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being
+generated from `pig.dtx' using `pig.ins'), the `Base Interpreter'
+referring to any `LaTeX-Format', and both `Copyright Holder' and
+`Current Maintainer' referring to the person `M. Y. Name'.
+
+If you do not want the Maintenance section of LPPL to apply to your
+Work, change `maintained' above into `author-maintained'.
+However, we recommend that you use `maintained', as the Maintenance
+section was added in order to ensure that your Work remains useful to
+the community even when you can no longer maintain and support it
+yourself.
+
+Derived Works That Are Not Replacements
+---------------------------------------
+
+Several clauses of the LPPL specify means to provide reliability and
+stability for the user community. They therefore concern themselves
+with the case that a Derived Work is intended to be used as a
+(compatible or incompatible) replacement of the original Work. If
+this is not the case (e.g., if a few lines of code are reused for a
+completely different task), then clauses 6b and 6d shall not apply.
+
+
+Important Recommendations
+-------------------------
+
+ Defining What Constitutes the Work
+
+ The LPPL requires that distributions of the Work contain all the
+ files of the Work. It is therefore important that you provide a
+ way for the licensee to determine which files constitute the Work.
+ This could, for example, be achieved by explicitly listing all the
+ files of the Work near the copyright notice of each file or by
+ using a line such as:
+
+ % This work consists of all files listed in manifest.txt.
+
+ in that place. In the absence of an unequivocal list it might be
+ impossible for the licensee to determine what is considered by you
+ to comprise the Work and, in such a case, the licensee would be
+ entitled to make reasonable conjectures as to which files comprise
+ the Work.
+
+
+LGPLv2.1 clause:
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the full text of the LGPLv2.1 can be found in
+/usr/share/common-licenses/LGPL-2.1.
diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzlcore-data-tqt.install b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzlcore-data-tqt.install
new file mode 100644
index 000000000..322cc7393
--- /dev/null
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzlcore-data-tqt.install
@@ -0,0 +1,6 @@
+/usr/share/zlibrary-tqt/keynames.desktop-tqt.xml
+/usr/share/zlibrary-tqt/languagePatterns.zip
+/usr/share/zlibrary-tqt/unicode.xml.gz
+/usr/share/zlibrary-tqt/default/
+/usr/share/zlibrary-tqt/encodings/
+/usr/share/zlibrary-tqt/resources/
diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt-dev.install b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt-dev.install
new file mode 100644
index 000000000..4f30f38c6
--- /dev/null
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt-dev.install
@@ -0,0 +1,2 @@
+/usr/include/zlibrary-tqt/core
+/usr/lib/$(DEB_HOST_MULTIARCH)/libzlcore-tqt.so
diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt.install b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt.install
new file mode 100644
index 000000000..3a6addd23
--- /dev/null
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt.install
@@ -0,0 +1 @@
+/usr/lib/$(DEB_HOST_MULTIARCH)/libzlcore-tqt.so.*
diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzltext-data-tqt.install b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzltext-data-tqt.install
new file mode 100644
index 000000000..55acf8e02
--- /dev/null
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzltext-data-tqt.install
@@ -0,0 +1 @@
+/usr/share/zlibrary-tqt/hyphenationPatterns.zip
diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt-dev.install b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt-dev.install
new file mode 100644
index 000000000..95be86c20
--- /dev/null
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt-dev.install
@@ -0,0 +1,2 @@
+/usr/include/zlibrary-tqt/text
+/usr/lib/$(DEB_HOST_MULTIARCH)/libzltext-tqt.so
diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt.install b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt.install
new file mode 100644
index 000000000..3faed63a9
--- /dev/null
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt.install
@@ -0,0 +1 @@
+/usr/lib/$(DEB_HOST_MULTIARCH)/libzltext-tqt.so.*
diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/patches/series b/ubuntu/_base/applications/office/tde-ebook-reader/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/patches/series
diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/rules b/ubuntu/_base/applications/office/tde-ebook-reader/debian/rules
new file mode 100755
index 000000000..0589ec408
--- /dev/null
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/rules
@@ -0,0 +1,18 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include debian/cdbs/debian-tde.mk
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCMAKE_ZLIBRARY_INSTALL_PREFIX="/usr" \
+ -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/office/tde-ebook-reader/debian/source/format b/ubuntu/_base/applications/office/tde-ebook-reader/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/source/options b/ubuntu/_base/applications/office/tde-ebook-reader/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/tde-ebook-reader.install b/ubuntu/_base/applications/office/tde-ebook-reader/debian/tde-ebook-reader.install
new file mode 100644
index 000000000..59065ad25
--- /dev/null
+++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/tde-ebook-reader.install
@@ -0,0 +1,2 @@
+/opt/trinity/bin
+/opt/trinity/share
diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/dirs b/ubuntu/_base/applications/settings/kmyfirewall/debian/dirs
deleted file mode 100644
index f0312285e..000000000
--- a/ubuntu/_base/applications/settings/kmyfirewall/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-opt/trinity/bin
-opt/trinity/share/doc/tde/HTML/en
diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/install b/ubuntu/_base/applications/settings/kmyfirewall/debian/install
deleted file mode 100644
index 311ed806e..000000000
--- a/ubuntu/_base/applications/settings/kmyfirewall/debian/install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/kmyfirewall.xpm opt/trinity/share/pixmaps
-debian/kmyfirewall-trinity/opt/trinity/share/man/man1/*
diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/kmfinstallerplugin.desktop b/ubuntu/_base/applications/settings/kmyfirewall/debian/kmfinstallerplugin.desktop
deleted file mode 100644
index 3a562e7c0..000000000
--- a/ubuntu/_base/applications/settings/kmyfirewall/debian/kmfinstallerplugin.desktop
+++ /dev/null
@@ -1,44 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=ServiceType
-X-TDE-ServiceType=KMyFirewall/Installer
-X-TDE-Library=libkmfinstallerplugin
-
-Name=KMyFirewall Installer Plugin
-Name[bg]=Приставка-инсталатор на KMyFirewall
-Name[br]=Lugent stalier KMyFirewall
-Name[bs]=KMyFirewall dodatak za instalaciju
-Name[ca]=Connector d'instal·lació per a KMyFirewall
-Name[cs]=Modul instalátoru KMyFirewall
-Name[de]=KMyFirewall Installationsprogramm
-Name[el]=Πρόσθετο εγκατάστασης για το KMyFirewall
-Name[es]=Complemento de instalación de KMyFirewall
-Name[et]=KMyFirewalli paigaldamisplugin
-Name[fr]=Module d'installation de KMyFirewall
-Name[gl]=Extensión de Instalazón de KMyFirewall
-Name[hi]=के-माइ-फायरवाल संस्थापक प्लगइन
-Name[hu]=KMyFirewall telepítőmodul
-Name[it]=Plugin di installazione di KMyFirewall
-Name[ja]=KMyFirewall インストーラ プラグイン
-Name[ka]=KMyFirewall დაყენების მოდული
-Name[nl]=KMyFirewall Installatieplugin
-Name[pa]=KMyFirewall ਇੰਸਟਾਲਰ ਪਲੱਗਿੰਨ
-Name[pl]=Wtyczka instalatora KMyFirewall
-Name[pt]='Plugin' de Instalação do KMyFirewall
-Name[pt_BR]=Plug-in Instaldor par ao KMyFirewall
-Name[ru]=KMyFirewall - Модуль установки
-Name[sr]=KMyFirewall-ов прикључак за инсталирање
-Name[sr@Latn]=KMyFirewall-ov priključak za instaliranje
-Name[sv]=Installationsdel för Min brandvägg
-Name[ta]=KMyதீச்சுவர் நிறுவுபவரைச் சொருகு
-Name[tr]=KMyFirewall Kurulum Eklentisi
-Name[uk]=Втулок встановлення KMyFirewall
-Name[xx]=xxKMyFirewall Installer Pluginxx
-Name[zh_CN]=KMyFirewall 安装程序插件
-
-[PropertyDef::X-KMyFirewall-Platform]
-Type=TQString
-
-[PropertyDef::X-KMyFirewall-Language]
-Type=TQString
-
diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.desktop b/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.desktop
deleted file mode 100644
index 57f12ad9c..000000000
--- a/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.desktop
+++ /dev/null
@@ -1,35 +0,0 @@
-[Desktop Entry]
-Type=Application
-MimeType=application/x-kmyfirewall;application/x-kmyfirewall-kmfrs;application/x-kmyfirewall-kmfgrs;application/x-kmyfirewall-kmfnet;
-Icon=kmyfirewall
-Exec=/opt/trinity/bin/kmyfirewall %u
-Terminal=false
-Categories=Qt;TDE;System;
-Name=KMyFirewall
-Name[sv]=Min brandvägg
-Name[xx]=xxKMyFirewallxx
-GenericName=Firewall Configuration Tool
-GenericName[bg]=Настройване на защитна стена
-GenericName[es]=Herramienta de configuración de cortafuegos
-GenericName[et]=Tulemüüri seadistamistööriist
-GenericName[it]=Strumento di configurazione di KMyFirewall
-GenericName[nl]=Firewall-configuratieprogramma
-GenericName[pt]=Ferramenta de Configuração da Firewall
-GenericName[pt_BR]=Ferramenta de Configuração da Firewall
-GenericName[sr]=Алат за подешавање заштитног зида
-GenericName[sr@Latn]=Алат за подешавање заштитног зида
-GenericName[sv]=Verktyg för brandväggsinställning
-GenericName[xx]=xxFirewall Configuration Toolxx
-Comment=Firewall Configuration Tool
-Comment[bg]=Настройване на KMyFirewall
-Comment[es]=Herramienta de configuración de cortafuegos
-Comment[et]=Tulemüüri seadistamistööriist
-Comment[it]=Strumento di configurazione di KMyFirewall
-Comment[ms]=Alatan Tetapan Firewall
-Comment[nl]=Firewall-configuratieprogramma
-Comment[pt]=Ferramenta de Configuração da Firewall
-Comment[pt_BR]=Ferramenta de Configuração da Firewall
-Comment[sr]=Алат за подешавање заштитног зида
-Comment[sr@Latn]=Алат за подешавање заштитног зида
-Comment[sv]=Verktyg för inställning av brandvägg
-Comment[xx]=xxFirewall Configuration Toolxx
diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.xpm b/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.xpm
deleted file mode 100644
index 3d58b81ff..000000000
--- a/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.xpm
+++ /dev/null
@@ -1,369 +0,0 @@
-/* XPM */
-static char * kmyfirewall_xpm[] = {
-"32 32 334 2",
-" c None",
-". c #FE0000",
-"+ c #E60000",
-"@ c #E10000",
-"# c #EA0000",
-"$ c #EF0000",
-"% c #E40000",
-"& c #DA0000",
-"* c #D70000",
-"= c #DC0000",
-"- c #F50F0F",
-"; c #F02525",
-"> c #EE4949",
-", c #EB6C6C",
-"' c #F89999",
-") c #FBAFAF",
-"! c #FDC4C4",
-"~ c #FDCACA",
-"{ c #FCC2C2",
-"] c #FBB2B2",
-"^ c #F59494",
-"/ c #E87272",
-"( c #DD4343",
-"_ c #D42929",
-": c #EF0808",
-"< c #ED5858",
-"[ c #F29191",
-"} c #F7BCBC",
-"| c #FBC8C8",
-"1 c #FCCCCC",
-"2 c #FDCCCC",
-"3 c #FECCCC",
-"4 c #FBC9C9",
-"5 c #F6B7B7",
-"6 c #ED9999",
-"7 c #D54D4D",
-"8 c #BF1313",
-"9 c #E82525",
-"0 c #EB7F7F",
-"a c #F8CCCC",
-"b c #FACCCC",
-"c c #FBCCCC",
-"d c #F9CCCC",
-"e c #F6C6C6",
-"f c #E58E8E",
-"g c #B91A1A",
-"h c #DE0000",
-"i c #E46969",
-"j c #F4BEBE",
-"k c #F8C9C9",
-"l c #F9C9C9",
-"m c #FAC9C9",
-"n c #FCC9C9",
-"o c #FDC9C9",
-"p c #FECBCB",
-"q c #FECFCF",
-"r c #FEC9C9",
-"s c #F7C9C9",
-"t c #F5C5C5",
-"u c #D55C5C",
-"v c #AF0A0A",
-"w c #CC0000",
-"x c #EEA4A4",
-"y c #F3B5B5",
-"z c #F5B5B5",
-"A c #F7B5B5",
-"B c #F9B5B5",
-"C c #FAB5B5",
-"D c #FBB5B5",
-"E c #FCB5B5",
-"F c #FDC3C3",
-"G c #FFF1F1",
-"H c #FDB9B9",
-"I c #F6B5B5",
-"J c #F4B5B5",
-"K c #F2B5B5",
-"L c #E88B8B",
-"M c #C81818",
-"N c #9E0000",
-"O c #EE0000",
-"P c #C90000",
-"Q c #EB9393",
-"R c #F0A2A2",
-"S c #F2A2A2",
-"T c #F4A2A2",
-"U c #F6A2A2",
-"V c #F7A2A2",
-"W c #F9A2A2",
-"X c #FAA2A2",
-"Y c #FCBDBD",
-"Z c #FFF5F5",
-"` c #FCB3B3",
-" . c #F8A2A2",
-".. c #F5A2A2",
-"+. c #F3A2A2",
-"@. c #F1A2A2",
-"#. c #EFA2A2",
-"$. c #E57D7D",
-"%. c #CC1616",
-"&. c #B00000",
-"*. c #8F0000",
-"=. c #F20000",
-"-. c #D20000",
-";. c #C30000",
-">. c #C80000",
-",. c #DC4747",
-"'. c #E97C7C",
-"). c #ED8282",
-"!. c #EF8282",
-"~. c #F28282",
-"{. c #F48282",
-"]. c #F68888",
-"^. c #F9A6A6",
-"/. c #FDD9D9",
-"(. c #FFFFFF",
-"_. c #FDE4E4",
-":. c #F89898",
-"<. c #F48484",
-"[. c #F38282",
-"}. c #F08282",
-"|. c #EE8282",
-"1. c #EC8282",
-"2. c #E97F7F",
-"3. c #D83E3E",
-"4. c #C80505",
-"5. c #BD0000",
-"6. c #A20000",
-"7. c #C50000",
-"8. c #D11111",
-"9. c #DE4343",
-"0. c #E86969",
-"a. c #EB6969",
-"b. c #EE6969",
-"c. c #F06969",
-"d. c #F37878",
-"e. c #FBCECE",
-"f. c #FFF7F7",
-"g. c #FEF2F2",
-"h. c #F69999",
-"i. c #F59999",
-"j. c #EF7070",
-"k. c #EC6969",
-"l. c #EA6969",
-"m. c #E66666",
-"n. c #DF4B4B",
-"o. c #CD0B0B",
-"p. c #C60000",
-"q. c #BF0000",
-"r. c #B40000",
-"s. c #7C0000",
-"t. c #D40000",
-"u. c #C70000",
-"v. c #CD0000",
-"w. c #D20101",
-"x. c #DB1E1E",
-"y. c #E13535",
-"z. c #E74343",
-"A. c #E94646",
-"B. c #F06C6C",
-"C. c #FCE4E4",
-"D. c #FFFCFC",
-"E. c #FACECE",
-"F. c #FAD8D8",
-"G. c #EC6363",
-"H. c #E54141",
-"I. c #E13838",
-"J. c #D81A1A",
-"K. c #D00404",
-"L. c #CA0000",
-"M. c #BB0000",
-"N. c #940000",
-"O. c #FD0000",
-"P. c #D00000",
-"Q. c #D50202",
-"R. c #D90808",
-"S. c #DF1414",
-"T. c #E21D1D",
-"U. c #EA4F4F",
-"V. c #FBDCDC",
-"W. c #FFFEFE",
-"X. c #FDEFEF",
-"Y. c #EC7171",
-"Z. c #DD1212",
-"`. c #D90909",
-" + c #D30101",
-".+ c #CF0000",
-"++ c #A10000",
-"@+ c #6C0000",
-"#+ c #E70000",
-"$+ c #BE0000",
-"%+ c #CB0000",
-"&+ c #CE0000",
-"*+ c #D30000",
-"=+ c #D60000",
-"-+ c #DC1010",
-";+ c #EA6565",
-">+ c #E53B3B",
-",+ c #F8C7C7",
-"'+ c #FCEBEB",
-")+ c #DA1111",
-"!+ c #D50303",
-"~+ c #D10000",
-"{+ c #C00000",
-"]+ c #BC0000",
-"^+ c #AD0000",
-"/+ c #7B0000",
-"(+ c #DB0000",
-"_+ c #D50000",
-":+ c #DD2828",
-"<+ c #F7CACA",
-"[+ c #F6BCBC",
-"}+ c #E45656",
-"|+ c #E04545",
-"1+ c #C10000",
-"2+ c #B30000",
-"3+ c #810000",
-"4+ c #E25050",
-"5+ c #FBE7E7",
-"6+ c #F9DFDF",
-"7+ c #BA0000",
-"8+ c #840000",
-"9+ c #E76A6A",
-"0+ c #FDF4F4",
-"a+ c #FEFAFA",
-"b+ c #FEF8F8",
-"c+ c #C40000",
-"d+ c #C20000",
-"e+ c #E66B6B",
-"f+ c #FDF3F3",
-"g+ c #F2A7A7",
-"h+ c #EA7777",
-"i+ c #F5C7C7",
-"j+ c #830000",
-"k+ c #D90000",
-"l+ c #E66767",
-"m+ c #ED8989",
-"n+ c #E34848",
-"o+ c #F1A8A8",
-"p+ c #DD0000",
-"q+ c #E44C4C",
-"r+ c #FBE0E0",
-"s+ c #FBE5E5",
-"t+ c #E64E4E",
-"u+ c #E23535",
-"v+ c #F2A5A5",
-"w+ c #FADCDC",
-"x+ c #F8D6D6",
-"y+ c #DB2020",
-"z+ c #D50404",
-"A+ c #740000",
-"B+ c #D80000",
-"C+ c #E75858",
-"D+ c #EF8989",
-"E+ c #F3A3A3",
-"F+ c #EA5E5E",
-"G+ c #DF0D0D",
-"H+ c #DE0B0B",
-"I+ c #E33232",
-"J+ c #F7C6C6",
-"K+ c #EF9B9B",
-"L+ c #DB1818",
-"M+ c #620000",
-"N+ c #E00C0C",
-"O+ c #F29696",
-"P+ c #E52727",
-"Q+ c #EC5E5E",
-"R+ c #F28F8F",
-"S+ c #E20D0D",
-"T+ c #E00000",
-"U+ c #EE7A7A",
-"V+ c #DF0B0B",
-"W+ c #900000",
-"X+ c #420000",
-"Y+ c #E20000",
-"Z+ c #E30404",
-"`+ c #F18080",
-" @ c #EC4646",
-".@ c #E61010",
-"+@ c #EA3434",
-"@@ c #E50404",
-"#@ c #EF6B6B",
-"$@ c #E51717",
-"%@ c #630000",
-"&@ c #E80000",
-"*@ c #E90000",
-"=@ c #EC2020",
-"-@ c #FCD4D4",
-";@ c #EB1010",
-">@ c #EE3434",
-",@ c #FAC7C7",
-"'@ c #FEF3F3",
-")@ c #F69898",
-"!@ c #9D0000",
-"~@ c #EC0000",
-"{@ c #ED0000",
-"]@ c #F34C4C",
-"^@ c #FCCDCD",
-"/@ c #FCDBDB",
-"(@ c #F24F4F",
-"_@ c #F89D9D",
-":@ c #FFF9F9",
-"<@ c #F78A8A",
-"[@ c #F02424",
-"}@ c #700000",
-"|@ c #F30000",
-"1@ c #F40000",
-"2@ c #F40C0C",
-"3@ c #FA7676",
-"4@ c #FA7C7C",
-"5@ c #F51C1C",
-"6@ c #F73F3F",
-"7@ c #F62525",
-"8@ c #6F0000",
-"9@ c #F80000",
-"0@ c #F70000",
-"a@ c #F80404",
-"b@ c #F80808",
-"c@ c #DF0000",
-"d@ c #960000",
-"e@ c #710000",
-"f@ c #9A0000",
-"g@ c #F00000",
-"h@ c #A80000",
-"i@ c #800000",
-"j@ c #F10000",
-"k@ c #F90000",
-"l@ c #FC0000",
-"m@ c #660000",
-"n@ c #750000",
-"o@ c #8D0000",
-"p@ c #980000",
-"q@ c #A00000",
-"r@ c #9C0000",
-"s@ c #690000",
-" ",
-" . + @ # $ % & * = ",
-" - ; > , ' ) ! ~ { ] ^ / ( _ ",
-" : < [ } | 1 2 3 3 2 2 1 4 5 6 7 8 ",
-" 9 0 a b c 1 2 3 3 3 3 2 2 c b d e f g ",
-" h i j k l m n o o p q r o n 4 m l s t u v ",
-" h w x y z A B C D E F G H E C B A I J K L M N ",
-" O P P Q R S T U V W X Y Z ` X .V ..+.@.#.$.%.&.*. ",
-" =.-.;.>.,.'.).!.~.{.].^./.(._.:.<.[.}.|.1.2.3.4.5.6. ",
-" % 7.;.>.8.9.0.a.b.c.d.e.f.(.g.h.i.j.k.l.m.n.o.p.q.r.s. ",
-" t.5.;.u.v.w.x.y.z.A.B.C.(.(.D.E.F.G.H.I.J.K.L.p.q.M.N. ",
-" O.;.5.;.u.w P.Q.R.S.T.U.V.(.(.(.W.X.Y.Z.`. +.+P 7.q.M.++@+ ",
-" #+M.$+;.u.%+&+*+=+-+;+>+,+(.(.(.(.(.'+)+!+~+v.P 7.{+]+^+/+ ",
-" (+M.q.;.u.%+&+-._+:+<+[+'+(.(.(.(.(.(.}+|+P.v.P 7.1+5.2+3+ ",
-" t.$+1+7.u.%+&+~+t.4+5+(.(.(.(.(.(.(.(.(.6+.+v.P u.;.{+7+8+ ",
-" t.1+;.p.>.%+&+~+*+9+0+(.(.(.(.a+b+(.(.(.6+.+v.L.u.c+d+$+8+ ",
-" _+7.p.P %+&+P.-.e+f+(.(.(.(.(.g+h+(.(.(.i+~+.+v.L.u.p.{+j+ ",
-" k+>.L.w &+P.~+t.l+(.(.(.(.(.(.m+n+(.(.(.o+-.~+.+v.%+P {+3+ ",
-" p+&+.+~+-.*+_+* q+(.(.r+'+r+s+t+u+v+w+(.x+y+z+*+-..+&+M.A+ ",
-" (+*+*+t._+* B+& C+(.(.D+z E+F+G+H+I+J+(.D.K+L+=+_+*+*+&.M+ ",
-" t.k+(+(+p+p+N+O+(.(.P+Q+R+S+T+@ T+G.(.(.U+V+= (+& k+W+X+ ",
-" P.(+T+T+@ Y+Z+`+(.(. @.@+@@@% % % #@(.X.$@Y+@ T+T+_+%@ ",
-" ~++ #+&@&@*@=@-@D.h.;@# # # # >@,@'@)@&@&@#+#+h !@ ",
-" $+@ ~@~@~@{@{@]@^@/@(@{@{@{@{@_@:@<@[@{@~@~@~@p.}@ ",
-" $+Y+|@1@|@1@1@2@3@4@1@1@1@5@6@7@1@1@1@1@=.(+8@ ",
-" $+$ 9@0@0@9@9@a@b@9@9@9@9@9@9@0@0@0@0@c@d@ ",
-" ^+B+9@O.O.O.O.O.O.O.O.O.O.O.O.O.|@*+e@ ",
-" f@;.$ . . . . . . . . . . . g@h@A+ ",
-" i@2+.+&@j@k@l@9@j@Y+&+N m@ ",
-" n@o@p@q@6.r@N.i@s@X+ ",
-" ",
-" "};
diff --git a/ubuntu/_base/applications/system/polkit-agent-tde/debian/control b/ubuntu/_base/applications/system/polkit-agent-tde/debian/control
index 7fb2e0d3b..c7936bded 100644
--- a/ubuntu/_base/applications/system/polkit-agent-tde/debian/control
+++ b/ubuntu/_base/applications/system/polkit-agent-tde/debian/control
@@ -12,7 +12,7 @@ Architecture: any
Provides: polkit-1-auth-agent
Replaces: tde-ubuntu-integration
Breaks: tde-ubuntu-integration
-Depends: ${shlibs:Depends}, ${misc:Depends}, policykit-1
+Depends: ${shlibs:Depends}, ${misc:Depends}, policykit-1 | polkitd
Conflicts: tde-ubuntu-integration
Description: TDE dialogs for PolicyKit
PolicyKit is an application-level toolkit for defining and handling the policy
diff --git a/ubuntu/_base/core/tdebase/debian/control b/ubuntu/_base/core/tdebase/debian/control
index 0d88bcb73..6765d61cb 100644
--- a/ubuntu/_base/core/tdebase/debian/control
+++ b/ubuntu/_base/core/tdebase/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: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, init, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386] | libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, rss-glx, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xkb-data, xutils, texinfo, htdig, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, libogg-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~), libssl-dev, libssh-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, init, libtirpc-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386] | libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, rss-glx, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xkb-data, xutils, texinfo, htdig, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, libogg-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~), libssl-dev, libssh-dev
Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs14-trinity-doc
Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
Standards-Version: 3.8.4
diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff
index bb1dccd7b..1b53be325 100644
--- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff
+++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff
@@ -5,5 +5,5 @@ index dd64b58..0af3e44 100644
@@ -12,3 +12,4 @@ Terminal=false
X-TDE-InitialPreference=8
X-DCOP-ServiceType=Multi
- Categories=Qt;TDE;TextEditor;
+ Categories=Qt;TDE;Utility;TextEditor;
+NoDisplay=true
diff --git a/ubuntu/_base/core/tdebase/debian/rules b/ubuntu/_base/core/tdebase/debian/rules
index 8cdb710e0..d24d632f0 100755
--- a/ubuntu/_base/core/tdebase/debian/rules
+++ b/ubuntu/_base/core/tdebase/debian/rules
@@ -64,7 +64,7 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DWITH_UPOWER="ON" \
-DWITH_LIBART="ON" \
-DWITH_LIBCONFIG="ON" \
- -DWITH_PCRE="ON" \
+ -DWITH_PCRE2="ON" \
-DWITH_KRB5="ON"
DEB_FIXPERMS_EXCLUDE := \
diff --git a/ubuntu/_base/core/tdebase/debian/twin-trinity.install b/ubuntu/_base/core/tdebase/debian/twin-trinity.install
index 52c59c4a7..f9b6061d4 100644
--- a/ubuntu/_base/core/tdebase/debian/twin-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/twin-trinity.install
@@ -74,19 +74,7 @@ debian/tmp/opt/trinity/share/apps/twin/eventsrc
debian/tmp/opt/trinity/share/apps/twin/keramik.desktop
debian/tmp/opt/trinity/share/apps/twin/laptop.desktop
debian/tmp/opt/trinity/share/apps/twin/modernsystem.desktop
-debian/tmp/opt/trinity/share/apps/twin/pics/bluesun.png
-debian/tmp/opt/trinity/share/apps/twin/pics/close.png
-debian/tmp/opt/trinity/share/apps/twin/pics/fog-grey.png
-debian/tmp/opt/trinity/share/apps/twin/pics/fog.png
-debian/tmp/opt/trinity/share/apps/twin/pics/greenie.dim.png
-debian/tmp/opt/trinity/share/apps/twin/pics/greenie.light.png
-debian/tmp/opt/trinity/share/apps/twin/pics/iconify.png
-debian/tmp/opt/trinity/share/apps/twin/pics/maximizedown.png
-debian/tmp/opt/trinity/share/apps/twin/pics/maximize.png
-debian/tmp/opt/trinity/share/apps/twin/pics/menu.png
-debian/tmp/opt/trinity/share/apps/twin/pics/pindown.png
-debian/tmp/opt/trinity/share/apps/twin/pics/pinup.png
-debian/tmp/opt/trinity/share/apps/twin/pics/unknown.png
+debian/tmp/opt/trinity/share/apps/twin/pics/*
debian/tmp/opt/trinity/share/apps/twin/plastik.desktop
debian/tmp/opt/trinity/share/apps/twin/quartz.desktop
debian/tmp/opt/trinity/share/apps/twin/redmond.desktop
diff --git a/ubuntu/_base/core/tdelibs/debian/control b/ubuntu/_base/core/tdelibs/debian/control
index c2e08704b..9c3d16328 100644
--- a/ubuntu/_base/core/tdelibs/debian/control
+++ b/ubuntu/_base/core/tdelibs/debian/control
@@ -11,7 +11,7 @@ Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, sharutil
aspell, libaspell-dev, hspell, libbz2-dev, liblzma-dev, libcupsys2-dev | libcups2-dev,
libidn-dev | libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev | heimdal-dev, libldap2-dev,
liblua5.4-dev | liblua5.3-dev | liblua5.2-dev | liblua5.1-dev | liblualib50-dev,
- libopenexr-dev (>= 1.2.2-4.1), libpcre3-dev,
+ libopenexr-dev (>= 1.2.2-4.1), libpcre2-dev,
libsasl2-dev, libxcomposite-dev, libdbus-1-tqt-dev,
libtiff-dev, libwebp-dev, libavahi-client-dev (>= 0.4), x11-xserver-utils,
libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-tqt-dev,
@@ -103,7 +103,7 @@ Depends: tdelibs14-trinity (= ${source:Version}), libart-2.0-dev (>= 4:14.0.0~),
libarts1-trinity-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev,
libaspell-dev, hspell, libbz2-dev,
libidn-dev | libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev | heimdal-dev,
- libopenexr-dev (>= 1.2.2-3), libpcre3-dev,
+ libopenexr-dev (>= 1.2.2-3), libpcre2-dev,
liblua5.4-dev | liblua5.3-dev | liblua5.2-dev | liblua5.1-dev | liblualib50-dev,
libsasl2-dev, libxcomposite-dev,
libtiff-dev, libxml2-dev, libxml2-utils, libxslt1-dev,
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/control b/ubuntu/_base/dependencies/polkit-tqt/debian/control
index 27e070a69..ea2dffb78 100644
--- a/ubuntu/_base/dependencies/polkit-tqt/debian/control
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/control
@@ -11,7 +11,7 @@ Package: libpolkit-tqt
Section: libs
Architecture: any
Multi-Arch: same
-Depends: ${shlibs:Depends}, policykit-1
+Depends: ${shlibs:Depends}, policykit-1 | polkitd
Description: PolicyKit-tqt library
PolicyKit is an application-level toolkit for defining and handling the policy
that allows unprivileged processes to speak to privileged processes.
@@ -47,7 +47,7 @@ Package: libpolkit-tqt-examples
Section: libs
Architecture: any
Multi-Arch: foreign
-Depends: ${shlibs:Depends}, policykit-1
+Depends: ${shlibs:Depends}, policykit-1 | polkitd
Description: PolicyKit-tqt library example files
PolicyKit is an application-level toolkit for defining and handling the policy
that allows unprivileged processes to speak to privileged processes.
diff --git a/ubuntu/_base/dependencies/tqt3/debian/control b/ubuntu/_base/dependencies/tqt3/debian/control
index 36266f44e..a0f53d3a9 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/control
+++ b/ubuntu/_base/dependencies/tqt3/debian/control
@@ -2,7 +2,7 @@ Source: tqt-x11-free
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Sune Vuorela <debian@pusling.com>, Fathi Boudra <fabo@debian.org>, Modestas Vainius <modestas@vainius.eu>
-Build-Depends: cdbs, debhelper (>= 10~), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1-4),
+Build-Depends: cdbs, debhelper (>= 10~), quilt, cpio, libnsl-dev | libc6-dev (<<2.32~), libxext-dev (>= 4.3.0.dfsg.1-4),
libxrandr-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4),
libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4),
libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev,
diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install
index 53633098e..5ea24d537 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install
+++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install
@@ -1,197 +1,194 @@
usr/include/tqt3/private/*
-usr/include/tqt3/ntqabstractlayout.h
-usr/include/tqt3/ntqaccel.h
-usr/include/tqt3/ntqaccessible.h
-usr/include/tqt3/ntqaction.h
+usr/include/tqt3/tqaccel.h
+usr/include/tqt3/tqaccessible.h
+usr/include/tqt3/tqaction.h
usr/include/tqt3/ntqapplication.h
-usr/include/tqt3/ntqasciicache.h
-usr/include/tqt3/ntqasciidict.h
-usr/include/tqt3/ntqasyncimageio.h
-usr/include/tqt3/ntqasyncio.h
+usr/include/tqt3/tqasciicache.h
+usr/include/tqt3/tqasciidict.h
+usr/include/tqt3/tqasyncimageio.h
+usr/include/tqt3/tqasyncio.h
usr/include/tqt3/tqbig5codec.h
-usr/include/tqt3/ntqbitarray.h
-usr/include/tqt3/ntqbitmap.h
-usr/include/tqt3/ntqbrush.h
-usr/include/tqt3/ntqbuffer.h
-usr/include/tqt3/ntqbutton.h
-usr/include/tqt3/ntqbuttongroup.h
-usr/include/tqt3/ntqcache.h
+usr/include/tqt3/tqbitarray.h
+usr/include/tqt3/tqbitmap.h
+usr/include/tqt3/tqbrush.h
+usr/include/tqt3/tqbuffer.h
+usr/include/tqt3/tqbutton.h
+usr/include/tqt3/tqbuttongroup.h
+usr/include/tqt3/tqcache.h
usr/include/tqt3/tqcanvas.h
-usr/include/tqt3/ntqcdestyle.h
-usr/include/tqt3/ntqcheckbox.h
-usr/include/tqt3/ntqcleanuphandler.h
-usr/include/tqt3/ntqclipboard.h
-usr/include/tqt3/ntqcolor.h
-usr/include/tqt3/ntqcolordialog.h
-usr/include/tqt3/ntqcombobox.h
-usr/include/tqt3/ntqcommonstyle.h
-usr/include/tqt3/ntqcompactstyle.h
-usr/include/tqt3/ntqconnection.h
-usr/include/tqt3/ntqcstring.h
-usr/include/tqt3/ntqcursor.h
+usr/include/tqt3/tqcdestyle.h
+usr/include/tqt3/tqcheckbox.h
+usr/include/tqt3/tqcleanuphandler.h
+usr/include/tqt3/tqclipboard.h
+usr/include/tqt3/tqcolor.h
+usr/include/tqt3/tqcolordialog.h
+usr/include/tqt3/tqcombobox.h
+usr/include/tqt3/tqcommonstyle.h
+usr/include/tqt3/tqcompactstyle.h
+usr/include/tqt3/tqconnection.h
+usr/include/tqt3/tqcstring.h
+usr/include/tqt3/tqcursor.h
usr/include/tqt3/tqdatabrowser.h
-usr/include/tqt3/ntqdatastream.h
+usr/include/tqt3/tqdatastream.h
usr/include/tqt3/tqdatatable.h
usr/include/tqt3/tqdataview.h
usr/include/tqt3/tqdatetime.h
usr/include/tqt3/tqdatetimeedit.h
-usr/include/tqt3/ntqdeepcopy.h
-usr/include/tqt3/ntqdesktopwidget.h
-usr/include/tqt3/ntqdial.h
-usr/include/tqt3/ntqdialog.h
-usr/include/tqt3/ntqdict.h
-usr/include/tqt3/ntqdir.h
-usr/include/tqt3/ntqdns.h
-usr/include/tqt3/ntqdockarea.h
-usr/include/tqt3/ntqdockwindow.h
+usr/include/tqt3/tqdeepcopy.h
+usr/include/tqt3/tqdesktopwidget.h
+usr/include/tqt3/tqdial.h
+usr/include/tqt3/tqdialog.h
+usr/include/tqt3/tqdict.h
+usr/include/tqt3/tqdir.h
+usr/include/tqt3/tqdns.h
+usr/include/tqt3/tqdockarea.h
+usr/include/tqt3/tqdockwindow.h
usr/include/tqt3/tqdom.h
-usr/include/tqt3/ntqdragobject.h
-usr/include/tqt3/ntqdrawutil.h
-usr/include/tqt3/ntqdropsite.h
+usr/include/tqt3/tqdragobject.h
+usr/include/tqt3/tqdrawutil.h
+usr/include/tqt3/tqdropsite.h
usr/include/tqt3/tqeditorfactory.h
-usr/include/tqt3/ntqerrormessage.h
+usr/include/tqt3/tqerrormessage.h
usr/include/tqt3/tqeucjpcodec.h
usr/include/tqt3/tqeuckrcodec.h
-usr/include/tqt3/ntqevent.h
-usr/include/tqt3/ntqeventloop.h
-usr/include/tqt3/ntqfeatures.h
-usr/include/tqt3/ntqfile.h
-usr/include/tqt3/ntqfiledialog.h
-usr/include/tqt3/ntqfileinfo.h
-usr/include/tqt3/ntqfocusdata.h
-usr/include/tqt3/ntqfont.h
-usr/include/tqt3/ntqfontdatabase.h
-usr/include/tqt3/ntqfontdialog.h
-usr/include/tqt3/ntqfontinfo.h
-usr/include/tqt3/ntqfontmetrics.h
-usr/include/tqt3/ntqframe.h
-usr/include/tqt3/ntqftp.h
-usr/include/tqt3/ntqgarray.h
+usr/include/tqt3/tqevent.h
+usr/include/tqt3/tqeventloop.h
+usr/include/tqt3/tqfeatures.h
+usr/include/tqt3/tqfile.h
+usr/include/tqt3/tqfiledialog.h
+usr/include/tqt3/tqfileinfo.h
+usr/include/tqt3/tqfocusdata.h
+usr/include/tqt3/tqfont.h
+usr/include/tqt3/tqfontdatabase.h
+usr/include/tqt3/tqfontdialog.h
+usr/include/tqt3/tqfontinfo.h
+usr/include/tqt3/tqfontmetrics.h
+usr/include/tqt3/tqframe.h
+usr/include/tqt3/tqftp.h
+usr/include/tqt3/tqgarray.h
usr/include/tqt3/tqgb18030codec.h
usr/include/tqt3/tqgbkcodec.h
-usr/include/tqt3/ntqgcache.h
-usr/include/tqt3/ntqgdict.h
-usr/include/tqt3/ntqgeneric.h
-usr/include/tqt3/ntqgif.h
-usr/include/tqt3/ntqglist.h
-usr/include/tqt3/ntqglobal.h
-usr/include/tqt3/ntqgplugin.h
-usr/include/tqt3/ntqgrid.h
-usr/include/tqt3/ntqgridview.h
-usr/include/tqt3/ntqgroupbox.h
-usr/include/tqt3/ntqguardedptr.h
-usr/include/tqt3/ntqgvector.h
-usr/include/tqt3/ntqhbox.h
-usr/include/tqt3/ntqhbuttongroup.h
-usr/include/tqt3/ntqheader.h
+usr/include/tqt3/tqgcache.h
+usr/include/tqt3/tqgdict.h
+usr/include/tqt3/tqgif.h
+usr/include/tqt3/tqglist.h
+usr/include/tqt3/tqglobal.h
+usr/include/tqt3/tqgplugin.h
+usr/include/tqt3/tqgrid.h
+usr/include/tqt3/tqgridview.h
+usr/include/tqt3/tqgroupbox.h
+usr/include/tqt3/tqguardedptr.h
+usr/include/tqt3/tqgvector.h
+usr/include/tqt3/tqhbox.h
+usr/include/tqt3/tqhbuttongroup.h
+usr/include/tqt3/tqheader.h
usr/include/tqt3/tqhebrewcodec.h
-usr/include/tqt3/ntqhgroupbox.h
-usr/include/tqt3/ntqhostaddress.h
-usr/include/tqt3/ntqhttp.h
+usr/include/tqt3/tqhgroupbox.h
+usr/include/tqt3/tqhostaddress.h
+usr/include/tqt3/tqhttp.h
usr/include/tqt3/tqiconset.h
usr/include/tqt3/tqiconview.h
usr/include/tqt3/tqimage.h
usr/include/tqt3/tqimageformatplugin.h
-usr/include/tqt3/ntqinputcontext.h
-usr/include/tqt3/ntqinputcontextfactory.h
-usr/include/tqt3/ntqinputcontextplugin.h
-usr/include/tqt3/ntqinputdialog.h
-usr/include/tqt3/ntqintcache.h
-usr/include/tqt3/ntqintdict.h
-usr/include/tqt3/ntqinterlacestyle.h
-usr/include/tqt3/ntqiodevice.h
+usr/include/tqt3/tqinputcontext.h
+usr/include/tqt3/tqinputcontextfactory.h
+usr/include/tqt3/tqinputcontextplugin.h
+usr/include/tqt3/tqinputdialog.h
+usr/include/tqt3/tqintcache.h
+usr/include/tqt3/tqintdict.h
+usr/include/tqt3/tqinterlacestyle.h
+usr/include/tqt3/tqiodevice.h
usr/include/tqt3/tqjiscodec.h
-usr/include/tqt3/ntqjpegio.h
+usr/include/tqt3/tqjpegio.h
usr/include/tqt3/tqjpunicode.h
-usr/include/tqt3/ntqkeycode.h
-usr/include/tqt3/ntqkeysequence.h
-usr/include/tqt3/ntqlabel.h
-usr/include/tqt3/ntqlayout.h
-usr/include/tqt3/ntqlcdnumber.h
-usr/include/tqt3/ntqlibrary.h
-usr/include/tqt3/ntqlineedit.h
-usr/include/tqt3/ntqlistbox.h
-usr/include/tqt3/ntqlistview.h
-usr/include/tqt3/ntqlocale.h
-usr/include/tqt3/ntqlocalfs.h
-usr/include/tqt3/ntqmainwindow.h
+usr/include/tqt3/tqkeycode.h
+usr/include/tqt3/tqkeysequence.h
+usr/include/tqt3/tqlabel.h
+usr/include/tqt3/tqlayout.h
+usr/include/tqt3/tqlcdnumber.h
+usr/include/tqt3/tqlibrary.h
+usr/include/tqt3/tqlineedit.h
+usr/include/tqt3/tqlistbox.h
+usr/include/tqt3/tqlistview.h
+usr/include/tqt3/tqlocale.h
+usr/include/tqt3/tqlocalfs.h
+usr/include/tqt3/tqmainwindow.h
usr/include/tqt3/tqmap.h
-usr/include/tqt3/ntqmemarray.h
-usr/include/tqt3/ntqmenubar.h
-usr/include/tqt3/ntqmenudata.h
+usr/include/tqt3/tqmemarray.h
+usr/include/tqt3/tqmenubar.h
+usr/include/tqt3/tqmenudata.h
usr/include/tqt3/ntqmessagebox.h
usr/include/tqt3/ntqmetaobject.h
-usr/include/tqt3/ntqmime.h
+usr/include/tqt3/tqmime.h
usr/include/tqt3/ntqmngio.h
-usr/include/tqt3/ntqmotifstyle.h
-usr/include/tqt3/ntqmotifplusstyle.h
-usr/include/tqt3/ntqmovie.h
-usr/include/tqt3/ntqmultilineedit.h
+usr/include/tqt3/tqmotifstyle.h
+usr/include/tqt3/tqmotifplusstyle.h
+usr/include/tqt3/tqmovie.h
+usr/include/tqt3/tqmultilineedit.h
usr/include/tqt3/tqmutex.h
usr/include/tqt3/ntqnamespace.h
-usr/include/tqt3/ntqnetwork.h
-usr/include/tqt3/ntqnetworkprotocol.h
+usr/include/tqt3/tqnetwork.h
+usr/include/tqt3/tqnetworkprotocol.h
usr/include/tqt3/ntqnp.h
usr/include/tqt3/tqobject.h
usr/include/tqt3/tqobjectcleanuphandler.h
usr/include/tqt3/tqobjectdefs.h
usr/include/tqt3/tqobjectdict.h
usr/include/tqt3/tqobjectlist.h
-usr/include/tqt3/ntqpaintdevice.h
-usr/include/tqt3/ntqpaintdevicemetrics.h
-usr/include/tqt3/ntqpainter.h
+usr/include/tqt3/tqpaintdevice.h
+usr/include/tqt3/tqpaintdevicemetrics.h
+usr/include/tqt3/tqpainter.h
usr/include/tqt3/tqpair.h
-usr/include/tqt3/ntqpalette.h
-usr/include/tqt3/ntqpen.h
-usr/include/tqt3/ntqpicture.h
-usr/include/tqt3/ntqpixmap.h
-usr/include/tqt3/ntqpixmapcache.h
-usr/include/tqt3/ntqplatinumstyle.h
-usr/include/tqt3/ntqpngio.h
-usr/include/tqt3/ntqpoint.h
-usr/include/tqt3/ntqpointarray.h
+usr/include/tqt3/tqpalette.h
+usr/include/tqt3/tqpen.h
+usr/include/tqt3/tqpicture.h
+usr/include/tqt3/tqpixmap.h
+usr/include/tqt3/tqpixmapcache.h
+usr/include/tqt3/tqplatinumstyle.h
+usr/include/tqt3/tqpngio.h
+usr/include/tqt3/tqpoint.h
+usr/include/tqt3/tqpointarray.h
usr/include/tqt3/ntqpolygonscanner.h
-usr/include/tqt3/ntqpopupmenu.h
+usr/include/tqt3/tqpopupmenu.h
usr/include/tqt3/ntqprintdialog.h
-usr/include/tqt3/ntqprinter.h
-usr/include/tqt3/ntqprocess.h
-usr/include/tqt3/ntqprogressbar.h
-usr/include/tqt3/ntqprogressdialog.h
+usr/include/tqt3/tqprinter.h
+usr/include/tqt3/tqprocess.h
+usr/include/tqt3/tqprogressbar.h
+usr/include/tqt3/tqprogressdialog.h
usr/include/tqt3/tqptrcollection.h
usr/include/tqt3/tqptrdict.h
usr/include/tqt3/tqptrlist.h
usr/include/tqt3/tqptrqueue.h
usr/include/tqt3/tqptrstack.h
usr/include/tqt3/tqptrvector.h
-usr/include/tqt3/ntqpushbutton.h
-usr/include/tqt3/ntqradiobutton.h
+usr/include/tqt3/tqpushbutton.h
+usr/include/tqt3/tqradiobutton.h
usr/include/tqt3/ntqrangecontrol.h
-usr/include/tqt3/ntqrect.h
-usr/include/tqt3/ntqregexp.h
-usr/include/tqt3/ntqregion.h
-usr/include/tqt3/ntqscrollbar.h
-usr/include/tqt3/ntqscrollview.h
+usr/include/tqt3/tqrect.h
+usr/include/tqt3/tqregexp.h
+usr/include/tqt3/tqregion.h
+usr/include/tqt3/tqscrollbar.h
+usr/include/tqt3/tqscrollview.h
usr/include/tqt3/tqsemaphore.h
-usr/include/tqt3/ntqserversocket.h
-usr/include/tqt3/ntqsession.h
-usr/include/tqt3/ntqsessionmanager.h
-usr/include/tqt3/ntqsettings.h
-usr/include/tqt3/ntqsgistyle.h
+usr/include/tqt3/tqserversocket.h
+usr/include/tqt3/tqsessionmanager.h
+usr/include/tqt3/tqsettings.h
+usr/include/tqt3/tqsgistyle.h
usr/include/tqt3/ntqshared.h
-usr/include/tqt3/ntqsignal.h
-usr/include/tqt3/ntqsignalmapper.h
-usr/include/tqt3/ntqsignalslotimp.h
-usr/include/tqt3/ntqsimplerichtext.h
-usr/include/tqt3/ntqsize.h
-usr/include/tqt3/ntqsizegrip.h
-usr/include/tqt3/ntqsizepolicy.h
+usr/include/tqt3/tqsignal.h
+usr/include/tqt3/tqsignalmapper.h
+usr/include/tqt3/tqsignalslotimp.h
+usr/include/tqt3/tqsimplerichtext.h
+usr/include/tqt3/tqsize.h
+usr/include/tqt3/tqsizegrip.h
+usr/include/tqt3/tqsizepolicy.h
usr/include/tqt3/tqsjiscodec.h
-usr/include/tqt3/ntqslider.h
-usr/include/tqt3/ntqsocket.h
-usr/include/tqt3/ntqsocketdevice.h
-usr/include/tqt3/ntqsocketnotifier.h
+usr/include/tqt3/tqslider.h
+usr/include/tqt3/tqsocket.h
+usr/include/tqt3/tqsocketdevice.h
+usr/include/tqt3/tqsocketnotifier.h
usr/include/tqt3/ntqsound.h
-usr/include/tqt3/ntqspinbox.h
+usr/include/tqt3/tqspinbox.h
usr/include/tqt3/ntqsplashscreen.h
usr/include/tqt3/ntqsplitter.h
usr/include/tqt3/tqsql.h
@@ -209,7 +206,7 @@ usr/include/tqt3/tqsqlquery.h
usr/include/tqt3/tqsqlrecord.h
usr/include/tqt3/tqsqlresult.h
usr/include/tqt3/tqsqlselectcursor.h
-usr/include/tqt3/ntqstatusbar.h
+usr/include/tqt3/tqstatusbar.h
usr/include/tqt3/tqstring.h
usr/include/tqt3/tqstringlist.h
usr/include/tqt3/tqstrlist.h
@@ -218,13 +215,13 @@ usr/include/tqt3/tqstyle.h
usr/include/tqt3/tqstylefactory.h
usr/include/tqt3/tqstyleplugin.h
usr/include/tqt3/tqstylesheet.h
-usr/include/tqt3/ntqsyntaxhighlighter.h
+usr/include/tqt3/tqsyntaxhighlighter.h
usr/include/tqt3/ntqt.h
usr/include/tqt3/tqt.h
-usr/include/tqt3/ntqtabbar.h
-usr/include/tqt3/ntqtabdialog.h
-usr/include/tqt3/ntqtable.h
-usr/include/tqt3/ntqtabwidget.h
+usr/include/tqt3/tqtabbar.h
+usr/include/tqt3/tqtabdialog.h
+usr/include/tqt3/tqtable.h
+usr/include/tqt3/tqtabwidget.h
usr/include/tqt3/tqtextbrowser.h
usr/include/tqt3/tqtextcodec.h
usr/include/tqt3/tqtextcodecfactory.h
@@ -236,36 +233,36 @@ usr/include/tqt3/tqthread.h
usr/include/tqt3/tqthreadstorage.h
usr/include/tqt3/tqtimer.h
usr/include/tqt3/ntqtl.h
-usr/include/tqt3/ntqtoolbar.h
-usr/include/tqt3/ntqtoolbox.h
-usr/include/tqt3/ntqtoolbutton.h
-usr/include/tqt3/ntqtooltip.h
-usr/include/tqt3/ntqtranslator.h
+usr/include/tqt3/tqtoolbar.h
+usr/include/tqt3/tqtoolbox.h
+usr/include/tqt3/tqtoolbutton.h
+usr/include/tqt3/tqtooltip.h
+usr/include/tqt3/tqtranslator.h
usr/include/tqt3/tqtsciicodec.h
-usr/include/tqt3/ntqurl.h
-usr/include/tqt3/ntqurlinfo.h
-usr/include/tqt3/ntqurloperator.h
+usr/include/tqt3/tqurl.h
+usr/include/tqt3/tqurlinfo.h
+usr/include/tqt3/tqurloperator.h
usr/include/tqt3/tqutfcodec.h
usr/include/tqt3/ntquuid.h
-usr/include/tqt3/ntqvalidator.h
+usr/include/tqt3/tqvalidator.h
usr/include/tqt3/tqvaluelist.h
usr/include/tqt3/tqvaluestack.h
usr/include/tqt3/tqvaluevector.h
usr/include/tqt3/ntqvariant.h
-usr/include/tqt3/ntqvbox.h
-usr/include/tqt3/ntqvbuttongroup.h
-usr/include/tqt3/ntqvgroupbox.h
+usr/include/tqt3/tqvbox.h
+usr/include/tqt3/tqvbuttongroup.h
+usr/include/tqt3/tqvgroupbox.h
usr/include/tqt3/tqwaitcondition.h
-usr/include/tqt3/ntqwhatsthis.h
+usr/include/tqt3/tqwhatsthis.h
usr/include/tqt3/tqwidget.h
usr/include/tqt3/tqwidgetintdict.h
usr/include/tqt3/tqwidgetlist.h
usr/include/tqt3/tqwidgetplugin.h
usr/include/tqt3/tqwidgetstack.h
usr/include/tqt3/ntqwindowdefs.h
-usr/include/tqt3/ntqwindowsstyle.h
+usr/include/tqt3/tqwindowsstyle.h
usr/include/tqt3/ntqwinexport.h
-usr/include/tqt3/ntqwizard.h
-usr/include/tqt3/ntqwmatrix.h
-usr/include/tqt3/ntqworkspace.h
+usr/include/tqt3/tqwizard.h
+usr/include/tqt3/tqwmatrix.h
+usr/include/tqt3/tqworkspace.h
usr/include/tqt3/tqxml.h
diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install
index 9425bb67a..6ef3618a7 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install
+++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install
@@ -5,7 +5,7 @@ usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.prl
usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so
usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/tqt-mt.pc
usr/include/tqt3/ntqconfig.h
-usr/include/tqt3/ntqgl.h
-usr/include/tqt3/ntqglcolormap.h
+usr/include/tqt3/tqgl.h
+usr/include/tqt3/tqglcolormap.h
usr/include/tqt3/ntqmodules.h
usr/include/tqt3/tqwidgetfactory.h
diff --git a/ubuntu/_base/dependencies/tqt3/debian/rules b/ubuntu/_base/dependencies/tqt3/debian/rules
index f42f8989d..37a09ad05 100755
--- a/ubuntu/_base/dependencies/tqt3/debian/rules
+++ b/ubuntu/_base/dependencies/tqt3/debian/rules
@@ -212,7 +212,7 @@ clean::
$(MAKE) -C tools/qconfig distclean; \
$(MAKE) -C tools/msg2tqm distclean; $(MAKE) -C tools/tqtmergetr distclean; $(MAKE) -C tools/qembed distclean; \
$(MAKE) -C tools/designer/tools/tqtconv2ui distclean; $(MAKE) -C tools/designer/tools/tqtcreatecw distclean; \
- $(MAKE) -C tools/designer/plugins/glade distclean; $(MAKE) -C tools/designer/plugins/qglwidget distclean; \
+ $(MAKE) -C tools/designer/plugins/glade distclean; \
$(MAKE) -C config.tests/unix/largefile distclean; $(MAKE) -C qmake distclean; \
fi
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.install b/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.install
index 43dc0a94a..d3cfad18a 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.install
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.install
@@ -1,4 +1,4 @@
usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.so
usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.so
usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.so
-usr/include/tqt3/ntqassistantclient.h
+usr/include/tqt3/tqassistantclient.h