diff options
Diffstat (limited to 'dilos/dependencies')
128 files changed, 1219 insertions, 991 deletions
diff --git a/dilos/dependencies/arts/debian/cdbs/debian-tde.mk b/dilos/dependencies/arts/debian/cdbs/debian-tde.mk index e2b1dc666..82994a844 100644 --- a/dilos/dependencies/arts/debian/cdbs/debian-tde.mk +++ b/dilos/dependencies/arts/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ 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 +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 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/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; \ diff --git a/dilos/dependencies/arts/debian/compat b/dilos/dependencies/arts/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/dependencies/arts/debian/compat +++ b/dilos/dependencies/arts/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/dependencies/arts/debian/control b/dilos/dependencies/arts/debian/control index 980e2a77e..e850901d6 100644 --- a/dilos/dependencies/arts/debian/control +++ b/dilos/dependencies/arts/debian/control @@ -4,7 +4,7 @@ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/TDE Maintainers <debian-qt-tde@lists.debian.org> Priority: optional Uploaders: Adeodato Sim <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fabo@debian.org>, Modestas Vainius <modestas@vainius.eu> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, docbook-to-man, texinfo, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !solaris-any], libaudio-dev, libaudiofile-dev, libglib2.0-dev, libmad0-dev, @@ -18,7 +18,7 @@ Architecture: all Section: sound Replaces: arts-trinity (<< 4:14.0.0~) Breaks: arts-trinity (<< 4:14.0.0~) -Depends: libartsc0-trinity (>= ${source:Version}), libarts1c2a-trinity (>= ${source:Version}) +Depends: libartsc0-trinity (>= ${source:Version}), libarts1c2a-trinity (>= ${source:Version}) | libarts1t64-trinity (>= ${source:Version}) Description: sound system from the official TDE release TDE (the Trinity Desktop Environment) is a powerful Open Source graphical desktop environment for Unix workstations. It combines ease of use, diff --git a/dilos/dependencies/arts/debian/docs b/dilos/dependencies/arts/debian/docs new file mode 100644 index 000000000..6f7727790 --- /dev/null +++ b/dilos/dependencies/arts/debian/docs @@ -0,0 +1,2 @@ +README.md +TODO diff --git a/dilos/dependencies/arts/debian/libarts1c2a-trinity.install b/dilos/dependencies/arts/debian/libarts1c2a-trinity.install index d0eb2e316..3281c7b85 100644 --- a/dilos/dependencies/arts/debian/libarts1c2a-trinity.install +++ b/dilos/dependencies/arts/debian/libarts1c2a-trinity.install @@ -60,3 +60,5 @@ debian/tmp/usr/lib/*/mcop/kmedia2.mcopclass debian/tmp/usr/lib/*/mcop/kmedia2.mcoptype debian/tmp/usr/lib/*/mcop/soundserver.mcopclass debian/tmp/usr/lib/*/mcop/soundserver.mcoptype +debian/tmp/usr/share/man/man1/artscat-trinity.1 +debian/tmp/usr/share/man/man1/artsdsp-trinity.1 diff --git a/dilos/dependencies/arts/debian/libarts1c2a-trinity.manpages b/dilos/dependencies/arts/debian/libarts1c2a-trinity.manpages deleted file mode 100644 index 8d7f5c573..000000000 --- a/dilos/dependencies/arts/debian/libarts1c2a-trinity.manpages +++ /dev/null @@ -1,3 +0,0 @@ -debian/man/out/artscat-trinity.1 -debian/man/artsdsp-trinity.1 - diff --git a/dilos/dependencies/arts/debian/libartsc0-dev-trinity.manpages b/dilos/dependencies/arts/debian/libartsc0-dev-trinity.manpages deleted file mode 100644 index cef6ee689..000000000 --- a/dilos/dependencies/arts/debian/libartsc0-dev-trinity.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/man/out/artsc-config-trinity.1 diff --git a/dilos/dependencies/arts/debian/libartsc0-trinity-dev.install b/dilos/dependencies/arts/debian/libartsc0-trinity-dev.install index 47133e9b8..6f8af8383 100644 --- a/dilos/dependencies/arts/debian/libartsc0-trinity-dev.install +++ b/dilos/dependencies/arts/debian/libartsc0-trinity-dev.install @@ -4,6 +4,7 @@ debian/tmp/usr/include/artsc/artsc_export.h debian/tmp/usr/lib/*/libartsc.la debian/tmp/usr/lib/*/libartsc.so debian/tmp/usr/lib/*/libartsgsl.a +debian/tmp/usr/share/man/man1/artsc-config-trinity.1 debian/tmp/usr/lib/*/pkgconfig/arts.pc debian/tmp/usr/lib/*/pkgconfig/artsc.pc diff --git a/dilos/dependencies/arts/debian/man/artsc-config-trinity.sgml b/dilos/dependencies/arts/debian/man/artsc-config-trinity.sgml deleted file mode 100644 index 8072e337d..000000000 --- a/dilos/dependencies/arts/debian/man/artsc-config-trinity.sgml +++ /dev/null @@ -1,160 +0,0 @@ -<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ - -<!-- Process this file with docbook-to-man to generate an nroff manual - page: `docbook-to-man manpage.sgml > manpage.1'. You may view - the manual page with: `docbook-to-man manpage.sgml | nroff -man | - less'. A typical entry in a Makefile or Makefile.am is: - -manpage.1: manpage.sgml - docbook-to-man $< > $@ - - - The docbook-to-man binary is found in the docbook-to-man package. - Please remember that if you create the nroff version in one of the - debian/rules file targets (such as build), you will need to include - docbook-to-man in your Build-Depends control field. - - --> - - <!-- Fill in your name for FIRSTNAME and SURNAME. --> - <!ENTITY dhfirstname "<firstname>Chris</firstname>"> - <!ENTITY dhsurname "<surname>Cheney</surname>"> - <!-- Please adjust the date whenever revising the manpage. --> - <!ENTITY dhdate "<date>November 6, 2002</date>"> - <!-- SECTION should be 1-8, maybe w/ subsection other parameters are - allowed: see man(7), man(1). --> - <!ENTITY dhsection "<manvolnum>1</manvolnum>"> - <!ENTITY dhemail "<email>ccheney@debian.org</email>"> - <!ENTITY dhusername "Chris Cheney"> - <!ENTITY dhucpackage "<refentrytitle>ARTSC-CONFIG</refentrytitle>"> - <!ENTITY dhpackage "artsc-config"> - - <!ENTITY debian "<productname>Debian</productname>"> - <!ENTITY gnu "<acronym>GNU</acronym>"> -]> - -<refentry> - <refentryinfo> - <address> - &dhemail; - </address> - <author> - &dhfirstname; - &dhsurname; - </author> - <copyright> - <year>2002</year> - <holder>&dhusername;</holder> - </copyright> - &dhdate; - </refentryinfo> - <refmeta> - &dhucpackage; - - &dhsection; - </refmeta> - <refnamediv> - <refname>&dhpackage;</refname> - - <refpurpose>Get information about a libartsc installation</refpurpose> - </refnamediv> - <refsynopsisdiv> - <cmdsynopsis> - <command>&dhpackage;</command> - - <arg><option>--arts-prefix<replaceable></replaceable></option></arg> - <arg><option>--arts-version<replaceable></replaceable></option></arg> - <arg><option>--cflags<replaceable></replaceable></option></arg> - <arg><option>--libs<replaceable></replaceable></option></arg> - <arg><option>--version<replaceable></replaceable></option></arg> - - </cmdsynopsis> - </refsynopsisdiv> - <refsect1> - <title>DESCRIPTION</title> - - <para>This manual page documents briefly the - <command>&dhpackage;</command> command.</para> - - <para><command>&dhpackage;</command> displays information about a previous libartsc installation.</para> - - </refsect1> - <refsect1> - <title>OPTIONS</title> - - <para>This program follows the usual GNU command line syntax, - with long options starting with two dashes (`-'). A summary of - options is included below.</para> - - <variablelist> - <varlistentry> - <term><option>--arts-prefix</option> - </term> - <listitem> - <para>This is the prefix used when libartsc was installed.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--arts-version</option> - </term> - <listitem> - <para>Outputs version information about the installed arts.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--cflags</option> - </term> - <listitem> - <para>Set of compiler options (CFLAGS) to use when compiling files that use libartsc.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--libs</option> - </term> - <listitem> - <para>Shows the complete set of libs and other linker options you will need in order to link your application with libartsc.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--version</option> - </term> - <listitem> - <para>Outputs version information about the installed libartsc.</para> - </listitem> - </varlistentry> - </variablelist> - </refsect1> - <refsect1> - <title>AUTHOR</title> - - <para>This manual page was written by &dhusername; - <&dhemail;> for the &debian; system (but may be used by - others). Permission is granted to copy, distribute and/or - modify this document under the terms of the &gnu; General Public - License, Version 2 or any later version published by the Free - Software Foundation. - </para> - - <para>On Debian systems, the complete text of the GNU General - Public License can be found in /usr/share/common-licenses/GPL. - </para> - - </refsect1> -</refentry> - -<!-- Keep this comment at the end of the file -Local variables: -mode: sgml -sgml-omittag:t -sgml-shorttag:t -sgml-minimize-attributes:nil -sgml-always-quote-attributes:t -sgml-indent-step:2 -sgml-indent-data:t -sgml-parent-document:nil -sgml-default-dtd-file:nil -sgml-exposed-tags:nil -sgml-local-catalogs:nil -sgml-local-ecat-files:nil -End: ---> diff --git a/dilos/dependencies/arts/debian/man/artscat-trinity.sgml b/dilos/dependencies/arts/debian/man/artscat-trinity.sgml deleted file mode 100644 index 7dff34d95..000000000 --- a/dilos/dependencies/arts/debian/man/artscat-trinity.sgml +++ /dev/null @@ -1,164 +0,0 @@ -<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ - -<!-- Process this file with docbook-to-man to generate an nroff manual - page: `docbook-to-man manpage.sgml > manpage.1'. You may view - the manual page with: `docbook-to-man manpage.sgml | nroff -man | - less'. A typical entry in a Makefile or Makefile.am is: - -manpage.1: manpage.sgml - docbook-to-man $< > $@ - - - The docbook-to-man binary is found in the docbook-to-man package. - Please remember that if you create the nroff version in one of the - debian/rules file targets (such as build), you will need to include - docbook-to-man in your Build-Depends control field. - - --> - - <!-- Fill in your name for FIRSTNAME and SURNAME. --> - <!ENTITY dhfirstname "<firstname>Chris</firstname>"> - <!ENTITY dhsurname "<surname>Cheney</surname>"> - <!-- Please adjust the date whenever revising the manpage. --> - <!ENTITY dhdate "<date>November 6, 2002</date>"> - <!-- SECTION should be 1-8, maybe w/ subsection other parameters are - allowed: see man(7), man(1). --> - <!ENTITY dhsection "<manvolnum>1</manvolnum>"> - <!ENTITY dhemail "<email>ccheney@debian.org</email>"> - <!ENTITY dhusername "Chris Cheney"> - <!ENTITY dhucpackage "<refentrytitle>ARTSCAT</refentrytitle>"> - <!ENTITY dhpackage "artscat"> - - <!ENTITY debian "<productname>Debian</productname>"> - <!ENTITY gnu "<acronym>GNU</acronym>"> -]> - -<refentry> - <refentryinfo> - <address> - &dhemail; - </address> - <author> - &dhfirstname; - &dhsurname; - </author> - <copyright> - <year>2002</year> - <holder>&dhusername;</holder> - </copyright> - &dhdate; - </refentryinfo> - <refmeta> - &dhucpackage; - - &dhsection; - </refmeta> - <refnamediv> - <refname>&dhpackage;</refname> - - <refpurpose>pipe data to sound device</refpurpose> - </refnamediv> - <refsynopsisdiv> - <cmdsynopsis> - <command>&dhpackage;</command> - - <arg><option><replaceable> options </replaceable></option></arg> - <arg><option><replaceable> filename </replaceable></option></arg> - - </cmdsynopsis> - </refsynopsisdiv> - <refsect1> - <title>DESCRIPTION</title> - - <para>This manual page documents briefly the - <command>&dhpackage;</command> command.</para> - - <para><command>&dhpackage;</command> pipes data from a pipe to the sound device through arts.</para> - - </refsect1> - <refsect1> - <title>OPTIONS</title> - - <para>This program follows the usual GNU command line syntax, - with long options starting with two dashes (`-'). A summary of - options is included below.</para> - - <variablelist> - <varlistentry> - <term><option>-b <replaceable>bits</replaceable></option> - </term> - <listitem> - <para>set number of bits (8 or 16)</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>-c <replaceable>channels</replaceable></option> - </term> - <listitem> - <para>set number of channels (1 or 2)</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>-h</option> - </term> - <listitem> - <para>display help and exit</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>-r <replaceable>samplingrate</replaceable></option> - </term> - <listitem> - <para>set samplingrate to use</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>-t <replaceable>title</replaceable></option> - </term> - <listitem> - <para>set stream title</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>-v</option> - </term> - <listitem> - <para>show version</para> - </listitem> - </varlistentry> - </variablelist> - </refsect1> - <refsect1> - <title>AUTHOR</title> - - <para>This manual page was written by &dhusername; - <&dhemail;> for the &debian; system (but may be used by - others). Permission is granted to copy, distribute and/or - modify this document under the terms of the &gnu; General Public - License, Version 2 or any later version published by the Free - Software Foundation. - </para> - - <para>On Debian systems, the complete text of the GNU General - Public License can be found in /usr/share/common-licenses/GPL. - </para> - - </refsect1> -</refentry> - -<!-- Keep this comment at the end of the file -Local variables: -mode: sgml -sgml-omittag:t -sgml-shorttag:t -sgml-minimize-attributes:nil -sgml-always-quote-attributes:t -sgml-indent-step:2 -sgml-indent-data:t -sgml-parent-document:nil -sgml-default-dtd-file:nil -sgml-exposed-tags:nil -sgml-local-catalogs:nil -sgml-local-ecat-files:nil -End: ---> diff --git a/dilos/dependencies/arts/debian/man/artsdsp-trinity.1 b/dilos/dependencies/arts/debian/man/artsdsp-trinity.1 deleted file mode 100644 index 2615f47c2..000000000 --- a/dilos/dependencies/arts/debian/man/artsdsp-trinity.1 +++ /dev/null @@ -1,31 +0,0 @@ -.TH ARTSDSP "1" "February 2008" "artsdsp" "User Commands" -.SH NAME -artsdsp \- manual page for artsdsp -.SH DESCRIPTION -artsdsp \- attempt to reroute audio device to artsd -.PP -artsdsp [options] binary -.PP -options: -.TP -.B \-h, \-\-help -Show brief help. -.TP -.B \-n, \-\-name\fR=\fINAME\fR -Use name to identify player to artsd. -.TP -.B \-m, \-\-mmap -Emulate memory mapping (i.e. for quake). -.TP -.B \-s, \-\-single\-threaded -Use the single\-threaded version. -.TP -.B \-v, \-\-verbose -Show parameters. -.TP -.B \-V, \-\-version -Show version. -.PP -This manual page was written by Fathi Boudra <fabo@debian.org>, -for the Debian project (but may be used by others). - diff --git a/dilos/dependencies/arts/debian/rules b/dilos/dependencies/arts/debian/rules index a81635c90..b97d4a1af 100755 --- a/dilos/dependencies/arts/debian/rules +++ b/dilos/dependencies/arts/debian/rules @@ -12,6 +12,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk +DEB_TIME64_API = $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false) +ifeq ($(DEB_TIME64_API),true) +DEB_TIME64_SUFFIX = t64 +else +DEB_TIME64_SUFFIX = c2a +endif + + DEB_CMAKE_EXTRA_FLAGS := \ -DCONFIG_INSTALL_DIR="/etc/trinity" \ -DSYSCONF_INSTALL_DIR="/etc/trinity" \ @@ -37,13 +45,13 @@ DEB_DH_STRIP_ARGS := --dbg-package=arts-trinity-dbg \ -Xlibmcop.so.1.0.0 -Xlibqtmcop.so.1.0.0 -Xartsplay -Xartsd -Xartscat \ -Xartsshell -Xartsrec -Xmcopidl -PACKAGES_WITH_LIBS := libarts1c2a-trinity libartsc0-trinity +PACKAGES_WITH_LIBS := libarts1$(DEB_TIME64_SUFFIX)-trinity libartsc0-trinity DEB_DH_MAKESHLIBS_ARGS_ALL := -V DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib/$(DEB_HOST_MULTIARCH)) -DEB_DH_MAKESHLIBS_ARGS_libarts1c2a-trinity := -V'libarts1c2a-trinity (>= 1.5.9)' -DEB_DH_MAKESHLIBS_ARGS_libartsc0-trinity := -V'libartsc0-trinity (>= 1.5.9)' +DEB_DH_MAKESHLIBS_ARGS_libarts1$(DEB_TIME64_SUFFIX)-trinity := -V'libarts1$(DEB_TIME64_SUFFIX)-trinity (>= 1.5.9)' +DEB_DH_MAKESHLIBS_ARGS_libartsc0-trinity := -V'libartsc0-trinity (>= 1.5.9)' #shlibs_ver = 1.5.0-1 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))')) @@ -54,3 +62,40 @@ binary-predeb/libarts1-trinity-dev:: ifeq (linux,$(DEB_HOST_ARCH_OS)) echo "libasound2-dev=libasound2-dev" >> debian/libarts1-trinity-dev.substvars endif + +post-patches:: + dh_testdir +ifeq ($(DEB_TIME64_API),true) + # update library package name for TIME64 ABI + ls -d debian/* | \ + grep -E "/libarts1c2a" | \ + grep -v "\.t64$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.t64 ] || \ + (cp -a $$a debian/libarts1$(DEB_TIME64_SUFFIX)$${a##*c2a} && mv $$a $$a.t64); \ + done + [ -f debian/control.t64 ] || \ + sed -i.t64 \ + -e "s/^\\(Package: libarts1\\)c2a-trinity$$/\\1$(DEB_TIME64_SUFFIX)-trinity/" \ + -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(libarts1\\)c2a-trinity\\( \|$$\)/\\1:\\2\\3c2a-trinity, \\3$(DEB_TIME64_SUFFIX)-trinity\\4/" \ + -e "s/\\(libarts1\\)c2a-trinity (=/\\1$(DEB_TIME64_SUFFIX)-trinity (=/" \ + debian/control +endif + +clean:: + dh_testdir + dh_clean + +ifeq ($(DEB_TIME64_API),true) + # revert library package name for TIME64 ABI + ls -d debian/* | \ + grep -E "\.t64$$" | \ + while read a; do \ + mv $$a $${a%.t64}; \ + done + ls -d debian/* | \ + grep -E "/libarts1$(DEB_TIME64_SUFFIX)-" | \ + xargs -r rm + [ ! -f debian/control.t64 ] || \ + mv debian/control.t64 debian/control +endif diff --git a/dilos/dependencies/avahi-tqt/debian/cdbs/debian-tde.mk b/dilos/dependencies/avahi-tqt/debian/cdbs/debian-tde.mk index f36e3527c..5b87bf463 100644 --- a/dilos/dependencies/avahi-tqt/debian/cdbs/debian-tde.mk +++ b/dilos/dependencies/avahi-tqt/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ 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 +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 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/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; \ diff --git a/dilos/dependencies/avahi-tqt/debian/compat b/dilos/dependencies/avahi-tqt/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/dependencies/avahi-tqt/debian/compat +++ b/dilos/dependencies/avahi-tqt/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/dependencies/avahi-tqt/debian/control b/dilos/dependencies/avahi-tqt/debian/control index 171d4678e..a21507b87 100644 --- a/dilos/dependencies/avahi-tqt/debian/control +++ b/dilos/dependencies/avahi-tqt/debian/control @@ -3,8 +3,8 @@ Section: net Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, - cmake-trinity, ninja-build, +Build-Depends: cdbs, debhelper (>= 10~), quilt, + tde-cmake, ninja-build, gcc, pkg-config, libtqtinterface-dev, diff --git a/dilos/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk b/dilos/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk index e2b1dc666..82994a844 100644 --- a/dilos/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk +++ b/dilos/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ 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 +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 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/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; \ diff --git a/dilos/dependencies/dbus-1-tqt/debian/compat b/dilos/dependencies/dbus-1-tqt/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/dependencies/dbus-1-tqt/debian/compat +++ b/dilos/dependencies/dbus-1-tqt/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/dependencies/dbus-1-tqt/debian/control b/dilos/dependencies/dbus-1-tqt/debian/control index 451be956d..20064441f 100644 --- a/dilos/dependencies/dbus-1-tqt/debian/control +++ b/dilos/dependencies/dbus-1-tqt/debian/control @@ -2,7 +2,7 @@ Source: dbus-1-tqt Section: devel Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqtinterface-dev, libdbus-1-dev (>= 0.90) +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libtqtinterface-dev, libdbus-1-dev (>= 0.90) Build-Depends-Indep: doxygen, graphviz Standards-Version: 3.8.3 diff --git a/dilos/dependencies/dbus-tqt/debian/cdbs/debian-tde.mk b/dilos/dependencies/dbus-tqt/debian/cdbs/debian-tde.mk index f36e3527c..5b87bf463 100644 --- a/dilos/dependencies/dbus-tqt/debian/cdbs/debian-tde.mk +++ b/dilos/dependencies/dbus-tqt/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ 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 +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 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/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; \ diff --git a/dilos/dependencies/dbus-tqt/debian/compat b/dilos/dependencies/dbus-tqt/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/dependencies/dbus-tqt/debian/compat +++ b/dilos/dependencies/dbus-tqt/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/dependencies/dbus-tqt/debian/control b/dilos/dependencies/dbus-tqt/debian/control index 68eab2d63..d16fa5d28 100644 --- a/dilos/dependencies/dbus-tqt/debian/control +++ b/dilos/dependencies/dbus-tqt/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Sjoerd Simons <sjoerd@debian.org>, Sebastian Drge <slomo@ubuntu.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqtinterface-dev, libdbus-1-dev (>= 0.90) +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libtqtinterface-dev, libdbus-1-dev (>= 0.90) Standards-Version: 3.8.3 Package: libdbus-tqt-1-1c2 diff --git a/dilos/dependencies/libart-lgpl/debian/cdbs/debian-tde.mk b/dilos/dependencies/libart-lgpl/debian/cdbs/debian-tde.mk index f36e3527c..5b87bf463 100644 --- a/dilos/dependencies/libart-lgpl/debian/cdbs/debian-tde.mk +++ b/dilos/dependencies/libart-lgpl/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ 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 +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 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/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; \ diff --git a/dilos/dependencies/libart-lgpl/debian/compat b/dilos/dependencies/libart-lgpl/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/dependencies/libart-lgpl/debian/compat +++ b/dilos/dependencies/libart-lgpl/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/dependencies/libart-lgpl/debian/control b/dilos/dependencies/libart-lgpl/debian/control index 85484ca75..7dde9f931 100644 --- a/dilos/dependencies/libart-lgpl/debian/control +++ b/dilos/dependencies/libart-lgpl/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Josselin Mouette <joss@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build Standards-Version: 3.8.4 Package: libart-2.0-2 diff --git a/dilos/dependencies/python-tqt/debian/README.Debian b/dilos/dependencies/python-tqt/debian/README.Debian deleted file mode 100644 index 33603ec40..000000000 --- a/dilos/dependencies/python-tqt/debian/README.Debian +++ /dev/null @@ -1,4 +0,0 @@ -DOCUMENTATION -------------- -You can find doc and examples about PyTQt in the package python-tqt-doc - diff --git a/dilos/dependencies/python-tqt/debian/compat b/dilos/dependencies/python-tqt/debian/compat deleted file mode 100644 index ec635144f..000000000 --- a/dilos/dependencies/python-tqt/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/dilos/dependencies/python-tqt/debian/python-tqt-dev.dirs b/dilos/dependencies/python-tqt/debian/python-tqt-dev.dirs deleted file mode 100644 index ae635cbcd..000000000 --- a/dilos/dependencies/python-tqt/debian/python-tqt-dev.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/share/sip/tqt diff --git a/dilos/dependencies/python-tqt/debian/python-tqt-dev.install b/dilos/dependencies/python-tqt/debian/python-tqt-dev.install deleted file mode 100644 index 7b6aca191..000000000 --- a/dilos/dependencies/python-tqt/debian/python-tqt-dev.install +++ /dev/null @@ -1,2 +0,0 @@ -sip/* usr/share/sip/tqt - diff --git a/dilos/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides b/dilos/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides deleted file mode 100644 index 36e6c1349..000000000 --- a/dilos/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides +++ /dev/null @@ -1,15 +0,0 @@ -# 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 - diff --git a/dilos/dependencies/python-tqt/debian/python-tqt-doc.dirs b/dilos/dependencies/python-tqt/debian/python-tqt-doc.dirs deleted file mode 100644 index 43a4fa9fa..000000000 --- a/dilos/dependencies/python-tqt/debian/python-tqt-doc.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/share/doc/python-tqt-doc/html -usr/share/doc/python-tqt-doc/examples diff --git a/dilos/dependencies/python-tqt/debian/python-tqt-doc.examples b/dilos/dependencies/python-tqt/debian/python-tqt-doc.examples deleted file mode 100644 index 3162f69a8..000000000 --- a/dilos/dependencies/python-tqt/debian/python-tqt-doc.examples +++ /dev/null @@ -1,2 +0,0 @@ -examples3/* - diff --git a/dilos/dependencies/python-tqt/debian/python-tqt-doc.install b/dilos/dependencies/python-tqt/debian/python-tqt-doc.install deleted file mode 100644 index 65f82036b..000000000 --- a/dilos/dependencies/python-tqt/debian/python-tqt-doc.install +++ /dev/null @@ -1 +0,0 @@ -doc/PyQt.html usr/share/doc/python-tqt-doc/html diff --git a/dilos/dependencies/python-tqt/debian/python-tqt-gl.install b/dilos/dependencies/python-tqt/debian/python-tqt-gl.install deleted file mode 100644 index 288f3cb88..000000000 --- a/dilos/dependencies/python-tqt/debian/python-tqt-gl.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python*/*-packages/python_tqt/qtgl.so diff --git a/dilos/dependencies/python-tqt/debian/python-tqt.install b/dilos/dependencies/python-tqt/debian/python-tqt.install deleted file mode 100644 index 61a9363d0..000000000 --- a/dilos/dependencies/python-tqt/debian/python-tqt.install +++ /dev/null @@ -1,7 +0,0 @@ -usr/lib/python*/*-packages/python_tqt/qtcanvas.so -usr/lib/python*/*-packages/python_tqt/qtnetwork.so -usr/lib/python*/*-packages/python_tqt/qtsql.so -usr/lib/python*/*-packages/python_tqt/qttable.so -usr/lib/python*/*-packages/python_tqt/qtui.so -usr/lib/python*/*-packages/python_tqt/qtxml.so -usr/lib/python*/*-packages/python_tqt/qt.so diff --git a/dilos/dependencies/python-tqt/debian/python-tqtext.install b/dilos/dependencies/python-tqt/debian/python-tqtext.install deleted file mode 100644 index 582be1bb1..000000000 --- a/dilos/dependencies/python-tqt/debian/python-tqtext.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python*/*-packages/python_tqt/qtext.so diff --git a/dilos/dependencies/python-tqt/debian/pytqt-tools.manpages b/dilos/dependencies/python-tqt/debian/pytqt-tools.manpages deleted file mode 100644 index 7d27d0034..000000000 --- a/dilos/dependencies/python-tqt/debian/pytqt-tools.manpages +++ /dev/null @@ -1,2 +0,0 @@ -debian/manpages/pylupdate.1 -debian/manpages/pyuic.1 diff --git a/dilos/dependencies/python-tqt/debian/watch b/dilos/dependencies/python-tqt/debian/watch deleted file mode 100644 index 506321d38..000000000 --- a/dilos/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/dilos/dependencies/pytqt/debian/README.Debian b/dilos/dependencies/pytqt/debian/README.Debian new file mode 100644 index 000000000..201336f3a --- /dev/null +++ b/dilos/dependencies/pytqt/debian/README.Debian @@ -0,0 +1,3 @@ +DOCUMENTATION +------------- +You can find doc and examples about PyTQt in the package pytqt-doc diff --git a/dilos/dependencies/python-tqt/debian/changelog b/dilos/dependencies/pytqt/debian/changelog index 95e2f0cce..e834a6ca8 100644 --- a/dilos/dependencies/python-tqt/debian/changelog +++ b/dilos/dependencies/pytqt/debian/changelog @@ -1,4 +1,4 @@ -python-tqt (3.18.1-4ubuntu0) lucid; urgency=low +pytqt (3.18.1-4ubuntu0) lucid; urgency=low * Initial build diff --git a/dilos/dependencies/pytqt/debian/compat b/dilos/dependencies/pytqt/debian/compat new file mode 100644 index 000000000..f599e28b8 --- /dev/null +++ b/dilos/dependencies/pytqt/debian/compat @@ -0,0 +1 @@ +10 diff --git a/dilos/dependencies/python-tqt/debian/control b/dilos/dependencies/pytqt/debian/control index 9fc68128b..d363c373f 100644 --- a/dilos/dependencies/python-tqt/debian/control +++ b/dilos/dependencies/pytqt/debian/control @@ -1,20 +1,22 @@ -Source: python-tqt +Source: pytqt Section: python 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), libtqtinterface-dev, tqt3-dev-tools, tqt3-apps-dev, python-sip-tqt-dev, python-sip-tqt-dbg [!solaris-any], libtqscintilla-dev, python-support (>= 0.7.1) | python-dev (>= 2.6.6-3~), python-all-dbg [!solaris-any], dh-python +Build-Depends: debhelper (>= 10~), python3-all-dev, python3-all-dbg [!solaris-any], libtqtinterface-dev, tqt3-dev-tools, tqt3-apps-dev, python3-sip-tqt-dev, python3-sip-tqt-dbg [!solaris-any], libtqscintilla-dev, dh-python Standards-Version: 3.8.4 +XS-Python-Version: >= 2.3 +X-Python3-Version: >= 3.0 -Package: python-tqt +Package: python3-pytqt Architecture: any -Depends: ${shlibs:Depends}, ${python:Depends}, ${sip:Depends}, ${misc:Depends} -Replaces: python-tqt (<< 4:14.0.0~) -Breaks: python-tqt (<< 4:14.0.0~) -Suggests: python-tqt-gl, python-tqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql -Provides: ${python:Provides} -Description: TQt bindings for Python +Depends: ${shlibs:Depends}, ${python3:Depends}, ${py3sip-tqt:Depends}, ${misc:Depends} +Suggests: python3-pytqt-gl, pytqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql +Provides: ${python3:Provides} +Replaces: python3-tqt +Breaks: python3-tqt +Description: TQt bindings for Python 3 Python binding module that allows use of TQt X Window toolkit v3. You can use it to create portable graphics-capable scripts (there are PyTQt versions for Linux, Windows and MacOS X). @@ -24,41 +26,41 @@ Description: TQt bindings for Python (types, etc), but usually you'll be able to write code pretty much the same way in both languages (with syntax differences, of course) -Package: python-tqt-dbg -Architecture: linux-any +Package: python3-pytqt-dbg +Architecture: any Priority: extra -Replaces: python-tqt-dbg (<< 4:14.0.0~) -Breaks: python-tqt-dbg (<< 4:14.0.0~) Section: debug -Depends: ${shlibs:Depends}, python-dbg, python-tqt (= ${binary:Version}), python-sip-tqt-dbg, ${misc:Depends} -Description: TQt bindings for Python (debug extension) +Depends: ${shlibs:Depends}, python3-all-dbg, python3-pytqt (= ${binary:Version}), python3-sip-tqt-dbg, ${misc:Depends} +Replaces: python3-tqt-dbg +Breaks: python3-tqt-dbg +Description: TQt bindings for Python 3 (debug extension) Python binding module that allows use of TQt X Window toolkit v3. You can use it to create portable graphics-capable scripts (there are PyTQt versions for Linux, Windows and MacOS X). . This package contains the extension built for the Python debug interpreter. -Package: python-tqt-gl +Package: python3-pytqt-gl Architecture: any -Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), python-opengl (>= 2.0.1.09-2.2), ${misc:Depends} -Replaces: python-tqt-gl (<< 4:14.0.0~) -Breaks: python-tqt-gl (<< 4:14.0.0~) -Suggests: python-tqt-doc -Provides: ${python:Provides} -Description: TQt OpenGL bindings for Python +Depends: ${shlibs:Depends}, ${python3:Depends}, python3-pytqt (= ${binary:Version}), python3-opengl, ${misc:Depends} +Suggests: pytqt-doc +Provides: ${python3:Provides} +Replaces: python3-tqt-gl +Breaks: python3-tqt-gl +Description: TQt OpenGL bindings for Python 3 Python binding module that allows use of the OpenGL facilities offered by the TQt X Window toolkit v3. You can use it to create portable graphics-capable scripts (there are PyTQt versions for Linux, Windows and MacOS X). -Package: python-tqt-gl-dbg +Package: python3-pytqt-gl-dbg Priority: extra Section: debug -Replaces: python-tqt-gl-dbg (<< 4:14.0.0~) -Breaks: python-tqt-gl-dbg (<< 4:14.0.0~) -Architecture: linux-any -Depends: ${shlibs:Depends}, python-dbg, python-tqt-gl (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends} -Description: TQt OpenGL bindings for Python (debug extension) +Architecture: any +Depends: ${shlibs:Depends}, python3-all-dbg, python3-pytqt-gl (= ${binary:Version}), python3-pytqt-dbg (= ${binary:Version}), ${misc:Depends} +Replaces: python3-tqt-gl-dbg +Breaks: python3-tqt-gl-dbg +Description: TQt OpenGL bindings for Python 3 (debug extension) Python binding module that allows use of the OpenGL facilities offered by the TQt X Window toolkit v3. You can use it to create portable graphics-capable scripts (there are PyTQt versions for @@ -66,29 +68,29 @@ Description: TQt OpenGL bindings for Python (debug extension) . This package contains the extension built for the Python debug interpreter. -Package: python-tqtext +Package: python3-pytqtext Architecture: any -Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), ${misc:Depends} -Replaces: python-tqtext (<< 4:14.0.0~) -Breaks: python-tqtext (<< 4:14.0.0~) -Provides: ${python:Provides} +Depends: ${shlibs:Depends}, ${python3:Depends}, python3-pytqt (= ${binary:Version}), ${misc:Depends} +Provides: ${python3:Provides} +Replaces: python3-tqtext +Breaks: python3-tqtext Description: TQt extensions for PyTQt PyTQt Extensions. Contains: . - * QScintilla: a featureful TQt source code editing component based + * TQScintilla: a featureful TQt source code editing component based on Scintilla. -Package: python-tqtext-dbg +Package: python3-pytqtext-dbg Priority: extra Section: debug -Replaces: python-tqtext-dbg (<< 4:14.0.0~) -Breaks: python-tqtext-dbg (<< 4:14.0.0~) -Architecture: linux-any -Depends: ${shlibs:Depends}, python-dbg, python-tqtext (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends} +Architecture: any +Depends: ${shlibs:Depends}, python3-all-dbg, python3-pytqtext (= ${binary:Version}), python3-pytqt-dbg (= ${binary:Version}), ${misc:Depends} +Replaces: python3-tqtext-dbg +Breaks: python3-tqtext-dbg Description: TQt debug extensions for PyTQt PyTQt debug Extensions. Contains: . - * QScintilla: a featureful TQt source code editing component based + * TQScintilla: a featureful TQt source code editing component based on Scintilla. Package: pytqt-tools @@ -103,24 +105,24 @@ Description: pyuic and pylupdate for TQt pylupdate is the counterpart for TQt's lupdate. It updates TQt Linguist translation files from Python code. -Package: python-tqt-dev -Depends: python-tqt (= ${binary:Version}), ${python:Depends}, ${misc:Depends} -Suggests: python-sip-tqt-dev -Replaces: python-tqt-dev (<< 4:14.0.0~) -Breaks: python-tqt-dev (<< 4:14.0.0~) +Package: pytqt-dev +Depends: python3-pytqt (= ${binary:Version}), ${misc:Depends} +Suggests: python3-sip-tqt-dev, sip-tqt-dev +Replaces: python-tqt-dev +Breaks: python-tqt-dev Architecture: all Description: TQt bindings for Python - Development files Development .sip files with definitions of PyTQt classes. They are needed to build PyTQt, but also as building blocks of other packages based on them, like PyTDE. -Package: python-tqt-doc +Package: pytqt-doc Section: doc Architecture: all -Replaces: python-tqt-doc (<< 4:14.0.0~) -Breaks: python-tqt-doc (<< 4:14.0.0~) +Replaces: python-tqt-doc +Breaks: python-tqt-doc Depends: ${misc:Depends} -Suggests: python-tqt +Suggests: python3-pytqt Description: TQt bindings for Python - Documentation and examples Documentation and examples for the PyTQt (bindings that allow the use of TQt library from within a Python script). diff --git a/dilos/dependencies/python-tqt/debian/copyright b/dilos/dependencies/pytqt/debian/copyright index 715a83f24..715a83f24 100644 --- a/dilos/dependencies/python-tqt/debian/copyright +++ b/dilos/dependencies/pytqt/debian/copyright diff --git a/dilos/dependencies/python-tqt/debian/docs b/dilos/dependencies/pytqt/debian/docs index 50bd824bb..50bd824bb 100644 --- a/dilos/dependencies/python-tqt/debian/docs +++ b/dilos/dependencies/pytqt/debian/docs diff --git a/dilos/dependencies/python-tqt/debian/manpages/pylupdate.1 b/dilos/dependencies/pytqt/debian/manpages/pytqlupdate.1 index 4d2c8919a..9e68e9605 100644 --- a/dilos/dependencies/python-tqt/debian/manpages/pylupdate.1 +++ b/dilos/dependencies/pytqt/debian/manpages/pytqlupdate.1 @@ -1,4 +1,4 @@ -.TH pylupdate 1 "18 October 2001" "Trolltech AS" \" -*- nroff -*- +.TH pytqlupdate 1 "18 October 2001" "Trolltech AS" \" -*- nroff -*- .\" .\" Copyright 2001 Trolltech AS. All rights reserved. .\" Copyright 2004 Ricardo Cardenes. All rights reserved. @@ -14,20 +14,20 @@ .\" See http://www.trolltech.com/gpl/ for GPL licensing information. .\" .SH NAME -pylupdate \- update Qt Linguist translation files from Python sources +pytqlupdate \- update TQt Linguist translation files from Python sources .SH SYNOPSIS -.B pylupdate +.B pytqlupdate .RI "[ " options " ] " project-file... .SH DESCRIPTION This page documents the -.B Qt Linguist Update -tool for the Qt GUI toolkit, for Python source files. -.B PyLupdate -reads a qmake project file (.pro file), finds the translatable +.B TQt Linguist Update +tool for the TQt GUI toolkit, for Python source files. +.B PyTQLupdate +reads a tqmake project file (.pro file), finds the translatable strings in the specified source, header and interface files, and updates the translation files (.ts files) specified in it. The translation files are given to the translator who uses -.B Qt Linguist +.B TQt Linguist to read the files and insert the translations. .PP The .ts file format is a simple human-readable XML format that can be @@ -66,15 +66,15 @@ TRANSLATIONS = gnomovision_dk.ts \\ .in -4 .PP When running -.B pylupdate +.B pytqlupdate on this project file, the translatable strings in all the files listed in the SOURCES and FORMS entries will be put in the translation files listed in the TRANSLATIONS entry. Previous translations will be reused as far as possible, and translated strings that have vanished from the source files are marked obsolete. .SH "SEE ALSO" -.BR lupdate (1), -.BR lrelease (1) +.BR tqlupdate (1), +.BR tqlrelease (1) and .BR http://doc.trolltech.com/i18n.html .SH AUTHOR diff --git a/dilos/dependencies/python-tqt/debian/manpages/pyuic.1 b/dilos/dependencies/pytqt/debian/manpages/pytquic.1 index f1ffa41ff..e456074a2 100644 --- a/dilos/dependencies/python-tqt/debian/manpages/pyuic.1 +++ b/dilos/dependencies/pytqt/debian/manpages/pytquic.1 @@ -1,26 +1,26 @@ -.TH pyuic 1 "25 June 2001" \" -*- nroff -*- +.TH pytquic 1 "25 June 2001" \" -*- nroff -*- .SH NAME -pyuic \- Qt user interface compiler for Python +pytquic \- TQt user interface compiler for Python .SH SYNOPSIS -.B pyuic +.B pytquic [options] <uifile> .SH DESCRIPTION This page documents the .B Python User Interface Compiler -for the Qt GUI application framework. The -.B pyuic -reads a user interface definition file (.ui) in XML as generated by Qt +for the TQt GUI application framework. The +.B pytquic +reads a user interface definition file (.ui) in XML as generated by TQt Designer and creates corresponding Python module. .PP .PP Generate implementation: .br -.I "\fB pyuic [options] \fI<uifile>" +.I "\fB pytquic [options] \fI<uifile>" .br .PP Generate image collection: .br -.I "\fB pyuic [options] -embed \fI<project> <image1> <image2> <image3>\fP ..." +.I "\fB pytquic [options] -embed \fI<project> <image1> <image2> <image3>\fP ..." .br \fI<project>\fP: project name \fI<image[1..n]>\fP: image files @@ -28,7 +28,7 @@ Generate image collection: .PP Generate subclass implementation: .br -.I "\fB pyuic [options] -subimpl <classname> \fI<uifile>" +.I "\fB pytquic [options] -subimpl <classname> \fI<uifile>" .br \fI<classname>\fP: name of the subclass to generate .PP @@ -57,13 +57,13 @@ Generate extra code to test the class Generate extra code to test but not display the class .TP .I -version -Display version of pyuic +Display version of pytquic .TP .I -help Display this information .SH "SEE ALSO" -.BR uic (1) +.BR tquic (1) .BR http://www.trolltech.com/ diff --git a/dilos/dependencies/python-tqt/debian/patches/debian_configure_changes.diff b/dilos/dependencies/pytqt/debian/patches/debian_configure_changes.diff index 131e9dbdc..131e9dbdc 100644 --- a/dilos/dependencies/python-tqt/debian/patches/debian_configure_changes.diff +++ b/dilos/dependencies/pytqt/debian/patches/debian_configure_changes.diff diff --git a/dilos/dependencies/python-tqt/debian/patches/series b/dilos/dependencies/pytqt/debian/patches/series index 573069d8d..573069d8d 100644 --- a/dilos/dependencies/python-tqt/debian/patches/series +++ b/dilos/dependencies/pytqt/debian/patches/series diff --git a/dilos/dependencies/pytqt/debian/python3-pytqt-gl.install b/dilos/dependencies/pytqt/debian/python3-pytqt-gl.install new file mode 100644 index 000000000..dd7cab0c0 --- /dev/null +++ b/dilos/dependencies/pytqt/debian/python3-pytqt-gl.install @@ -0,0 +1 @@ +usr/lib/python3*/*-packages/PyTQt/tqtgl.so diff --git a/dilos/dependencies/pytqt/debian/python3-pytqt.install b/dilos/dependencies/pytqt/debian/python3-pytqt.install new file mode 100644 index 000000000..f18aeefd0 --- /dev/null +++ b/dilos/dependencies/pytqt/debian/python3-pytqt.install @@ -0,0 +1,7 @@ +usr/lib/python3*/*-packages/PyTQt/tqtcanvas.so +usr/lib/python3*/*-packages/PyTQt/tqtnetwork.so +usr/lib/python3*/*-packages/PyTQt/tqtsql.so +usr/lib/python3*/*-packages/PyTQt/tqttable.so +usr/lib/python3*/*-packages/PyTQt/tqtui.so +usr/lib/python3*/*-packages/PyTQt/tqtxml.so +usr/lib/python3*/*-packages/PyTQt/tqt.so diff --git a/dilos/dependencies/pytqt/debian/python3-pytqtext.install b/dilos/dependencies/pytqt/debian/python3-pytqtext.install new file mode 100644 index 000000000..511c1c0c4 --- /dev/null +++ b/dilos/dependencies/pytqt/debian/python3-pytqtext.install @@ -0,0 +1 @@ +usr/lib/python3*/*-packages/PyTQt/tqtext.so diff --git a/dilos/dependencies/pytqt/debian/pytqt-dev.dirs b/dilos/dependencies/pytqt/debian/pytqt-dev.dirs new file mode 100644 index 000000000..735874a93 --- /dev/null +++ b/dilos/dependencies/pytqt/debian/pytqt-dev.dirs @@ -0,0 +1 @@ +usr/share/sip-tqt/tqt diff --git a/dilos/dependencies/pytqt/debian/pytqt-dev.install b/dilos/dependencies/pytqt/debian/pytqt-dev.install new file mode 100644 index 000000000..de146d1b0 --- /dev/null +++ b/dilos/dependencies/pytqt/debian/pytqt-dev.install @@ -0,0 +1,2 @@ +sip/* usr/share/sip-tqt/tqt + diff --git a/dilos/dependencies/pytqt/debian/pytqt-dev.lintian-overrides b/dilos/dependencies/pytqt/debian/pytqt-dev.lintian-overrides new file mode 100644 index 000000000..1a3799d59 --- /dev/null +++ b/dilos/dependencies/pytqt/debian/pytqt-dev.lintian-overrides @@ -0,0 +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 + +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqt/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtaxcontainer/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtcanvas/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtext/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtgl/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtnetwork/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtpe/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtsql/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqttable/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtui/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtxml/copying.sip diff --git a/dilos/dependencies/pytqt/debian/pytqt-doc.dirs b/dilos/dependencies/pytqt/debian/pytqt-doc.dirs new file mode 100644 index 000000000..8067955f9 --- /dev/null +++ b/dilos/dependencies/pytqt/debian/pytqt-doc.dirs @@ -0,0 +1,2 @@ +usr/share/doc/pytqt-doc/html +usr/share/doc/pytqt-doc/examples diff --git a/dilos/dependencies/pytqt/debian/pytqt-doc.examples b/dilos/dependencies/pytqt/debian/pytqt-doc.examples new file mode 100644 index 000000000..c48447a3e --- /dev/null +++ b/dilos/dependencies/pytqt/debian/pytqt-doc.examples @@ -0,0 +1,2 @@ +examples/* + diff --git a/dilos/dependencies/pytqt/debian/pytqt-doc.install b/dilos/dependencies/pytqt/debian/pytqt-doc.install new file mode 100644 index 000000000..273120f41 --- /dev/null +++ b/dilos/dependencies/pytqt/debian/pytqt-doc.install @@ -0,0 +1 @@ +doc/PyTQt.html usr/share/doc/pytqt-doc/html diff --git a/dilos/dependencies/python-tqt/debian/pytqt-tools.install b/dilos/dependencies/pytqt/debian/pytqt-tools.install index 1df36c612..1df36c612 100644 --- a/dilos/dependencies/python-tqt/debian/pytqt-tools.install +++ b/dilos/dependencies/pytqt/debian/pytqt-tools.install diff --git a/dilos/dependencies/pytqt/debian/pytqt-tools.manpages b/dilos/dependencies/pytqt/debian/pytqt-tools.manpages new file mode 100644 index 000000000..a8224067a --- /dev/null +++ b/dilos/dependencies/pytqt/debian/pytqt-tools.manpages @@ -0,0 +1,2 @@ +debian/manpages/pytqlupdate.1 +debian/manpages/pytquic.1 diff --git a/dilos/dependencies/pytqt/debian/pytqtconfig_py3.py b/dilos/dependencies/pytqt/debian/pytqtconfig_py3.py new file mode 100644 index 000000000..c25f1f56e --- /dev/null +++ b/dilos/dependencies/pytqt/debian/pytqtconfig_py3.py @@ -0,0 +1,17 @@ +# import the pytqtconfig.py for the normal or the debug build + +import os +import sys +import sysconfig + +sys.path.insert(0, os.path.join(sysconfig.get_path('platstdlib'), 'dist-packages', 'PyTQt')) + +if 'd' in sys.abiflags: + try: + from pytqtconfig_d import * + from pytqtconfig_d import _pkg_config, _default_macros + except ImportError as msg: + raise ImportError('No module named pytqtconfig; package python3-pytqt-dbg not installed') +else: + from pytqtconfig_nd import * + from pytqtconfig_nd import _pkg_config, _default_macros diff --git a/dilos/dependencies/python-tqt/debian/rules b/dilos/dependencies/pytqt/debian/rules index 0056ca307..d7427e40a 100755 --- a/dilos/dependencies/python-tqt/debian/rules +++ b/dilos/dependencies/pytqt/debian/rules @@ -3,8 +3,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) - # 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| .*||" | \ @@ -15,9 +13,13 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) endif +export DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +export DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) +export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + export DH_OPTIONS --include /usr/share/python/python.mk +-include /usr/share/python3/python.mk ifeq (,$(py_sitename)) py_sitename = site-packages py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages @@ -26,7 +28,7 @@ py_libdir_sh = $(py_libdir) endif -DOC=$(CURDIR)/debian/python-tqt-doc/usr/share/doc/python-tqt-doc +DOC=$(CURDIR)/debian/pytqt-doc/usr/share/doc/pytqt-doc INSTDIR=$(CURDIR)/debian export TQTDIR=/usr/share/tqt3 @@ -39,35 +41,28 @@ else endif CXXFLAGS += "-I/usr/include/tqt" -PYTHONS := $(shell pyversions -vr debian/control) - -DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport) -DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport) - +PYTHONS := $(shell py3versions -vr) -GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p') -ifneq (,$(filter $(GCCVER),4.2 4.3)) - SPLIT=40 -else - SPLIT=10 -endif +DEB_PARALLEL_JOBS ?= 40 .PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp #configure: $(PYTHONS:%=build-%/configure-stamp) $(PYTHONS:%=dbg-build-%/configure-stamp) configure: $(PYTHONS:%=build-%/configure-stamp) + build-%/configure-stamp: dh_testdir 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/$(DEB_HOST_MULTIARCH) -u -j $(SPLIT) \ - -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \ + -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(DEB_PARALLEL_JOBS) \ + -d /usr/lib/python$*/$(call py_sitename,$*)/PyTQt \ -l /usr/include/python$* \ - -v /usr/share/sip/tqt \ + -v /usr/share/sip-tqt/tqt \ -m /usr/lib/python$*/config \ + -z \ CXXFLAGS_RELEASE="" CXXFLAGS="${CXXFLAGS}" STRIP="" touch $@ @@ -76,13 +71,13 @@ dbg-build-%/configure-stamp: mkdir -p dbg-build-$* cd dbg-build-$* && echo yes \ | python$*-dbg ../configure.py \ - -c -n /usr/include/tqscintilla \ - -e python$* \ - -o /usr/lib -u -j $(SPLIT) \ - -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \ + -c -n /usr/include/tqt3 \ + -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(DEB_PARALLEL_JOBS) \ + -d /usr/lib/python$*/$(call py_sitename,$*)/PyTQt \ -l /usr/include/python$*_d \ - -v /usr/share/sip/tqt \ + -v /usr/share/sip-tqt/tqt \ -m /usr/lib/python$*/config_d \ + -z \ CXXFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt" STRIP="" touch $@ @@ -105,30 +100,49 @@ install-indep: configure dh_testroot dh_clean -k -i dh_installdirs -i - for version in ${PYTHONS}; do\ - pylib=$$(python$$version -c 'from distutils import sysconfig; print sysconfig.get_python_lib()')/python_tqt; \ - mkdir -p debian/python-tqt-dev/$$pylib;\ - install -m 644 -o root -g root build-$$version/pyqtconfig.py debian/python-tqt-dev/$$pylib;\ + for version in ${PYTHONS}; do \ + pylibdev=debian/pytqt-dev/$$(python$$version -c "import sysconfig; print(sysconfig.get_path('platstdlib'))")/dist-packages/PyTQt;\ + mkdir -p $$pylibdev;\ + install -m 644 -o root -g root build-$$version/pytqtconfig.py $$pylibdev/pytqtconfig_nd.py; \ + install -m 644 -o root -g root dbg-build-$$version/pytqtconfig.py $$pylibdev/pytqtconfig_d.py; \ done dh_install -i + mkdir -p debian/pytqt-dev/usr/lib/python3/dist-packages/PyTQt + install -m 644 -o root -g root debian/pytqtconfig_py3.py debian/pytqt-dev/usr/lib/python3/dist-packages/PyTQt/pytqtconfig.py install-arch: build dh_testdir dh_testroot dh_clean -k -a dh_installdirs -a - for version in ${PYTHONS}; do \ - $(MAKE) -C build-$$version install DESTDIR=$(CURDIR)/debian/tmp;\ - done - for version in ${PYTHONS}; do \ - pylib=$$(python$$version -c 'from distutils import sysconfig; print sysconfig.get_python_lib()')/python_tqt; \ - mkdir -p debian/python-tqt/$$pylib;\ - cp -a debian/tmp/$$pylib/__init__.py \ - debian/python-tqt/$$pylib/__init__.py;\ + + for p in ${PYTHONS} ; do \ + $(MAKE) -f debian/rules install-arch-$$p;\ done dh_install -a --sourcedir=$(CURDIR)/debian/tmp + for i in $$(find debian/python3-*-dbg -name '*.so'); do \ + b=$$(basename $$i .so); \ + mv $$i $$(dirname $$i)/$${b}_d.so; \ + done + find debian/python3-*-dbg ! -type d \ + ! \( -name '*.so' -o -name '*config_d.py' \) | xargs rm -f + find debian/python3-*-dbg -depth -type d -empty -exec rmdir {} \; + +install-arch-3.%: + $(MAKE) -C build-3.$* install DESTDIR=$(CURDIR)/debian/tmp +# $(MAKE) -C dbg-build-3.$* install DESTDIR=$(CURDIR)/debian/python3-pytqt-dbg + mkdir -p debian/python3-pytqt/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt + cp -a debian/tmp/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/__init__.py \ + debian/python3-pytqt/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/__init__.py +# mkdir -p debian/python3-pytqt-gl-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt +# mv debian/python3-pytqt-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/tqtgl.so \ +# debian/python3-pytqt-gl-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/ +# mkdir -p debian/python3-pytqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt +# mv debian/python3-pytqt-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/tqtext.so \ +# debian/python3-pytqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/ + clean: dh_testdir dh_testroot @@ -150,8 +164,8 @@ binary-common: # dh_strip dh_compress -X.py -X.bmp -X.ui -X.sql dh_fixperms - ${DH_PYTHON2} - dh_sip_tqt + dh_python3 --no-dbg-cleaning + dh_py3sip_tqt dh_lintian dh_installdeb dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info diff --git a/dilos/dependencies/python-tqt/debian/source/format b/dilos/dependencies/pytqt/debian/source/format index 163aaf8d8..163aaf8d8 100644 --- a/dilos/dependencies/python-tqt/debian/source/format +++ b/dilos/dependencies/pytqt/debian/source/format diff --git a/dilos/dependencies/python-tqt/debian/source/options b/dilos/dependencies/pytqt/debian/source/options index 72f1f5450..72f1f5450 100644 --- a/dilos/dependencies/python-tqt/debian/source/options +++ b/dilos/dependencies/pytqt/debian/source/options diff --git a/dilos/dependencies/sip4-tqt/debian/compat b/dilos/dependencies/sip4-tqt/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/dependencies/sip4-tqt/debian/compat +++ b/dilos/dependencies/sip4-tqt/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/dependencies/sip4-tqt/debian/control b/dilos/dependencies/sip4-tqt/debian/control index cdb796e02..2c7df285c 100644 --- a/dilos/dependencies/sip4-tqt/debian/control +++ b/dilos/dependencies/sip4-tqt/debian/control @@ -4,60 +4,79 @@ 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 [!solaris-any], python-support (>= 0.7.1) | python-dev (>= 2.6.6-3~), libtqtinterface-dev +Build-Depends: debhelper (>= 10~), python3-all-dev, python3-all-dbg, dh-python, libtqtinterface-dev, bison, flex Standards-Version: 3.8.4 XS-Python-Version: all +X-Python3-Version: >= 3.0 -Package: python-sip-tqt +Package: python3-sip-tqt Architecture: any Section: python -Replaces: python-sip-tqt (<< 4:14.0.0~) -Breaks: python-sip-tqt (<< 4:14.0.0~) -Provides: ${python:Provides}, sip-api-7.0, sip-api-7.1 -Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} -Conflicts: python-sip4 (<< 4.10) -Description: Python/C++ bindings generator runtime library - SIP is a tool for generating bindings for C++ classes with some ideas +Provides: ${python3:Provides} +Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends} +Description: Python 3/C++ bindings generator runtime library + SIP-TQt is a tool for generating bindings for C++ classes with some ideas borrowed from SWIG, but capable of tighter bindings because of its specificity towards C++ and Python. + . + This package provides the SIP-TQt module for Python 3 -Package: python-sip-tqt-dbg -Priority: extra -Architecture: linux-any -Replaces: python-sip-tqt-dbg (<< 4:14.0.0~) -Breaks: python-sip-tqt-dbg (<< 4:14.0.0~) +Package: python3-sip-tqt-dev +Architecture: any +Section: python +Depends: ${python3:Depends}, python3-sip-tqt (= ${binary:Version}), sip-tqt-dev, python3-all-dev, ${shlibs:Depends}, libjs-jquery, ${misc:Depends} +Description: Python/C++ bindings generator development files + SIP-TQt is a tool for generating bindings for C++ classes with some ideas + borrowed from SWIG, but capable of tighter bindings because of its + specificity towards C++ and Python. + . + SIP-TQt was originally designed to generate Python bindings for TDE and so + has explicit support for the signal slot mechanism used by the TQt/TDE + class libraries. + . + Features: + - connecting TQt signals to Python functions and class methods + - connecting Python signals to TQt slots + - overloading virtual member functions with Python class methods + - protected member functions + - abstract classes + - enumerated types + - global class instances + - static member functions. + . + This package contains the code generator tool and the development headers + needed to develop Python 3 bindings with sip-tqt. + +Package: python3-sip-tqt-dbg +Architecture: any Section: debug -Provides: ${python:Provides} -Depends: python-sip-tqt (= ${binary:Version}), python-dbg, ${shlibs:Depends}, ${misc:Depends} -Conflicts: python-sip4-dbg (<< 4.10) -Description: Python/C++ bindings generator runtime library (debug extension) - SIP is a tool for generating bindings for C++ classes with some ideas +Priority: extra +Depends: python3-sip-tqt (= ${binary:Version}), python3-all-dbg, ${shlibs:Depends}, ${misc:Depends} +Description: Python 3/C++ bindings generator runtime library + SIP-TQt is a tool for generating bindings for C++ classes with some ideas borrowed from SWIG, but capable of tighter bindings because of its specificity towards C++ and Python. . - This package contains the extension built for the Python debug interpreter. + This package provides the SIP-TQt module for the debug build of the Python 3. -Package: python-sip-tqt-dev +Package: sip-tqt-dev Architecture: any Section: python -Replaces: python-sip-tqt-dev (<< 4:14.0.0~) -Breaks: python-sip-tqt-dev (<< 4:14.0.0~) -Depends: ${python:Depends}, python-sip-tqt (= ${binary:Version}), python-dev, ${shlibs:Depends}, libjs-jquery, ${misc:Depends} -Recommends: python-sip-tqt (>= ${source:Version}) -Provides: python-sip-dev, python-sip4-dev, sip4 -Conflicts: python-sip-dev, python-sip4-dev (<< 4.10), sip4 (<< 4.10) +Depends: ${python3:Depends}, ${shlibs:Depends} +Breaks: python-sip-tqt-dev (<< 4:14.1.0~) +Recommends: python3-sip-tqt-dev Description: Python/C++ bindings generator development files - SIP is a tool for generating bindings for C++ classes with some ideas + SIP-TQt is a tool for generating bindings for C++ classes with some ideas borrowed from SWIG, but capable of tighter bindings because of its specificity towards C++ and Python. . - SIP was originally designed to generate Python bindings for TDE and so + SIP-TQt was originally designed to generate Python bindings for TDE and so has explicit support for the signal slot mechanism used by the TQt/TDE class libraries. . Features: - - connecting Qt signals to Python functions and class methods - - connecting Python signals to Qt slots + - connecting TQt signals to Python functions and class methods + - connecting Python signals to TQt slots - overloading virtual member functions with Python class methods - protected member functions - abstract classes @@ -65,6 +84,4 @@ Description: Python/C++ bindings generator development files - global class instances - static member functions. . - This package contains the code generator tool and the development headers - needed to develop Python bindings with sip. - + This package contains the code generator tool needed to develop Python 3 bindings with sip-tqt. diff --git a/dilos/dependencies/sip4-tqt/debian/dh_py3sip_tqt b/dilos/dependencies/sip4-tqt/debian/dh_py3sip_tqt new file mode 100644 index 000000000..a59025f15 --- /dev/null +++ b/dilos/dependencies/sip4-tqt/debian/dh_py3sip_tqt @@ -0,0 +1,49 @@ +#!/usr/bin/perl -w + +=head1 NAME + +dh_py3sip_tqt - set the correct dependencies for Python 3 packages using sip + +=cut + +use strict; +use Debian::Debhelper::Dh_Lib; + +=head1 SYNOPSIS + +B<dh_py3sip_tqt> + +=head1 DESCRIPTION + +dh_py3sip_tqt creates the ${py3sip-tqt:Depends} substitution variable which must be +used by Python 3 extensions built with sip-tqt in order to depend on a version of +python3-sip-tqt that exports the correct public API. + +=cut + +init(); + +my $sip_tqt_provides = `dpkg -s python3-sip-tqt`; +$sip_tqt_provides =~ /^Provides:\s*(.+)$/m; + +my @sip_tqt_apis = sort(grep(/sip\-tqt\-py3api/, split(/,\s*/, $1))); + +my $sip_tqt_api_version=$sip_tqt_apis[-1]; + +foreach my $package (@{$dh{DOPACKAGES}}) { + addsubstvar($package, "py3sip-tqt:Depends", $sip_tqt_api_version); +} + +=head1 SEE ALSO + +L<debhelper(7)> + +This program is a part of python3-sip-tqt-dev but is made to work with debhelper. + +=head1 AUTHORS + +Torsten Marek <shlomme@debian.org> +Adapted for Python3 by +Slávek Banko <slavek.banko@axis.cz> + +=cut diff --git a/dilos/dependencies/sip4-tqt/debian/dh_sip_tqt b/dilos/dependencies/sip4-tqt/debian/dh_sip_tqt deleted file mode 100644 index b1a8c19e3..000000000 --- a/dilos/dependencies/sip4-tqt/debian/dh_sip_tqt +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/perl -w - -=head1 NAME - -dh_sip_tqt - set the correct dependencies for Python packages using sip - -=cut - -use strict; -use Debian::Debhelper::Dh_Lib; - -=head1 SYNOPSIS - -B<dh_sip_tqt> - -=head1 DESCRIPTION - -dh_sip_tqt creates the ${sip:Depends} substitution variable which must be used by -Python extensions built with sip in order to depend on a version of python-sip -that exports the correct public API. - -=cut - -init(); - -my $sip_provides = `dpkg -s python-sip-tqt`; -$sip_provides =~ /^Provides:\s*(.+)$/m; - -my @sip_apis = sort(grep(/sip\-api/, split(/,\s*/, $1))); - -my $sip_api_version=$sip_apis[-1]; - -foreach my $package (@{$dh{DOPACKAGES}}) { - addsubstvar($package, "sip:Depends", $sip_api_version); -} - -=head1 SEE ALSO - -L<debhelper(7)> - -This program is a part of python-sip-dev but is made to work with debhelper. - -=head1 AUTHORS - -Torsten Marek <shlomme@debian.org> - -=cut diff --git a/dilos/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1 b/dilos/dependencies/sip4-tqt/debian/manpages/dh_py3sip_tqt.1 index ea429fe9a..8539600cf 100644 --- a/dilos/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1 +++ b/dilos/dependencies/sip4-tqt/debian/manpages/dh_py3sip_tqt.1 @@ -123,27 +123,29 @@ .rm #[ #] #H #V #F C .\" ======================================================================== .\" -.IX Title "DH_SIP_TQT 1" -.TH DH_SIP_TQT 1 "2010-02-02" "perl v5.10.1" "User Contributed Perl Documentation" +.IX Title "DH_PY3SIP_TQT 1" +.TH DH_PY3SIP_TQT 1 "2010-02-02" "perl v5.10.1" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l .nh .SH "NAME" -dh_sip_tqt \- set the correct dependencies for Python packages using sip +dh_py3sip_tqt \- set the correct dependencies for Python 3 packages using sip-tqt .SH "SYNOPSIS" .IX Header "SYNOPSIS" -\&\fBdh_sip_tqt\fR +\&\fBdh_py3sip_tqt\fR .SH "DESCRIPTION" .IX Header "DESCRIPTION" -dh_sip_tqt creates the ${sip:Depends} substitution variable which must be used by -Python extensions built with sip in order to depend on a version of python-sip +dh_py3sip_tqt creates the ${py3sip-tqt:Depends} substitution variable which must be used by +Python 3 extensions built with sip-tqt in order to depend on a version of python3-sip-tqt that exports the correct public \s-1API\s0. .SH "SEE ALSO" .IX Header "SEE ALSO" \&\fIdebhelper\fR\|(7) .PP -This program is a part of python-sip-dev but is made to work with debhelper. +This program is a part of python3-sip-tqt-dev but is made to work with debhelper. .SH "AUTHORS" .IX Header "AUTHORS" Torsten Marek <shlomme@debian.org> +Adapted for Python3 by +Slávek Banko <slavek.banko@axis.cz> diff --git a/dilos/dependencies/sip4-tqt/debian/manpages/sip.1 b/dilos/dependencies/sip4-tqt/debian/manpages/sip-tqt.1 index ce178cc7e..ef824974f 100644 --- a/dilos/dependencies/sip4-tqt/debian/manpages/sip.1 +++ b/dilos/dependencies/sip4-tqt/debian/manpages/sip-tqt.1 @@ -1,26 +1,26 @@ .\" .\" Created by Ricardo Cárdenes 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/dilos/dependencies/sip4-tqt/debian/patches/series b/dilos/dependencies/sip4-tqt/debian/patches/series index 0b31a69ff..e69de29bb 100644 --- a/dilos/dependencies/sip4-tqt/debian/patches/series +++ b/dilos/dependencies/sip4-tqt/debian/patches/series @@ -1,2 +0,0 @@ -# siputils_debian_changes.diff -# siputils_objdir_module_fix.diff diff --git a/dilos/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff b/dilos/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff deleted file mode 100644 index 2640f57c2..000000000 --- a/dilos/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff +++ /dev/null @@ -1,32 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_siputils.dpatch by Torsten Marek <shlomme@debian.org> -Index: sip4-qt3-4.10/siputils.py -=================================================================== ---- sip4-qt3-4.10.orig/siputils.py 2010-01-14 15:52:09.000000000 +0100 -+++ sip4-qt3-4.10/siputils.py 2010-01-26 21:09:49.172700039 +0100 -@@ -718,7 +718,8 @@ - - libs.extend(self.optional_list("LIBS_WINDOWS")) - -- lflags.extend(self._platform_rpaths(rpaths.as_list())) -+ # Don't append any rpaths -+ #lflags.extend(self._platform_rpaths(rpaths.as_list())) - - # Save the transformed values. - self.CFLAGS.set(cflags) -@@ -843,6 +844,15 @@ - clib is the library name in cannonical form. - framework is set of the library is implemented as a MacOS framework. - """ -+ ################################################################## -+ # Generally, the linker is intelligent enough not to need this # -+ # additional information! # -+ # And Qt4's pkg-config and prl files are broken # -+ # Changed for Debian packaging, Torsten Marek <shlomme@gmx.net> # -+ ################################################################## -+ -+ return [] -+ - prl_libs = [] - - if self.generator in ("MSVC", "MSVC.NET", "BMAKE"): diff --git a/dilos/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff b/dilos/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff deleted file mode 100644 index 3c4570b21..000000000 --- a/dilos/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff +++ /dev/null @@ -1,18 +0,0 @@ -Index: b/siputils.py -=================================================================== ---- a/siputils.py -+++ b/siputils.py -@@ -1547,9 +1547,12 @@ - mfile.write("\n$(OFILES): $(HFILES)\n") - - for mf in self._build["tqmoc_headers"].split(): -- root, discard = os.path.splitext(mf) -+ root, _ = os.path.splitext(mf) - cpp = "tqmoc_" + root + ".cpp" - -+ if self._src_dir != self.dir: -+ mf = os.path.join(self._src_dir, mf) -+ - mfile.write("\n%s: %s\n" % (cpp, mf)) - mfile.write("\t$(MOC) -o %s %s\n" % (cpp, mf)) - diff --git a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install b/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install deleted file mode 100644 index 1df36c612..000000000 --- a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install +++ /dev/null @@ -1 +0,0 @@ -usr/bin/* diff --git a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.links b/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.links deleted file mode 100644 index fdd5af4cc..000000000 --- a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.links +++ /dev/null @@ -1 +0,0 @@ -usr/share/javascript/jquery/jquery.js usr/share/doc/python-sip-tqt-dev/html/_static/jquery.js diff --git a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages b/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages deleted file mode 100644 index ba33bb512..000000000 --- a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages +++ /dev/null @@ -1,2 +0,0 @@ -debian/manpages/sip.1 -debian/manpages/dh_sip_tqt.1 diff --git a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt.install b/dilos/dependencies/sip4-tqt/debian/python-sip-tqt.install deleted file mode 100644 index 9639c2814..000000000 --- a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python*/*-packages/sip4_tqt/sip.so diff --git a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.docs b/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.docs index 416a453aa..416a453aa 100644 --- a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.docs +++ b/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.docs diff --git a/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.install b/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.install new file mode 100644 index 000000000..8c6fee21f --- /dev/null +++ b/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.install @@ -0,0 +1 @@ +../dh_py3sip_tqt /usr/bin/ diff --git a/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.links b/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.links new file mode 100644 index 000000000..47086f7df --- /dev/null +++ b/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.links @@ -0,0 +1 @@ +usr/share/javascript/jquery/jquery.js usr/share/doc/python3-sip-tqt-dev/html/_static/jquery.js diff --git a/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.manpages b/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.manpages new file mode 100644 index 000000000..42f51bda1 --- /dev/null +++ b/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.manpages @@ -0,0 +1 @@ +debian/manpages/dh_py3sip_tqt.1 diff --git a/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt.install b/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt.install new file mode 100644 index 000000000..5603520f7 --- /dev/null +++ b/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt.install @@ -0,0 +1 @@ +usr/lib/python3.*/*-packages/sip_tqt.so diff --git a/dilos/dependencies/sip4-tqt/debian/pyversions b/dilos/dependencies/sip4-tqt/debian/pyversions deleted file mode 100644 index 57a7586e4..000000000 --- a/dilos/dependencies/sip4-tqt/debian/pyversions +++ /dev/null @@ -1 +0,0 @@ -2.3- diff --git a/dilos/dependencies/sip4-tqt/debian/rules b/dilos/dependencies/sip4-tqt/debian/rules index 9fd544a5a..9f54ca009 100755 --- a/dilos/dependencies/sip4-tqt/debian/rules +++ b/dilos/dependencies/sip4-tqt/debian/rules @@ -12,8 +12,15 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) endif +export DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +export DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) +export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + export DH_OPTIONS +PY3_PROVIDES=sip-tqt-py3api-7.0, sip-tqt-py3api-7.1 +PYDIST=sip $(shell python -c "a=[i.strip() for i in '$(PY3_PROVIDES)'.split(',')]; print sorted(a, reverse=True)[0]") + INSTDIR=$(CURDIR)/debian #CFLAGS= @@ -24,12 +31,9 @@ else CFLAGS += -O2 -g endif -PYTHONS := $(shell pyversions -vr debian/control) - -DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport) -DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport) +PYTHONS := $(shell py3versions -vr) --include /usr/share/python/python.mk +-include /usr/share/python3/python.mk ifeq (,$(py_sitename)) py_sitename = site-packages py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages @@ -48,8 +52,7 @@ build-%/configure-stamp: mkdir -p build-$* cd build-$* \ && python$* ../configure.py \ - -d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \ - -g python$* \ + -d /usr/lib/python$*/$(call py_sitename,$*) \ -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="" \ -p solaris-g++ touch $@ @@ -59,9 +62,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 \ - -g python$* \ - -e /usr/include/python$*_d \ + -d /usr/lib/python$*/$(call py_sitename,$*) \ -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="" touch $@ @@ -85,12 +86,13 @@ clean: dh_testdir dh_testroot rm -rf *-stamp siputils.pyc $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%) - dh_clean + dh_clean debian/python3-sip.pydist install-arch: build dh_testdir dh_testroot dh_prep -a + echo "python3:Provides=$(PY3_PROVIDES)" >> debian/python3-sip-tqt.substvars dh_installdirs -a # This is needed to enforce that the install-arch-% rules are # not run in parallel. Both rules install into the same directory, @@ -101,31 +103,29 @@ install-arch: build $(MAKE) -f debian/rules install-arch-$$p;\ done -# for i in $$(find debian/python-sip-tqt-dbg -name '*.so'); do \ +# for i in $$(find debian/python3-sip-tqt-dbg -name '*.so'); do \ # b=$$(basename $$i .so); \ # mv $$i $$(dirname $$i)/$${b}_d.so; \ # done -# find debian/python-sip-tqt-dbg ! -type d ! -name '*_d.*' | xargs rm -f -# find debian/python-sip-tqt-dbg -depth -empty -exec rmdir {} \; +# find debian/python3-sip-tqt-dbg ! -type d ! -name '*_d.*' | xargs rm -f +# find debian/python3-sip-tqt-dbg -depth -empty -exec rmdir {} \; dh_install -a --sourcedir=$(CURDIR)/debian/tmp - install -m 755 -o root -g root debian/dh_sip_tqt debian/python-sip-tqt-dev/usr/bin - -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-dev/usr/include/python$* - install -m 644 -o root -g root siplib/sip.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 + +install-arch-3.%: + $(MAKE) -C build-3.$* install DESTDIR=$(CURDIR)/debian/tmp +# $(MAKE) -C dbg-build-3.$* install DESTDIR=$(CURDIR)/debian/python3-sip-tqt-dbg + mkdir -p debian/python3-sip-tqt/usr/lib/python3.$*/dist-packages/ + install -m 644 -o root -g root debian/sip_tqt_config_py3.py debian/python3-sip-tqt/usr/lib/python3.$*/dist-packages/sip_tqt_config.py + install -m 644 -o root -g root build-3.$*/sip_tqt_config.py debian/python3-sip-tqt/usr/lib/python3.$*/dist-packages/sip_tqt_config_nd.py +# install -m 644 -o root -g root dbg-build-3.$*/sip_tqt_config.py debian/python3-sip-tqt-dbg/usr/lib/python3.$*/dist-packages/sip_tqt_config_d.py + mkdir -p debian/python3-sip-tqt-dev$$(python3.$* -c 'import sysconfig; print (sysconfig.get_path("include"))') + install -m 644 -o root -g root siplib/sip-tqt.h debian/python3-sip-tqt-dev$$(python3.$* -c 'import sysconfig; print (sysconfig.get_path("include"))')/ +# mkdir -p debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'import sysconfig; print (sysconfig.get_path("include"))') +# ln -s ../$$(python3.$* -c 'import sysconfig; print (sysconfig.get_path("include"))' | xargs basename)/sip-tqt.h \ +# debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'import sysconfig; print (sysconfig.get_path("include"))')/sip-tqt.h + mkdir -p debian/python3-sip-tqt-dev/usr/lib/python3.$*/dist-packages + install -m 644 -o root -g root sip_tqt_distutils.py debian/python3-sip-tqt-dev/usr/lib/python3.$*/dist-packages # Must not depend on anything. This is to be called by @@ -141,19 +141,15 @@ binary-common: dh_link # don't call strip twice, it's in binary-common ifneq (,$(findstring -a, $(DH_OPTIONS))) - DH_OPTIONS= dh_strip -ppython-sip-tqt-dev - DH_OPTIONS= dh_strip -ppython-sip-tqt -Npython-sip-tqt-dev --dbg-package=python-sip-tqt-dbg - rm -rf debian/python-sip-tqt-dbg/usr/share/doc/python-sip-tqt-dbg -# mkdir -p debian/python-sip-tqt-dbg/usr/share/doc -# ln -s python-sip-tqt debian/python-sip-tqt-dbg/usr/share/doc/python-sip-tqt-dbg + DH_OPTIONS= dh_strip -ppython3-sip-tqt-dev + DH_OPTIONS= dh_strip -ppython3-sip-tqt -Npython3-sip-tqt-dev --dbg-package=python3-sip-tqt-dbg + rm -rf debian/python3-sip-tqt-dbg/usr/share/doc/python3-sip-tqt-dbg +# mkdir -p debian/python3-sip-tqt-dbg/usr/share/doc +# ln -s python3-sip-tqt debian/python3-sip-tqt-dbg/usr/share/doc/python3-sip-tqt-dbg endif - dh_compress + dh_compress -X.inv dh_fixperms -ifneq (dh_pysupport,${DH_PYTHON2}) - ${DH_PYTHON2} --no-dbg-cleaning -else - ${DH_PYTHON2} -endif + dh_python3 --no-dbg-cleaning dh_installdeb dh_shlibdeps dh_gencontrol diff --git a/dilos/dependencies/sip4-tqt/debian/sip-tqt-dev.install b/dilos/dependencies/sip4-tqt/debian/sip-tqt-dev.install new file mode 100644 index 000000000..07438bc04 --- /dev/null +++ b/dilos/dependencies/sip4-tqt/debian/sip-tqt-dev.install @@ -0,0 +1 @@ +usr/bin/sip-tqt diff --git a/dilos/dependencies/sip4-tqt/debian/sip-tqt-dev.manpages b/dilos/dependencies/sip4-tqt/debian/sip-tqt-dev.manpages new file mode 100644 index 000000000..1570b539a --- /dev/null +++ b/dilos/dependencies/sip4-tqt/debian/sip-tqt-dev.manpages @@ -0,0 +1 @@ +debian/manpages/sip-tqt.1 diff --git a/dilos/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py b/dilos/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py new file mode 100644 index 000000000..a937df69a --- /dev/null +++ b/dilos/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py @@ -0,0 +1,17 @@ +# import the sip_tqt_config.py for the normal or the debug build + +import os +import sys +import sysconfig + +sys.path.insert(0, os.path.join(sysconfig.get_path('platstdlib'), 'dist-packages')) + +if 'd' in sys.abiflags: + try: + from sip_tqt_config_d import * + from sip_tqt_config_d import _pkg_config, _default_macros + except ImportError as msg: + raise ImportError('No module named sip_tqt_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/dilos/dependencies/sip4-tqt/debian/sipconfig.py b/dilos/dependencies/sip4-tqt/debian/sipconfig.py deleted file mode 100644 index a9e761f08..000000000 --- a/dilos/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/dilos/dependencies/sip4-tqt/debian/watch b/dilos/dependencies/sip4-tqt/debian/watch deleted file mode 100644 index 1ff1f0839..000000000 --- a/dilos/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/dilos/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl b/dilos/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl new file mode 100644 index 000000000..6bbbec325 --- /dev/null +++ b/dilos/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `cmake --version | awk '/^cmake version/ {print \$3}' | tr -d '\n'`; +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 "CMake-Version3=$version3\n"; +print "CMake-Version2=$version2\n"; +print "CMake-Next-Version3=$version3_next\n"; +print "CMake-Next-Version2=$version2_next\n"; diff --git a/dilos/dependencies/tde-cmake/debian/cdbs/debian-tde.mk b/dilos/dependencies/tde-cmake/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..82994a844 --- /dev/null +++ b/dilos/dependencies/tde-cmake/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_HOST_MULTIARCH)) + +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)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/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)/usr/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/usr/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/tde/HTML/en/$$pkg; \ + /usr/bin/meinproc $(DEB_DESTDIR)/usr/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/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/dilos/dependencies/tde-cmake/debian/cdbs/versions.pl b/dilos/dependencies/tde-cmake/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/dilos/dependencies/tde-cmake/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/dilos/dependencies/tde-cmake/debian/changelog b/dilos/dependencies/tde-cmake/debian/changelog new file mode 100644 index 000000000..368e8ed98 --- /dev/null +++ b/dilos/dependencies/tde-cmake/debian/changelog @@ -0,0 +1,11 @@ +tde-cmake (4:14.1.0~pre-0debian10.0.0+0) buster; urgency=low + + * Move from common submodule to dependencies. + + -- Slávek Banko <slavek.banko@axis.cz> Fri, 13 Jan 2023 15:36:28 +0100 + +cmake-trinity (4:14.1.0~pre-0debian10.0.0+0) buster; urgency=low + + * Initial release as a standalone package. + + -- Slávek Banko <slavek.banko@axis.cz> Fri, 14 May 2021 12:50:36 +0200 diff --git a/dilos/dependencies/tde-cmake/debian/compat b/dilos/dependencies/tde-cmake/debian/compat new file mode 100644 index 000000000..f599e28b8 --- /dev/null +++ b/dilos/dependencies/tde-cmake/debian/compat @@ -0,0 +1 @@ +10 diff --git a/dilos/dependencies/tde-cmake/debian/control b/dilos/dependencies/tde-cmake/debian/control new file mode 100644 index 000000000..54248affb --- /dev/null +++ b/dilos/dependencies/tde-cmake/debian/control @@ -0,0 +1,19 @@ +Source: tde-cmake +Section: tde +Priority: optional +Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> +Build-Depends: cdbs, debhelper (>= 10~), quilt, cmake (>= 3.5~) +Standards-Version: 3.8.4 + +Package: tde-cmake +Architecture: all +Depends: cmake (>= ${CMake-Version2}~), cmake (<< ${CMake-Next-Version2}~), perl-base, libxml-parser-perl +Replaces: cmake-trinity (<< 4:14.1.0~) +Breaks: cmake-trinity (<< 4:14.1.0~) +Provides: cmake-trinity +Description: TDE CMake modules + TDE uses its own set of modules and macros to simplify CMake rules. + . + This also includes the TDEL10n module that is used to generate and + update templates for translations and the modified version of + intltool-merge used to merge translations into desktop files. diff --git a/dilos/dependencies/tde-cmake/debian/copyright b/dilos/dependencies/tde-cmake/debian/copyright new file mode 100644 index 000000000..82d825030 --- /dev/null +++ b/dilos/dependencies/tde-cmake/debian/copyright @@ -0,0 +1,18 @@ +This package was debianized by Slávek Banko <slavek.banko@axis.cz> on +Fri, 14 May 2021 04:20:08 +0200. + +Copyright Holder: TDE Team <devels@trinitydesktop.org> + +License: + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License, version 2 +as published by the Free Software Foundation. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANDABILITY of FITNESS FOR A PARTICULAR PURPOSE. +See the GNU General Public License for details. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in /usr/share/common-licenses/GPL. diff --git a/dilos/dependencies/tde-cmake/debian/patches/series b/dilos/dependencies/tde-cmake/debian/patches/series new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/dilos/dependencies/tde-cmake/debian/patches/series diff --git a/dilos/dependencies/tde-cmake/debian/rules b/dilos/dependencies/tde-cmake/debian/rules new file mode 100755 index 000000000..95a42b3f7 --- /dev/null +++ b/dilos/dependencies/tde-cmake/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_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/cmake-versions.XXXXXX`; \ + perl debian/cdbs/cmake-versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) diff --git a/dilos/dependencies/tde-cmake/debian/source/format b/dilos/dependencies/tde-cmake/debian/source/format new file mode 100644 index 000000000..163aaf8d8 --- /dev/null +++ b/dilos/dependencies/tde-cmake/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/dilos/dependencies/tde-cmake/debian/source/options b/dilos/dependencies/tde-cmake/debian/source/options new file mode 100644 index 000000000..72f1f5450 --- /dev/null +++ b/dilos/dependencies/tde-cmake/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/dilos/dependencies/tqca/debian/cdbs/debian-tde.mk b/dilos/dependencies/tqca/debian/cdbs/debian-tde.mk index e2b1dc666..82994a844 100644 --- a/dilos/dependencies/tqca/debian/cdbs/debian-tde.mk +++ b/dilos/dependencies/tqca/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ 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 +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 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/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; \ diff --git a/dilos/dependencies/tqca/debian/compat b/dilos/dependencies/tqca/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/dependencies/tqca/debian/compat +++ b/dilos/dependencies/tqca/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/dependencies/tqca/debian/control b/dilos/dependencies/tqca/debian/control index 7da73e73c..91abded59 100644 --- a/dilos/dependencies/tqca/debian/control +++ b/dilos/dependencies/tqca/debian/control @@ -2,7 +2,7 @@ Source: tqca Section: libs Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqtinterface-dev, libssl-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libtqtinterface-dev, libssl-dev Standards-Version: 3.8.3 Package: libtqca diff --git a/dilos/dependencies/tqscintilla/debian/cdbs/debian-tde.mk b/dilos/dependencies/tqscintilla/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..5b87bf463 --- /dev/null +++ b/dilos/dependencies/tqscintilla/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)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/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/dilos/dependencies/tqscintilla/debian/cdbs/versions.pl b/dilos/dependencies/tqscintilla/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/dilos/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/dilos/dependencies/tqscintilla/debian/compat b/dilos/dependencies/tqscintilla/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/dependencies/tqscintilla/debian/compat +++ b/dilos/dependencies/tqscintilla/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/dependencies/tqscintilla/debian/control b/dilos/dependencies/tqscintilla/debian/control index adf09130c..0ce7442c2 100644 --- a/dilos/dependencies/tqscintilla/debian/control +++ b/dilos/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 (>= 10~), quilt, tde-cmake, 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: 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/dilos/dependencies/tqscintilla/debian/dirs b/dilos/dependencies/tqscintilla/debian/dirs deleted file mode 100644 index ca882bbb7..000000000 --- a/dilos/dependencies/tqscintilla/debian/dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin -usr/sbin diff --git a/dilos/dependencies/tqscintilla/debian/docs b/dilos/dependencies/tqscintilla/debian/docs index edc007104..50bd824bb 100644 --- a/dilos/dependencies/tqscintilla/debian/docs +++ b/dilos/dependencies/tqscintilla/debian/docs @@ -1 +1,2 @@ NEWS +README diff --git a/dilos/dependencies/tqscintilla/debian/libtqscintilla-dev.install b/dilos/dependencies/tqscintilla/debian/libtqscintilla-dev.install index 146a60371..8a9449faa 100644 --- a/dilos/dependencies/tqscintilla/debian/libtqscintilla-dev.install +++ b/dilos/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/dilos/dependencies/tqscintilla/debian/libtqscintilla-doc.install b/dilos/dependencies/tqscintilla/debian/libtqscintilla-doc.install index 005276324..d66379c9a 100644 --- a/dilos/dependencies/tqscintilla/debian/libtqscintilla-doc.install +++ b/dilos/dependencies/tqscintilla/debian/libtqscintilla-doc.install @@ -1 +1 @@ -usr/share/doc/libtqscintilla-doc +usr/share/doc/libtqscintilla/HTML diff --git a/dilos/dependencies/tqscintilla/debian/libtqscintilla7-i18n.install b/dilos/dependencies/tqscintilla/debian/libtqscintilla7-i18n.install new file mode 100644 index 000000000..8fc621fc3 --- /dev/null +++ b/dilos/dependencies/tqscintilla/debian/libtqscintilla7-i18n.install @@ -0,0 +1 @@ +usr/share/tqt3/translations/*.qm diff --git a/dilos/dependencies/tqscintilla/debian/libtqscintilla7.install b/dilos/dependencies/tqscintilla/debian/libtqscintilla7.install index 7b76fb1f7..b3c140659 100644 --- a/dilos/dependencies/tqscintilla/debian/libtqscintilla7.install +++ b/dilos/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/dilos/dependencies/tqscintilla/debian/rules b/dilos/dependencies/tqscintilla/debian/rules index 14545306f..bcf875516 100755 --- a/dilos/dependencies/tqscintilla/debian/rules +++ b/dilos/dependencies/tqscintilla/debian/rules @@ -1,119 +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 -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) - -# This is the debhelper compatibility version to use. -export TQTDIR=/usr/share/tqt3 -export QMAKESPEC=$(TQTDIR)/mkspecs/dilos-g++ -DOCDEST=$(CURDIR)/debian/tmp/usr/share/doc/libtqscintilla-doc/html -HEADERDEST=$(CURDIR)/debian/tmp/usr/include/tqscintilla -LIBSDEST=$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) -TRANSDEST=$(CURDIR)/debian/tmp/$(TQTDIR)/translations -PLUGINDEST=$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/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 --ctfconvert-flags="-i" -Xlibqscintilla.so.7.0.1 -Xlibqscintillaplugin.so - dh_compress -a - dh_fixperms -a - dh_makeshlibs -a -V - dh_installdeb -a - dh_shlibdeps -a --dpkg-shlibdeps-params=--ignore-missing-info - 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/dilos/dependencies/tqt3/debian/README.Debian b/dilos/dependencies/tqt3/debian/README.Debian index e48fe37ea..6d5c135e2 100644 --- a/dilos/dependencies/tqt3/debian/README.Debian +++ b/dilos/dependencies/tqt3/debian/README.Debian @@ -246,26 +246,6 @@ A: With qt-3.2.0, Trolltech has introduced a configure option to Qt called KDE programs. Install your application's system wide configuration file to /etc/tqt3. -Q: I'm compiling a program and I have a compile error due to a missing -include. Why isn't that include not present in the Debian packages anymore -? It compiled with older versions of Debian packages of Qt ! - -A: This may be due to two reasons: either the package still uses the old -includes from Qt 1.x or 2.x that got basically renamed by Trolltech due to -the naming convention. The filenames are now all following the scheme - -ClassName -> classname.h. - -Therefore, if you are the developer of the affected program, change your -sources according to this scheme. Qt ships with tqtrename140, a tool to -help developers migrate their API to the Qt 3 version, -which can help you in the transition upgrade to Qt 3. - -If you are affected by this as a packager, notify upstream to fix those -problems and in the meanwhile use libtqt3-compat-headers as a build -dependency which includes the compatibility headers that just include the -right files from the new API again. - Q: I have a question not covered by this FAQ and README file. Who should I turn to ? diff --git a/dilos/dependencies/tqt3/debian/compat b/dilos/dependencies/tqt3/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/dependencies/tqt3/debian/compat +++ b/dilos/dependencies/tqt3/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/dependencies/tqt3/debian/control b/dilos/dependencies/tqt3/debian/control index cbf9bae09..021e167a6 100644 --- a/dilos/dependencies/tqt3/debian/control +++ b/dilos/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 (>= 9~), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1-4), +Build-Depends: cdbs, debhelper (>= 10~), quilt, cpio, 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, @@ -125,7 +125,7 @@ Depends: libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), libxft-dev, libaudio-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libc6-dev [!solaris-any], libtqt3-mt (= ${binary:Version}), libtqt3-headers (= ${binary:Version}), tqt3-dev-tools (= ${binary:Version}) -Recommends: libtqt3-compat-headers, libcups2-dev +Recommends: libcups2-dev Suggests: libtqt3-i18n, tqt3-doc Description: TQt development files (Threaded) TQt is a C++ class library optimized for graphical user interface @@ -133,13 +133,6 @@ Description: TQt development files (Threaded) for building threaded TQt applications as well as the libtqui.so symlink and the necessary header files for libtqui.so. (See README.Debian and the TQt Documentation for instructions on libtqui.so) - . - WARNING: If you plan to build some older TQt3 applications, you will - most probably have to install the libtqt3-compat-headers package. It - contains all the headers which are not part of the official TQt3 API - anymore but which are still used by some programs. So if you encounter - problems with missing header files, please install this package first - before you send a bugreport. Package: libtqt3-headers Architecture: all @@ -153,23 +146,6 @@ Description: TQt3 header files with TQt3. If you want to compile or develop programs which use TQt3, you have to install this package. -Package: libtqt3-compat-headers -Architecture: all -Multi-Arch: foreign -Section: devel -Replaces: libtqt3-compat-headers (<< 4:14.0.0~) -Breaks: libtqt3-compat-headers (<< 4:14.0.0~) -Depends: libtqt3-headers (= ${binary:Version}) -Recommends: libtqt3-mt-dev -Description: TQt 1.x and 2.x compatibility includes - This package contains header files that are intended for build - compatibility for applications that build with TQt3 but still use - deprecated includes. It is meant as an intermediate solution and - these header files are not part of the official TQt3 API. - All sourcecode that is still using the headers of this package is - subject to be changed to use the new header files which are in - libtqt3-headers. - Package: tqt3-dev-tools Architecture: any Multi-Arch: foreign @@ -211,17 +187,27 @@ Depends: ${shlibs:Depends} Description: TQt3 Designer plugins This package contains plugins for TQt3 Designer +Package: libtqt3-apps-dev +Architecture: any +Multi-Arch: same +Section: libdevel +Conflicts: tqt3-apps-dev (<< 4:14.1.0~) +Depends: ${shlibs:Depends}, libtqt3-mt (= ${binary:Version}) +Description: TQt3 Developer applications development libraries + This package contains additional libraries that ship with the applications + included with TQt - the TQt Designer and the TQt Assistant. + Package: tqt3-apps-dev Architecture: any Multi-Arch: no Section: devel Replaces: tqt3-apps-dev (<< 4:14.0.0~) Breaks: tqt3-apps-dev (<< 4:14.0.0~) -Depends: libtqt3-mt-dev +Depends: libtqt3-mt-dev, libtqt3-apps-dev Description: TQt3 Developer applications development files This package is intended for developers who want to develop applications - using the additional static libraries that ship with the applications - included with TQt; the TQt Designer and the TQt Assistant. + using the additional libraries that ship with the applications + included with TQt - the TQt Designer and the TQt Assistant. It allows integrating additional enhancements into the TQt Designer respectively faciliate the TQt Assistant from within your TQt application to interactively call the Assistant for displaying online help that the @@ -300,7 +286,7 @@ Breaks: tqt3-dev-tools-compat (<< 4:14.0.0~) Recommends: libtqt3-mt-dev Depends: ${shlibs:Depends} Description: Conversion utilities for TQt3 development - This package contains some older TQt tools (namely tqtrename140, + This package contains some older TQt tools (namely tqm2ts, tqtmergetr, tqtfindtr and msg2tqm). These tools are needed only by application developers who need to migrate any TQt application written for TQt 1.x or 2.x over to TQt 3.x. The purpose of the tools are to @@ -314,7 +300,7 @@ Multi-Arch: foreign Section: libs Replaces: libtqt3-i18n (<< 4:14.0.0~) Breaks: libtqt3-i18n (<< 4:14.0.0~) -Recommends: libtqt3-mt +Recommends: libtqt3-mt | libtqt3-mt-t64 Description: i18n files for TQt3 library This package contains the internationalization files for the TQt library. TQt applications that are internationalized will need to depend on this package diff --git a/dilos/dependencies/tqt3/debian/libtqt3-apps-dev.install b/dilos/dependencies/tqt3/debian/libtqt3-apps-dev.install new file mode 100644 index 000000000..eea094136 --- /dev/null +++ b/dilos/dependencies/tqt3/debian/libtqt3-apps-dev.install @@ -0,0 +1,3 @@ +usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.so.* +usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.so.* +usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.so.* diff --git a/dilos/dependencies/tqt3/debian/libtqt3-compat-headers.install b/dilos/dependencies/tqt3/debian/libtqt3-compat-headers.install deleted file mode 100644 index d2bcbd7d6..000000000 --- a/dilos/dependencies/tqt3/debian/libtqt3-compat-headers.install +++ /dev/null @@ -1,48 +0,0 @@ -usr/include/tqt3/ntqapp.h -usr/include/tqt3/ntqarray.h -usr/include/tqt3/ntqbitarry.h -usr/include/tqt3/ntqbttngrp.h -usr/include/tqt3/ntqchkbox.h -usr/include/tqt3/ntqclipbrd.h -usr/include/tqt3/ntqcollect.h -usr/include/tqt3/ntqcollection.h -usr/include/tqt3/ntqcombo.h -usr/include/tqt3/ntqconnect.h -usr/include/tqt3/ntqdatetm.h -usr/include/tqt3/ntqdrawutl.h -usr/include/tqt3/ntqdstream.h -usr/include/tqt3/ntqfiledef.h -usr/include/tqt3/ntqfiledlg.h -usr/include/tqt3/ntqfileinf.h -usr/include/tqt3/ntqfontinf.h -usr/include/tqt3/ntqfontmet.h -usr/include/tqt3/ntqgrpbox.h -usr/include/tqt3/ntqintcach.h -usr/include/tqt3/ntqiodev.h -usr/include/tqt3/ntqlcdnum.h -usr/include/tqt3/ntqlined.h -usr/include/tqt3/ntqmenudta.h -usr/include/tqt3/ntqmetaobj.h -usr/include/tqt3/ntqmlined.h -usr/include/tqt3/ntqmsgbox.h -usr/include/tqt3/ntqmultilinedit.h -usr/include/tqt3/ntqobjcoll.h -usr/include/tqt3/ntqobjdefs.h -usr/include/tqt3/ntqpdevmet.h -usr/include/tqt3/ntqpmcache.h -usr/include/tqt3/ntqpntarry.h -usr/include/tqt3/ntqpopmenu.h -usr/include/tqt3/ntqprndlg.h -usr/include/tqt3/ntqprogbar.h -usr/include/tqt3/ntqprogdlg.h -usr/include/tqt3/ntqpsprn.h -usr/include/tqt3/ntqpushbt.h -usr/include/tqt3/ntqqueue.h -usr/include/tqt3/ntqradiobt.h -usr/include/tqt3/ntqrangect.h -usr/include/tqt3/ntqscrbar.h -usr/include/tqt3/ntqsocknot.h -usr/include/tqt3/ntqtabdlg.h -usr/include/tqt3/ntqtstream.h -usr/include/tqt3/ntqwidcoll.h -usr/include/tqt3/ntqwindefs.h diff --git a/dilos/dependencies/tqt3/debian/libtqt3-headers.install b/dilos/dependencies/tqt3/debian/libtqt3-headers.install index be1e2d79c..a91948f60 100644 --- a/dilos/dependencies/tqt3/debian/libtqt3-headers.install +++ b/dilos/dependencies/tqt3/debian/libtqt3-headers.install @@ -169,7 +169,6 @@ usr/include/tqt3/ntqrtlcodec.h usr/include/tqt3/ntqscrollbar.h usr/include/tqt3/ntqscrollview.h usr/include/tqt3/ntqsemaphore.h -usr/include/tqt3/ntqsemimodal.h usr/include/tqt3/ntqserversocket.h usr/include/tqt3/ntqsession.h usr/include/tqt3/ntqsessionmanager.h @@ -188,7 +187,6 @@ usr/include/tqt3/ntqslider.h usr/include/tqt3/ntqsocket.h usr/include/tqt3/ntqsocketdevice.h usr/include/tqt3/ntqsocketnotifier.h -usr/include/tqt3/ntqsortedlist.h usr/include/tqt3/ntqsound.h usr/include/tqt3/ntqspinbox.h usr/include/tqt3/ntqsplashscreen.h diff --git a/dilos/dependencies/tqt3/debian/libtqt3-mt-dev.docs b/dilos/dependencies/tqt3/debian/libtqt3-mt-dev.docs index dbd9a5d19..59a51ee13 100644 --- a/dilos/dependencies/tqt3/debian/libtqt3-mt-dev.docs +++ b/dilos/dependencies/tqt3/debian/libtqt3-mt-dev.docs @@ -1,4 +1,5 @@ -README +README.md README.immodule +README.Qt3 README-QT.TXT PLATFORMS diff --git a/dilos/dependencies/tqt3/debian/libtqt3-mt.docs b/dilos/dependencies/tqt3/debian/libtqt3-mt.docs index dbd9a5d19..59a51ee13 100644 --- a/dilos/dependencies/tqt3/debian/libtqt3-mt.docs +++ b/dilos/dependencies/tqt3/debian/libtqt3-mt.docs @@ -1,4 +1,5 @@ -README +README.md README.immodule +README.Qt3 README-QT.TXT PLATFORMS diff --git a/dilos/dependencies/tqt3/debian/rules b/dilos/dependencies/tqt3/debian/rules index 9b6c34f78..910bfb64a 100755 --- a/dilos/dependencies/tqt3/debian/rules +++ b/dilos/dependencies/tqt3/debian/rules @@ -25,6 +25,13 @@ DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +DEB_TIME64_API = $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false) +ifeq ($(DEB_TIME64_API),true) +DEB_TIME64_SUFFIX = -t64 +else +DEB_TIME64_SUFFIX = +endif + # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL ?= true @@ -36,7 +43,7 @@ PLATFORM_ARG = dilos-g++ # build variables (directorys) DEBIAN = $(shell pwd)/debian -P_LIBS = $(DEBIAN)/libtqt3-mt +P_LIBS = $(DEBIAN)/libtqt3-mt$(DEB_TIME64_SUFFIX) P_DOC = $(DEBIAN)/tqt3-doc P_APPSDEV = $(DEBIAN)/tqt3-apps-dev P_HEADERS = $(DEBIAN)/libtqt3-headers @@ -131,6 +138,22 @@ endif post-patches:: dh_testdir +ifeq ($(DEB_TIME64_API),true) + # update library package name for TIME64 ABI + ls -d debian/* | \ + grep -E "/libtqt3-mt\." | \ + grep -v "\.t64$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.t64 ] || \ + (cp -a $$a debian/libtqt3-mt$(DEB_TIME64_SUFFIX).$${a##*.} && mv $$a $$a.t64); \ + done + [ -f debian/control.t64 ] || \ + sed -i.t64 \ + -e "s/^\\(Package: libtqt3-mt\\)$$/\\1$(DEB_TIME64_SUFFIX)/" \ + -e "s/^\\(Replaces\\|Breaks\\): \\(libtqt3-mt\\)\\( \|$$\)/\\1: \\2, \\2$(DEB_TIME64_SUFFIX)\\3/" \ + -e "s/\\(libtqt3-mt\\) (=/\\1$(DEB_TIME64_SUFFIX) (=/" \ + debian/control +endif build build-arch: libqt-thread-stamp build-indep: @@ -159,7 +182,6 @@ libqt-thread-stamp: post-patches # archives get accidentally stripped by make install. Copy over unstripped ones for now. -cp lib/lib*.a $(TMP_INSTALL)/usr/lib/ - cp bin/tqtrename140 $(TMP_INSTALL)/usr/bin/ cp bin/tqtfindtr $(TMP_INSTALL)/usr/bin/ # build tqtconv2ui @@ -231,6 +253,20 @@ clean:: dh_clean +ifeq ($(DEB_TIME64_API),true) + # revert library package name for TIME64 ABI + ls -d debian/* | \ + grep -E "\.t64$$" | \ + while read a; do \ + mv $$a $${a%.t64}; \ + done + ls -d debian/* | \ + grep -E "/libtqt3-mt$(DEB_TIME64_SUFFIX)\." | \ + xargs -r rm + [ ! -f debian/control.t64 ] || \ + mv debian/control.t64 debian/control +endif + install: build dh_testdir @@ -430,7 +466,7 @@ binary-arch: build install dh_link -ptqt3-dev-tools usr/share/tqt3/doc/html usr/share/doc/tqt3-dev-tools/html # copy README.Debian - for a in libtqt3-mt-dev libtqt3-mt tqt3-doc; do install -D `pwd`/debian/README.Debian `pwd`/debian/"$$a"/usr/share/doc/"$$a"/README.Debian; done + for a in libtqt3-mt-dev libtqt3-mt$(DEB_TIME64_SUFFIX) tqt3-doc; do install -D `pwd`/debian/README.Debian `pwd`/debian/"$$a"/usr/share/doc/"$$a"/README.Debian; done # install the qmake binary rm -rf `pwd`/debian/tqt3-dev-tools/usr/bin/tqmake @@ -467,7 +503,7 @@ binary-arch: build install dh_makeshlibs -a $(IBASE) -V dh_installdeb -a $(IBASE) dh_perl -a $(IBASE) - dh_shlibdeps -a $(IBASE) -l`pwd`/debian/libtqt3-mt/usr/lib\ + dh_shlibdeps -a $(IBASE) -l`pwd`/debian/libtqt3-mt$(DEB_TIME64_SUFFIX)/usr/lib\ --dpkg-shlibdeps-params=--ignore-missing-info # fix shlibdeps madness diff --git a/dilos/dependencies/tqt3/debian/tqt3-apps-dev.install b/dilos/dependencies/tqt3/debian/tqt3-apps-dev.install index d60b07fc7..43dc0a94a 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-apps-dev.install +++ b/dilos/dependencies/tqt3/debian/tqt3-apps-dev.install @@ -1,4 +1,4 @@ -usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.* -usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.* -usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.* +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 diff --git a/dilos/dependencies/tqt3/debian/tqt3-apps-dev.links b/dilos/dependencies/tqt3/debian/tqt3-apps-dev.links index 72bd7093a..60fe91b77 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-apps-dev.links +++ b/dilos/dependencies/tqt3/debian/tqt3-apps-dev.links @@ -1,8 +1,8 @@ /usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.prl /usr/share/tqt3/lib/libtqteditor.prl -/usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.a /usr/share/tqt3/lib/libtqteditor.a +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.so /usr/share/tqt3/lib/libtqteditor.so /usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.prl /usr/share/tqt3/lib/libtqtdesignercore.prl -/usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.a /usr/share/tqt3/lib/libtqtdesignercore.a +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.so /usr/share/tqt3/lib/libtqtdesignercore.so /usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.prl /usr/share/tqt3/lib/libtqassistantclient.prl -/usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.a /usr/share/tqt3/lib/libtqassistantclient.a +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.so /usr/share/tqt3/lib/libtqassistantclient.so /usr/include/tqt3 /usr/share/tqt3/tools/designer/editor /usr/include/tqt3 /usr/share/tqt3/tools/designer/interfaces diff --git a/dilos/dependencies/tqt3/debian/tqt3-dev-tools-compat.install b/dilos/dependencies/tqt3/debian/tqt3-dev-tools-compat.install index 56e0156b5..5975d4bb9 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-dev-tools-compat.install +++ b/dilos/dependencies/tqt3/debian/tqt3-dev-tools-compat.install @@ -1,4 +1,3 @@ -usr/bin/tqtrename140 usr/bin/tqm2ts usr/bin/tqtmergetr usr/bin/tqtfindtr diff --git a/dilos/dependencies/tqt3/debian/tqt3-doc.docs b/dilos/dependencies/tqt3/debian/tqt3-doc.docs index f08fd0f02..2630a416c 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-doc.docs +++ b/dilos/dependencies/tqt3/debian/tqt3-doc.docs @@ -1,2 +1,3 @@ FAQ +README.md README-QT.TXT diff --git a/dilos/dependencies/tqtinterface/debian/cdbs/debian-tde.mk b/dilos/dependencies/tqtinterface/debian/cdbs/debian-tde.mk index f36e3527c..5b87bf463 100644 --- a/dilos/dependencies/tqtinterface/debian/cdbs/debian-tde.mk +++ b/dilos/dependencies/tqtinterface/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ 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 +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 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/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; \ diff --git a/dilos/dependencies/tqtinterface/debian/compat b/dilos/dependencies/tqtinterface/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/dependencies/tqtinterface/debian/compat +++ b/dilos/dependencies/tqtinterface/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/dependencies/tqtinterface/debian/control b/dilos/dependencies/tqtinterface/debian/control index 0c20229d6..0d440e29d 100644 --- a/dilos/dependencies/tqtinterface/debian/control +++ b/dilos/dependencies/tqtinterface/debian/control @@ -2,7 +2,7 @@ Source: libtqtinterface Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqt3-mt-dev, tqt3-apps-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libtqt3-mt-dev, tqt3-apps-dev Standards-Version: 3.8.4 Package: libtqtinterface |