summaryrefslogtreecommitdiffstats
path: root/ubuntu
diff options
context:
space:
mode:
Diffstat (limited to 'ubuntu')
-rw-r--r--ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.install2
-rw-r--r--ubuntu/_base/applications/multimedia/amarok/debian/control26
-rw-r--r--ubuntu/_base/applications/multimedia/amarok/debian/libamarok-trinity.install2
-rwxr-xr-xubuntu/_base/applications/multimedia/amarok/debian/rules1
-rw-r--r--ubuntu/_base/applications/office/kile/debian/control2
-rw-r--r--ubuntu/_base/applications/office/kile/debian/patches/series (renamed from ubuntu/_base/applications/office/kile/debian/patches/.gitignore)0
-rwxr-xr-xubuntu/_base/applications/office/kile/debian/rules73
-rw-r--r--ubuntu/_base/applications/office/kile/debian/watch2
-rw-r--r--ubuntu/_base/common/cmake/debian/control2
-rw-r--r--ubuntu/_base/core/tdebase/debian/control2
-rw-r--r--ubuntu/_base/core/tdebindings/debian/control2
-rwxr-xr-xubuntu/_base/core/tdegraphics/debian/rules4
-rw-r--r--ubuntu/_base/core/tdetoys/debian/kweather-trinity.install9
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/cdbs/debian-tde.mk246
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/cdbs/versions.pl19
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/changelog66
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/compat1
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/control61
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/copyright101
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/docs1
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-dev.install31
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-examples.install8
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt.install1
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/patches/series0
-rwxr-xr-xubuntu/_base/dependencies/polkit-tqt/debian/rules23
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/source/format1
-rw-r--r--ubuntu/_base/dependencies/polkit-tqt/debian/source/options6
-rw-r--r--ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs2
-rw-r--r--ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.install3
-rw-r--r--ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides23
-rwxr-xr-xubuntu/_base/dependencies/python-tqt/debian/rules12
-rw-r--r--ubuntu/_base/dependencies/python-tqt/debian/watch3
-rw-r--r--ubuntu/_base/dependencies/sip4-tqt/debian/control3
-rw-r--r--ubuntu/_base/dependencies/sip4-tqt/debian/manpages/sip-tqt.1 (renamed from ubuntu/_base/dependencies/sip4-tqt/debian/manpages/sip.1)20
-rw-r--r--ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages2
-rw-r--r--ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install2
-rwxr-xr-xubuntu/_base/dependencies/sip4-tqt/debian/rules23
-rw-r--r--ubuntu/_base/dependencies/sip4-tqt/debian/sip_tqt_config.py13
-rw-r--r--ubuntu/_base/dependencies/sip4-tqt/debian/sipconfig.py13
-rw-r--r--ubuntu/_base/dependencies/sip4-tqt/debian/watch3
-rw-r--r--ubuntu/_base/dependencies/tqscintilla/debian/cdbs/debian-tde.mk246
-rw-r--r--ubuntu/_base/dependencies/tqscintilla/debian/cdbs/versions.pl19
-rw-r--r--ubuntu/_base/dependencies/tqscintilla/debian/control21
-rw-r--r--ubuntu/_base/dependencies/tqscintilla/debian/dirs2
-rw-r--r--ubuntu/_base/dependencies/tqscintilla/debian/docs1
-rw-r--r--ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-dev.install3
-rw-r--r--ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-doc.install2
-rw-r--r--ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla7-i18n.install1
-rw-r--r--ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla7.install5
-rwxr-xr-xubuntu/_base/dependencies/tqscintilla/debian/rules129
-rwxr-xr-xubuntu/_base/dependencies/tqtinterface/debian/rules9
-rwxr-xr-xubuntu/_base/libraries/libtqt-perl/debian/rules1
-rw-r--r--ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs2
-rw-r--r--ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install2
-rwxr-xr-xubuntu/_base/libraries/python-trinity/debian/rules4
-rw-r--r--ubuntu/_base/libraries/python-trinity/debian/watch3
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/debian/control2
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/debian/kubuntu-default-settings-trinity.postrm3
l---------ubuntu/jammy (renamed from ubuntu/trusty)0
59 files changed, 996 insertions, 273 deletions
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.install b/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.install
index 2be358a21..ed34bb3c2 100644
--- a/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.install
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.install
@@ -31,8 +31,6 @@ debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.so
debian/tmp/opt/trinity/lib/trinity/libamarok_mtp-mediadevice.la
debian/tmp/opt/trinity/lib/trinity/libamarok_mtp-mediadevice.so
debian/tmp/opt/trinity/lib/ruby_lib/* /opt/trinity/lib/ruby_lib/
-debian/tmp/opt/trinity/lib/libamarok.so.0
-debian/tmp/opt/trinity/lib/libamarok.so.0.0.0
debian/tmp/opt/trinity/bin/amarok
debian/tmp/opt/trinity/bin/amarokapp
debian/tmp/opt/trinity/bin/amarok_libvisual
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/control b/ubuntu/_base/applications/multimedia/amarok/debian/control
index 8cd20b0ee..9e0aebf98 100644
--- a/ubuntu/_base/applications/multimedia/amarok/debian/control
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/control
@@ -17,7 +17,7 @@ Homepage: http://amarok.kde.org
Package: amarok-trinity
Architecture: any
-Depends: amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engines-trinity, unzip, ${shlibs:Depends}
+Depends: libamarok-trinity (= ${binary:Version}), amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engines-trinity, unzip, ${shlibs:Depends}
Replaces: amarok-kde3 (<< 4:14.0.0~), amarok-trinity (<< 4:14.0.0~)
Breaks: amarok-kde3 (<< 4:14.0.0~), amarok-trinity (<< 4:14.0.0~)
Suggests: amarok-konqsidebar-trinity, moodbar, konqueror-trinity | www-browser,
@@ -45,6 +45,16 @@ Description: versatile and easy to use audio player for Trinity
Support for libvisual visualization plugins is also compiled in (you need
to have libvisual-0.4-plugins installed to be able to use it).
+Package: libamarok-trinity
+Architecture: any
+Depends: ${shlibs:Depends}
+Breaks: amarok-trinity (<< 4:14.0.11~)
+Replaces: amarok-trinity (<< 4:14.0.11~)
+Description: base library for Amarok [Trinity]
+ This package contains base library needed for Amarok to run properly.
+ Therefore, unless you have 'amarok' package installed, you will hardly
+ find this package useful.
+
Package: amarok-common-trinity
Architecture: all
Depends: ruby
@@ -72,7 +82,7 @@ Description: Amarok sidebar for konqueror [Trinity]
Package: amarok-engines-trinity
Architecture: all
Depends: amarok-engine-xine-trinity (>= ${source:Version}) | amarok-engine-akode-trinity (>= ${source:Version})
-Recommends: amarok-engine-xine-trinity (>= ${source:Version}), amarok-engine-akode-trinity (>= ${source:Version}), amarok-engine-yauap-trinity (>= ${source:Version})
+Recommends: amarok-engine-xine-trinity (>= ${source:Version}), amarok-engine-akode-trinity (>= ${source:Version})
Replaces: amarok-engines-kde3 (<< 4:14.0.0~), amarok-engines-trinity (<< 4:14.0.0~)
Breaks: amarok-engines-kde3 (<< 4:14.0.0~), amarok-engines-trinity (<< 4:14.0.0~)
Description: output engines for the Amarok music player [Trinity]
@@ -100,18 +110,6 @@ Description: xine engine for the Amarok audio player [Trinity]
for some reason over the other engines (e.g., it is the lightest engine
Dependency-wise).
-Package: amarok-engine-yauap-trinity
-Architecture: any
-Depends: yauap, ${shlibs:Depends}
-Replaces: amarok-engine-yauap-kde3 (<< 4:14.0.0~), amarok-engine-yauap-trinity (<< 4:14.0.0~)
-Breaks: amarok-engine-yauap-kde3 (<< 4:14.0.0~), amarok-engine-yauap-trinity (<< 4:14.0.0~)
-Recommends: amarok-trinity (= ${binary:Version})
-Description: Yauap engine for the Amarok audio player [Trinity]
- This package includes Amarok yauap engine, which provides a frontend
- to Yauap Commandline Audio Player. DBus is used as a means of communication
- between the engine and Yauap. Please note that some extra Amarok features
- (like visualizations) might not be available while using this engine.
-
Package: amarok-trinity-dbg
Priority: extra
Architecture: any
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/libamarok-trinity.install b/ubuntu/_base/applications/multimedia/amarok/debian/libamarok-trinity.install
new file mode 100644
index 000000000..69d47ff8d
--- /dev/null
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/libamarok-trinity.install
@@ -0,0 +1,2 @@
+debian/tmp/opt/trinity/lib/libamarok.so.0
+debian/tmp/opt/trinity/lib/libamarok.so.0.0.0
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/rules b/ubuntu/_base/applications/multimedia/amarok/debian/rules
index fce2f7d4a..55c147b76 100755
--- a/ubuntu/_base/applications/multimedia/amarok/debian/rules
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/rules
@@ -15,4 +15,5 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_SKIP_RPATH="OFF" \
-DBUILD_ALL="ON" \
-DWITH_ALL_OPTIONS="ON" \
+ -DWITH_YAUAP="OFF" \
-DWITH_IFP="OFF"
diff --git a/ubuntu/_base/applications/office/kile/debian/control b/ubuntu/_base/applications/office/kile/debian/control
index 7b699f3b0..cb01d0882 100644
--- a/ubuntu/_base/applications/office/kile/debian/control
+++ b/ubuntu/_base/applications/office/kile/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, tdelibs14-trinity-dev, pkg-config, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Homepage: http://kile.sourceforge.net
diff --git a/ubuntu/_base/applications/office/kile/debian/patches/.gitignore b/ubuntu/_base/applications/office/kile/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/office/kile/debian/patches/.gitignore
+++ b/ubuntu/_base/applications/office/kile/debian/patches/series
diff --git a/ubuntu/_base/applications/office/kile/debian/rules b/ubuntu/_base/applications/office/kile/debian/rules
index bd5478578..59bca7cd4 100755
--- a/ubuntu/_base/applications/office/kile/debian/rules
+++ b/ubuntu/_base/applications/office/kile/debian/rules
@@ -1,60 +1,39 @@
#!/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_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
-DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp
-DEB_INSTALL_MANPAGES_kile := debian/kile.1
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
-
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
- cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
- cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
- cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
- cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-
- make -f admin/Makefile.common cvs
- touch debian/stamp-bootstrap
-
-install/kile-trinity-i18n-br::
- -for language in `cd translations; ls -1d */`; do \
- cd $(CURDIR)/$(DEB_BUILDDIR)/translations/$$language; \
- $(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-$$language; \
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
+
+common-install-indep::
+ # Install translations into individual packages
+ -for language in `cd debian/tmp/opt/trinity/share/locale; ls -1d */`; do \
+ pkg_lang=$$(echo $$language | tr '[:upper:]' '[:lower:]' | sed -e s/@latn/latin/ -e s/[@_]//g); \
+ install -d $(CURDIR)/debian/kile-trinity-i18n-$$pkg_lang/opt/trinity/share/locale; \
+ cp -a $(CURDIR)/debian/tmp/opt/trinity/share/locale/$$language \
+ $(CURDIR)/debian/kile-trinity-i18n-$$pkg_lang/opt/trinity/share/locale/$$language; \
+ done
+ -for language in `cd debian/tmp/opt/trinity/share/doc/tde/HTML; ls -1d */ | grep -v '^en/'`; do \
+ pkg_lang=$$(echo $$language | tr '[:upper:]' '[:lower:]' | sed -e s/@latn/latin/ -e s/[@_]//g); \
+ install -d $(CURDIR)/debian/kile-trinity-i18n-$$pkg_lang/opt/trinity/share/doc/tde/HTML; \
+ cp -a $(CURDIR)/debian/tmp/opt/trinity/share/doc/tde/HTML/$$language \
+ $(CURDIR)/debian/kile-trinity-i18n-$$pkg_lang/opt/trinity/share/doc/tde/HTML/$$language; \
done
-
- cd $(CURDIR)/$(DEB_BUILDDIR)/translations/en_GB/; \
- $(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-engb
-
- cd $(CURDIR)/$(DEB_BUILDDIR)/translations/pt_BR/; \
- $(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-ptbr
-
- cd $(CURDIR)/$(DEB_BUILDDIR)/translations/sr@Latn/;\
- $(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-srlatin
-
- cd $(CURDIR)/$(DEB_BUILDDIR)/translations/zh_CN/; \
- $(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-zhcn
install/kile-trinity::
# Install pixmap
install -D -p -m0644 debian/kile.xpm debian/kile-trinity/opt/trinity/share/pixmaps/kile.xpm
- chmod +x debian/tmp/opt/trinity/share/apps/kile/test/runTests.sh
-
clean::
rm -rf debian/kile-trinity-i18n-*
diff --git a/ubuntu/_base/applications/office/kile/debian/watch b/ubuntu/_base/applications/office/kile/debian/watch
deleted file mode 100644
index e372a7062..000000000
--- a/ubuntu/_base/applications/office/kile/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/kile/kile-([\d\.].[\d])\.tar\.bz2 debian svn-upgrade
diff --git a/ubuntu/_base/common/cmake/debian/control b/ubuntu/_base/common/cmake/debian/control
index 1363e01ee..50ea830ef 100644
--- a/ubuntu/_base/common/cmake/debian/control
+++ b/ubuntu/_base/common/cmake/debian/control
@@ -2,7 +2,7 @@ Source: cmake-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake (>= 3.1~)
Standards-Version: 3.8.4
Package: cmake-trinity
diff --git a/ubuntu/_base/core/tdebase/debian/control b/ubuntu/_base/core/tdebase/debian/control
index 651d7e4ea..3dea89d45 100644
--- a/ubuntu/_base/core/tdebase/debian/control
+++ b/ubuntu/_base/core/tdebase/debian/control
@@ -14,7 +14,7 @@ Section: tde
Architecture: all
Replaces: kdebase-kde3 (<< 4:14.0.0~), kdebase-trinity (<< 4:14.0.0~)
Breaks: kdebase-kde3 (<< 4:14.0.0~), kdebase-trinity (<< 4:14.0.0~)
-Depends: kappfinder-trinity (>= ${source:Version}), kate-trinity (>= ${source:Version}), kcontrol-trinity (>= ${source:Version}), tdebase-trinity-bin (>= ${source:Version}), tdebase-data-trinity (>= ${source:Version}), tdebase-tdeio-plugins-trinity (>= ${source:Version}), tdepasswd-trinity (>= ${source:Version}), tdeprint-trinity (>= ${source:Version}), kdesktop-trinity (>= ${source:Version}), kfind-trinity (>= ${source:Version}), khelpcenter-trinity (>= ${source:Version}), kicker-trinity (>= ${source:Version}), klipper-trinity (>= ${source:Version}), kmenuedit-trinity (>= ${source:Version}), konqueror-nsplugins-trinity (>= ${source:Version}), konqueror-trinity (>= ${source:Version}), konsole-trinity (>= ${source:Version}), kpager-trinity (>= ${source:Version}), kpersonalizer-trinity (>= ${source:Version}), ksmserver-trinity (>= ${source:Version}), ksplash-trinity (>= ${source:Version}), ksysguard-trinity (>= ${source:Version}), ktip-trinity (>= ${source:Version}), twin-trinity (>= ${source:Version}), libkonq4-trinity (>= ${source:Version}), xcalib
+Depends: kappfinder-trinity (>= ${source:Version}), kate-trinity (>= ${source:Version}), kcontrol-trinity (>= ${source:Version}), tdebase-trinity-bin (>= ${source:Version}), tdebase-data-trinity (>= ${source:Version}), tdebase-tdeio-plugins-trinity (>= ${source:Version}), tdepasswd-trinity (>= ${source:Version}), tdeprint-trinity (>= ${source:Version}), kdesktop-trinity (>= ${source:Version}), kfind-trinity (>= ${source:Version}), khelpcenter-trinity (>= ${source:Version}), kicker-trinity (>= ${source:Version}), klipper-trinity (>= ${source:Version}), kmenuedit-trinity (>= ${source:Version}), konqueror-nsplugins-trinity (>= ${source:Version}), konqueror-trinity (>= ${source:Version}), konsole-trinity (>= ${source:Version}), kpager-trinity (>= ${source:Version}), kpersonalizer-trinity (>= ${source:Version}), ksmserver-trinity (>= ${source:Version}), ksplash-trinity (>= ${source:Version}), ksysguard-trinity (>= ${source:Version}), ktip-trinity (>= ${source:Version}), twin-trinity (>= ${source:Version}), libkonq4-trinity (>= ${source:Version}), xcalib | argyll
Recommends: tdm-trinity (>= ${source:Version}), tdebase-runtime-data-common-trinity, libtqt3-integration-trinity
Suggests: tdebase-trinity-doc-html (>= ${source:Version})
Description: base components from the official TDE release
diff --git a/ubuntu/_base/core/tdebindings/debian/control b/ubuntu/_base/core/tdebindings/debian/control
index 52758928a..651da2701 100644
--- a/ubuntu/_base/core/tdebindings/debian/control
+++ b/ubuntu/_base/core/tdebindings/debian/control
@@ -1,7 +1,7 @@
Source: tdebindings-trinity
Build-Depends: cdbs (>= 0.4.43), debhelper (>= 9~),
python-all-dev (>= 2.3.5-11), python-support (>= 0.5) | dh-python, quilt, gawk,
- default-jdk [amd64 i386 armel armhf arm64 mipsel ia64 powerpc riscv64 s390 sparc],
+ default-jdk [amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc],
tdelibs14-trinity-dev, libtqt3-compat-headers (>= 3:3.3.5),
ruby, ruby-dev, flex, bison, libpkcs11-helper1-dev, automake, autoconf, libtool, libltdl-dev
Section: devel
diff --git a/ubuntu/_base/core/tdegraphics/debian/rules b/ubuntu/_base/core/tdegraphics/debian/rules
index d29cd5566..5598266c2 100755
--- a/ubuntu/_base/core/tdegraphics/debian/rules
+++ b/ubuntu/_base/core/tdegraphics/debian/rules
@@ -26,9 +26,7 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_SKIP_RPATH="OFF" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DBUILD_ALL="ON" \
- -DWITH_TIFF="ON" \
- -DWITH_OPENEXR="ON" \
- -DWITH_PDF="ON"
+ -DWITH_ALL_OPTIONS="ON"
DEB_DH_STRIP_ARGS := --dbg-package=tdegraphics-trinity-dbg
diff --git a/ubuntu/_base/core/tdetoys/debian/kweather-trinity.install b/ubuntu/_base/core/tdetoys/debian/kweather-trinity.install
index 34499d446..4ce8d6ef8 100644
--- a/ubuntu/_base/core/tdetoys/debian/kweather-trinity.install
+++ b/ubuntu/_base/core/tdetoys/debian/kweather-trinity.install
@@ -2,10 +2,12 @@ debian/tmp/opt/trinity/bin/kweatherservice
debian/tmp/opt/trinity/bin/kweatherreport
debian/tmp/opt/trinity/lib/libtdeinit_kweatherreport.so
debian/tmp/opt/trinity/lib/libtdeinit_kweatherreport.la
-debian/tmp/opt/trinity/lib/trinity/kcm_weather.so
-debian/tmp/opt/trinity/lib/trinity/kcm_weather.la
+debian/tmp/opt/trinity/lib/trinity/kcm_weatherapplet.so
+debian/tmp/opt/trinity/lib/trinity/kcm_weatherapplet.la
debian/tmp/opt/trinity/lib/trinity/kcm_weatherservice.so
debian/tmp/opt/trinity/lib/trinity/kcm_weatherservice.la
+debian/tmp/opt/trinity/lib/trinity/kcm_weatherstations.so
+debian/tmp/opt/trinity/lib/trinity/kcm_weatherstations.la
debian/tmp/opt/trinity/lib/trinity/kweatherreport.so
debian/tmp/opt/trinity/lib/trinity/kweatherreport.la
debian/tmp/opt/trinity/lib/trinity/weather_panelapplet.la
@@ -27,5 +29,6 @@ debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kweather.png
debian/tmp/opt/trinity/share/man/man1/kweatherreport.1
debian/tmp/opt/trinity/share/man/man1/kweatherservice.1
debian/tmp/opt/trinity/share/services/kweatherservice.desktop
-debian/tmp/opt/trinity/share/services/kcmweather.desktop
+debian/tmp/opt/trinity/share/services/kcmweatherapplet.desktop
debian/tmp/opt/trinity/share/services/kcmweatherservice.desktop
+debian/tmp/opt/trinity/share/services/kcmweatherstations.desktop
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/polkit-tqt/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- 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 = .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
+
+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/dependencies/polkit-tqt/debian/cdbs/versions.pl b/ubuntu/_base/dependencies/polkit-tqt/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/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/dependencies/polkit-tqt/debian/changelog b/ubuntu/_base/dependencies/polkit-tqt/debian/changelog
new file mode 100644
index 000000000..58e4a45de
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/changelog
@@ -0,0 +1,66 @@
+polkit-tqt (0.103.0-2) unstable; urgency=low
+
+ * Port to TQt3 and package renaming
+ * Initial release for TDE
+
+ -- Michele Calgaro <michele.calgaro@yahoo.it> Mon, 01 Nov 2021 14:03:00 +0900
+
+polkit-qt-1 (0.103.0-1) unstable; urgency=low
+
+ * New upstream release.
+ - fix annoying crash on shutdown. (Closes: #651815)
+
+ [ Felix Geyer ]
+ * Modify CFLAGS/CXXFLAGS after including debian-qt-kde.mk so the changes are
+ not overwritten.
+
+ [ Fathi Boudra ]
+ * Update debian/compat: bump to 8.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 14 Dec 2011 09:15:10 -0500
+
+polkit-qt-1 (0.99.0-3) unstable; urgency=low
+
+ [ Modestas Vainius ]
+ * Update symbol files.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 26 May 2011 00:31:01 +0300
+
+polkit-qt-1 (0.99.0-2) experimental; urgency=low
+
+ * Bump Standards-Version to 3.9.2: no changes needed.
+ * Build library with -fvisibility=hidden -fvisibility-inlines-hidden.
+ * Update symbol file: many private symbols are gone due to above.
+
+ -- Modestas Vainius <modax@debian.org> Thu, 28 Apr 2011 11:53:35 +0300
+
+polkit-qt-1 (0.99.0-1) experimental; urgency=low
+
+ * New upstream release.
+
+ [ Modestas Vainius ]
+ * Add Vcs fields to debian/control.
+ * Switch debian/rules engine to qt-kde-team/2/*.
+ * Bump Standards-Version to 3.9.1: no changes needed.
+ * Remove dupe "Section" field from debian/control.
+ * Include verbatim BSD license to debian/copyright.
+ * Override lintian libpolkit-qt-1-0: package-name-doesnt-match-sonames.
+ * Use more failsafe wildcards in libpolkit-qt-1-0.install.
+ * Add myself to Uploaders.
+ * SONAME bumped: rename libpolkit-qt-1-0 to libpolkit-qt-1-1.
+ * Add symbol file for libpolkit-qt-1-1.
+ * Update debian/copyright.
+
+ [ Didier Raboud ]
+ * Bump B-D of libpolkit to >= 0.98.
+
+ [ José Manuel Santamaría Lema ]
+ * Update installed files.
+
+ -- Modestas Vainius <modax@debian.org> Mon, 14 Mar 2011 01:03:06 +0200
+
+polkit-qt-1 (0.95.1-1) unstable; urgency=low
+
+ * Initial release. (Closes: #565395)
+
+ -- Fathi Boudra <fabo@debian.org> Fri, 15 Jan 2010 12:50:13 +0100
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/compat b/ubuntu/_base/dependencies/polkit-tqt/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/control b/ubuntu/_base/dependencies/polkit-tqt/debian/control
new file mode 100644
index 000000000..7da8dc684
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/control
@@ -0,0 +1,61 @@
+Source: polkit-tqt
+Section: devel
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqtinterface-dev,
+ libpolkit-gobject-1-dev, libpolkit-agent-1-dev, libdbus-1-tqt-dev
+Standards-Version: 3.9.2
+
+Package: libpolkit-tqt
+Section: libs
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, policykit-1
+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.
+ .
+ It is a framework for centralizing the decision making process with respect to
+ granting access to privileged operations for unprivileged (desktop) applications.
+ .
+ libpolkit-tqt provides convenience classes and methods for TQt/TDE
+ applications that want to use PolicyKit.
+ .
+ This package contains the files necessary for running applications that use
+ the libpolkit-tqt library.
+
+Package: libpolkit-tqt-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: foreign
+Depends: libpolkit-tqt (= ${binary:Version}), libtqtinterface-dev
+Suggests: libpolkit-tqt-examples
+Description: PolicyKit-tqt development files
+ PolicyKit is an application-level toolkit for defining and handling the policy
+ that allows unprivileged processes to speak to privileged processes.
+ .
+ It is a framework for centralizing the decision making process with respect to
+ granting access to privileged operations for unprivileged (desktop) applications.
+ .
+ libpolkit-tqt provides convenience classes and methods for TQt/TDE
+ applications that want to use PolicyKit.
+ .
+ This package contains the development libraries and headers.
+
+Package: libpolkit-tqt-examples
+Section: libs
+Architecture: any
+Multi-Arch: foreign
+Depends: ${shlibs:Depends}, policykit-1
+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.
+ .
+ It is a framework for centralizing the decision making process with respect to
+ granting access to privileged operations for unprivileged (desktop) applications.
+ .
+ libpolkit-tqt provides convenience classes and methods for TQt/TDE
+ applications that want to use PolicyKit.
+ .
+ This package contains example files and applications.
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/copyright b/ubuntu/_base/dependencies/polkit-tqt/debian/copyright
new file mode 100644
index 000000000..19e2663aa
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/copyright
@@ -0,0 +1,101 @@
+This code was ported to TQt3 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/polkit-qt-1/0.103.0-1/
+
+Original polkit-qt-1 code was packaged for Debian by:
+
+ Fathi Boudra <fabo@debian.org> on Fri, 15 Jan 2010 12:50:13 +0100
+
+It was downloaded from ftp://ftp.kde.org/pub/kde/stable/apps/KDE4.x/admin/
+
+Upstream Authors:
+
+ Daniel Nicoletti <dantti85-dev@yahoo.com.br>
+ Dario Freddi <drf@kde.org>
+ Jaroslav Reznik <jreznik@redhat.com>
+ Radek Novacek <rnovacek@redhat.com>
+ Lukas Tinkl <ltinkl@redhat.com>
+ Pino Toscano <pino@kde.org>
+
+Copyright:
+
+ Copyright (C) 2008-2009 Daniel Nicoletti
+ Copyright (C) 2009-2010 Dario Freddi
+ Copyright (C) 2009 Jaroslav Reznik
+ Copyright (C) 2009 Radek Novacek
+ Copyright (C) 2009 Lukas Tinkl
+
+Copyright for polkit-tqt-export.h file:
+
+ Copyright (C) 2009 Dario Freddi <drf@kde.org>
+ Copyright (C) 2007 David Faure <faure@kde.org>
+
+Copyright for polkittqt1-version.h.cmake file:
+
+ Copyright (C) 2009 Dario Freddi <drf@kde.org>
+ Copyright (C) 2007 Sebastian Trueg <trueg@kde.org>
+
+Copyright for cmake/modules/FindAutomoc4.cmake file:
+
+ Copyright (C) 2008-2009 Alexander Neundorf <neundorf@kde.org>
+
+Copyright for cmake/modules/MacroPushRequiredVars.cmake file:
+
+ Copyright (C) 2006 Alexander Neundorf <neundorf@kde.org>
+
+Copyright for cmake/modules/InstallSettings.cmake file:
+
+ Copyright (C) 2008 Kevin Krammer <kevin.krammer@gmx.at>
+
+License for cmake modules:
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License:
+
+ This package 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 of the License, or (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL-2' and
+`/usr/share/common-licenses/LGPL-3'.
+
+The Debian packaging is:
+
+ Copyright (C) 2010 Fathi Boudra <fabo@debian.org>
+ Copyright (C) 2011 Modestas Vainius <modax@debian.org>
+
+and is licensed under the GPL version 2 or any later version.
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/docs b/ubuntu/_base/dependencies/polkit-tqt/debian/docs
new file mode 100644
index 000000000..e845566c0
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/docs
@@ -0,0 +1 @@
+README
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-dev.install b/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-dev.install
new file mode 100644
index 000000000..698c043d8
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-dev.install
@@ -0,0 +1,31 @@
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/ActionDescription
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Agent/Listener
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Agent/Session
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Authority
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Details
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Gui/Action
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Gui/ActionButton
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Gui/ActionButtons
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Identity
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Subject
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/TemporaryAuthorization
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-actiondescription.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-agent-listener.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-agent-session.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-authority.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-details.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-export.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-gui-action.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-gui-actionbutton.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-gui-actionbuttons.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-identity.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-subject.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-temporaryauthorization.h
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libpolkit-tqt-agent.so
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libpolkit-tqt-core.so
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libpolkit-tqt-gui.so
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/polkit-tqt.pc
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/polkit-tqt-agent.pc
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/polkit-tqt-core.pc
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/polkit-tqt-gui.pc
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/polkit-tqt.cmake
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-examples.install b/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-examples.install
new file mode 100644
index 000000000..5bb70628a
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-examples.install
@@ -0,0 +1,8 @@
+debian/tmp/etc/dbus-1/system.d/org.tqt.policykit.examples.conf
+debian/tmp/usr/bin/polkit-tqt-agent-example
+debian/tmp/usr/bin/polkit-tqt-example
+debian/tmp/usr/bin/polkit-tqt-example-helper
+debian/tmp/usr/share/apps/polkit-tqt/examples/*
+debian/tmp/usr/share/apps/polkit-tqt/icons/*
+debian/tmp/usr/share/dbus-1/system-services/org.tqt.policykit.examples.service
+debian/tmp/usr/share/polkit-1/actions/org.tqt.policykit.examples.policy
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt.install b/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt.install
new file mode 100644
index 000000000..1bbe0900a
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libpolkit-tqt-*.so.*
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/patches/series b/ubuntu/_base/dependencies/polkit-tqt/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/patches/series
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/rules b/ubuntu/_base/dependencies/polkit-tqt/debian/rules
new file mode 100755
index 000000000..71edffe1c
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/rules
@@ -0,0 +1,23 @@
+#!/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
+
+ifdef DEB_HOST_MULTIARCH
+ CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH)
+else
+ CMAKE_INSTALL_LIBDIR = lib
+endif
+
+# Build options
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \
+ -DWITH_ALL_OPTIONS="ON" \
+ -DBUILD_ALL="ON"
+
+DEB_MAKE_CHECK_TARGET = check
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/source/format b/ubuntu/_base/dependencies/polkit-tqt/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/source/options b/ubuntu/_base/dependencies/polkit-tqt/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/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/dependencies/python-tqt/debian/python-tqt-dev.dirs b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs
index ae635cbcd..735874a93 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs
+++ b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs
@@ -1 +1 @@
-usr/share/sip/tqt
+usr/share/sip-tqt/tqt
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.install b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.install
index 7b6aca191..0f144be95 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.install
+++ b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.install
@@ -1,2 +1 @@
-sip/* usr/share/sip/tqt
-
+sip/* usr/share/sip-tqt/tqt
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides
index 36e6c1349..bd57734b2 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides
+++ b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides
@@ -1,15 +1,14 @@
# lintian test overriden as the files tripping this error are put into the source
# of the generated package. This is a false-positive
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qt/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtaxcontainer/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtcanvas/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtext/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtgl/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtnetwork/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtpe/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtsql/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qttable/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtui/copying.sip
-python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtxml/copying.sip
-
+python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qt/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtaxcontainer/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtcanvas/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtext/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtgl/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtnetwork/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtpe/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtsql/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qttable/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtui/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtxml/copying.sip
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/rules b/ubuntu/_base/dependencies/python-tqt/debian/rules
index 72a8d8dc0..9f597b2eb 100755
--- a/ubuntu/_base/dependencies/python-tqt/debian/rules
+++ b/ubuntu/_base/dependencies/python-tqt/debian/rules
@@ -58,12 +58,12 @@ build-%/configure-stamp:
mkdir -p build-$*
cd build-$* && echo yes \
| python$* ../configure.py \
- -c -n /usr/include/tqscintilla \
+ -c -n /usr/include/tqt3 \
-e python$* \
- -o /usr/lib -u -j $(SPLIT) \
+ -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(SPLIT) \
-d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
-l /usr/include/python$* \
- -v /usr/share/sip/tqt \
+ -v /usr/share/sip-tqt/tqt \
-m /usr/lib/python$*/config \
CXXFLAGS_RELEASE="" CXXFLAGS="${CXXFLAGS}" STRIP=""
touch $@
@@ -73,12 +73,12 @@ dbg-build-%/configure-stamp:
mkdir -p dbg-build-$*
cd dbg-build-$* && echo yes \
| python$*-dbg ../configure.py \
- -c -n /usr/include/tqscintilla \
+ -c -n /usr/include/tqt3 \
-e python$* \
- -o /usr/lib -u -j $(SPLIT) \
+ -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(SPLIT) \
-d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
-l /usr/include/python$*_d \
- -v /usr/share/sip/tqt \
+ -v /usr/share/sip-tqt/tqt \
-m /usr/lib/python$*/config_d \
CXXFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt" STRIP=""
touch $@
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/watch b/ubuntu/_base/dependencies/python-tqt/debian/watch
deleted file mode 100644
index 506321d38..000000000
--- a/ubuntu/_base/dependencies/python-tqt/debian/watch
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-http://www.riverbankcomputing.com/software/pyqt/download3 \
- /static/Downloads/PyQt3/PyQt-x11-gpl-([.\d]*)\.tar\.gz
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/control b/ubuntu/_base/dependencies/sip4-tqt/debian/control
index bdd8f4eb0..68283ead1 100644
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/control
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org>
-Build-Depends: debhelper (>= 9~), python-all-dev (>= 2.3.5-10), python-all-dbg, python-support (>= 0.7.1) | dh-python, libtqtinterface-dev
+Build-Depends: debhelper (>= 9~), python-all-dev (>= 2.3.5-10), python-all-dbg, python-support (>= 0.7.1) | dh-python, libtqtinterface-dev, bison, flex
Standards-Version: 3.8.4
XS-Python-Version: all
@@ -67,4 +67,3 @@ Description: Python/C++ bindings generator development files
.
This package contains the code generator tool and the development headers
needed to develop Python bindings with sip.
-
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/sip.1 b/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/sip-tqt.1
index ce178cc7e..ef824974f 100644
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/sip.1
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/sip-tqt.1
@@ -1,26 +1,26 @@
.\"
.\" Created by Ricardo Crdenes Medina <ricardo@conysis.com>
-.\" for the Debian 'sip' package
+.\" for the Debian 'sip-tqt' package
.\"
-.TH SIP 1 "2010/02/02"
+.TH SIP-TQT 1 "2010/02/02"
.SH NAME
-sip \- generates C++/Python bindings
+sip-tqt \- generates C++/Python bindings
.SH SYNOPSIS
-.B sip
+.B sip-tqt
[\fI-h\fR] [\fI-V\fR] [\fI-a file\fR] [\fI-c dir\fR] [\fI-d file\fR] [\fI-e\fR] [\fI-g\fR] [\fI-I dir\fR] [\fI-j #\fR] [\fI-k\fR] [\fI-m file\fR] [\fI-o\fR] [\fI-p module\fR] [\fI-P\fR] [\fI-r\fR] [\fI-s suffix\fR] [\fI-t tag\fR] [\fI-w\fR] [\fI-x feature\fR] [\fI-z file\fR] [\fIfile\fR]
.SH DESCRIPTION
-.B sip
+.B sip-tqt
takes a set of specification files and generates C++ code, documentation and build files.
The format of the needed specification file is similar to a C++ header.
-sip includes run-time support for the generated code.
+sip-tqt includes run-time support for the generated code.
.SH OPTIONS
.TP
.B \-h
Show summary of options.
.TP
.B \-V
-Display the sip version number
+Display the sip-tqt version number
.TP
.B \-a file
The name of the QScintilla API file. If not indicated, it will not
@@ -43,7 +43,7 @@ Enable support for exceptions. Disabled by default.
Always release and reaquire the GIL.
.TP
.B -I dir
-Directory where sip can search for included files.
+Directory where sip-tqt can search for included files.
.TP
.B -j number
Splits the generated code in \fInumber\fR files (1 by default). This
@@ -66,7 +66,7 @@ The suffix used for generated C or C++ files (".c" or ".cpp" if none specified)
.TP
.B -t tag
The primary version to tag generate code for. You only can specify those
-defined with a %Timeline directive. If you don't specify one, sip
+defined with a %Timeline directive. If you don't specify one, sip-tqt
will generate the latest available.
.TP
.B -w
@@ -80,7 +80,7 @@ The name of a file containing additional command line flags
.TP
.B file
The name of the file containing the specification. If you skip it,
-sip will expect to be fed by stdin.
+sip-tqt will expect to be fed by stdin.
.SH AUTHOR
This manual page was written by Ricardo Javier Cardenes Medina <rcardenes@debian.org> and Torsten Marek <shlomme@debian.org>,
for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages b/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages
index ba33bb512..b3b0eafea 100644
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages
@@ -1,2 +1,2 @@
-debian/manpages/sip.1
+debian/manpages/sip-tqt.1
debian/manpages/dh_sip_tqt.1
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install b/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install
index 9639c2814..bfa1b37f6 100644
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install
@@ -1 +1 @@
-usr/lib/python*/*-packages/sip4_tqt/sip.so
+usr/lib/python*/*-packages/sip_tqt.so
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/rules b/ubuntu/_base/dependencies/sip4-tqt/debian/rules
index 1feb9c154..1b07c97d2 100755
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/rules
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/rules
@@ -47,7 +47,7 @@ build-%/configure-stamp:
mkdir -p build-$*
cd build-$* \
&& python$* ../configure.py \
- -d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \
+ -d /usr/lib/python$*/$(call py_sitename,$*) \
-g python$* \
-u STRIP="" CFLAGS="${CFLAGS} -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CFLAGS_RELEASE="" CXXFLAGS="${CFLAGS} -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CXXFLAGS_RELEASE=""
touch $@
@@ -57,7 +57,7 @@ dbg-build-%/configure-stamp:
mkdir -p dbg-build-$*
cd dbg-build-$* \
&& python$*-dbg ../configure.py \
- -d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \
+ -d /usr/lib/python$*/$(call py_sitename,$*) \
-g python$* \
-e /usr/include/python$*_d \
-u CFLAGS="-O0 -g -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CXXFLAGS_RELEASE="" STRIP=""
@@ -110,18 +110,17 @@ install-arch: build
install-arch-%:
$(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp
$(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-sip-tqt-dbg
- mkdir -p debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/
- touch debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/__init__.py
- install -m 644 -o root -g root debian/sipconfig.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/
- install -m 644 -o root -g root build-$*/sipconfig.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/sipconfig_nd.py
- install -m 644 -o root -g root dbg-build-$*/sipconfig.py debian/python-sip-tqt-dbg/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/sipconfig_d.py
+ mkdir -p debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/
+ install -m 644 -o root -g root debian/sip_tqt_config.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip_tqt_config.py
+ install -m 644 -o root -g root build-$*/sip_tqt_config.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip_tqt_config_nd.py
+ install -m 644 -o root -g root dbg-build-$*/sip_tqt_config.py debian/python-sip-tqt-dbg/usr/lib/python$*/$(call py_sitename,$*)/sip_tqt_config_d.py
mkdir -p debian/python-sip-tqt-dev/usr/include/python$*
- install -m 644 -o root -g root siplib/sip.h debian/python-sip-tqt-dev/usr/include/python$*/
+ install -m 644 -o root -g root siplib/sip-tqt.h debian/python-sip-tqt-dev/usr/include/python$*/
mkdir -p debian/python-sip-tqt-dev/usr/include/python$*_d
- ln -s ../python$*/sip.h \
- debian/python-sip-tqt-dev/usr/include/python$*_d/sip.h
- mkdir -p debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt
- install -m 644 -o root -g root sipdistutils.py debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt
+ ln -s ../python$*/sip-tqt.h \
+ debian/python-sip-tqt-dev/usr/include/python$*_d/sip-tqt.h
+ mkdir -p debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*)
+ install -m 644 -o root -g root sip_tqt_distutils.py debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*)
# Must not depend on anything. This is to be called by
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/sip_tqt_config.py b/ubuntu/_base/dependencies/sip4-tqt/debian/sip_tqt_config.py
new file mode 100644
index 000000000..33ebcb65b
--- /dev/null
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/sip_tqt_config.py
@@ -0,0 +1,13 @@
+# import the sip_tqt_config.py for the normal or the debug build
+
+import sys
+
+if getattr(sys, "pydebug", False):
+ try:
+ from sip_tqt_config_d import *
+ from sip_tqt_config_d import _pkg_config, _default_macros
+ except ImportError, msg:
+ raise ImportError, 'No module named sip_config; package python-sip-tqt-dbg not installed'
+else:
+ from sip_tqt_config_nd import *
+ from sip_tqt_config_nd import _pkg_config, _default_macros
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/sipconfig.py b/ubuntu/_base/dependencies/sip4-tqt/debian/sipconfig.py
deleted file mode 100644
index a9e761f08..000000000
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/sipconfig.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# import the sipconfig.py for the normal or the debug build
-
-import sys
-
-if getattr(sys, "pydebug", False):
- try:
- from sipconfig_d import *
- from sipconfig_d import _pkg_config, _default_macros
- except ImportError, msg:
- raise ImportError, 'No module named sipconfig; package python-sip-tqt-dbg not installed'
-else:
- from sipconfig_nd import *
- from sipconfig_nd import _pkg_config, _default_macros
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/watch b/ubuntu/_base/dependencies/sip4-tqt/debian/watch
deleted file mode 100644
index 1ff1f0839..000000000
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/watch
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-http://www.riverbankcomputing.co.uk/software/sip/download \
- /static/Downloads/sip4/sip-([\d\.]*)\.tar\.gz debian uupdate
diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/tqscintilla/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/ubuntu/_base/dependencies/tqscintilla/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- 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 = .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
+
+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/dependencies/tqscintilla/debian/cdbs/versions.pl b/ubuntu/_base/dependencies/tqscintilla/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_base/dependencies/tqscintilla/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/dependencies/tqscintilla/debian/control b/ubuntu/_base/dependencies/tqscintilla/debian/control
index e89abba2a..9d4458b48 100644
--- a/ubuntu/_base/dependencies/tqscintilla/debian/control
+++ b/ubuntu/_base/dependencies/tqscintilla/debian/control
@@ -3,15 +3,17 @@ Section: libs
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
Uploaders: Torsten Marek <shlomme@debian.org>
-Build-Depends: debhelper (>= 9~), libtqt3-mt-dev, tqt3-dev-tools, libtqtinterface-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqt3-mt-dev, tqt3-dev-tools, libtqtinterface-dev
Standards-Version: 3.8.4
Package: libtqscintilla7
Section: libs
Architecture: any
+Multi-Arch: same
Replaces: libtqscintilla7 (<< 4:14.0.0~)
Breaks: libtqscintilla7 (<< 4:14.0.0~)
Depends: ${shlibs:Depends}
+Recommends: libtqscintilla7-i18n
Description: TQt source code editing component based on Scintilla
Scintilla is a free source code editing component. It has features found
in standard editing components, as well as features especially useful
@@ -19,9 +21,23 @@ Description: TQt source code editing component based on Scintilla
.
TQScintilla is a port or Scintilla to the TQt GUI toolkit.
+Package: libtqscintilla7-i18n
+Section: libs
+Architecture: all
+Multi-Arch: foreign
+Replaces: libtqscintilla7 (<< 4:14.0.12~)
+Breaks: libtqscintilla7 (<< 4:14.0.12~)
+Description: i18n files for TQScintilla library
+ Scintilla is a free source code editing component. It has features found
+ in standard editing components, as well as features especially useful
+ when editing and debugging source code.
+ .
+ This package contains the internationalization files for the TQScintilla library.
+
Package: libtqscintilla-dev
Section: libdevel
-Architecture: all
+Architecture: any
+Multi-Arch: foreign
Replaces: libtqscintilla-dev (<< 4:14.0.0~)
Breaks: libtqscintilla-dev (<< 4:14.0.0~)
Depends: libtqscintilla7 (>= ${source:Version})
@@ -36,6 +52,7 @@ Description: TQt source code editing component - development files
Package: libtqscintilla-doc
Section: doc
Architecture: all
+Multi-Arch: foreign
Replaces: libtqscintilla-doc (<< 4:14.0.0~)
Breaks: libtqscintilla-doc (<< 4:14.0.0~)
Suggests: libtqscintilla-dev
diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/dirs b/ubuntu/_base/dependencies/tqscintilla/debian/dirs
deleted file mode 100644
index ca882bbb7..000000000
--- a/ubuntu/_base/dependencies/tqscintilla/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/docs b/ubuntu/_base/dependencies/tqscintilla/debian/docs
index edc007104..50bd824bb 100644
--- a/ubuntu/_base/dependencies/tqscintilla/debian/docs
+++ b/ubuntu/_base/dependencies/tqscintilla/debian/docs
@@ -1 +1,2 @@
NEWS
+README
diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-dev.install b/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-dev.install
index e183cf963..8a9449faa 100644
--- a/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-dev.install
+++ b/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-dev.install
@@ -1,2 +1,3 @@
usr/include
-usr/lib/*.so
+usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
+usr/lib/$(DEB_HOST_MULTIARCH)/*.so
diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-doc.install b/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-doc.install
index 005276324..d66379c9a 100644
--- a/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-doc.install
+++ b/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-doc.install
@@ -1 +1 @@
-usr/share/doc/libtqscintilla-doc
+usr/share/doc/libtqscintilla/HTML
diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla7-i18n.install b/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla7-i18n.install
new file mode 100644
index 000000000..8fc621fc3
--- /dev/null
+++ b/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla7-i18n.install
@@ -0,0 +1 @@
+usr/share/tqt3/translations/*.qm
diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla7.install b/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla7.install
index 2cfef7f8a..b3c140659 100644
--- a/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla7.install
+++ b/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla7.install
@@ -1,3 +1,2 @@
-usr/lib/*.so.*
-usr/lib/tqt3/plugins/designer/*.so
-usr/share/tqt3/translations/*.qm
+usr/lib/$(DEB_HOST_MULTIARCH)/*.so.*
+usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/designer/*.so
diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/rules b/ubuntu/_base/dependencies/tqscintilla/debian/rules
index e87355584..bcf875516 100755
--- a/ubuntu/_base/dependencies/tqscintilla/debian/rules
+++ b/ubuntu/_base/dependencies/tqscintilla/debian/rules
@@ -1,117 +1,20 @@
-#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+#! /usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include debian/cdbs/debian-tde.mk
-# 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)
+ifdef DEB_HOST_MULTIARCH
+ CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH)
+else
+ CMAKE_INSTALL_LIBDIR = lib
endif
-# This is the debhelper compatibility version to use.
-export TQTDIR=/usr/share/tqt3
-export QMAKESPEC=$(TQTDIR)/mkspecs/linux-g++
-DOCDEST=$(CURDIR)/debian/tmp/usr/share/doc/libtqscintilla-doc/html
-HEADERDEST=$(CURDIR)/debian/tmp/usr/include/tqscintilla
-LIBSDEST=$(CURDIR)/debian/tmp/usr/lib
-TRANSDEST=$(CURDIR)/debian/tmp/$(TQTDIR)/translations
-PLUGINDEST=$(CURDIR)/debian/tmp/usr/lib/tqt3/plugins/designer
-
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- cd qt; qmake "DESTDIR=$(CURDIR)/tmplib"
- cd designer; qmake
- touch configure-stamp
-
-build build-arch: build-stamp
-build-indep:
-
-build-stamp: configure-stamp
- dh_testdir
-
- install -d $(CURDIR)/tmplib
- $(MAKE) -C qt
- $(MAKE) -C designer
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- [ ! -f qt/Makefile ] || $(MAKE) -C qt clean
- [ ! -f designer/Makefile ] || $(MAKE) -C designer clean
- -find -name 'Makefile' -exec rm {} \;
- -rm -rf tmplib
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- install -d $(HEADERDEST)/private
- install -d $(DOCDEST)
- install -d $(TRANSDEST)
- install -d $(LIBSDEST)
- install -d $(PLUGINDEST)
- for i in qt/qextscintilla*.h; do install -m 644 $$i $(HEADERDEST); done
- for i in include/*.h; do install -m 644 $$i $(HEADERDEST)/private; done
- for i in doc/html/*; do install -m 644 $$i $(DOCDEST); done
- for i in qt/*.qm; do install -m 644 $$i $(TRANSDEST); done
- mv designer/*.so $(PLUGINDEST)
- for i in tmplib/*; do mv $$i $(LIBSDEST); done
-
-
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir -i
- dh_testroot -i
- dh_install -i --sourcedir=$(CURDIR)/debian/tmp
- dh_installdocs -i
- dh_installchangelogs -i ChangeLog
- dh_link -i
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS)
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir -a
- dh_testroot -a
- dh_install -a --sourcedir=$(CURDIR)/debian/tmp
- dh_installdocs -a
- dh_installchangelogs -a ChangeLog
- dh_link -a
- dh_strip -a
- dh_compress -a
- dh_fixperms -a
- dh_makeshlibs -a -V
- dh_installdeb -a
- dh_shlibdeps -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a $(DEB_DH_BUILDDEB_ARGS)
-
-binary: binary-indep binary-arch
-.PHONY: build build-arch clean binary-indep binary-arch binary install configure
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/rules b/ubuntu/_base/dependencies/tqtinterface/debian/rules
index 5772f17f6..0db17ad7b 100755
--- a/ubuntu/_base/dependencies/tqtinterface/debian/rules
+++ b/ubuntu/_base/dependencies/tqtinterface/debian/rules
@@ -7,8 +7,15 @@ include debian/cdbs/debian-tde.mk
version=Debian Package $(DEB_VERSION)
DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION)
+ifdef DEB_HOST_MULTIARCH
+ CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH)
+else
+ CMAKE_INSTALL_LIBDIR = lib
+endif
+
DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
-DCMAKE_INSTALL_PREFIX="/usr" \
-DCMAKE_VERBOSE_MAKEFILE="ON" \
- -DCMAKE_BUILD_TYPE=RelWithDebInfo
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR)
diff --git a/ubuntu/_base/libraries/libtqt-perl/debian/rules b/ubuntu/_base/libraries/libtqt-perl/debian/rules
index c498ce8ca..85d92e923 100755
--- a/ubuntu/_base/libraries/libtqt-perl/debian/rules
+++ b/ubuntu/_base/libraries/libtqt-perl/debian/rules
@@ -24,7 +24,6 @@ DEB_CONFIGURE_EXTRA_FLAGS += \
--prefix=/opt/trinity \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
- --with-qt-dir=/usr/share/tqt3 \
--disable-rpath \
DEB_MAKE_INSTALL_TARGET := install \
diff --git a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs
index c395de89f..62e887ce2 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs
+++ b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs
@@ -1 +1 @@
-opt/trinity/share/sip/trinity
+opt/trinity/share/sip-tqt/trinity
diff --git a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install
index f7d970bcb..17b8480ab 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install
+++ b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install
@@ -1,2 +1,2 @@
-sip/* opt/trinity/share/sip/trinity
+sip/* opt/trinity/share/sip-tqt/trinity
contrib/tdepyuic opt/trinity/bin/
diff --git a/ubuntu/_base/libraries/python-trinity/debian/rules b/ubuntu/_base/libraries/python-trinity/debian/rules
index ddbb6b15f..532c74f7f 100755
--- a/ubuntu/_base/libraries/python-trinity/debian/rules
+++ b/ubuntu/_base/libraries/python-trinity/debian/rules
@@ -56,7 +56,7 @@ build-%/configure-stamp:
cd build-$* && python$* ../configure.py \
-c -u -k /opt/trinity -o /opt/trinity/include -n /opt/trinity/lib \
-e python$* \
- -v /opt/trinity/share/sip/trinity -j $(SPLIT)
+ -v /opt/trinity/share/sip-tqt/trinity -j $(SPLIT)
touch $@
dbg-build-%/configure-stamp:
@@ -65,7 +65,7 @@ dbg-build-%/configure-stamp:
cd dbg-build-$* && python$*-dbg ../configure.py \
-c -u -k /opt/trinity -o /opt/trinity/include -n /opt/trinity/lib \
-e python$* \
- -v /opt/trinity/share/sip/trinity -j $(SPLIT)
+ -v /opt/trinity/share/sip-tqt/trinity -j $(SPLIT)
touch $@
build build-arch: $(PYTHONS:%=build-%/build-stamp) $(DBG_PYTHONS:%=dbg-build-%/build-stamp)
diff --git a/ubuntu/_base/libraries/python-trinity/debian/watch b/ubuntu/_base/libraries/python-trinity/debian/watch
deleted file mode 100644
index 8b3afcac0..000000000
--- a/ubuntu/_base/libraries/python-trinity/debian/watch
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-
-http://www.riverbankcomputing.com/Downloads/PyTrinity/PyKDE-(.*)\.tar\.bz2
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/control b/ubuntu/_base/metapackages/kubuntu-default-settings/debian/control
index bae0ab8af..a67cc83c9 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/control
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.8.4
Package: kubuntu-default-settings-trinity
Architecture: all
Depends: crystalcursors
-Conflicts: kubuntu-default-settings, kubuntu-settings-desktop
+Conflicts: desktop-base, desktop-base-trinity, kubuntu-default-settings, kubuntu-settings-desktop
Recommends: tdmtheme-trinity, kubuntu-tdm-themes
Description: Default settings and artwork for the Ubuntu Trinity desktop
This package contains the default settings used by Ubuntu [Trinity]. It also
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/kubuntu-default-settings-trinity.postrm b/ubuntu/_base/metapackages/kubuntu-default-settings/debian/kubuntu-default-settings-trinity.postrm
index 3727a65c1..22d39ff4b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/kubuntu-default-settings-trinity.postrm
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/debian/kubuntu-default-settings-trinity.postrm
@@ -32,6 +32,9 @@ case "$1" in
upgrade)
;;
+ abort-install)
+ ;;
+
*)
echo "Unknown argument ($1) for $0"
;;
diff --git a/ubuntu/trusty b/ubuntu/jammy
index e7c887a6f..e7c887a6f 120000
--- a/ubuntu/trusty
+++ b/ubuntu/jammy