diff options
Diffstat (limited to 'ubuntu/_base/dependencies')
301 files changed, 4435 insertions, 7063 deletions
diff --git a/ubuntu/_base/dependencies/akode/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/akode/debian/cdbs/debian-tde.mk index fb8c1b6c3..aba508624 100644 --- a/ubuntu/_base/dependencies/akode/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/dependencies/akode/debian/cdbs/debian-tde.mk @@ -57,6 +57,15 @@ 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 @@ -73,7 +82,17 @@ 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 | \ + 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 @@ -95,6 +114,8 @@ 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 \ @@ -111,6 +132,14 @@ ifndef _cdbs_class_cmake 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 @@ -140,12 +169,27 @@ common-binary-arch:: 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 @@ -158,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)/opt/trinity/lib && \ + test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: set -e; \ @@ -179,7 +228,7 @@ debian/stamp-kde-apidox: common-install-indep:: common-install-kde-apidox common-install-kde-apidox:: - $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) + $(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)) @@ -195,6 +244,7 @@ ifndef _cdbs_class_cmake subdirs; \ fi endif + rm -f .tdepkginfo rm -f debian/stamp-kde-apidox rm -f debian/stamp-cvs-make diff --git a/ubuntu/_base/dependencies/akode/debian/compat b/ubuntu/_base/dependencies/akode/debian/compat index 7f8f011eb..f599e28b8 100644 --- a/ubuntu/_base/dependencies/akode/debian/compat +++ b/ubuntu/_base/dependencies/akode/debian/compat @@ -1 +1 @@ -7 +10 diff --git a/ubuntu/_base/dependencies/akode/debian/control b/ubuntu/_base/dependencies/akode/debian/control index b411183de..07f1b7913 100644 --- a/ubuntu/_base/dependencies/akode/debian/control +++ b/ubuntu/_base/dependencies/akode/debian/control @@ -1,10 +1,10 @@ Source: akode Section: sound Priority: optional -Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Isaac Clerencia <isaac@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Adeodato Simó <dato@net.com.org.es> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 7.0.50~), quilt, cmake, gawk, libflac-dev (>= 1.1.1-3), libflac-dev, libmad0-dev, libogg-dev, libvorbis-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsamplerate0-dev, libspeex-dev, libpulse-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libflac-dev (>= 1.1.1-3), libmad0-dev, libogg-dev, libvorbis-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsamplerate0-dev, libspeex-dev, libpulse-dev, libjack-dev, libavformat-dev Standards-Version: 3.7.3 Package: libakode2 @@ -19,8 +19,21 @@ Description: akode plugin for aRts plugins to play a variety of formats: Ogg Vorbis, Musepack (MPC), FLAC and Speex. aKode also focuses on performance, and so it means a big enhancement for users runing aRts in non-realtime mode. + +Package: libakode2-ffmpeg +Section: libs +Architecture: any +Depends: ${shlibs:Depends} +Conflicts: akode +Replaces: akode +Enhances: libarts1c2, libarts1c2a-trinity +Description: ffmpeg plugins for akode + aKode is a new multithreaded audio library that provides aRts with + plugins to play a variety of formats: Ogg Vorbis, Musepack (MPC), + FLAC and Speex. aKode also focuses on performance, and so it means a + big enhancement for users runing aRts in non-realtime mode. . - Homepage: http://www.carewolf.com/akode + This package provides for akode formats supported by FFMPEG. Package: libakode2-mpeg Section: libs @@ -36,8 +49,6 @@ Description: mpeg plugins for akode big enhancement for users runing aRts in non-realtime mode. . This package provides MP3 and other MPEG formats for akode. - . - Homepage: http://www.carewolf.com/akode Package: libakode2-pulse Section: libs @@ -53,8 +64,21 @@ Description: pulseaudio sink for akode big enhancement for users runing aRts in non-realtime mode. . This package provides PulseAudio sink for akode. + +Package: libakode2-jack +Section: libs +Architecture: any +Depends: ${shlibs:Depends} +Conflicts: akode +Replaces: akode +Enhances: libarts1c2, libarts1c2a-trinity +Description: jack sink for akode + aKode is a new multithreaded audio library that provides aRts with + plugins to play a variety of formats: Ogg Vorbis, Musepack (MPC), + FLAC and Speex. aKode also focuses on performance, and so it means a + big enhancement for users runing aRts in non-realtime mode. . - Homepage: http://www.carewolf.com/akode + This package provides JACK sink for akode. Package: libakode-dev Section: libdevel @@ -68,8 +92,6 @@ Description: development files for akode big enhancement for users runing aRts in non-realtime mode. . This package contains the development files for libakode. - . - Homepage: http://www.carewolf.com/akode Package: akode-dbg Section: libdevel diff --git a/ubuntu/_base/dependencies/akode/debian/docs b/ubuntu/_base/dependencies/akode/debian/docs new file mode 100644 index 000000000..0b6e0f321 --- /dev/null +++ b/ubuntu/_base/dependencies/akode/debian/docs @@ -0,0 +1,2 @@ +AUTHORS +README.md diff --git a/ubuntu/_base/dependencies/akode/debian/libakode-dev.install b/ubuntu/_base/dependencies/akode/debian/libakode-dev.install index 573b9c451..e61e3b46b 100644 --- a/ubuntu/_base/dependencies/akode/debian/libakode-dev.install +++ b/ubuntu/_base/dependencies/akode/debian/libakode-dev.install @@ -2,6 +2,7 @@ debian/tmp/usr/bin/akode-config debian/tmp/usr/lib/libakode.so debian/tmp/usr/lib/libakode.la debian/tmp/usr/lib/libakode_alsa_sink.la +debian/tmp/usr/lib/libakode_jack_sink.la debian/tmp/usr/lib/libakode_mpc_decoder.la debian/tmp/usr/lib/libakode_mpeg_decoder.la debian/tmp/usr/lib/libakode_oss_sink.la diff --git a/ubuntu/_base/dependencies/akode/debian/libakode2-ffmpeg.install b/ubuntu/_base/dependencies/akode/debian/libakode2-ffmpeg.install new file mode 100644 index 000000000..83c5e777b --- /dev/null +++ b/ubuntu/_base/dependencies/akode/debian/libakode2-ffmpeg.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libakode_ffmpeg_decoder.so diff --git a/ubuntu/_base/dependencies/akode/debian/libakode2-jack.install b/ubuntu/_base/dependencies/akode/debian/libakode2-jack.install new file mode 100644 index 000000000..937eebe69 --- /dev/null +++ b/ubuntu/_base/dependencies/akode/debian/libakode2-jack.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libakode_jack_sink.so diff --git a/ubuntu/_base/dependencies/akode/debian/patches/series b/ubuntu/_base/dependencies/akode/debian/patches/series index 8b1378917..e69de29bb 100644 --- a/ubuntu/_base/dependencies/akode/debian/patches/series +++ b/ubuntu/_base/dependencies/akode/debian/patches/series @@ -1 +0,0 @@ - diff --git a/ubuntu/_base/dependencies/akode/debian/rules b/ubuntu/_base/dependencies/akode/debian/rules index 929156f0e..1788b4f36 100755 --- a/ubuntu/_base/dependencies/akode/debian/rules +++ b/ubuntu/_base/dependencies/akode/debian/rules @@ -9,27 +9,21 @@ ifeq (linux,$(DEB_HOST_ARCH_OS)) DEB_DH_GENCONTROL_ARGS=-- -Valsa-dev=libasound2-dev endif -DEB_CONFIGURE_EXTRA_FLAGS := --without-libltdl --with-extra-includes=/usr/include/speex/ - DEB_DH_STRIP_ARGS := --dbg-package=akode-dbg PACKAGES_WITH_LIBS := libakode2 DEB_DH_MAKESHLIBS_ARGS_libakode2 := -V'libakode2 (>= 2-rc1-1)' -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - # Build options DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DWITH_ALL_OPTIONS="ON" \ -DWITH_LIBLTDL="OFF" \ - -DWITH_JACK_SINK="OFF" \ - -DWITH_PULSE_SINK="ON" \ - -DWITH_FFMPEG_DECODER="OFF" + -DWITH_FFMPEG_DECODER="ON" common-install-prehook-arch:: grep -v libakode_alsa_sink debian/libakode2.install > debian/libakode2.install.kfreebsd-i386 diff --git a/ubuntu/_base/dependencies/arts/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/arts/debian/cdbs/debian-tde.mk index fb8c1b6c3..aba508624 100644 --- a/ubuntu/_base/dependencies/arts/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/dependencies/arts/debian/cdbs/debian-tde.mk @@ -57,6 +57,15 @@ 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 @@ -73,7 +82,17 @@ 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 | \ + 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 @@ -95,6 +114,8 @@ 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 \ @@ -111,6 +132,14 @@ ifndef _cdbs_class_cmake 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 @@ -140,12 +169,27 @@ common-binary-arch:: 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 @@ -158,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)/opt/trinity/lib && \ + test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: set -e; \ @@ -179,7 +228,7 @@ debian/stamp-kde-apidox: common-install-indep:: common-install-kde-apidox common-install-kde-apidox:: - $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) + $(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)) @@ -195,6 +244,7 @@ ifndef _cdbs_class_cmake subdirs; \ fi endif + rm -f .tdepkginfo rm -f debian/stamp-kde-apidox rm -f debian/stamp-cvs-make diff --git a/ubuntu/_base/dependencies/arts/debian/compat b/ubuntu/_base/dependencies/arts/debian/compat index 7f8f011eb..f599e28b8 100644 --- a/ubuntu/_base/dependencies/arts/debian/compat +++ b/ubuntu/_base/dependencies/arts/debian/compat @@ -1 +1 @@ -7 +10 diff --git a/ubuntu/_base/dependencies/arts/debian/control b/ubuntu/_base/dependencies/arts/debian/control index 01eb5d724..c56f1200d 100644 --- a/ubuntu/_base/dependencies/arts/debian/control +++ b/ubuntu/_base/dependencies/arts/debian/control @@ -1,15 +1,15 @@ Source: arts-trinity Section: libs -Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +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 (>= 0.4.48), debhelper (>= 7.0.50~), quilt, - docbook-to-man, gawk, sharutils, texinfo, +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, + docbook-to-man, texinfo, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libaudio-dev, libaudiofile-dev, libglib2.0-dev, libmad0-dev, libogg-dev, libtqtinterface-dev, - libvorbis-dev, cmake, libltdl-dev + libvorbis-dev, libltdl-dev Build-Conflicts: libmas-dev Standards-Version: 3.8.4 @@ -18,7 +18,7 @@ Architecture: all Section: sound Replaces: arts-kde3 (<< 4:14.0.0~), arts-trinity (<< 4:14.0.0~) Breaks: arts-kde3 (<< 4:14.0.0~), 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/ubuntu/_base/dependencies/arts/debian/docs b/ubuntu/_base/dependencies/arts/debian/docs new file mode 100644 index 000000000..6f7727790 --- /dev/null +++ b/ubuntu/_base/dependencies/arts/debian/docs @@ -0,0 +1,2 @@ +README.md +TODO diff --git a/ubuntu/_base/dependencies/arts/debian/libarts1c2a-trinity.install b/ubuntu/_base/dependencies/arts/debian/libarts1c2a-trinity.install index 856cad6c5..cfc14e7c5 100644 --- a/ubuntu/_base/dependencies/arts/debian/libarts1c2a-trinity.install +++ b/ubuntu/_base/dependencies/arts/debian/libarts1c2a-trinity.install @@ -60,3 +60,5 @@ debian/tmp/opt/trinity/lib/mcop/kmedia2.mcopclass debian/tmp/opt/trinity/lib/mcop/kmedia2.mcoptype debian/tmp/opt/trinity/lib/mcop/soundserver.mcopclass debian/tmp/opt/trinity/lib/mcop/soundserver.mcoptype +debian/tmp/opt/trinity/share/man/man1/artscat-trinity.1 +debian/tmp/opt/trinity/share/man/man1/artsdsp-trinity.1 diff --git a/ubuntu/_base/dependencies/arts/debian/libarts1c2a-trinity.manpages b/ubuntu/_base/dependencies/arts/debian/libarts1c2a-trinity.manpages deleted file mode 100644 index 8d7f5c573..000000000 --- a/ubuntu/_base/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/ubuntu/_base/dependencies/arts/debian/libartsc0-dev-trinity.manpages b/ubuntu/_base/dependencies/arts/debian/libartsc0-dev-trinity.manpages deleted file mode 100644 index cef6ee689..000000000 --- a/ubuntu/_base/dependencies/arts/debian/libartsc0-dev-trinity.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/man/out/artsc-config-trinity.1 diff --git a/ubuntu/_base/dependencies/arts/debian/libartsc0-trinity-dev.install b/ubuntu/_base/dependencies/arts/debian/libartsc0-trinity-dev.install index 125ebc39e..fcecb09b2 100644 --- a/ubuntu/_base/dependencies/arts/debian/libartsc0-trinity-dev.install +++ b/ubuntu/_base/dependencies/arts/debian/libartsc0-trinity-dev.install @@ -4,6 +4,7 @@ debian/tmp/opt/trinity/include/artsc/artsc_export.h debian/tmp/opt/trinity/lib/libartsc.la debian/tmp/opt/trinity/lib/libartsc.so debian/tmp/opt/trinity/lib/libartsgsl.a +debian/tmp/opt/trinity/share/man/man1/artsc-config-trinity.1 debian/tmp/usr/lib/pkgconfig/arts.pc debian/tmp/usr/lib/pkgconfig/artsc.pc diff --git a/ubuntu/_base/dependencies/arts/debian/man/artsc-config-kde3.sgml b/ubuntu/_base/dependencies/arts/debian/man/artsc-config-kde3.sgml deleted file mode 100644 index 8072e337d..000000000 --- a/ubuntu/_base/dependencies/arts/debian/man/artsc-config-kde3.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/ubuntu/_base/dependencies/arts/debian/man/artsc-config-trinity.sgml b/ubuntu/_base/dependencies/arts/debian/man/artsc-config-trinity.sgml deleted file mode 100644 index 8072e337d..000000000 --- a/ubuntu/_base/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/ubuntu/_base/dependencies/arts/debian/man/artscat-kde3.sgml b/ubuntu/_base/dependencies/arts/debian/man/artscat-kde3.sgml deleted file mode 100644 index 7dff34d95..000000000 --- a/ubuntu/_base/dependencies/arts/debian/man/artscat-kde3.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/ubuntu/_base/dependencies/arts/debian/man/artscat-trinity.sgml b/ubuntu/_base/dependencies/arts/debian/man/artscat-trinity.sgml deleted file mode 100644 index 7dff34d95..000000000 --- a/ubuntu/_base/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/ubuntu/_base/dependencies/arts/debian/man/artsdsp-kde3.1 b/ubuntu/_base/dependencies/arts/debian/man/artsdsp-kde3.1 deleted file mode 100644 index 2615f47c2..000000000 --- a/ubuntu/_base/dependencies/arts/debian/man/artsdsp-kde3.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/ubuntu/_base/dependencies/arts/debian/man/artsdsp-trinity.1 b/ubuntu/_base/dependencies/arts/debian/man/artsdsp-trinity.1 deleted file mode 100644 index 2615f47c2..000000000 --- a/ubuntu/_base/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/ubuntu/_base/dependencies/arts/debian/rules b/ubuntu/_base/dependencies/arts/debian/rules index 7f5debe08..a934b8c5a 100755 --- a/ubuntu/_base/dependencies/arts/debian/rules +++ b/ubuntu/_base/dependencies/arts/debian/rules @@ -12,25 +12,39 @@ 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 := -DPKGCONFIG_INSTALL_DIR="/usr/lib/pkgconfig" -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" \ --DCMAKE_BUILD_TYPE=RelWithDebInfo +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 -# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to -# never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL = true -DEB_DH_STRIP_ARGS := --dbg-package=arts-trinity-dbg +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DPKGCONFIG_INSTALL_DIR="/usr/lib/pkgconfig" \ + -DLIB_SUFFIX="" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \ + -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" \ + -DAUTODETECT_QT_DIRS="ON" \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DBUILD_ALL="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DWITH_GCC_VISIBILITY="ON" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) +DEB_DH_STRIP_ARGS := --dbg-package=arts-trinity-dbg -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)/opt/trinity/lib) -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))')) @@ -42,3 +56,39 @@ 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/ubuntu/_base/dependencies/avahi-tqt/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/avahi-tqt/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..aba508624 --- /dev/null +++ b/ubuntu/_base/dependencies/avahi-tqt/debian/cdbs/debian-tde.mk @@ -0,0 +1,251 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Copyright © 2019 TDE Team +# Description: A class for TDE packages; sets TDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch debian/stamp-cvs-make + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +ifdef _cdbs_class_cmake +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif +endif + +ifndef _cdbs_rules_patchsys_quilt +DEB_PATCHDIRS := debian/patches/common debian/patches +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el + +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +DEB_BUILD_PARALLEL ?= true + +cdbs_configure_flags += \ + --with-qt-dir=/usr/share/qt3 \ + --disable-rpath \ + --with-xinerama \ + $(cdbs_kde_enable_final) \ + $(cdbs_kde_enable_debug) + + +# This is a convenience target for calling manually. +# It's not part of the build process. +buildprep: clean apply-patches +ifndef _cdbs_class_cmake + $(MAKE) -f admin/Makefile.common dist +endif + debian/rules clean + +.tdepkginfo: + echo "# TDE package information" >.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo + date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo + +post-patches:: .tdepkginfo + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + # update multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ + sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ + done + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + # revert multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ ! -f $$a.arch ] || \ + mv $$a.arch $$a; \ + done + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \ + test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f .tdepkginfo + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/ubuntu/_base/dependencies/avahi-tqt/debian/cdbs/versions.pl b/ubuntu/_base/dependencies/avahi-tqt/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/ubuntu/_base/dependencies/avahi-tqt/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/_base/dependencies/avahi-tqt/debian/compat b/ubuntu/_base/dependencies/avahi-tqt/debian/compat index 7f8f011eb..f599e28b8 100644 --- a/ubuntu/_base/dependencies/avahi-tqt/debian/compat +++ b/ubuntu/_base/dependencies/avahi-tqt/debian/compat @@ -1 +1 @@ -7 +10 diff --git a/ubuntu/_base/dependencies/avahi-tqt/debian/control b/ubuntu/_base/dependencies/avahi-tqt/debian/control index 2ab2e4a7f..a21507b87 100644 --- a/ubuntu/_base/dependencies/avahi-tqt/debian/control +++ b/ubuntu/_base/dependencies/avahi-tqt/debian/control @@ -1,13 +1,11 @@ Source: avahi-tqt Section: net Priority: optional -Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> -Uploaders: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Build-Depends: debhelper (>= 7.0.50~), - cmake, +Build-Depends: cdbs, debhelper (>= 10~), quilt, + tde-cmake, ninja-build, gcc, - cdbs, pkg-config, libtqtinterface-dev, libavahi-common-dev, diff --git a/ubuntu/_base/dependencies/avahi-tqt/debian/patches/.gitignore b/ubuntu/_base/dependencies/avahi-tqt/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/ubuntu/_base/dependencies/avahi-tqt/debian/patches/.gitignore +++ b/ubuntu/_base/dependencies/avahi-tqt/debian/patches/series diff --git a/ubuntu/_base/dependencies/avahi-tqt/debian/rules b/ubuntu/_base/dependencies/avahi-tqt/debian/rules index 32d30901d..dc8f0248c 100755 --- a/ubuntu/_base/dependencies/avahi-tqt/debian/rules +++ b/ubuntu/_base/dependencies/avahi-tqt/debian/rules @@ -2,6 +2,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk +include debian/cdbs/debian-tde.mk # Ensure at build time that the library has no dependencies on undefined # symbols, and speed up loading. @@ -9,10 +10,8 @@ export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,-z,defs -Wl,-O1 # Build options DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DWITH_ALL_OPTIONS="ON" - -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) diff --git a/ubuntu/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk index fb8c1b6c3..aba508624 100644 --- a/ubuntu/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk @@ -57,6 +57,15 @@ 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 @@ -73,7 +82,17 @@ 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 | \ + 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 @@ -95,6 +114,8 @@ 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 \ @@ -111,6 +132,14 @@ ifndef _cdbs_class_cmake 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 @@ -140,12 +169,27 @@ common-binary-arch:: 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 @@ -158,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)/opt/trinity/lib && \ + test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: set -e; \ @@ -179,7 +228,7 @@ debian/stamp-kde-apidox: common-install-indep:: common-install-kde-apidox common-install-kde-apidox:: - $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) + $(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)) @@ -195,6 +244,7 @@ ifndef _cdbs_class_cmake subdirs; \ fi endif + rm -f .tdepkginfo rm -f debian/stamp-kde-apidox rm -f debian/stamp-cvs-make diff --git a/ubuntu/_base/dependencies/dbus-1-tqt/debian/compat b/ubuntu/_base/dependencies/dbus-1-tqt/debian/compat index 7f8f011eb..f599e28b8 100644 --- a/ubuntu/_base/dependencies/dbus-1-tqt/debian/compat +++ b/ubuntu/_base/dependencies/dbus-1-tqt/debian/compat @@ -1 +1 @@ -7 +10 diff --git a/ubuntu/_base/dependencies/dbus-1-tqt/debian/control b/ubuntu/_base/dependencies/dbus-1-tqt/debian/control index 74814f926..20064441f 100644 --- a/ubuntu/_base/dependencies/dbus-1-tqt/debian/control +++ b/ubuntu/_base/dependencies/dbus-1-tqt/debian/control @@ -1,8 +1,8 @@ Source: dbus-1-tqt Section: devel Priority: optional -Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Build-Depends: cdbs (>= 0.4.43), debhelper (>= 7.0.50~), quilt, libtqtinterface-dev, libdbus-1-dev (>= 0.90), cmake +Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> +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/ubuntu/_base/dependencies/dbus-1-tqt/debian/rules b/ubuntu/_base/dependencies/dbus-1-tqt/debian/rules index 0c9611c12..6621aaf1e 100755 --- a/ubuntu/_base/dependencies/dbus-1-tqt/debian/rules +++ b/ubuntu/_base/dependencies/dbus-1-tqt/debian/rules @@ -6,13 +6,10 @@ include debian/cdbs/debian-tde.mk DEB_KDE_APIDOX := yes -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - # Build options DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_APIDOX_HTML_DIRECTORY="usr/share/doc/libdbus-1-tqt/HTML" \ -DWITH_ALL_OPTIONS="ON" diff --git a/ubuntu/_base/dependencies/dbus-tqt/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/dbus-tqt/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..aba508624 --- /dev/null +++ b/ubuntu/_base/dependencies/dbus-tqt/debian/cdbs/debian-tde.mk @@ -0,0 +1,251 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Copyright © 2019 TDE Team +# Description: A class for TDE packages; sets TDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch debian/stamp-cvs-make + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +ifdef _cdbs_class_cmake +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif +endif + +ifndef _cdbs_rules_patchsys_quilt +DEB_PATCHDIRS := debian/patches/common debian/patches +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el + +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +DEB_BUILD_PARALLEL ?= true + +cdbs_configure_flags += \ + --with-qt-dir=/usr/share/qt3 \ + --disable-rpath \ + --with-xinerama \ + $(cdbs_kde_enable_final) \ + $(cdbs_kde_enable_debug) + + +# This is a convenience target for calling manually. +# It's not part of the build process. +buildprep: clean apply-patches +ifndef _cdbs_class_cmake + $(MAKE) -f admin/Makefile.common dist +endif + debian/rules clean + +.tdepkginfo: + echo "# TDE package information" >.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo + date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo + +post-patches:: .tdepkginfo + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + # update multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ + sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ + done + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + # revert multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ ! -f $$a.arch ] || \ + mv $$a.arch $$a; \ + done + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \ + test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f .tdepkginfo + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/ubuntu/_base/dependencies/dbus-tqt/debian/cdbs/versions.pl b/ubuntu/_base/dependencies/dbus-tqt/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/ubuntu/_base/dependencies/dbus-tqt/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/_base/dependencies/dbus-tqt/debian/compat b/ubuntu/_base/dependencies/dbus-tqt/debian/compat index 7f8f011eb..f599e28b8 100644 --- a/ubuntu/_base/dependencies/dbus-tqt/debian/compat +++ b/ubuntu/_base/dependencies/dbus-tqt/debian/compat @@ -1 +1 @@ -7 +10 diff --git a/ubuntu/_base/dependencies/dbus-tqt/debian/control b/ubuntu/_base/dependencies/dbus-tqt/debian/control index 4b1fb2b5c..d16fa5d28 100644 --- a/ubuntu/_base/dependencies/dbus-tqt/debian/control +++ b/ubuntu/_base/dependencies/dbus-tqt/debian/control @@ -1,27 +1,11 @@ Source: dbus-tqt Section: devel Priority: optional -Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org> +Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Sjoerd Simons <sjoerd@debian.org>, Sebastian Drge <slomo@ubuntu.com> -Build-Depends: cdbs (>= 0.4.43), debhelper (>= 7.0.50~), quilt, libtqtinterface-dev, libdbus-1-dev (>= 0.90), cmake +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-dev -Section: libdevel -Architecture: any -Replaces: libdbus-tqt-1-dev (<< 4:14.0.0~) -Breaks: libdbus-tqt-1-dev (<< 4:14.0.0~) -Depends: libdbus-tqt-1-1c2 (= ${source:Version}), libdbus-1-dev (>= 0.90), libtqtinterface-dev -Conflicts: dbus-tqt-1-dev -Description: simple interprocess messaging system (TQt interface) - D-BUS is a message bus, used for sending messages between applications. - Conceptually, it fits somewhere in between raw sockets and CORBA in - terms of complexity. - . - This package provides a TQt-style interface to D-BUS. - . - See the dbus description for more information about D-BUS in general. - Package: libdbus-tqt-1-1c2 Section: libs Architecture: any @@ -39,3 +23,18 @@ Description: simple interprocess messaging system (TQt-based shared library) . See the dbus description for more information about D-BUS in general. +Package: libdbus-tqt-1-dev +Section: libdevel +Architecture: any +Replaces: libdbus-tqt-1-dev (<< 4:14.0.0~) +Breaks: libdbus-tqt-1-dev (<< 4:14.0.0~) +Depends: libdbus-tqt-1-1c2 (= ${source:Version}), libdbus-1-dev (>= 0.90), libtqtinterface-dev +Conflicts: dbus-tqt-1-dev +Description: simple interprocess messaging system (TQt interface) + D-BUS is a message bus, used for sending messages between applications. + Conceptually, it fits somewhere in between raw sockets and CORBA in + terms of complexity. + . + This package provides a TQt-style interface to D-BUS. + . + See the dbus description for more information about D-BUS in general. diff --git a/ubuntu/_base/dependencies/dbus-tqt/debian/docs b/ubuntu/_base/dependencies/dbus-tqt/debian/docs new file mode 100644 index 000000000..6f83607c1 --- /dev/null +++ b/ubuntu/_base/dependencies/dbus-tqt/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +NEWS +README diff --git a/ubuntu/_base/dependencies/dbus-tqt/debian/rules b/ubuntu/_base/dependencies/dbus-tqt/debian/rules index 71f625c30..ff4a21c43 100755 --- a/ubuntu/_base/dependencies/dbus-tqt/debian/rules +++ b/ubuntu/_base/dependencies/dbus-tqt/debian/rules @@ -4,12 +4,17 @@ # Copyright 2006 Sjoerd Simons <sjoerd@debian.org> #include /usr/share/cdbs/1/rules/patchsys-quilt.mk -include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk +include debian/cdbs/debian-tde.mk # Strict library versioning DEB_DH_MAKESHLIBS_ARGS_ALL := -V -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) +# Build options +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DWITH_ALL_OPTIONS="ON" diff --git a/ubuntu/_base/dependencies/libart-lgpl/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/libart-lgpl/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..aba508624 --- /dev/null +++ b/ubuntu/_base/dependencies/libart-lgpl/debian/cdbs/debian-tde.mk @@ -0,0 +1,251 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Copyright © 2019 TDE Team +# Description: A class for TDE packages; sets TDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch debian/stamp-cvs-make + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +ifdef _cdbs_class_cmake +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif +endif + +ifndef _cdbs_rules_patchsys_quilt +DEB_PATCHDIRS := debian/patches/common debian/patches +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el + +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +DEB_BUILD_PARALLEL ?= true + +cdbs_configure_flags += \ + --with-qt-dir=/usr/share/qt3 \ + --disable-rpath \ + --with-xinerama \ + $(cdbs_kde_enable_final) \ + $(cdbs_kde_enable_debug) + + +# This is a convenience target for calling manually. +# It's not part of the build process. +buildprep: clean apply-patches +ifndef _cdbs_class_cmake + $(MAKE) -f admin/Makefile.common dist +endif + debian/rules clean + +.tdepkginfo: + echo "# TDE package information" >.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo + date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo + +post-patches:: .tdepkginfo + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + # update multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ + sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ + done + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + # revert multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ ! -f $$a.arch ] || \ + mv $$a.arch $$a; \ + done + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \ + test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f .tdepkginfo + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/ubuntu/_base/dependencies/libart-lgpl/debian/cdbs/versions.pl b/ubuntu/_base/dependencies/libart-lgpl/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/ubuntu/_base/dependencies/libart-lgpl/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/_base/dependencies/libart-lgpl/debian/compat b/ubuntu/_base/dependencies/libart-lgpl/debian/compat index 7f8f011eb..f599e28b8 100644 --- a/ubuntu/_base/dependencies/libart-lgpl/debian/compat +++ b/ubuntu/_base/dependencies/libart-lgpl/debian/compat @@ -1 +1 @@ -7 +10 diff --git a/ubuntu/_base/dependencies/libart-lgpl/debian/control b/ubuntu/_base/dependencies/libart-lgpl/debian/control index 2885055f0..8e22d7559 100644 --- a/ubuntu/_base/dependencies/libart-lgpl/debian/control +++ b/ubuntu/_base/dependencies/libart-lgpl/debian/control @@ -1,10 +1,10 @@ Source: libart-lgpl Section: devel Priority: optional -Maintainer: TDE Team +Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Josselin Mouette <joss@debian.org> Standards-Version: 3.8.4 -Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, cmake +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build Package: libart-2.0-2 Architecture: any diff --git a/ubuntu/_base/dependencies/libart-lgpl/debian/docs b/ubuntu/_base/dependencies/libart-lgpl/debian/docs new file mode 100644 index 000000000..6f83607c1 --- /dev/null +++ b/ubuntu/_base/dependencies/libart-lgpl/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +NEWS +README diff --git a/ubuntu/_base/dependencies/libart-lgpl/debian/rules b/ubuntu/_base/dependencies/libart-lgpl/debian/rules index 9f7abd076..affcc25c7 100755 --- a/ubuntu/_base/dependencies/libart-lgpl/debian/rules +++ b/ubuntu/_base/dependencies/libart-lgpl/debian/rules @@ -2,16 +2,15 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk +include debian/cdbs/debian-tde.mk libart-2.0-N := $(shell sed -rn 's/^Package:[[:space:]]*(libart-2\.0-[0-9]+)[[:space:]]*$$/\1/p' debian/control) DEB_DH_MAKESHLIBS_ARGS_$(libart-2.0-N) += -V '$(libart-2.0-N)(>= 2.3.18)' -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - # Build options DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ diff --git a/ubuntu/_base/dependencies/libcaldav/debian/README.Debian b/ubuntu/_base/dependencies/libcaldav/debian/README.Debian deleted file mode 100644 index 9adebeacc..000000000 --- a/ubuntu/_base/dependencies/libcaldav/debian/README.Debian +++ /dev/null @@ -1,45 +0,0 @@ - Imlib Version 11 - ---------------- - -Imlib11 is linked with libpng12, which began life as libpng3. This is -in accordance with the practice of Redhat. The GDK version of imlib, -being part of GNOME 1, has remained linked with libpng2. - -No library that links with this version of Imlib may also link with -libpng2. - -No application that links with this version of Imlib may link with -libpng2, neither directly nor through a third library. - -If you accidentally link an application with imlib and libpng2, the -application may behave in unpredictible ways, possibly crashing, -possibly emitting warnings similar to the following: - - libpng warning: Application was compiled with png.h from libpng-1.2.1 - libpng warning: Application is running with png.c from libpng-1.0.12 - libpng error: Incompatible libpng version in application and library - - - - Imlib Version 1 - --------------- - -Imlib1 and gdk-imlib1 are compiled against libpng2. If you need to -build with libpng2, install the package imlib1-dev or gdk-imlib1-dev -as appropriate. - - - The Palette File - ---------------- - -The system Imlib/Gdk-Imlib palette file was moved from the directory -`/etc/im' to `/etc/imlib'. This move may cause problems for users who -have a `.imrc' file in their home directory since that file may -contain a reference to the old location of the palette file. To -correct this problem, the "PaletteFile" entry should look like: - - PaletteFile /etc/imlib/im_palette.pal - -I believe this changed happened in late 1999. - - -- Steve M. Robbins <smr@debian.org>, Sun Oct 19 15:11:42 2003 diff --git a/ubuntu/_base/dependencies/libcaldav/debian/README.fallback b/ubuntu/_base/dependencies/libcaldav/debian/README.fallback deleted file mode 100644 index 1b41c225f..000000000 --- a/ubuntu/_base/dependencies/libcaldav/debian/README.fallback +++ /dev/null @@ -1,23 +0,0 @@ - Imlib Image Conversion - ---------------------- - -The imlib and gdk-imlib libraries have a number of built-in image -conversion routines, and are capable of loading or saving in *at -least* the following formats: GIF, JPEG, PNG, TIFF, PS, BMP, XPM, and -PPM. - -Prior to version 1.9.13, imlib and gdk-imlib could use an external -program, such as Imagemagick's "convert", to load or save images -in formats not handled internally to Imlib. - - - - "All fallbacks failed." - ----------------------- - -This message indicates that the file you wished to load is not handled -by Imlib. - -The remedy is to convert the image file by hand using, for example, -Imagemagick's "convert" command: "convert foo.rgb foo.png". Then -you'll have to fix up the application to use the new filename instead. diff --git a/ubuntu/_base/dependencies/libcaldav/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/libcaldav/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..aba508624 --- /dev/null +++ b/ubuntu/_base/dependencies/libcaldav/debian/cdbs/debian-tde.mk @@ -0,0 +1,251 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Copyright © 2019 TDE Team +# Description: A class for TDE packages; sets TDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch debian/stamp-cvs-make + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +ifdef _cdbs_class_cmake +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif +endif + +ifndef _cdbs_rules_patchsys_quilt +DEB_PATCHDIRS := debian/patches/common debian/patches +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el + +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +DEB_BUILD_PARALLEL ?= true + +cdbs_configure_flags += \ + --with-qt-dir=/usr/share/qt3 \ + --disable-rpath \ + --with-xinerama \ + $(cdbs_kde_enable_final) \ + $(cdbs_kde_enable_debug) + + +# This is a convenience target for calling manually. +# It's not part of the build process. +buildprep: clean apply-patches +ifndef _cdbs_class_cmake + $(MAKE) -f admin/Makefile.common dist +endif + debian/rules clean + +.tdepkginfo: + echo "# TDE package information" >.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo + date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo + +post-patches:: .tdepkginfo + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + # update multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ + sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ + done + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + # revert multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ ! -f $$a.arch ] || \ + mv $$a.arch $$a; \ + done + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \ + test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f .tdepkginfo + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/ubuntu/_base/dependencies/libcaldav/debian/cdbs/versions.pl b/ubuntu/_base/dependencies/libcaldav/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/ubuntu/_base/dependencies/libcaldav/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/_base/dependencies/libcaldav/debian/compat b/ubuntu/_base/dependencies/libcaldav/debian/compat index 7f8f011eb..f599e28b8 100644 --- a/ubuntu/_base/dependencies/libcaldav/debian/compat +++ b/ubuntu/_base/dependencies/libcaldav/debian/compat @@ -1 +1 @@ -7 +10 diff --git a/ubuntu/_base/dependencies/libcaldav/debian/control b/ubuntu/_base/dependencies/libcaldav/debian/control index 5aee0c950..35bc4055d 100644 --- a/ubuntu/_base/dependencies/libcaldav/debian/control +++ b/ubuntu/_base/dependencies/libcaldav/debian/control @@ -1,12 +1,13 @@ Source: libcaldav -Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, libcurl4-gnutls-dev (>= 7.19), libglib2.0-dev, automake, autoconf, libtool, libltdl-dev Section: graphics Priority: optional -Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libcurl4-gnutls-dev (>= 7.19), libglib2.0-dev Standards-Version: 3.8.3 Package: libcaldav Architecture: any +Multi-Arch: same Section: libs Depends: ${shlibs:Depends} Description: @@ -14,6 +15,7 @@ Description: Package: libcaldav-dev Architecture: any +Multi-Arch: foreign Section: libdevel Depends: libcaldav (= ${binary:Version}) Description: diff --git a/ubuntu/_base/dependencies/libcaldav/debian/docs b/ubuntu/_base/dependencies/libcaldav/debian/docs new file mode 100644 index 000000000..ca0272abf --- /dev/null +++ b/ubuntu/_base/dependencies/libcaldav/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +README +TODO diff --git a/ubuntu/_base/dependencies/libcaldav/debian/libcaldav-dev.install b/ubuntu/_base/dependencies/libcaldav/debian/libcaldav-dev.install new file mode 100644 index 000000000..12a4ea50c --- /dev/null +++ b/ubuntu/_base/dependencies/libcaldav/debian/libcaldav-dev.install @@ -0,0 +1,4 @@ +debian/tmp/usr/include/libcaldav/* +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libcaldav.so +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libcaldav.la +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/* diff --git a/ubuntu/_base/dependencies/libcaldav/debian/libcaldav.install b/ubuntu/_base/dependencies/libcaldav/debian/libcaldav.install new file mode 100644 index 000000000..f9fa56fcc --- /dev/null +++ b/ubuntu/_base/dependencies/libcaldav/debian/libcaldav.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libcaldav.so.* diff --git a/ubuntu/_base/dependencies/libcaldav/debian/rules b/ubuntu/_base/dependencies/libcaldav/debian/rules index a6922482f..9b371a62d 100755 --- a/ubuntu/_base/dependencies/libcaldav/debian/rules +++ b/ubuntu/_base/dependencies/libcaldav/debian/rules @@ -1,110 +1,64 @@ -#!/usr/bin/make -f +#! /usr/bin/make -f -#include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk +include debian/cdbs/debian-tde.mk -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - -# This has to be exported to make some magic below work. -export DH_OPTIONS +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 = 0t64 +else +DEB_TIME64_SUFFIX = +endif -export CFLAGS = -g -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) -CFLAGS += -O0 +ifdef DEB_HOST_MULTIARCH + CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH) else -CFLAGS += -O3 + CMAKE_INSTALL_LIBDIR = lib endif -# Suppress accidental execution of the auto-* tools, c.f. -# http://lists.debian.org/debian-devel/2001/debian-devel-200111/msg01416.html -no_auto_tools = ACLOCAL="`pwd`/missing aclocal" \ - AUTOCONF="`pwd`/missing autoconf" \ - AUTOMAKE="`pwd`/missing automake" \ - AUTOHEADER="`pwd`/missing autoheader" - -make_flags = moduledir=/usr/lib/gdk-imlib2 $(no_auto_tools) +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \ + -DWITH_ALL_OPTIONS="ON" \ + -DBUILD_ALL="ON" post-patches:: dh_testdir - -build: post-patches build-stamp -build-stamp: - dh_testdir - ./autogen.sh - ./configure --prefix=/usr \ - --mandir=/usr/share/man - $(MAKE) $(make_flags) - - touch build-stamp +ifeq ($(DEB_TIME64_API),true) + # update library package name for TIME64 ABI + ls -d debian/* | \ + grep -E "/libcaldav\." | \ + grep -v "\.t64$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.t64 ] || \ + (cp -a $$a debian/libcaldav$(DEB_TIME64_SUFFIX).$${a##*.} && mv $$a $$a.t64); \ + done + [ -f debian/control.t64 ] || \ + sed -i.t64 \ + -e "s/^Package: \\(libcaldav\\)$$/Package: \\1$(DEB_TIME64_SUFFIX)\\nReplaces: \\1\\nBreaks: \\1/" \ + -e "s/\\(libcaldav\\) (=/\\1$(DEB_TIME64_SUFFIX) (=/" \ + debian/control +endif clean:: dh_testdir - dh_testroot - rm -f build-stamp - - [ ! -f Makefile ] || $(MAKE) clean - [ ! -f Makefile ] || $(MAKE) distclean - dh_clean -install: DH_OPTIONS= -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - $(MAKE) $(make_flags) DESTDIR=`pwd`/debian/tmp install - - dh_movefiles - - # Library package - dh_install -plibcaldav --autodest debian/tmp/usr/lib/libcaldav.so* - - # Developer package - dh_install -plibcaldav-dev --autodest debian/tmp/usr/lib/libcaldav.la - dh_install -plibcaldav-dev --autodest debian/tmp/usr/include/libcaldav/* - dh_install -plibcaldav-dev --autodest debian/tmp/usr/lib/pkgconfig/* - -# This single target is used to build all the packages, all at once, or -# one at a time. So keep in mind: any options passed to commands here will -# affect _all_ packages. Anything you want to only affect one package -# should be put in another target, such as the install target. -binary-common: - dh_testdir - dh_testroot - dh_installdocs -A debian/README.Debian - dh_installexamples - dh_installmenu - dh_installcron - dh_installinfo - dh_installchangelogs ChangeLog - dh_link - dh_compress - dh_fixperms - dh_strip - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb $(DEB_DH_BUILDDEB_ARGS) - -# Build architecture independent packages using the common target. -binary-indep: build install - $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common - -# Build architecture dependent packages using the common target. -binary-arch: build install - $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common - -# Any other binary targets build just one binary package at a time. -binary-%: build install - make -f debian/rules binary-common DH_OPTIONS=-p$* - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +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 "/libcaldav$(DEB_TIME64_SUFFIX)\." | \ + xargs -r rm + [ ! -f debian/control.t64 ] || \ + mv debian/control.t64 debian/control +endif diff --git a/ubuntu/_base/dependencies/libcaldav/debian/watch b/ubuntu/_base/dependencies/libcaldav/debian/watch deleted file mode 100644 index 8cea7d35f..000000000 --- a/ubuntu/_base/dependencies/libcaldav/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -ftp://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/imlib-(.*)\.tar\.gz diff --git a/ubuntu/_base/dependencies/libcarddav/debian/README.Debian b/ubuntu/_base/dependencies/libcarddav/debian/README.Debian deleted file mode 100644 index 9adebeacc..000000000 --- a/ubuntu/_base/dependencies/libcarddav/debian/README.Debian +++ /dev/null @@ -1,45 +0,0 @@ - Imlib Version 11 - ---------------- - -Imlib11 is linked with libpng12, which began life as libpng3. This is -in accordance with the practice of Redhat. The GDK version of imlib, -being part of GNOME 1, has remained linked with libpng2. - -No library that links with this version of Imlib may also link with -libpng2. - -No application that links with this version of Imlib may link with -libpng2, neither directly nor through a third library. - -If you accidentally link an application with imlib and libpng2, the -application may behave in unpredictible ways, possibly crashing, -possibly emitting warnings similar to the following: - - libpng warning: Application was compiled with png.h from libpng-1.2.1 - libpng warning: Application is running with png.c from libpng-1.0.12 - libpng error: Incompatible libpng version in application and library - - - - Imlib Version 1 - --------------- - -Imlib1 and gdk-imlib1 are compiled against libpng2. If you need to -build with libpng2, install the package imlib1-dev or gdk-imlib1-dev -as appropriate. - - - The Palette File - ---------------- - -The system Imlib/Gdk-Imlib palette file was moved from the directory -`/etc/im' to `/etc/imlib'. This move may cause problems for users who -have a `.imrc' file in their home directory since that file may -contain a reference to the old location of the palette file. To -correct this problem, the "PaletteFile" entry should look like: - - PaletteFile /etc/imlib/im_palette.pal - -I believe this changed happened in late 1999. - - -- Steve M. Robbins <smr@debian.org>, Sun Oct 19 15:11:42 2003 diff --git a/ubuntu/_base/dependencies/libcarddav/debian/README.fallback b/ubuntu/_base/dependencies/libcarddav/debian/README.fallback deleted file mode 100644 index 1b41c225f..000000000 --- a/ubuntu/_base/dependencies/libcarddav/debian/README.fallback +++ /dev/null @@ -1,23 +0,0 @@ - Imlib Image Conversion - ---------------------- - -The imlib and gdk-imlib libraries have a number of built-in image -conversion routines, and are capable of loading or saving in *at -least* the following formats: GIF, JPEG, PNG, TIFF, PS, BMP, XPM, and -PPM. - -Prior to version 1.9.13, imlib and gdk-imlib could use an external -program, such as Imagemagick's "convert", to load or save images -in formats not handled internally to Imlib. - - - - "All fallbacks failed." - ----------------------- - -This message indicates that the file you wished to load is not handled -by Imlib. - -The remedy is to convert the image file by hand using, for example, -Imagemagick's "convert" command: "convert foo.rgb foo.png". Then -you'll have to fix up the application to use the new filename instead. diff --git a/ubuntu/_base/dependencies/libcarddav/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/libcarddav/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..aba508624 --- /dev/null +++ b/ubuntu/_base/dependencies/libcarddav/debian/cdbs/debian-tde.mk @@ -0,0 +1,251 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Copyright © 2019 TDE Team +# Description: A class for TDE packages; sets TDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch debian/stamp-cvs-make + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +ifdef _cdbs_class_cmake +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif +endif + +ifndef _cdbs_rules_patchsys_quilt +DEB_PATCHDIRS := debian/patches/common debian/patches +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el + +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +DEB_BUILD_PARALLEL ?= true + +cdbs_configure_flags += \ + --with-qt-dir=/usr/share/qt3 \ + --disable-rpath \ + --with-xinerama \ + $(cdbs_kde_enable_final) \ + $(cdbs_kde_enable_debug) + + +# This is a convenience target for calling manually. +# It's not part of the build process. +buildprep: clean apply-patches +ifndef _cdbs_class_cmake + $(MAKE) -f admin/Makefile.common dist +endif + debian/rules clean + +.tdepkginfo: + echo "# TDE package information" >.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo + date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo + +post-patches:: .tdepkginfo + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + # update multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ + sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ + done + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + # revert multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ ! -f $$a.arch ] || \ + mv $$a.arch $$a; \ + done + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \ + test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f .tdepkginfo + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/ubuntu/_base/dependencies/libcarddav/debian/cdbs/versions.pl b/ubuntu/_base/dependencies/libcarddav/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/ubuntu/_base/dependencies/libcarddav/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/_base/dependencies/libcarddav/debian/compat b/ubuntu/_base/dependencies/libcarddav/debian/compat index 7f8f011eb..f599e28b8 100644 --- a/ubuntu/_base/dependencies/libcarddav/debian/compat +++ b/ubuntu/_base/dependencies/libcarddav/debian/compat @@ -1 +1 @@ -7 +10 diff --git a/ubuntu/_base/dependencies/libcarddav/debian/control b/ubuntu/_base/dependencies/libcarddav/debian/control index c2409ffd1..1f8eee3bb 100644 --- a/ubuntu/_base/dependencies/libcarddav/debian/control +++ b/ubuntu/_base/dependencies/libcarddav/debian/control @@ -1,12 +1,13 @@ Source: libcarddav -Build-Depends: cdbs, debhelper (>= 7.0.50~), libcurl4-gnutls-dev, libglib2.0-dev, quilt, automake, autoconf, libtool, libltdl-dev Section: graphics Priority: optional -Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libcurl4-gnutls-dev, libglib2.0-dev Standards-Version: 3.8.4 Package: libcarddav Architecture: any +Multi-Arch: same Section: libs Depends: ${shlibs:Depends} Description: @@ -14,6 +15,7 @@ Description: Package: libcarddav-dev Architecture: any +Multi-Arch: foreign Section: libdevel Depends: libcarddav (= ${binary:Version}) Description: diff --git a/ubuntu/_base/dependencies/libcarddav/debian/docs b/ubuntu/_base/dependencies/libcarddav/debian/docs new file mode 100644 index 000000000..ca0272abf --- /dev/null +++ b/ubuntu/_base/dependencies/libcarddav/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +README +TODO diff --git a/ubuntu/_base/dependencies/libcarddav/debian/libcarddav-dev.install b/ubuntu/_base/dependencies/libcarddav/debian/libcarddav-dev.install new file mode 100644 index 000000000..ce7045855 --- /dev/null +++ b/ubuntu/_base/dependencies/libcarddav/debian/libcarddav-dev.install @@ -0,0 +1,4 @@ +debian/tmp/usr/include/libcarddav/* +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libcarddav.so +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libcarddav.la +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/* diff --git a/ubuntu/_base/dependencies/libcarddav/debian/libcarddav.install b/ubuntu/_base/dependencies/libcarddav/debian/libcarddav.install new file mode 100644 index 000000000..2fa7b4f2e --- /dev/null +++ b/ubuntu/_base/dependencies/libcarddav/debian/libcarddav.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libcarddav.so.* diff --git a/ubuntu/_base/dependencies/libcarddav/debian/rules b/ubuntu/_base/dependencies/libcarddav/debian/rules index 38c17ea44..22b8c9e32 100755 --- a/ubuntu/_base/dependencies/libcarddav/debian/rules +++ b/ubuntu/_base/dependencies/libcarddav/debian/rules @@ -1,110 +1,64 @@ -#!/usr/bin/make -f +#! /usr/bin/make -f -#include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk +include debian/cdbs/debian-tde.mk -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - -# This has to be exported to make some magic below work. -export DH_OPTIONS +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 = 0t64 +else +DEB_TIME64_SUFFIX = +endif -export CFLAGS = -g -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) -CFLAGS += -O0 +ifdef DEB_HOST_MULTIARCH + CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH) else -CFLAGS += -O3 + CMAKE_INSTALL_LIBDIR = lib endif -# Suppress accidental execution of the auto-* tools, c.f. -# http://lists.debian.org/debian-devel/2001/debian-devel-200111/msg01416.html -no_auto_tools = ACLOCAL="`pwd`/missing aclocal" \ - AUTOCONF="`pwd`/missing autoconf" \ - AUTOMAKE="`pwd`/missing automake" \ - AUTOHEADER="`pwd`/missing autoheader" - -make_flags = moduledir=/usr/lib/gdk-imlib2 $(no_auto_tools) +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \ + -DWITH_ALL_OPTIONS="ON" \ + -DBUILD_ALL="ON" post-patches:: dh_testdir - -build: post-patches build-stamp -build-stamp: - dh_testdir - ./autogen.sh - ./configure --prefix=/usr \ - --mandir=/usr/share/man - $(MAKE) $(make_flags) - - touch build-stamp +ifeq ($(DEB_TIME64_API),true) + # update library package name for TIME64 ABI + ls -d debian/* | \ + grep -E "/libcarddav\." | \ + grep -v "\.t64$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.t64 ] || \ + (cp -a $$a debian/libcarddav$(DEB_TIME64_SUFFIX).$${a##*.} && mv $$a $$a.t64); \ + done + [ -f debian/control.t64 ] || \ + sed -i.t64 \ + -e "s/^Package: \\(libcarddav\\)$$/Package: \\1$(DEB_TIME64_SUFFIX)\\nReplaces: \\1\\nBreaks: \\1/" \ + -e "s/\\(libcarddav\\) (=/\\1$(DEB_TIME64_SUFFIX) (=/" \ + debian/control +endif clean:: dh_testdir - dh_testroot - rm -f build-stamp - - [ ! -f Makefile ] || $(MAKE) clean - [ ! -f Makefile ] || $(MAKE) distclean - dh_clean -install: DH_OPTIONS= -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - $(MAKE) $(make_flags) DESTDIR=`pwd`/debian/tmp install - - dh_movefiles - - # Library package - dh_install -plibcarddav --autodest debian/tmp/usr/lib/libcarddav.so* - - # Developer package - dh_install -plibcarddav-dev --autodest debian/tmp/usr/lib/libcarddav.la - dh_install -plibcarddav-dev --autodest debian/tmp/usr/include/libcarddav/* - dh_install -plibcarddav-dev --autodest debian/tmp/usr/lib/pkgconfig/* - -# This single target is used to build all the packages, all at once, or -# one at a time. So keep in mind: any options passed to commands here will -# affect _all_ packages. Anything you want to only affect one package -# should be put in another target, such as the install target. -binary-common: - dh_testdir - dh_testroot - dh_installdocs -A debian/README.Debian - dh_installexamples - dh_installmenu - dh_installcron - dh_installinfo - dh_installchangelogs ChangeLog - dh_link - dh_compress - dh_fixperms - dh_strip - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb $(DEB_DH_BUILDDEB_ARGS) - -# Build architecture independent packages using the common target. -binary-indep: build install - $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common - -# Build architecture dependent packages using the common target. -binary-arch: build install - $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common - -# Any other binary targets build just one binary package at a time. -binary-%: build install - make -f debian/rules binary-common DH_OPTIONS=-p$* - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +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 "/libcarddav$(DEB_TIME64_SUFFIX)\." | \ + xargs -r rm + [ ! -f debian/control.t64 ] || \ + mv debian/control.t64 debian/control +endif diff --git a/ubuntu/_base/dependencies/libcarddav/debian/watch b/ubuntu/_base/dependencies/libcarddav/debian/watch deleted file mode 100644 index 8cea7d35f..000000000 --- a/ubuntu/_base/dependencies/libcarddav/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -ftp://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/imlib-(.*)\.tar\.gz diff --git a/ubuntu/_base/dependencies/libr/debian/README.Debian b/ubuntu/_base/dependencies/libr/debian/README.Debian deleted file mode 100644 index 120ea0ed1..000000000 --- a/ubuntu/_base/dependencies/libr/debian/README.Debian +++ /dev/null @@ -1,6 +0,0 @@ -libr for Debian ---------------- - -<possible notes regarding this package - if none, delete this file> - - -- Erich Hoover <ehoover@mines.edu> Tue, 03 Nov 2009 20:26:31 -0700 diff --git a/ubuntu/_base/dependencies/libr/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/libr/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..aba508624 --- /dev/null +++ b/ubuntu/_base/dependencies/libr/debian/cdbs/debian-tde.mk @@ -0,0 +1,251 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Copyright © 2019 TDE Team +# Description: A class for TDE packages; sets TDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch debian/stamp-cvs-make + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +ifdef _cdbs_class_cmake +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif +endif + +ifndef _cdbs_rules_patchsys_quilt +DEB_PATCHDIRS := debian/patches/common debian/patches +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el + +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +DEB_BUILD_PARALLEL ?= true + +cdbs_configure_flags += \ + --with-qt-dir=/usr/share/qt3 \ + --disable-rpath \ + --with-xinerama \ + $(cdbs_kde_enable_final) \ + $(cdbs_kde_enable_debug) + + +# This is a convenience target for calling manually. +# It's not part of the build process. +buildprep: clean apply-patches +ifndef _cdbs_class_cmake + $(MAKE) -f admin/Makefile.common dist +endif + debian/rules clean + +.tdepkginfo: + echo "# TDE package information" >.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo + date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo + +post-patches:: .tdepkginfo + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + # update multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ + sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ + done + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + # revert multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ ! -f $$a.arch ] || \ + mv $$a.arch $$a; \ + done + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \ + test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f .tdepkginfo + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/ubuntu/_base/dependencies/libr/debian/cdbs/versions.pl b/ubuntu/_base/dependencies/libr/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/ubuntu/_base/dependencies/libr/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/_base/dependencies/libr/debian/compat b/ubuntu/_base/dependencies/libr/debian/compat index 7f8f011eb..f599e28b8 100644 --- a/ubuntu/_base/dependencies/libr/debian/compat +++ b/ubuntu/_base/dependencies/libr/debian/compat @@ -1 +1 @@ -7 +10 diff --git a/ubuntu/_base/dependencies/libr/debian/control b/ubuntu/_base/dependencies/libr/debian/control index 471fc6475..df44ba5b5 100644 --- a/ubuntu/_base/dependencies/libr/debian/control +++ b/ubuntu/_base/dependencies/libr/debian/control @@ -1,21 +1,21 @@ Source: libr Priority: extra -Maintainer: Erich E. Hoover <ehoover@mines.edu> -Build-Depends: debhelper (>= 7.0.50~), cdbs, cmake, quilt, pkg-config, libglade2-dev, binutils-dev, doxygen +Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, pkg-config, libgtk2.0-dev, binutils-dev, doxygen Standards-Version: 3.8.4 Section: libs Homepage: http://www.compholio.com/elficon/ -Package: libr-dev -Section: libdevel +Package: libr1 +Section: libs Architecture: any -Depends: libr0 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends} Description: ELF binary resource library Store and retrieve resources from ELF binaries. -Package: libr0 -Section: libs +Package: libr-dev +Section: libdevel Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: libr1 (= ${binary:Version}) Description: ELF binary resource library Store and retrieve resources from ELF binaries. diff --git a/ubuntu/_base/dependencies/libr/debian/docs b/ubuntu/_base/dependencies/libr/debian/docs index 50bd824bb..6f12db508 100644 --- a/ubuntu/_base/dependencies/libr/debian/docs +++ b/ubuntu/_base/dependencies/libr/debian/docs @@ -1,2 +1,2 @@ -NEWS +AUTHORS README diff --git a/ubuntu/_base/dependencies/libr/debian/libr0.dirs b/ubuntu/_base/dependencies/libr/debian/libr1.dirs index 68457717b..68457717b 100644 --- a/ubuntu/_base/dependencies/libr/debian/libr0.dirs +++ b/ubuntu/_base/dependencies/libr/debian/libr1.dirs diff --git a/ubuntu/_base/dependencies/libr/debian/libr0.install b/ubuntu/_base/dependencies/libr/debian/libr1.install index d0dbfd18a..d0dbfd18a 100644 --- a/ubuntu/_base/dependencies/libr/debian/libr0.install +++ b/ubuntu/_base/dependencies/libr/debian/libr1.install diff --git a/ubuntu/_base/dependencies/libr/debian/rules b/ubuntu/_base/dependencies/libr/debian/rules index 1b6b94b3e..72e752cf6 100755 --- a/ubuntu/_base/dependencies/libr/debian/rules +++ b/ubuntu/_base/dependencies/libr/debian/rules @@ -2,19 +2,11 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/rules/utils.mk - -DEB_BUILD_PARALLEL = true - -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) +include debian/cdbs/debian-tde.mk # Build options DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo - -clean:: - dh_testdir - rm -fr man/man3 diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/polkit-tqt/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..aba508624 --- /dev/null +++ b/ubuntu/_base/dependencies/polkit-tqt/debian/cdbs/debian-tde.mk @@ -0,0 +1,251 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Copyright © 2019 TDE Team +# Description: A class for TDE packages; sets TDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch debian/stamp-cvs-make + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +ifdef _cdbs_class_cmake +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif +endif + +ifndef _cdbs_rules_patchsys_quilt +DEB_PATCHDIRS := debian/patches/common debian/patches +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el + +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +DEB_BUILD_PARALLEL ?= true + +cdbs_configure_flags += \ + --with-qt-dir=/usr/share/qt3 \ + --disable-rpath \ + --with-xinerama \ + $(cdbs_kde_enable_final) \ + $(cdbs_kde_enable_debug) + + +# This is a convenience target for calling manually. +# It's not part of the build process. +buildprep: clean apply-patches +ifndef _cdbs_class_cmake + $(MAKE) -f admin/Makefile.common dist +endif + debian/rules clean + +.tdepkginfo: + echo "# TDE package information" >.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo + date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo + +post-patches:: .tdepkginfo + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + # update multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ + sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ + done + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + # revert multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ ! -f $$a.arch ] || \ + mv $$a.arch $$a; \ + done + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \ + test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f .tdepkginfo + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/cdbs/versions.pl b/ubuntu/_base/dependencies/polkit-tqt/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/ubuntu/_base/dependencies/polkit-tqt/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/changelog b/ubuntu/_base/dependencies/polkit-tqt/debian/changelog new file mode 100644 index 000000000..58e4a45de --- /dev/null +++ b/ubuntu/_base/dependencies/polkit-tqt/debian/changelog @@ -0,0 +1,66 @@ +polkit-tqt (0.103.0-2) unstable; urgency=low + + * Port to TQt3 and package renaming + * Initial release for TDE + + -- Michele Calgaro <michele.calgaro@yahoo.it> Mon, 01 Nov 2021 14:03:00 +0900 + +polkit-qt-1 (0.103.0-1) unstable; urgency=low + + * New upstream release. + - fix annoying crash on shutdown. (Closes: #651815) + + [ Felix Geyer ] + * Modify CFLAGS/CXXFLAGS after including debian-qt-kde.mk so the changes are + not overwritten. + + [ Fathi Boudra ] + * Update debian/compat: bump to 8. + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 14 Dec 2011 09:15:10 -0500 + +polkit-qt-1 (0.99.0-3) unstable; urgency=low + + [ Modestas Vainius ] + * Update symbol files. + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 26 May 2011 00:31:01 +0300 + +polkit-qt-1 (0.99.0-2) experimental; urgency=low + + * Bump Standards-Version to 3.9.2: no changes needed. + * Build library with -fvisibility=hidden -fvisibility-inlines-hidden. + * Update symbol file: many private symbols are gone due to above. + + -- Modestas Vainius <modax@debian.org> Thu, 28 Apr 2011 11:53:35 +0300 + +polkit-qt-1 (0.99.0-1) experimental; urgency=low + + * New upstream release. + + [ Modestas Vainius ] + * Add Vcs fields to debian/control. + * Switch debian/rules engine to qt-kde-team/2/*. + * Bump Standards-Version to 3.9.1: no changes needed. + * Remove dupe "Section" field from debian/control. + * Include verbatim BSD license to debian/copyright. + * Override lintian libpolkit-qt-1-0: package-name-doesnt-match-sonames. + * Use more failsafe wildcards in libpolkit-qt-1-0.install. + * Add myself to Uploaders. + * SONAME bumped: rename libpolkit-qt-1-0 to libpolkit-qt-1-1. + * Add symbol file for libpolkit-qt-1-1. + * Update debian/copyright. + + [ Didier Raboud ] + * Bump B-D of libpolkit to >= 0.98. + + [ José Manuel Santamaría Lema ] + * Update installed files. + + -- Modestas Vainius <modax@debian.org> Mon, 14 Mar 2011 01:03:06 +0200 + +polkit-qt-1 (0.95.1-1) unstable; urgency=low + + * Initial release. (Closes: #565395) + + -- Fathi Boudra <fabo@debian.org> Fri, 15 Jan 2010 12:50:13 +0100 diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/compat b/ubuntu/_base/dependencies/polkit-tqt/debian/compat new file mode 100644 index 000000000..f599e28b8 --- /dev/null +++ b/ubuntu/_base/dependencies/polkit-tqt/debian/compat @@ -0,0 +1 @@ +10 diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/control b/ubuntu/_base/dependencies/polkit-tqt/debian/control new file mode 100644 index 000000000..27e070a69 --- /dev/null +++ b/ubuntu/_base/dependencies/polkit-tqt/debian/control @@ -0,0 +1,61 @@ +Source: polkit-tqt +Section: devel +Priority: optional +Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> +XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libtqtinterface-dev, + libpolkit-gobject-1-dev, libpolkit-agent-1-dev, libdbus-1-tqt-dev +Standards-Version: 3.9.2 + +Package: libpolkit-tqt +Section: libs +Architecture: any +Multi-Arch: same +Depends: ${shlibs:Depends}, policykit-1 +Description: PolicyKit-tqt library + PolicyKit is an application-level toolkit for defining and handling the policy + that allows unprivileged processes to speak to privileged processes. + . + It is a framework for centralizing the decision making process with respect to + granting access to privileged operations for unprivileged (desktop) applications. + . + libpolkit-tqt provides convenience classes and methods for TQt/TDE + applications that want to use PolicyKit. + . + This package contains the files necessary for running applications that use + the libpolkit-tqt library. + +Package: libpolkit-tqt-dev +Section: libdevel +Architecture: any +Multi-Arch: foreign +Depends: libpolkit-tqt (= ${binary:Version}), libtqtinterface-dev +Suggests: libpolkit-tqt-examples +Description: PolicyKit-tqt development files + PolicyKit is an application-level toolkit for defining and handling the policy + that allows unprivileged processes to speak to privileged processes. + . + It is a framework for centralizing the decision making process with respect to + granting access to privileged operations for unprivileged (desktop) applications. + . + libpolkit-tqt provides convenience classes and methods for TQt/TDE + applications that want to use PolicyKit. + . + This package contains the development libraries and headers. + +Package: libpolkit-tqt-examples +Section: libs +Architecture: any +Multi-Arch: foreign +Depends: ${shlibs:Depends}, policykit-1 +Description: PolicyKit-tqt library example files + PolicyKit is an application-level toolkit for defining and handling the policy + that allows unprivileged processes to speak to privileged processes. + . + It is a framework for centralizing the decision making process with respect to + granting access to privileged operations for unprivileged (desktop) applications. + . + libpolkit-tqt provides convenience classes and methods for TQt/TDE + applications that want to use PolicyKit. + . + This package contains example files and applications. diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/copyright b/ubuntu/_base/dependencies/polkit-tqt/debian/copyright new file mode 100644 index 000000000..19e2663aa --- /dev/null +++ b/ubuntu/_base/dependencies/polkit-tqt/debian/copyright @@ -0,0 +1,101 @@ +This code was ported to TQt3 and packaged for Debian by: + Michele Calgaro <michele.calgaro@yahoo.it> +and is based on the code downloaded from Debian Snapshot Archive at: + https://snapshot.debian.org/package/polkit-qt-1/0.103.0-1/ + +Original polkit-qt-1 code was packaged for Debian by: + + Fathi Boudra <fabo@debian.org> on Fri, 15 Jan 2010 12:50:13 +0100 + +It was downloaded from ftp://ftp.kde.org/pub/kde/stable/apps/KDE4.x/admin/ + +Upstream Authors: + + Daniel Nicoletti <dantti85-dev@yahoo.com.br> + Dario Freddi <drf@kde.org> + Jaroslav Reznik <jreznik@redhat.com> + Radek Novacek <rnovacek@redhat.com> + Lukas Tinkl <ltinkl@redhat.com> + Pino Toscano <pino@kde.org> + +Copyright: + + Copyright (C) 2008-2009 Daniel Nicoletti + Copyright (C) 2009-2010 Dario Freddi + Copyright (C) 2009 Jaroslav Reznik + Copyright (C) 2009 Radek Novacek + Copyright (C) 2009 Lukas Tinkl + +Copyright for polkit-tqt-export.h file: + + Copyright (C) 2009 Dario Freddi <drf@kde.org> + Copyright (C) 2007 David Faure <faure@kde.org> + +Copyright for polkittqt1-version.h.cmake file: + + Copyright (C) 2009 Dario Freddi <drf@kde.org> + Copyright (C) 2007 Sebastian Trueg <trueg@kde.org> + +Copyright for cmake/modules/FindAutomoc4.cmake file: + + Copyright (C) 2008-2009 Alexander Neundorf <neundorf@kde.org> + +Copyright for cmake/modules/MacroPushRequiredVars.cmake file: + + Copyright (C) 2006 Alexander Neundorf <neundorf@kde.org> + +Copyright for cmake/modules/InstallSettings.cmake file: + + Copyright (C) 2008 Kevin Krammer <kevin.krammer@gmx.at> + +License for cmake modules: + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + 1. Redistributions of source code must retain the copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +License: + + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL-2' and +`/usr/share/common-licenses/LGPL-3'. + +The Debian packaging is: + + Copyright (C) 2010 Fathi Boudra <fabo@debian.org> + Copyright (C) 2011 Modestas Vainius <modax@debian.org> + +and is licensed under the GPL version 2 or any later version. diff --git a/ubuntu/_base/dependencies/tqca-tls/debian/docs b/ubuntu/_base/dependencies/polkit-tqt/debian/docs index e845566c0..e845566c0 100644 --- a/ubuntu/_base/dependencies/tqca-tls/debian/docs +++ b/ubuntu/_base/dependencies/polkit-tqt/debian/docs diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-dev.install b/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-dev.install new file mode 100644 index 000000000..698c043d8 --- /dev/null +++ b/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-dev.install @@ -0,0 +1,31 @@ +debian/tmp/usr/include/polkit-tqt/PolkitTQt/ActionDescription +debian/tmp/usr/include/polkit-tqt/PolkitTQt/Agent/Listener +debian/tmp/usr/include/polkit-tqt/PolkitTQt/Agent/Session +debian/tmp/usr/include/polkit-tqt/PolkitTQt/Authority +debian/tmp/usr/include/polkit-tqt/PolkitTQt/Details +debian/tmp/usr/include/polkit-tqt/PolkitTQt/Gui/Action +debian/tmp/usr/include/polkit-tqt/PolkitTQt/Gui/ActionButton +debian/tmp/usr/include/polkit-tqt/PolkitTQt/Gui/ActionButtons +debian/tmp/usr/include/polkit-tqt/PolkitTQt/Identity +debian/tmp/usr/include/polkit-tqt/PolkitTQt/Subject +debian/tmp/usr/include/polkit-tqt/PolkitTQt/TemporaryAuthorization +debian/tmp/usr/include/polkit-tqt/polkit-tqt-actiondescription.h +debian/tmp/usr/include/polkit-tqt/polkit-tqt-agent-listener.h +debian/tmp/usr/include/polkit-tqt/polkit-tqt-agent-session.h +debian/tmp/usr/include/polkit-tqt/polkit-tqt-authority.h +debian/tmp/usr/include/polkit-tqt/polkit-tqt-details.h +debian/tmp/usr/include/polkit-tqt/polkit-tqt-export.h +debian/tmp/usr/include/polkit-tqt/polkit-tqt-gui-action.h +debian/tmp/usr/include/polkit-tqt/polkit-tqt-gui-actionbutton.h +debian/tmp/usr/include/polkit-tqt/polkit-tqt-gui-actionbuttons.h +debian/tmp/usr/include/polkit-tqt/polkit-tqt-identity.h +debian/tmp/usr/include/polkit-tqt/polkit-tqt-subject.h +debian/tmp/usr/include/polkit-tqt/polkit-tqt-temporaryauthorization.h +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libpolkit-tqt-agent.so +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libpolkit-tqt-core.so +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libpolkit-tqt-gui.so +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/polkit-tqt.pc +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/polkit-tqt-agent.pc +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/polkit-tqt-core.pc +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/polkit-tqt-gui.pc +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/polkit-tqt.cmake diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-examples.install b/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-examples.install new file mode 100644 index 000000000..5bb70628a --- /dev/null +++ b/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-examples.install @@ -0,0 +1,8 @@ +debian/tmp/etc/dbus-1/system.d/org.tqt.policykit.examples.conf +debian/tmp/usr/bin/polkit-tqt-agent-example +debian/tmp/usr/bin/polkit-tqt-example +debian/tmp/usr/bin/polkit-tqt-example-helper +debian/tmp/usr/share/apps/polkit-tqt/examples/* +debian/tmp/usr/share/apps/polkit-tqt/icons/* +debian/tmp/usr/share/dbus-1/system-services/org.tqt.policykit.examples.service +debian/tmp/usr/share/polkit-1/actions/org.tqt.policykit.examples.policy diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt.install b/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt.install new file mode 100644 index 000000000..1bbe0900a --- /dev/null +++ b/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libpolkit-tqt-*.so.* diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/patches/series b/ubuntu/_base/dependencies/polkit-tqt/debian/patches/series new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/ubuntu/_base/dependencies/polkit-tqt/debian/patches/series diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/rules b/ubuntu/_base/dependencies/polkit-tqt/debian/rules new file mode 100755 index 000000000..71edffe1c --- /dev/null +++ b/ubuntu/_base/dependencies/polkit-tqt/debian/rules @@ -0,0 +1,23 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk +include debian/cdbs/debian-tde.mk + +ifdef DEB_HOST_MULTIARCH + CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH) +else + CMAKE_INSTALL_LIBDIR = lib +endif + +# Build options +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \ + -DWITH_ALL_OPTIONS="ON" \ + -DBUILD_ALL="ON" + +DEB_MAKE_CHECK_TARGET = check diff --git a/ubuntu/_base/dependencies/python-tqt/debian/source/format b/ubuntu/_base/dependencies/polkit-tqt/debian/source/format index 163aaf8d8..163aaf8d8 100644 --- a/ubuntu/_base/dependencies/python-tqt/debian/source/format +++ b/ubuntu/_base/dependencies/polkit-tqt/debian/source/format diff --git a/ubuntu/_base/dependencies/python-tqt/debian/source/options b/ubuntu/_base/dependencies/polkit-tqt/debian/source/options index 72f1f5450..72f1f5450 100644 --- a/ubuntu/_base/dependencies/python-tqt/debian/source/options +++ b/ubuntu/_base/dependencies/polkit-tqt/debian/source/options diff --git a/ubuntu/_base/dependencies/python-tqt/debian/README.Debian b/ubuntu/_base/dependencies/python-tqt/debian/README.Debian deleted file mode 100644 index 33603ec40..000000000 --- a/ubuntu/_base/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/ubuntu/_base/dependencies/python-tqt/debian/compat b/ubuntu/_base/dependencies/python-tqt/debian/compat deleted file mode 100644 index 7f8f011eb..000000000 --- a/ubuntu/_base/dependencies/python-tqt/debian/compat +++ /dev/null @@ -1 +0,0 @@ -7 diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs deleted file mode 100644 index ae635cbcd..000000000 --- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/share/sip/tqt diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.install b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.install deleted file mode 100644 index 7b6aca191..000000000 --- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.install +++ /dev/null @@ -1,2 +0,0 @@ -sip/* usr/share/sip/tqt - diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides deleted file mode 100644 index 36e6c1349..000000000 --- a/ubuntu/_base/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/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-doc.dirs b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-doc.dirs deleted file mode 100644 index 43a4fa9fa..000000000 --- a/ubuntu/_base/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/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-doc.examples b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-doc.examples deleted file mode 100644 index 3162f69a8..000000000 --- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-doc.examples +++ /dev/null @@ -1,2 +0,0 @@ -examples3/* - diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-doc.install b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-doc.install deleted file mode 100644 index 65f82036b..000000000 --- a/ubuntu/_base/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/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-gl.install b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-gl.install deleted file mode 100644 index 288f3cb88..000000000 --- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-gl.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python*/*-packages/python_tqt/qtgl.so diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt.install b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt.install deleted file mode 100644 index 61a9363d0..000000000 --- a/ubuntu/_base/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/ubuntu/_base/dependencies/python-tqt/debian/python-tqtext.install b/ubuntu/_base/dependencies/python-tqt/debian/python-tqtext.install deleted file mode 100644 index 582be1bb1..000000000 --- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqtext.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python*/*-packages/python_tqt/qtext.so diff --git a/ubuntu/_base/dependencies/python-tqt/debian/pytqt-tools.manpages b/ubuntu/_base/dependencies/python-tqt/debian/pytqt-tools.manpages deleted file mode 100644 index 7d27d0034..000000000 --- a/ubuntu/_base/dependencies/python-tqt/debian/pytqt-tools.manpages +++ /dev/null @@ -1,2 +0,0 @@ -debian/manpages/pylupdate.1 -debian/manpages/pyuic.1 diff --git a/ubuntu/_base/dependencies/python-tqt/debian/watch b/ubuntu/_base/dependencies/python-tqt/debian/watch deleted file mode 100644 index 506321d38..000000000 --- a/ubuntu/_base/dependencies/python-tqt/debian/watch +++ /dev/null @@ -1,3 +0,0 @@ -version=3 -http://www.riverbankcomputing.com/software/pyqt/download3 \ - /static/Downloads/PyQt3/PyQt-x11-gpl-([.\d]*)\.tar\.gz diff --git a/ubuntu/_base/dependencies/pytqt/debian/README.Debian b/ubuntu/_base/dependencies/pytqt/debian/README.Debian new file mode 100644 index 000000000..201336f3a --- /dev/null +++ b/ubuntu/_base/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/ubuntu/_base/dependencies/python-tqt/debian/changelog b/ubuntu/_base/dependencies/pytqt/debian/changelog index 95e2f0cce..e834a6ca8 100644 --- a/ubuntu/_base/dependencies/python-tqt/debian/changelog +++ b/ubuntu/_base/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/ubuntu/_base/dependencies/pytqt/debian/compat b/ubuntu/_base/dependencies/pytqt/debian/compat new file mode 100644 index 000000000..f599e28b8 --- /dev/null +++ b/ubuntu/_base/dependencies/pytqt/debian/compat @@ -0,0 +1 @@ +10 diff --git a/ubuntu/_base/dependencies/python-tqt/debian/control b/ubuntu/_base/dependencies/pytqt/debian/control index 5e6a36407..d29e68c39 100644 --- a/ubuntu/_base/dependencies/python-tqt/debian/control +++ b/ubuntu/_base/dependencies/pytqt/debian/control @@ -1,20 +1,22 @@ -Source: python-tqt +Source: pytqt Section: python Priority: optional -Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +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 (>= 7.0.50~), python-all-dev (>= 2.3.5-10), libtqtinterface-dev, tqt3-dev-tools, tqt3-apps-dev, python-sip-tqt-dev, python-sip-tqt-dbg, libtqscintilla-dev, python-support (>= 0.7.1) | python-dev (>= 2.6.6-3~), python-all-dbg +Build-Depends: debhelper (>= 10~), python3-all-dev, python3-all-dbg, libtqtinterface-dev, tqt3-dev-tools, tqt3-apps-dev, python3-sip-tqt-dev, python3-sip-tqt-dbg, 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 +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: 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) +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: any -Depends: ${shlibs:Depends}, python-dbg, python-tqtext (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends} +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/ubuntu/_base/dependencies/python-tqt/debian/copyright b/ubuntu/_base/dependencies/pytqt/debian/copyright index 715a83f24..715a83f24 100644 --- a/ubuntu/_base/dependencies/python-tqt/debian/copyright +++ b/ubuntu/_base/dependencies/pytqt/debian/copyright diff --git a/ubuntu/_base/dependencies/python-tqt/debian/docs b/ubuntu/_base/dependencies/pytqt/debian/docs index 50bd824bb..50bd824bb 100644 --- a/ubuntu/_base/dependencies/python-tqt/debian/docs +++ b/ubuntu/_base/dependencies/pytqt/debian/docs diff --git a/ubuntu/_base/dependencies/python-tqt/debian/manpages/pylupdate.1 b/ubuntu/_base/dependencies/pytqt/debian/manpages/pytqlupdate.1 index 4d2c8919a..9e68e9605 100644 --- a/ubuntu/_base/dependencies/python-tqt/debian/manpages/pylupdate.1 +++ b/ubuntu/_base/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/ubuntu/_base/dependencies/python-tqt/debian/manpages/pyuic.1 b/ubuntu/_base/dependencies/pytqt/debian/manpages/pytquic.1 index f1ffa41ff..e456074a2 100644 --- a/ubuntu/_base/dependencies/python-tqt/debian/manpages/pyuic.1 +++ b/ubuntu/_base/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/ubuntu/_base/dependencies/python-tqt/debian/patches/debian_configure_changes.diff b/ubuntu/_base/dependencies/pytqt/debian/patches/debian_configure_changes.diff index 131e9dbdc..131e9dbdc 100644 --- a/ubuntu/_base/dependencies/python-tqt/debian/patches/debian_configure_changes.diff +++ b/ubuntu/_base/dependencies/pytqt/debian/patches/debian_configure_changes.diff diff --git a/ubuntu/_base/dependencies/python-tqt/debian/patches/series b/ubuntu/_base/dependencies/pytqt/debian/patches/series index 573069d8d..573069d8d 100644 --- a/ubuntu/_base/dependencies/python-tqt/debian/patches/series +++ b/ubuntu/_base/dependencies/pytqt/debian/patches/series diff --git a/ubuntu/_base/dependencies/pytqt/debian/python3-pytqt-gl.install b/ubuntu/_base/dependencies/pytqt/debian/python3-pytqt-gl.install new file mode 100644 index 000000000..dd7cab0c0 --- /dev/null +++ b/ubuntu/_base/dependencies/pytqt/debian/python3-pytqt-gl.install @@ -0,0 +1 @@ +usr/lib/python3*/*-packages/PyTQt/tqtgl.so diff --git a/ubuntu/_base/dependencies/pytqt/debian/python3-pytqt.install b/ubuntu/_base/dependencies/pytqt/debian/python3-pytqt.install new file mode 100644 index 000000000..f18aeefd0 --- /dev/null +++ b/ubuntu/_base/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/ubuntu/_base/dependencies/pytqt/debian/python3-pytqtext.install b/ubuntu/_base/dependencies/pytqt/debian/python3-pytqtext.install new file mode 100644 index 000000000..511c1c0c4 --- /dev/null +++ b/ubuntu/_base/dependencies/pytqt/debian/python3-pytqtext.install @@ -0,0 +1 @@ +usr/lib/python3*/*-packages/PyTQt/tqtext.so diff --git a/ubuntu/_base/dependencies/pytqt/debian/pytqt-dev.dirs b/ubuntu/_base/dependencies/pytqt/debian/pytqt-dev.dirs new file mode 100644 index 000000000..735874a93 --- /dev/null +++ b/ubuntu/_base/dependencies/pytqt/debian/pytqt-dev.dirs @@ -0,0 +1 @@ +usr/share/sip-tqt/tqt diff --git a/ubuntu/_base/dependencies/pytqt/debian/pytqt-dev.install b/ubuntu/_base/dependencies/pytqt/debian/pytqt-dev.install new file mode 100644 index 000000000..0f144be95 --- /dev/null +++ b/ubuntu/_base/dependencies/pytqt/debian/pytqt-dev.install @@ -0,0 +1 @@ +sip/* usr/share/sip-tqt/tqt diff --git a/ubuntu/_base/dependencies/pytqt/debian/pytqt-dev.lintian-overrides b/ubuntu/_base/dependencies/pytqt/debian/pytqt-dev.lintian-overrides new file mode 100644 index 000000000..1a3799d59 --- /dev/null +++ b/ubuntu/_base/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/ubuntu/_base/dependencies/pytqt/debian/pytqt-doc.dirs b/ubuntu/_base/dependencies/pytqt/debian/pytqt-doc.dirs new file mode 100644 index 000000000..8067955f9 --- /dev/null +++ b/ubuntu/_base/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/ubuntu/_base/dependencies/pytqt/debian/pytqt-doc.examples b/ubuntu/_base/dependencies/pytqt/debian/pytqt-doc.examples new file mode 100644 index 000000000..c48447a3e --- /dev/null +++ b/ubuntu/_base/dependencies/pytqt/debian/pytqt-doc.examples @@ -0,0 +1,2 @@ +examples/* + diff --git a/ubuntu/_base/dependencies/pytqt/debian/pytqt-doc.install b/ubuntu/_base/dependencies/pytqt/debian/pytqt-doc.install new file mode 100644 index 000000000..273120f41 --- /dev/null +++ b/ubuntu/_base/dependencies/pytqt/debian/pytqt-doc.install @@ -0,0 +1 @@ +doc/PyTQt.html usr/share/doc/pytqt-doc/html diff --git a/ubuntu/_base/dependencies/python-tqt/debian/pytqt-tools.install b/ubuntu/_base/dependencies/pytqt/debian/pytqt-tools.install index 1df36c612..1df36c612 100644 --- a/ubuntu/_base/dependencies/python-tqt/debian/pytqt-tools.install +++ b/ubuntu/_base/dependencies/pytqt/debian/pytqt-tools.install diff --git a/ubuntu/_base/dependencies/pytqt/debian/pytqt-tools.manpages b/ubuntu/_base/dependencies/pytqt/debian/pytqt-tools.manpages new file mode 100644 index 000000000..a8224067a --- /dev/null +++ b/ubuntu/_base/dependencies/pytqt/debian/pytqt-tools.manpages @@ -0,0 +1,2 @@ +debian/manpages/pytqlupdate.1 +debian/manpages/pytquic.1 diff --git a/ubuntu/_base/dependencies/pytqt/debian/pytqtconfig_py3.py b/ubuntu/_base/dependencies/pytqt/debian/pytqtconfig_py3.py new file mode 100644 index 000000000..c25f1f56e --- /dev/null +++ b/ubuntu/_base/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/ubuntu/_base/dependencies/python-tqt/debian/rules b/ubuntu/_base/dependencies/pytqt/debian/rules index ba02eb70a..532bf34bd 100755 --- a/ubuntu/_base/dependencies/python-tqt/debian/rules +++ b/ubuntu/_base/dependencies/pytqt/debian/rules @@ -3,12 +3,23 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +# 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 + +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 @@ -17,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 @@ -30,34 +41,26 @@ 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) + build-%/configure-stamp: dh_testdir mkdir -p build-$* cd build-$* && echo yes \ | python$* ../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$* \ - -v /usr/share/sip/tqt \ + -v /usr/share/sip-tqt/tqt \ -m /usr/lib/python$*/config \ + -z \ CXXFLAGS_RELEASE="" CXXFLAGS="${CXXFLAGS}" STRIP="" touch $@ @@ -66,13 +69,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 $@ @@ -94,44 +97,48 @@ 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; \ - $(MAKE) -C dbg-build-$$version install DESTDIR=$(CURDIR)/debian/python-tqt-dbg;\ - mkdir -p debian/python-tqt/$$pylib;\ - cp -a debian/tmp/$$pylib/__init__.py \ - debian/python-tqt/$$pylib/__init__.py;\ - mkdir -p debian/python-tqt-gl-dbg/$$pylib;\ - mv debian/python-tqt-dbg/$$pylib/qtgl.so \ - debian/python-tqt-gl-dbg/$$pylib/;\ - mkdir -p debian/python-tqtext-dbg/$$pylib;\ - mv debian/python-tqt-dbg/$$pylib/qtext.so \ - debian/python-tqtext-dbg/$$pylib/;\ + + 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/python-*-dbg -name '*.so'); do \ + for i in $$(find debian/python3-*-dbg -name '*.so'); do \ b=$$(basename $$i .so); \ mv $$i $$(dirname $$i)/$${b}_d.so; \ done - find debian/python-*-dbg ! -type d \ + find debian/python3-*-dbg ! -type d \ ! \( -name '*.so' -o -name '*config_d.py' \) | xargs rm -f - find debian/python-*-dbg -depth -type d -empty -exec rmdir {} \; + 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 @@ -154,7 +161,7 @@ binary-common: ifeq (,$(findstring -i, $(DH_OPTIONS))) DH_OPTIONS= dh_strip -ppytqt-tools set -e; \ - for p in python-tqt python-tqt-gl python-tqtext; do \ + for p in python3-pytqt python3-pytqt-gl python3-pytqtext; do \ DH_OPTIONS= dh_strip -p$$p --dbg-package=$$p-dbg; \ rm -rf debian/$$p-dbg/usr/share/doc/$$p-dbg; \ ln -s $$p debian/$$p-dbg/usr/share/doc/$$p-dbg; \ @@ -163,8 +170,8 @@ endif # 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 diff --git a/ubuntu/_base/dependencies/qt3/debian/source/format b/ubuntu/_base/dependencies/pytqt/debian/source/format index 163aaf8d8..163aaf8d8 100644 --- a/ubuntu/_base/dependencies/qt3/debian/source/format +++ b/ubuntu/_base/dependencies/pytqt/debian/source/format diff --git a/ubuntu/_base/dependencies/qt3/debian/source/options b/ubuntu/_base/dependencies/pytqt/debian/source/options index 72f1f5450..72f1f5450 100644 --- a/ubuntu/_base/dependencies/qt3/debian/source/options +++ b/ubuntu/_base/dependencies/pytqt/debian/source/options diff --git a/ubuntu/_base/dependencies/qt3/debian/README.Debian b/ubuntu/_base/dependencies/qt3/debian/README.Debian deleted file mode 100644 index afdde2610..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/README.Debian +++ /dev/null @@ -1,277 +0,0 @@ -Qt for Debian README --------------------- - -1. Preface - -This README is intended to give developers and users exact information -about how the qt-x11-free package provided by TrollTech AS has been packaged -for Debian in case you either want to faciliate it for development -of applications and libraries or plugins using the Qt class library. With -qt-x11-3.1.1, the Debian packages have been massively restructured to get -the most out of theoriginal Qt package and spit the contents up into -several packages so that they make the most sensefor several groups of -users; developers, application users, translators of Qt-based -applications and Debian packagers who are packaging applications developed -with Qt.2. - -2. General Overview - -As Qt is a huge package that contains a complete environment for -developers, it needs to be split up into several packages that make it -easier for everyone else to handle it and not to require -unnecessary disk space for end-users. Additionally, Qt can be configured -in several ways - and therefore also used in several ways. Qt development -usually requires the environment variable QTDIR. As Debian is placing -libraries and header files in a quite specific filesystem order, this -usually breaks setting a single environment variable to meet the -requirements of packages. Therefore, symlinks are used to set up the system -to meet both, the Debian filesystem standard and the QTDIR variable. All of -Qt (so the QTDIR path) is available in /usr/share/qt3. If you need to set -QTDIR, do export QTDIR=/usr/share/qt3 - -As far as the common build configuration goes, we note explicitely that the -Debian package of Qt will in very rare cases break the compilation (most -likely the linking) of applications on Debian which use Qt, in particular -utilizing styles in an incorrect way by deriving from one of the styles -that ship with Qt. In case you are a Debian packager and encounter -problems, contact Debian Qt/KDE Maintainers (debian-qt-kde@lists.debian.org). -We will tell you why things don't work and what you should communicate on -with the programmers of your application that you are packaging. The build -configuration generally is intended to provide a Qt version that is as -small as possible in terms of the memory size it requires. Therefore, -everything inside Qt that can be compiled as plugins has been compiled that -way. This includes: - -- imageformats: jpeg and mng - codecs (for languages like arab, japanese - etc provided with Qt) -- sql drivers for databases (MySQL, ODBC and PostgreSQL) - -The only exception is the imageformat png which has been compiled built-in -due to the fact that there is literally no program that uses no icons at -all and icons are to be used preferrably in png format. The plugins are all -located under /usr/lib/qt3/plugins. This is also the install location you -should choose as a package maintainer for -qt-plugins so the user doesn't have to customize his library path for -loading Qt plugins. The only exception is that KDE delivers a set of Qt -plugins as well (mainly styles and designer plugins); those are placed in -/usr/lib/trinity/plugins. - -QMotif Extension: As this code is only available in commercial environments -(and produces a static library libqmotif.a anyway that those commercial -applications have to be linked against in addition to Qt), we left out all -header files of the libqt3-headers package that are belonging to this -QMotif extension. - -Oracle Database driver, Sybase & Microsoft SQL Server driver: Those drivers -are only available in a commercial version of Qt due to license -incompatibilities with the GPL. If you need to faciliate those drivers, -please visit http://www.trolltech.com and have a read at -http://doc.trolltech.com/3.0/sql-driver.html. - -3. Packages (End-User) - -The Qt built has been split up into several packages that allow for easy -installation for all types of users. The End-user usually only requires to -have the following packages installed to run an application that links -against Qt: - -Threaded version:libqt3-mt (the library libqt-mt.so.* and libqui.so.* for -loading designer-made user interfaces at runtime). - -Optionally depending on the program's requirements: - -libqt3-mt-odbc -libqt3-mt-mysql -libqt3-mt-psql - -In addition to the libraries, it may make sense to install the program -qtconfig to customize the look and behaviorof Qt programs. If you have KDE -installed, the KDE control center will take this task automatically in most -cases. qtconfig is available in the package qt3-qtconfig. - -Also, Qt programs can make use of the online-help tool that ships with Qt, -the Qt Assistant. The Assistant can be installed with the package -qt3-assistant. - -Qt Configuration files ----------------------- -Qt programs most often use QSettings to store their information in configuration -files. With Qt 3.2, the new option --sysconfdir has been introduced that allows -us to use /etc/qt3 as the system-wide location where qt-program specific global -configuration files can go. If you're a programmer that wants to get familiar with -that, please look at the examples, documentation and the code in designer or -assistant as well as qtconfig. - -4. Packages (Package maintainers) - -In addition to the library, a package maintainer will require an additional -set of packages to compile a package that requires Qt. Depending on the -version of the qt library, you will require a different set of packages; -the most common option should be to make your application link against the -multi-threaded version (-mt).Packages necessary for compiling Qt -applications from source: - -libqt3-mt-dev (use libqt3-dev for linking against -lqt, this package only - contains the .so files and the header file for libqui.so) - -libqt3-headers (header files for libqt and libqt-mt) - -qt3-dev-tools (this package contains the tools uic and moc as well as -qmake, required for building Qt applications) - -If, however, you encounter an older program not to compile with this set -read the FAQ at the end of this document. - -5. Packages (Developers) - -In addition to the packages that packagers require, a developer usually -will require the Qt API documentationas well as tools like the assistant, -linguist or designer. However, you should be fine with installing the API -documentation that you can browse with a webbrowser, optionally with the -assistant. They are available in /usr/share/doc/qt3-doc/html. -For a regular development environment, install qt3-designer and qt3-doc. - -For faciliating Qt's extended environment to write plugins for the Qt -Designer or extend the Designer as well as utilizing the Qt Assistant by -calling it from within your program, install qt3-apps-dev, which contains -the static libraries and header files required for this functionality. - -For Embedded Developers, the program qvfb (Qt Virtual Frambuffer) and -makeqpf (embedded fonts tool)have been packaged into -qt3-dev-tools-embedded. For developers that work on migrating their program -from any Qt version prior to Qt 3.x to the Qt 3.x platform you will find -additional tools in the qt3-dev-tools-compat. - -For using the QTranslator class and where to find the qm-file for qt as -well as where to place your translations,see the next section. - -If your program doesn't compile with those settings in case you have -started your project with Qt 1.x or 2.x, please read the FAQ section at the -end of this document. - -5. Packages (Translators) - -In order to translate a Qt program into any other language, the Qt 3 way to -do this is to let the developer create a ts-file containing the strings -that the program exposes on the user interface. The tools to create the -ts-file and to create the final qm (Q-message binary) file, lupdate and -lrelease, are included in qt3-dev-tools.The single translator that only -gets provided the ts file and has to return a translated ts file, it -is absolutely enough to install qt3-linguist; the package qt3-assistant can -be installed to access the online-help for the Qt Linguist itself. -In case you're converting an application using Qt prior to Qt 3, you may -want to uitilize the qt3-dev-tools-compat which include the necessary tools -to convert older qm files to the new ts file standard. - -Locations of message translations: - -Qt ships with a set of translations for the strings used inside Qt. Those -translations will be installed into /usr/share/qt3/translations (qm files -only), which equals $QTDIR/translations respectively -qInstallPath() + QString( "/translations" ). - -The configure option --translationdir has been set to /usr/share/qt3/translations -accordingly since it was introduced in Qt 3.2. - -To correctly enable your program to display the translations to the Qt -library and to load the translation of the program itself, we currently -suggest to either install your translations along with any other data files -into/usr/share/<appname>/, translation files into the subdirectory -translations (that is /usr/share/<appname>/translations) The code that your -application should use to load the Qt translation will have to look like -the following: - -int main( int argc, char **argv ) - { - QApplication app( argc, argv ); - - // translation file for Qt - QTranslator qt( 0 ); - qt.load( QString( "qt_" ) + QTextCodec::locale(), qInstallPath() + - QString( "/translations" ); - app.installTranslator( &qt ); - - // translation file for application strings - QTranslator myapp( 0 ); - myapp.load( QString( "myapp_" ) + QTextCodec::locale(), "." ); - // use a substitue for $prefix/share/appname/translations here - app.installTranslator( &myapp ); - -6. Frequently Asked Questions - -Using Qt for Debian as a developer or packager ----------------------------------------------- - -Q: I want to compile a source package that utilizes qmake to build the -Makefiles. What do I need to do to makeit work ? - -A: qmake requires two environment variables to be set, QTDIR and QMAKESPEC. -To make it work, do -export QTDIR=/usr/share/qt3 -export QMAKESPEC=linux-g++ - -Then run qmake -o Makefile <projectfile>.pro - -After that, the Makefile is correctly created to build your application on -Debian. As a packager, export thosetwo variables in the rules file before -calling qmake. - -Q: I have an application that when linking gives me symbol referencing -errors to Q*Style. Why does my applicationnot link correctly ? - -A: The author of the program is using the styles that ship with Qt directly -instead of using the QStylePlugin interface.If you are the author of the -program, change your program to use QStylePlugin. If you are a packager, -write to theauthor of the program that he is assuming that the styles -shipped with Qt are built-in to the library which is not the case on Debian -and that he please should fix this and use QStylePlugin. - -Q: Where are all the examples and tutorials ? And how do I build them ? - -A: Qt ships with examples and tutorials; so does the Linguist and Designer. -The tutorials and examples are compressed tarballs which you can unpack with -tar -zxvf into your home directory. Change into the qt3-examples directory -and run the provided ./build-examples script. All Qt examples and tutorials, -including those for designer and the linguist, will be compiled. You will -notice however, that those examples that inherit from style classes which -are not built-in into Qt but configured as a plugin will not compile due -to the fact that they can't link to the Qt library. - -Q: I'm writing a pure Qt application and I want to ship it with a default -configuration file. Where does that global configuration file go if I make -use of the QSettings class ? - -A: With qt-3.2.0, Trolltech has introduced a configure option to Qt called ---sysconfdir which we intentionally set to /etc/qt3 similar to /etc/trinity for -KDE programs. Install your application's system wide configuration file -to /etc/qt3. - -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 qtrename140, 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 libqt3-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 ? - -A: Please turn to Debian Qt/KDE Maintainers (debian-qt-kde@lists.debian.org) -for any questions regarding Qt on Debian. - - -- Ralf Nolden <nolden@kde.org> Sun, 26 Jan 2003 20:39:19 +0100 - -- Ralf Nolden <nolden@kde.org> Mon, 1 Sep 2003 19:24:16 +0200 - -- Modestas Vainius <modestas@vainius.eu> Fri, 22 Feb 2008 01:40:06 +0200 diff --git a/ubuntu/_base/dependencies/qt3/debian/changelog b/ubuntu/_base/dependencies/qt3/debian/changelog deleted file mode 100644 index 8c265b2d1..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/changelog +++ /dev/null @@ -1,2664 +0,0 @@ -qt-x11-free (3:3.3.8-d-0ubuntu0) maverick; urgency=low - - * Upload of 3.3.8d (working revision) from GIT - - -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Fri, 22 Jul 2011 16:40:00 -0600 - -qt-x11-free (3:3.3.8-c-0ubuntu0) maverick; urgency=low - - * Patch to 3.3.8c - - -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Wed, 09 Mar 2011 16:12:00 -0600 - -qt-x11-free (3:3.3.8-b-6ubuntu2) lucid; urgency=low - - * Fix locations in libqt3-mt.install file - - -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 09 Nov 2009 17:26:38 +0000 - -qt-x11-free (3:3.3.8-b-6ubuntu1) lucid; urgency=low - - * Merge with Debian, remaining changes: - - Add kubuntu_06_fglrx_0_size_screen.dpatch work around fglrx reporting a 0 size screen. - Closes https://bugs.launchpad.net/ubuntu/+source/qt-x11-free/+bug/81686 - - Add kubuntu_09_flickerfree_qiconview.dpatch to add - double-buffering for the icon redraw - prevents flicker on window - redrawing (LP: #209227) - - No firebird/ibase build (remove build-dep, control entry, ibase - ./configure option), firebird is not in Ubuntu main - - Add debian/qt_plugins_3.3rc and debian/qtrc to set default style to plastique, edit libqt3-mt.install to install them - - -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 09 Nov 2009 14:37:51 +0000 - -qt-x11-free (3:3.3.8b-6) unstable; urgency=low - - +++ Changes by Fathi Boudra: - - * Add firebird2-dev as alternative build-dependency for backports. - (Closes: #475251) - * Replace old libcupsys2-dev names by libcups2-dev in Build-Depends and - Depends. Thanks to Martin-Éric Racine. (Closes: #529965). - * Add missing build-dependency on cpio. (Closes: #536848) - - +++ Changes by Modestas Vainius: - - * Build depend on libmysqlclient-dev only. It is a virtual package in Lenny. - - +++ Changes by Sune Vuorela: - - * Add debian/patches/71_sparc_only_-O1.diff and use linux-g++-sparc: - - Build with -O1 on sparc as something is broken here. (Closes: #490999) - * Fix parallel build. Thanks Robert Millan. (Closes: 475333) - - -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 26 Aug 2009 12:50:18 +0300 - -qt-x11-free (3:3.3.8-b-5ubuntu3) karmic; urgency=low - - * Build-depend on cpio (LP: #445582). - - -- Colin Watson <cjwatson@ubuntu.com> Wed, 07 Oct 2009 18:00:08 +0100 - -qt-x11-free (3:3.3.8-b-5ubuntu2) karmic; urgency=low - - * Build against mysql 5.1 - - -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 19 Aug 2009 21:22:20 +0100 - -qt-x11-free (3:3.3.8-b-5ubuntu1) intrepid; urgency=low - - * Merge with Debian, remaining changes: - - Add kubuntu_06_fglrx_0_size_screen.dpatch work around fglrx reporting a 0 size screen. - Closes https://bugs.launchpad.net/ubuntu/+source/qt-x11-free/+bug/81686 - - Add kubuntu_09_flickerfree_qiconview.dpatch to add - double-buffering for the icon redraw - prevents flicker on window - redrawing (LP: #209227) - - No firebird/ibase build (remove build-dep, control entry, ibase - ./configure option), firebird is not in Ubuntu main - - install qtrc and qt_plugins_3.3rc - - add /etc/ to libqt3-mt - - -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 02 May 2008 11:30:32 +0100 - -qt-x11-free (3:3.3.8b-5) unstable; urgency=medium - - +++ Changes by Modestas Vainius: - - * The previous implemention of the hack was still incomplete solution for - restoration of [fl]?stat64 symbols on libqt-mt.so.3 compiled with -O2 - against glibc << 2.7. In such a case, [fl]?stat64 were still inlined and - not exported. Therefore, the hack implementation was extended to cover the - latter case as a well and as result it should be fully compatible with - m68k/unstable and backports. - * Cleanup README.Debian: remove old information about non-threaded version - of Qt3 and substitude contacts of previous maintainers with - Debian Qt/KDE Maintainers (debian-qt-kde@lists.debian.org). - * Drop 61_fcfontmatch_fontwidth_fix.diff patch. A bit different fix was - applied upstream. - * Add 61_eastern_asian_languagues.diff to fix font substitution for Eastern - Asian languages under other locales (Closes: #468430). - * Set urgency to medium because this revision fixes 3.3.8 regressions from - 3.3.7 and 3.3.8 has already entered testing. - - +++ Changes by Fathi Boudra: - - * Suggest qt3-apps-dev to qt3-examples. Thanks to Matthew Rosewarne. - - -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Mon, 10 Mar 2008 17:10:24 +0200 - -qt-x11-free (3:3.3.8b-4) unstable; urgency=low - - +++ Changes by Modestas Vainius: - - * Make 01_export_stat64_symbols.diff hack glibc >=2.7 dependant instead of - build depending on libc6-dev (>=2.7-1) and its other incarnations. This - will restore Qt3 backports friendliness. Thanks to Pierre Habouzit for - this idea. - - -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 21 Feb 2008 12:59:07 +0200 - -qt-x11-free (3:3.3.8b-3) unstable; urgency=low - - * The "Optimized Qt3" release. - - ++ Changes by Modestas Vainius: - - * Add 00_qmake_debian_compliant_release_target.diff patch to make 'qmake' - release target debian policy compliant: - - Use C(XX)FLAGS=-02 -g - - Prevent qmake from striping binaries. Debian has dh_strip for that. - - Patch configure script to build qmake itself with 'release' - configuration too. - * Build Qt3 using "release" build configuration. - * Remove 01_stat_extern_inline_hack.diff and use different way of exporting - [fl]?stat64 symbols because previous way is ineffective with -O2. Add - 01_export_stat64_symbols.diff patch for that. - * The hack above depends on libc6-dev (>= 2.7-1). Adjust Build-Depends. - * Add 73_configure_quilt_compat.diff patch to make ./configure script ignore - "project files" under quilt temporary directory (./.pc/). I think that - this problem was the cause of FTBFS on alpha & mips since *.pro files - under .pc had to be `found` last in order for ./configure to succeed. - Probably, this condition was not met on alpha & mips, but it was met on - other arches. - * Add myself to uploaders. - - -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 21 Feb 2008 01:13:16 +0200 - -qt-x11-free (3:3.3.8b-2) unstable; urgency=medium - - * Re-add *stat64 symbols to Qt3 using 01_stat_extern_inline_hack patch: - - * the extern inlines from sys/stat.h are just gone, and that's just normal - in fact. - * /usr/lib/libc.so is a linker script that pulls /lib/libc-2.7.so _and_ - /usr/lib/libc_nonshared.a. - * the latter defines stat64 and friends as weak-symbols and alises to - __xstat64 and friends. - - That's how when you link something that uses fstat64 it finds the symbol at - link time, letting you the possibility to override it with your own - implementation. - - The fact that the extern inlines were used at some point in the past _was_ - a bug, and let qt3 divert those, which should have not happened in the - first place. Sadly, when you link against qt3, it picks those symbols - because it will always prefer symbols from a shared lib than from the .a - IIRC, or it's due to the link order, anyways, it's not relevant. - - Thanks to Pierre Habouzit and Modestas Vainius. (Closes: #465028) - - -- Fathi Boudra <fabo@debian.org> Sat, 16 Feb 2008 16:02:03 +0100 - -qt-x11-free (3:3.3.8b-1) unstable; urgency=low - - * New upstream release: - * This version adds the GNU Public License version 3 as a - possible choice for licenses to the Open Source releases of Qt 3. - * It includes the patch for CVE-2007-3388, a potential vulnerability in - QTextEdit, which might cause remote execution when parsing maliciously - crafted text from an unknown source. - - * Fix desktop files: - * Add semicolon at the end of the MimeType key. Thanks to Pino Toscano. - * Remove deprecated MapNotify key. - * Bump compat/debhelper to 6. - * Add myself in Uploaders field. - * Switch to quilt patch system. - * Add Homepage, Vcs-Browser and Vcs-Svn fields. - * Update copyright file. Add the GNU GPL 3 as a possible choice of licenses. - (Closes: #464613) - * Update libqt3-mt* links. - * Update rules: install upstream changelog changes-3.3.8 and changes-3.3.8b. - * Refresh patches. (Closes: #441580) - * Remove patches: - * 30_qtc_arabic_font_fixes.dpatch - * 49_immodule_inputcontext_fix.dpatch - * 62_bengali_charfix.dpatch - * 64_utf8-parsing-vulnerability.dpatch - * 69_CVE-2007-3388.dpatch - * Add patches: - * lubos lunak xinerama patch. It adds _net_wm_full_placement support. - * xinerama dialog placement fix. - * Use qt-copy patches original name. Don't use "xx_qtc_patch_name" scheme. - * Replace deprecated Source-Version by binary:Version. - * Update menu files to latest Debian menu policy. - * Install translations files with 644 permissions. - - -- Fathi Boudra <fabo@debian.org> Fri, 08 Feb 2008 11:01:58 +0100 - -qt-x11-free (3:3.3.8-b-0ubuntu3) hardy; urgency=low - - * Add 61_eastern_asian_languagues.diff from Debian, - closes LP: #94282 - "Qt program doesn't select Chinese font correctly" - - -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 09 Apr 2008 16:56:29 +0100 - -qt-x11-free (3:3.3.8-b-0ubuntu2) hardy; urgency=low - - * Add debian/patches/kubuntu_09_flickerfree_qiconview.dpatch to add - double-buffering for the icon redraw - prevents flicker on window - redrawing (LP: #209227) - - -- Scott Kitterman <scott@kitterman.com> Tue, 08 Apr 2008 09:24:36 -0400 - -qt-x11-free (3:3.3.8-b-0ubuntu1) hardy; urgency=low - - * New upstream release with GPL 3 licence - - -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 21 Jan 2008 10:50:42 +0000 - -qt-x11-free (3:3.3.8really3.3.7-0ubuntu13) hardy; urgency=low - - * Remove kubuntu_05_gcc_hidden_visibility.dpatch, it breaks typing - composite keys. - - -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 16 Nov 2007 11:40:40 +0000 - -qt-x11-free (3:3.3.8really3.3.7-0ubuntu12) hardy; urgency=low - - * Merge with Debian, remaining changes: - - No firebird/ibase build (remove build-dep, control entry, ibase ./configure option), firebird is not in Ubuntu main - - install qtrc (change rules, qtrc file) and qt_plugins_3.3rc - - add /etc/ to libqt3-mt - - Add kubuntu_04_xinerama.dpatch from http://ktown.kde.org/~seli/xinerama/ - - Add kubuntu_06_fglrx_0_size_screen.dpatch work around fglrx reporting a 0 size screen. - Closes https://bugs.launchpad.net/ubuntu/+source/qt-x11-free/+bug/81686 - - Add kubuntu_07_font_default_subst.dpatch from Dirk Muller, - should fix rendering of CKJ and other characters - * Add kubuntu_05_gcc_hidden_visibility.dpatch from - http://bugs.kde.org/attachment.cgi?id=13069&action=view - on http://bugs.kde.org/109386, I am promised GCC won't break things this time - - -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 01 Nov 2007 15:59:56 +0000 - -qt-x11-free (3:3.3.7-9) unstable; urgency=low - - * Trust dpkg-architecture better than uname -m for the build key. Make - mappings to not break current binary compability. Add patch 72 for that. - Thanks to Bastian Blank for often changing uname -m on his buildds to - discover this bug. - - -- Sune Vuorela <debian@pusling.com> Wed, 26 Sep 2007 21:42:24 +0200 - -qt-x11-free (3:3.3.7-8) unstable; urgency=low - - * Add patch for utf8 parser decoder overflow. CVE-2007-4137 - (Closes: #442780). Thanks to Dirk Mueller for the patch and Stefan Fritsch - for noticing it. - - -- Sune Vuorela <debian@pusling.com> Sun, 16 Sep 2007 23:13:32 +0200 - -qt-x11-free (3:3.3.7-7) unstable; urgency=low - - * Updating Qt3 to build against firebird2. Many thanks to Damyan Ivanov for - his work on this! - - Build-Depend on firebird2.0-dev instead of firebird1.5-dev. - - Add powerpc to firebird-supported architectures. - - Add patch 70_bad_typecast_amd64 to fix bad typecast in - src/sql/drivers/ibase/qsql_ibase.cpp causing FTBFS on amd64. - * Update uploaders. - - -- Ana Beatriz Guerrero Lopez <ana@debian.org> Thu, 23 Aug 2007 08:25:07 +0200 - -qt-x11-free (3:3.3.7-6) unstable; urgency=low - - * Patch for potential vulnerability in QTextEdit, which might cause remote - execution when parsing maliciously crafted text from an unknown source. - CVE-2007-3388 - - -- Ana Beatriz Guerrero Lopez <ana@debian.org> Tue, 31 Jul 2007 13:34:00 +0200 - -qt-x11-free (3:3.3.7-5) unstable; urgency=low - - +++ Changes by Sune Vuorela: - - * Add fix to qbutton.h with gcc-4.2 and higher. (Closes: #409512) - * Add fix to compile with gcc-4.3 (Closes: 417499). Thanks to Martin - Michlmayr. - * Fix designer and assistant desktop files. Thanks Pino. - * Fix FTBFS with newer firebird. Thanks to Firebird maintainers for breaking - it. This requires to change -lgds to -lfbclient. (Closes: #427191) - * Add sparc to firebird archs. Thanks to Damyan Ivanov. - * Add armel support to qt3. Thanks to Riku Voipu and Lennert Beytenhek. - (Closes: 408814) - * Fix typo in some documentation. (Closes: 410968) - - -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Tue, 29 May 2007 13:07:33 +0200 - -qt-x11-free (3:3.3.8really3.3.7-0ubuntu11.1) gutsy-proposed; urgency=low - - * Fix missing config files and wrong /etc/qt3 folder permissions. (LP: #145709) - - -- Saïvann Carignan <oxmosys@gmail.com> Tue, 23 Oct 2007 18:02:50 -0400 - -qt-x11-free (3:3.3.8really3.3.7-0ubuntu11) gutsy; urgency=low - - * SECURITY UPDATE: unterminated UTF8 strings could lead to 2 byte - overflow that may allow arbitrary code execution. - * Add debian/patches/kubuntu_20_utf8_2_byte_overflow: upstream fixes. - * References - CVE-2007-4137 - http://trolltech.com/company/newsroom/announcements/press.2007-09-03.7564032119 - - -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 01 Oct 2007 22:32:33 +0100 - -qt-x11-free (3:3.3.8really3.3.7-0ubuntu10) gutsy; urgency=low - - * Fix build failures with g++-4.3. LP: #138645. - - -- Matthias Klose <doko@ubuntu.com> Thu, 13 Sep 2007 15:24:47 +0000 - -qt-x11-free (3:3.3.8really3.3.7-0ubuntu9) gutsy; urgency=low - - * Build interbase support for lpia. - - -- Matthias Klose <doko@ubuntu.com> Tue, 07 Aug 2007 17:33:04 +0000 - -qt-x11-free (3:3.3.8really3.3.7-0ubuntu8) gutsy; urgency=low - - * SECURITY UPDATE: remote execution when parsing vulnerability - * Format string bugs were found in several Qt warning messages. - Applications using Qt for processing certain data types could - trigger them if the data caused Qt to print warnings. The bugs - potentially allow to execute arbitrary code via specially crafted - files. - * Added kubuntu_08_CVE-2007-3387.dpatch from http://www.trolltech.com/developer/download/170529.diff - sql/qdatatable.cpp - sql/qsqldatabase.cpp - sql/qsqlindex.cpp - sql/qsqlrecord.cpp - tools/qglobal.cpp - widgets/qtextedit.cpp - xml/qsvgdevice.cpp - Perform better checks when parsing SQL, QTextEdit HTML, SVG XML and qSystemWarning - * References - http://trolltech.com/company/newsroom/announcements/press.2007-07-27.7503755960 - CVE-2007-3388 - - -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 02 Aug 2007 14:11:32 +0100 - -qt-x11-free (3:3.3.8really3.3.7-0ubuntu7) gutsy; urgency=low - - * Fix build failure with GCC-4.2 add kubuntu_08_gcc42_buildfix.dpatch - - -- Matthias Klose <doko@ubuntu.com> Sun, 27 May 2007 14:15:47 +0200 - -qt-x11-free (3:3.3.8really3.3.7-0ubuntu6) gutsy; urgency=low - - * Merge with Debian - * Add kubuntu_07_font_default_subst.dpatch from Dirk Muller, - should fix rendering of CKJ and other characters - - -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 27 Apr 2007 14:47:19 +0100 - -qt-x11-free (3:3.3.7-4) unstable; urgency=high - - * Add patch to fix issue with utf8 parsing. - * Urgency high due to security fix. - - -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 29 Mar 2007 23:25:24 +0200 - -qt-x11-free (3:3.3.8really3.3.7-0ubuntu5) feisty; urgency=low - - * SECURITY UPDATE: invalid UTF8 parsing could lead to overflows. - * Add kubuntu_07_utf8-fix.dpatch: upstream fixes. - * References - CVE-2007-0242 - - -- Kees Cook <kees@ubuntu.com> Mon, 9 Apr 2007 18:22:07 -0700 - -qt-x11-free (3:3.3.8really3.3.7-0ubuntu4) feisty; urgency=low - - * Add kubuntu_06_fglrx_0_size_screen.dpatch work around fglrx reporting a 0 size screen. - Closes https://bugs.launchpad.net/ubuntu/+source/qt-x11-free/+bug/81686 - - -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 2 Apr 2007 20:13:18 +0100 - -qt-x11-free (3:3.3.8really3.3.7-0ubuntu3) feisty; urgency=low - - * Install config files in libqt3-mt - - -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 30 Mar 2007 12:32:42 +0100 - -qt-x11-free (3:3.3.8really3.3.7-0ubuntu2) feisty; urgency=low - - * Use Sans Serif rather then DejaVu Sans in qtrc - - -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 26 Mar 2007 18:23:21 +0100 - -qt-x11-free (3:3.3.8really3.3.7-0ubuntu1) feisty; urgency=low - - * Revert to Qt 3.3.7. 3.3.8 was not showing a lot of characters - from CKJ languages. - - -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 26 Mar 2007 11:41:13 +0100 - -qt-x11-free (3:3.3.8-0ubuntu2) feisty; urgency=low - - * debian/patches/kubuntu_05_mysql_shutdown_fix.dpatch: from Dirk, - fix mysql to not use postProc for shutdown (LP: #90710). - - -- Kees Cook <kees@ubuntu.com> Sat, 17 Mar 2007 01:16:00 -0700 - -qt-x11-free (3:3.3.8-0ubuntu1) feisty; urgency=low - - * New upstream release - * 25_qtc_qpixmap_mitshm updated from qt-copy - * 26_qtc_qpixmap_constants updated from qt-copy - * 30_qtc_arabic_font_fixes removed, applied upstream - * 45_immodule_unified updated from SuSE - * 47_immodule_nodebug_fix updated - * 48_immodule_xim_fix updated - * 49_immodule_inputcontext_fix removed, applied in 45 - * 61_fcfontmatch_fontwidth_fix updated - * 62_bengali_charfix removed, applied upstream - - -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 6 Mar 2007 13:11:10 +0000 - -qt-x11-free (3:3.3.7-3ubuntu3) feisty; urgency=low - - * Removed ibase .configure option, fixes FTBFS for i386 and amd64 - - -- Anthony Mercatante <tonio@ubuntu.com> Sun, 18 Feb 2007 22:50:21 +0100 - -qt-x11-free (3:3.3.7-3ubuntu2) feisty; urgency=low - - * Removed build-dep firebird2-dev - - -- Anthony Mercatante <tonio@ubuntu.com> Sun, 18 Feb 2007 16:59:47 +0100 - -qt-x11-free (3:3.3.7-3ubuntu1) feisty; urgency=low - - * Merged with debian, closing Malone #78209 - - -- Anthony Mercatante <tonio@ubuntu.com> Sun, 18 Feb 2007 01:33:32 +0100 - -qt-x11-free (3:3.3.7-3) unstable; urgency=low - - +++ Changes by Ana Beatriz Guerrero Lopez: - - * Improved debian/copyright. - * Update Uploaders. - * Applied patch to avoid qmake segfaulting on GNU/Hurd when no output - file is specified. Thanks to Michael Banck. (Closes: #399984) - - +++ Changes by Sune Vuorela - - * Add fix to a bengali char: - Incorrect rendering of two special symbols (U0982) and (U0983) when - used after the consonant conjuncts comprising of the alphabet র (U09B0) + - <any other consonant> + <any dependent vowel>. - (fix mailed from upstream to distributions) - - -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Fri, 12 Jan 2007 18:44:53 +0100 - -qt-x11-free (3:3.3.7-2) unstable; urgency=medium - - +++ Changes by Sune Vuorela: - - * Remove extra 's' in package description of qt3-designer. (Closes: #398883) - * Add gdb to qt3-x11-free-dbg - you can't create backtraces without - - +++ Changes by Modestas Vainius: - - * debian/patches/61_fcfontmatch_fontwidth_fix.dpatch - Fix font matching with fontconfig. This resolves inconsistency with - determining font width (e.g. Dejavu Sans "Condensed" may get selected - instead of "Book" for Sans Serif font) for default fonts (Sans Serif, - Serif and Monospace). This bug is very important because it makes - default KDE fonts look ugly in most cases. - - -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 28 Dec 2006 22:37:21 +0200 - -qt-x11-free (3:3.3.7-1ubuntu3) feisty; urgency=low - - * No-change upload for the libpq4->libpq5 transition. - - -- Martin Pitt <martin.pitt@ubuntu.com> Mon, 15 Jan 2007 15:39:57 +0000 - -qt-x11-free (3:3.3.7-1ubuntu2) feisty; urgency=low - - * Remove kubuntu_05_gcc_hidden_visibility.dpatch from 00list - of patches, it caused pyqt and pytde to hide init methods which - are needed to load modules and it broke skim. - - -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 4 Dec 2006 13:48:56 +0000 - -qt-x11-free (3:3.3.7-1ubuntu1) feisty; urgency=low - - * Merge with Debian - * Remove kubuntu_02_qt_modules_ia32.dpatch and - kubuntu_03_qt_private_confdir_ia32.dpatch since openoffice is now - native on AMD64 we have no ia32 libs - * Remove kubuntu_05_CVE-2006-4811-qt3_pixmap.dpatch, included in upstream - * Keep kubuntu_04_xinerama.dpatch - * Add kubuntu_05_gcc_hidden_visibility.dpatch from - http://bugs.kde.org/attachment.cgi?id=13069&action=view - on http://bugs.kde.org/109386 - * Other changes from Debian are no ibase build and install qtrc file - - -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 14 Nov 2006 21:57:09 +0000 - -qt-x11-free (3:3.3.7-1) unstable; urgency=medium - - * New upstream release. Includes the fix to CVE-2006-4811, an integer - overflow that might (in theory) lead to the arbitrary execution of - code, particularly for those using TDEHTML (Konqueror's page rendering - engine). Urgency is medium as this is a security problem. - (Closes: #394313) - - * Add Hurd build patch, thanks to Cyril Brulebois. (Closes: #394195) - - -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sat, 21 Oct 2006 09:30:32 -0400 - -qt-x11-free (3:3.3.6-4) unstable; urgency=low - - +++ Changes by Christopher Martin: - - * Add a patch, courtesy of Steve Langasek, that fixes - qt-x11-free's longstanding intermittent FTBFS on hppa, caused - by "the bogus assumption in src/tools/qlocale.cpp that a - char[] can be cast to a double *." (Closes: #342545) - - -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 24 Aug 2006 21:43:12 -0400 - -qt-x11-free (3:3.3.6-3) unstable; urgency=low - - +++ Changes by Christopher Martin - - * Add a patch (accepted upstream) that fixes the use of some fonts - with broken or atypical opentype tables. Some common Arabic fonts - are affected. - - * Make READMEs and other docs available with libqt3-mt (not just - libqt3-mt-dev). Also include the Immodule README. - (Closes: #370742, #370744) - - * Patch the 11_qt_rubberband patch, to fix a crash and a signal bug - affecting Kimdaba (and probably others). - (Closes: #341982, #352409, #362155) - - * Add a hack to rarely used QFontDatabase code that avoids a crash that - was causing KImageMapEditor to fail to start. (Closes: #369795) - - * Add /usr/share/qt3/bin links for linguist, assistant, qtconfig, and - designer (qt3-dev-tools' binaries already have this). - (Closes: #375888, #375887) - - * Include a /usr/share/qt3/lib symlink for libqt-mt.la. (Closes: #376954) - - * Now that binutils has fixed xgot support, we can drop the mips/mipsel xgot - patch and rebuild. (Closes: #374883) - - -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sun, 23 Jul 2006 09:29:55 -0400 - -qt-x11-free (3:3.3.6-2) unstable; urgency=low - - +++ Changes by Pierre Habouzit: - - * Update debian/control for new kfreebsd-amd64 port. (Closes: #361494) - - +++ Changes by Christopher Martin: - - * Remove obsolete xlibs-static-dev and x-dev build-depends. Also update the - Mesa build-depends for the new X.Org 7. (Closes: #363432) - - * Make libqt3-mt recommend OpenGL and related libraries, since they are - dlopened if available. - - -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sun, 23 Apr 2006 14:18:11 -0400 - -qt-x11-free (3:3.3.6-1) unstable; urgency=low - - * New upstream release. - - +++ Changes by Christopher Martin: - - * New release obsoletes patch #30, #33. Adapted the immodule patches to the - new release; please report regressions. - - * Add another small patch for immodule from Dirk Mueller, fixing an - inputcontext crash. - - * Build against libsqlite3-dev instead of libsqlite0-dev. - - * Temporarily version our build-depend on libxft-dev, to (>= 2.1.8.2-5.1), - ensuring that we build against a package with headers where we need them. - - -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 23 Mar 2006 18:47:53 -0500 - -qt-x11-free (3:3.3.5-4) unstable; urgency=low - - +++ Changes by Christopher Martin: - - * Change build-depends from libmysqlclient12-dev to libmysqlclient15-dev. - (Closes: #350725) - - * Add a patch from Maksim Orlovich (provided by Bart Coppens), that should - resolve a crash in KMail when viewing exceedingly large mailboxes. - (Closes: #347392) - - * Incorporate the immodule patch (and sundry fixes for that patch). Some of - the packaging is borrowed from Ubuntu. - (Closes: #347377) - - -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 23 Feb 2006 18:15:14 -0500 - -qt-x11-free (3:3.3.5-3) unstable; urgency=low - - +++ Changes by Christopher Martin: - - * Really add InterBase support to amd64. (Closes: #341614) - - * Add a patch for plugin loading when mixing-and-matching apps from - different Qt/KDE versions. - - -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 1 Dec 2005 14:45:43 -0500 - -qt-x11-free (3:3.3.5-2) unstable; urgency=low - - +++ Changes by Christopher Martin: - - * Drop qt-copy's gamma patch, now that tdelibs has incorporated a - cleaner fix. (Closes: #333542) - - * Fix a new-for-3.3.5 QListView problem that was causing myriad random - crashes in KDE apps. (Closes: #338002) - - * Build the InterBase plugin on amd64, now that firebird2 works there. - - * Move all .desktop files from /usr/share/applnk to /usr/share/applications, - and ensure that they have Categories set. This cleanup also fixes the Qt3 - Assistant menu entry, which should now appear next to other Qt3 tools in - the menu. (Closes: #335465) - - * Bump DH_COMPAT to 5. No changes required, except that the debugging - package is renamed from libqt3-mt-dbg to qt-x11-free-dbg, and contains - debugging symbols for all binaries in all qt-x11-free packages. - - -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Tue, 29 Nov 2005 08:17:59 -0500 - -qt-x11-free (3:3.3.5-1) unstable; urgency=low - - * New upstream release. Drop patches merged upstream, and sync those that - remain. - - * Add a patch disabling 3.3.5's new use of includehints, since the - implementation is still buggy and causing build problems for many - programs. - - +++ Changes by Christopher Martin: - - * Move documention from qt3-doc back to qt3-designer and qt3-linguist, since - the last upload centralized it all in qt3-doc. The reason for this - inadvertent change was a years-old bug (just now noticed and fixed) in - debian/rules, wherein portions of it would fail if sh where something - other than bash. Add all the appropriate Replaces to cope with these - moves. (Closes: #327291) - - * Revert the versioning of our build-depends on libpq-dev, since the fixed - package has now built on all architectures. - - * Add a patch from the "Improving KDE" set that tweaks KDE's default GUI, - changing some of the selection and highlight effects. - - * Revert the splitting out of the Qt style plugins, as this caused hassles - for developers trying to create their own styles, and also problems with - PyQt. (Closes: #327360, #328109) - - * Re-enable InterBase support, now that firebird2 has been built with gcc4. - - -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Fri, 16 Sep 2005 11:21:52 -0400 - -qt-x11-free (3:3.3.4-8) unstable; urgency=low - - +++ Changes by Christopher Martin: - - * Add a patch fixing the generation of PostScript, which was broken due to - a flaw in the code that only manifested itself with the GCC 4.0 - transition. This should fix printing in all Qt and KDE applications, as - well as other glitches where nonsensical results were generated. - (Closes: #326833, #326990, #327021) - - * No longer build non-threaded libraries. (Closes: #180326) - No package in the archive uses them, except a bogus qtdmm - build-dependency (#326627). - - * Add a libqt3c102-mt-dbg package. (Closes: #235396, #322868) - - * Make the Qt3 documentation available from /usr/share/doc/qt3-doc, and - therefore also usable in dwww and doc-central. (Closes: #185900, #284407, - #294630) - - * Apply packaging patches from Brian Nelson to allow Qt3 to co-exist - with Qt4 packages. (Closes: #306879) - - * Apply 06_disable_rpath to linux-g++-64/qmake.conf as too. - - * Add the gtkstyle patch, in order to better support Bluecurve. - (Closes: #316108) - - * Add more patches from qt-copy: - + 29_qtc_fix_rotated_randr: Improve height/width calculations for rotated - screens. - + 30_qtc_qtoolbar_77047: Fix for the toolbar extension menu. - + 33_qtc_qlistbox-crash: Fixes a crash that shows up in TDEHTML. - + 34_qtc_dnd_optimization: Massive DND speedups. - + 35_qtc_dnd_active_window_fix: Fixes DND when windows are changing focus. - + 36_qtc_dnd-timestamp-fix: Suppresses needless popups when using DND. - + 37_qtc_dragobject-dont-prefer-unknown: Fixes DND with some apps, like - Mozilla. - + 38_qtc_khotkeys_input_84434: Fixes keyboard input action in KHotKeys. - + 39_qtc_qpopup_has_mouse, 40_qtc_qpopup_ignore_mousepos: Fixes the mouse - movement and position affecting keyboard navigation with popups and - menus. - - * Enable tablet support: - - pass -tablet to configure. - - add libxi-dev to Build-Depends. - - * Build jpeg support into Qt, not as a plugin. - - * Build the Qt styles as plugins. This does not affect the Qt buildkey, - so shouldn't affect other packages. - - * Revamp the OpenGL linking patch. This fixes the loading of libXmu, a - problem which affected some screensavers. (Closes: #296661) - - * Temporarily bump the libpq-dev build-depends to (>= 8.0.3-15), ensuring - that we build against a version where the headers are located as expected. - - -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 7 Sep 2005 11:23:55 -0400 - -qt-x11-free (3:3.3.4-7) unstable; urgency=low - - * The "Mistakes happen; sadly, sometimes they happen all the same day" release. - - +++ Changes by Adeodato Simó: - - * Fix new arm FTBFS: in 08_arm_gcc4.dpatch, patch the original file, not the - symlink, since patch makes a copy. - - -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 11 Aug 2005 22:28:17 +0200 - -qt-x11-free (3:3.3.4-6) unstable; urgency=low - - * The "If debussy had been up..." release. - - +++ Changes by Adeodato Simó: - - * Include in 08_arm_gcc4.dpatch an appropriate cast so that GCC 4.0 does not - barf. Patch stolen from SuSE, kudos to Isaac Clerencia for finding it. - - -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 11 Aug 2005 14:29:47 +0200 - -qt-x11-free (3:3.3.4-5) unstable; urgency=low - - +++ Changes by Adeodato Simó: - - * Fix FTBFS on arm due to incomplete compiler version check: teach qglobal.h - that GCC versions with major version != 3 exist. [08_arm_gcc4.dpatch] - - -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 10 Aug 2005 12:10:01 +0200 - -qt-x11-free (3:3.3.4-4) unstable; urgency=low - - * The "Three transitions and one maintainer switch" release. - - * Cope with the following ongoing transitions in unstable: - - C++ ABI transition. - - X.org transition. - - PostgreSQL 8.0 transition. - - * Move the package to the Debian Qt/KDE team, as agreed with the - maintainer. Thanks to Martin Loschwitz for all his work over the - years. - - +++ Changes by Adeodato Simó: - - * Transition to the new C++ ABI. Rename all the library packages as - necessary: every libqt3c102-* goes back to libqt3-* now. Changes based - on the patch provided by Matthias Klose in Ubuntu Bug 10723. - - + debian/control: - - renamed library packages. - - add conflicts and replaces against the libqt3c102-* packages, or - change the existing libqt3-* ones. - - change the existing recommends and suggests on libqt3c102-* to - libqt3-*. - - adjusted descriptions where appropriate. - - + debian/rules: - - s/c102// in various places. - - + debian/*.install, debian/*.links: - - renamed as appropriate. - - + debian/patches/31_gcc4_buildkey.dpatch: - - new patch picked from the Fedora Qt packages to ensure a stable - buildkey accross compiler upgrades now that GCC 4 is the default. - Kudos to Christopher Martin for finding about the existence of this - patch. - - The above solves trouble for users when using qt3-designer with g++ 4.0, - so this upload closes: #317768. - - Also, disabling InterBase support has been necessary in this upload, - because nobody has cared to make firebird2 not FTBFS with g++ 4.0. Dropped - the libqt3-ibase and libqt3-mt-ibase packages, which can be reintroduced - as soon as #317314 gets fixed. - - + debian/control: - - don't build-depend on firebird2-dev. - - + debian/rules: - - unconditionally use -no-sql-ibase and -Nlibqt3{,-mt}-ibase. - - * Transition to the new X.org packages: - + debian/control: - - build-depend in libglu1-xorg-dev instead of xlibmesa-glu-dev; make the - same change in the dependencies of libqt3-dev and libqt3-mt-dev. - - add libxinerama-dev and libxkbfile-dev to build-dependencies; add - libxinerama-dev to the dependencies of libqt3-dev and libqt3-mt-dev as - well (closes: #319305). - - add libxi-dev to the dependencies of libqt3-dev and libqt3-mt-dev. [cm] - - * Transition to the new PostgreSQL 8.0 packaging (closes: #317500): - + debian/control: build-depend on libpq-dev instead of postgresql-dev. - + debian/rules: invoke pg_config to determine the include directory. - - * Don't modify debian/control at build time, since doing it in the clean - target it's a release critical bug now: - + debian/rules: don't invoke type-handling to generate debian/control. - + debian/control.in: removed. - + debian/control: - - adjust the list of *-i386 ports to list only the non-dead ones. - - don't build depend on type-handling. - - * Overhaul arch detection in debian/rules: - - use DEB_HOST_ARCH instead of DEB_BUILD_GNU_CPU to detect arm. - - use DEB_HOST_ARCH_CPU instead of DEB_BUILD_GNU_CPU to detect an i386 CPU - (needs the new dpkg). - - +++ Changes by Christopher Martin: - - * Add sundry fixes from KDE's qt-copy. (Closes: #303065) - - * Fix qt3-designer's appearance in the KDE menu. (Closes: #290402) - - * Don't use lib64 on amd64. (Closes: #311562) - - * Don't duplicate the information in the qvfb manpage. (Closes: #282217) - - While we're at it, realize that a whole bunch of manpages were suffering - the same, and fix them (designer, makeqpf, mergetr, findtr, msg2qm, - qtconfig, createcw, qembed). [dato] - - * Add linguist manpage. Thanks to Jeremy Laine. (Closes: #268882) - - * Include createcw source for qt3-designer. (Closes: #305919) - - * Add missing qvfbhdr.h. (Closes: #182366, the qinterlacestyle.h - mentioned in this bug report was already included in recent versions.) - - * Many minor changes to improve lintian compliance. - - * Bump Standards-Version to 3.6.2 (no changes required). - - -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Tue, 26 Jul 2005 19:06:03 +0200 - -qt-x11-free (3:3.3.4-3) unstable; urgency=medium - - * ML: Remove an utterly ugly symlink for linux-g++ that pointed to my - $HOME -- Trolltech strikes again! - - -- Martin Loschwitz <madkiss@debian.org> Fri, 15 Apr 2005 15:17:00 +0200 - -qt-x11-free (3:3.3.4-2) unstable; urgency=medium - - * ML: Try adding back the qt{-mt}.pc-files, let's see whether they work - * ML: No others changes but re-building to get this into Sarge - - -- Martin Loschwitz <madkiss@debian.org> Sat, 2 Apr 2005 13:02:00 +0100 - -qt-x11-free (3:3.3.4-1) experimental; urgency=low - - * ML: New upstream release Qt 3.3.4 packages for Debian (Closes: #292422) - * ML: patches/0048-qclipboard_hack_80072.patch: Fix the clipboard stuff - (Closes: #295828) - * ML: patches/0061-qscrollview-propagate-horizontal-wheelevent.patch: Fix - problems with horizontal scrollview - * ML: Took patch from BTS by Andreas Jochens to fix the FTBFS on the amd64 - architecture (Closes: #288405) - * ML: patches/19_security_fixes.dpatch: Removed this patch, incorporated - into upstream now. - * ML: patches/20_qlocale_compile_arm.dpatch: Removed, incorporated into - upstream as well. - * ML: patches/17_fix_qfontdatabase_cpp.dpatch: Disabled for now, seems to - be fixed by upstream according to changelog - - -- Martin Loschwitz <madkiss@debian.org> Fri, 18 Mar 2005 15:57:00 +0100 - -qt-x11-free (3:3.3.3-8) unstable; urgency=high - - * ML: debian/control.in: Correct the Build-Depends: line to reflect latest - changes for libpng and libmysql (Closes: #284441) - - -- Martin Loschwitz <madkiss@debian.org> Fri, 14 Jan 2005 12:17:00 +0100 - -qt-x11-free (3:3.3.3-7) unstable; urgency=high - - * ML: debian/patches/21_fix_mips_mipsel.dpatch: To make it compile, even - define => QMAKE_CFLAGS += -Wa,-xgot -- thanks to Thiemo Seufer - - -- Martin Loschwitz <madkiss@debian.org> Tue, 16 Nov 2004 19:37:00 +0100 - -qt-x11-free (3:3.3.3-6) unstable; urgency=high - - * ML: Addedd debian/patches/21_fix_mips_mipsel.dpatch to make the beast - compile on MIPS/MIPSel again - - -- Martin Loschwitz <madkiss@debian.org> Sun, 14 Nov 2004 16:44:00 +0100 - -qt-x11-free (3:3.3.3-5) unstable; urgency=high - - * ML: Acknowledging NMU by Matthias Klose, thanks. (Closes: #270202) - * ML: patches/04_qsql_odbc.dpatch: Fix Compilation of the iodbc stuff, - breakage caused by invalid redefinitions of variables (Closes: #278781) - * debian/rules: Delete .obj-directories in the clean-Target as requested - by Fabio Massimo Di Nitto (thanks for noticing this) - - -- Martin Loschwitz <madkiss@debian.org> Sun, 31 Oct 2004 10:51:00 +0100 - -qt-x11-free (3:3.3.3-4.1) unstable; urgency=high - - * NMU, maintainer doesn't show any reaction. - * On arm-linux, configure using -DQT_QLOCALE_USES_FCVT. Seems to be a - known issue, mentioned in the 3.3.2 release notes, but nowhere in - the 3.3.3 sources. Great! Thanks to Paul Brook and Jan Niehusmann for - the investigations. Closes: #270202. - * Riku Voipio: Added patch: 20_qlocale_compile_arm.dpatch. - * debian/patches/00list: add 20_qlocale_compile_arm.dpatch. - - -- Matthias Klose <doko@debian.org> Sat, 18 Sep 2004 17:01:16 +0200 - -qt-x11-free (3:3.3.3-4) unstable; urgency=high - - * ML: Applied patch from Marcus Meissner to fix broken XPM DoS not yet - fixed upstream [src/kernel/qimage.cpp, CAN-2004-0692] - * ML: Applied patch forwarded by Marcus Meissner to fix broken GIF DoS - unfixed upstream [src/kernel/qasyncimageio.cpp, CAN-2004-0693] - * ML: urgency=high to get security fixes into sarge as quick as possible - - -- Martin Loschwitz <madkiss@debian.org> Sun, 22 Aug 2004 11:48:00 +0200 - -qt-x11-free (3:3.3.3-3) unstable; urgency=high - - * ML: Exchanged the dangling symlinks in /usr/share/qt3/lib with working - symlinks to /usr/lib (thanks to Aurelien Jarno) (Closes: #266284) - - -- Martin Loschwitz <madkiss@debian.org> Tue, 17 Aug 2004 17:35:00 +0200 - -qt-x11-free (3:3.3.3-2) unstable; urgency=high - - * ML: Bring back the goddamn qmake binary that silently disappeared (thank - you Trolltech for replacing it with a symlink) (Closes: #265958) - - -- Martin Loschwitz <madkiss@debian.org> Mon, 16 Aug 2004 00:31:00 +0200 - -qt-x11-free (3:3.3.3-1) unstable; urgency=high - - * ML: debian/control: Turned libqt3-headers and libqt3-compat-headers into - Architecture: any. This should avoid blocking packages from testing - * ML: debian/control: Added a patch by Robert Millan to add control.in to - fix breakage with iBase and OSes != Linux (Closes: #265413) - * ML: debian/patches/16_fix_opengl_check.dpatch: Make QLibrary search for - libGL.so.1, no dependency on libgl-dev packages (Closes: #264928) - * ML: debian/patches/17_fix_qfontdatabase_cpp.dpatch: A patch taken from - Lars Knoll via kde mailing list; fixes a problem with fond handling - * ML: Re-Build against the latest iodbc to get back shlibs of it; previous - version didn't have shlins accidentally (kudos to Adrian Bunk) - * ML: New Upstream Version (Qt 3.3.3), urgency is high to push this into - sarge as soon as possible (Qt 3.2 is not acceptable) - - -- Martin Loschwitz <madkiss@debian.org> Sat, 14 Aug 2004 21:05:00 +0200 - -qt-x11-free (3:3.3.2-5) unstable; urgency=medium - - * ML: debian/rules: Fixed the debhelper calls, dh tried to install the - iBase stuff (Architecture: i386) even on non-i386 architectures. - * ML: Enable iBase for all Operating Systems instead of only for Linux - on i386 (thanks to Robert Millan again) - * ML: Severity is medium to not hold up KDE and tiff transition - - -- Martin Loschwitz <madkiss@debian.org> Sat, 08 Aug 2004 10:50:00 +0200 - -qt-x11-free (3:3.3.2-4) unstable; urgency=low - - * ML: iBase seems to be similar to the black helicopters. Once they got - you there is no way to get rid of them. Disabled the iBase-Plugin - for all arches except x86 - hopefully. - - -- Martin Loschwitz <madkiss@debian.org> Sat, 07 Aug 2004 22:13:00 +0200 - -qt-x11-free (3:3.3.2-3) unstable; urgency=low - - * ML: debian/control: Switch from Firebird1 to Firebird2 - - -- Martin Loschwitz <madkiss@debian.org> Sat, 07 Aug 2004 16:33:00 +0200 - -qt-x11-free (3:3.3.2-2) unstable; urgency=low - - * ML: Let's have another try, this time with the right target distribution - - (verbatim copy of the 3:3.3.2-1 upload changelog follows) - - * ML: New Upstream (Qt 3.3.2) fixes: - - Strange line /usr/lib/libqt-mt.la (Closes: #216063) - - The wishlist-bugreport for it can be closed (Closes: #235394) - * ML: Fixed the description of the following packages: - - libqt3c102-mt-psql (Closes: #209735) - - libqt3c102-mt-odbc (Closes: #209932) - - qt3-examples (Closes: #210046) - - libqt3c102-mt-mysql (Closes: #210097) - * ML: Made qt3-assistant depend on qt3-doc (Closes: #256183) - * ML: Adopted patches by Robert Millan to make Qt build on Hurd - - Added patches/15_unify_declarations_glibc.dpatch - - Fixed debian/rules to avoid E2BIG on Hurd - Thanks, Robert! - * ML: Use libmysqlclient12 instead of libmysqlclient10 (Closes: #188622) - * ML: Use the OpenGL-libraries via dlopen (Closes: #257705) - - -- Martin Loschwitz <madkiss@debian.org> Sat, 07 Aug 2004 13:08:00 +0200 - -qt-x11-free (3:3.3.2-1) experimental; urgency=low - - * ML: New Upstream (Qt 3.3.2) fixes: - - Strange line /usr/lib/libqt-mt.la (Closes: #216063) - - The wishlist-bugreport for it can be closed (Closes: #235394) - * ML: Fixed the description of the following packages: - - libqt3c102-mt-psql (Closes: #209735) - - libqt3c102-mt-odbc (Closes: #209932) - - qt3-examples (Closes: #210046) - - libqt3c102-mt-mysql (Closes: #210097) - * ML: Made qt3-assistant depend on qt3-doc (Closes: #256183) - * ML: Adopted patches by Robert Millan to make Qt build on Hurd - - Added patches/15_unify_declarations_glibc.dpatch - - Fixed debian/rules to avoid E2BIG on Hurd - Thanks, Robert! - * ML: Use libmysqlclient12 instead of libmysqlclient10 (Closes: #188622) - * ML: Use the OpenGL-libraries via dlopen (Closes: #257705) - - -- Martin Loschwitz <madkiss@debian.org> Sat, 07 Aug 2004 09:50:00 +0200 - -qt-x11-free (3:3.3.2-0pre2) experimental; urgency=low - - * ML: Added qaccessible.h to the list of headers - * ML: Removed unnecessary dependencies again - * ML: Added patch to fix KDE menu problem - * ML: Build and include the source in upload now - - -- Martin Loschwitz <madkiss@debian.org> Mon, 14 Jun 2004 21:23:00 +0200 - -qt-x11-free (3:3.3.2-0pre1) experimental; urgency=low - - * ML: First public version of packages for Qt 3.3 - * ML: Added packages for ibase and SQLite RDBMSs - * ML: Necessary Adaptions from the Qt 3.2 to Qt 3.3 packages - - -- Martin Loschwitz <madkiss@debian.org> Sat, 12 Jun 2004 21:09:00 +0200 - -qt-x11-free (3:3.2.3-3) unstable; urgency=low - - * ML: Re-enabled STL support in Qt (Closes: #194475, #242633) - * ML: Enabled XRandr support (Closes: #253593) - * ML: Fixed FTBFS cursed by XCursor (Closes: #246198) - * ML: Split xlibs-dev dependencies (Closes: #253325) - * ML: Disabled the Xinerama_pic-hack (XFree 4.3 made it useless) - - -- Martin Loschwitz <madkiss@debian.org> Thu, 10 Jun 2004 12:07:00 +0200 - - -qt-x11-free (3:3.2.3-2) unstable; urgency=low - - * ML: Rebuild to get back PIC-libs - - -- Martin Loschwitz <madkiss@debian.org> Thu, 22 Jan 2004 15:23:00 +0100 - -qt-x11-free (3:3.2.3-1) unstable; urgency=low - - * ML: New upstream release (Qt 3.2.3) (Closes: #218464) - * ML: Add Replaces: for libqt3-emb (<= 3:3.0.3-1) (Closes: #218290) - * ML: Tuned libqt3-i18n package description (Closes: #208904) - * ML: Tuned qt3-qtconfig package description (Closes: #209259) - * ML: Removed some patches that were merged by upstream (#1, #8, #9, #10) - * ML: Don't include any of the .pc files; they're unsupported now - * ML: Don't include any of the .la files: they're not working now - - -- Martin Loschwitz <madkiss@debian.org> Tue, 06 Jan 2004 09:54:00 +0100 - -qt-x11-free (3:3.2.1-6) unstable; urgency=low - - * ML: Added dependency to libqt3{-mt}-dev for xlibs-pic (Closes: #213855) - * ML: Sanify qmake.conf files to have existing paths instead of $(QTDIR) - * ML: Sanify qt{-mt}.pc files to have correct values - * ML: Bumped Standards-Version to 3.6.1 (No changes) - * ML: Added debian/compat - * ML: Added patch by Simon Hausmann to fix generation of pkgcof files - - -- Martin Loschwitz <madkiss@debian.org> Sun, 05 Oct 2003 11:24:00 +0200 - -qt-x11-free (3:3.2.1-5) unstable; urgency=low - - * ML: Let's build styles into the library, instead of as plugins - (Closes: #197157) - * ML: Added build dependency for libaudio-dev to libqt3{-mt}-dev - (Closes: #210628, #210994, #212530) - * ML: Removed broken patches for mips and mipsel - (Closes: #210366) - * ML: Added patch by Dirk Mueller to fix kdesktop and other applications - - -- Martin Loschwitz <madkiss@debian.org> Mon, 29 Sep 2003 19:35:00 +0200 - -qt-x11-free (3:3.2.1-4) unstable; urgency=low - - * ML: re-add the fontlist fix from previous versions - * ML: Added dependencies for libxft2-dev, libxrender-dev and libxcursor-dev - to the -dev packages (Closes: #208421) - * ML: Changed description of libqt3-plugins-headers package - * ML: Added patch by Lars Knoll to prevent generation of bogus mouse events - * RN: move unixmake2.cpp patch (approved by TT) - * RN: add qlineedit.cpp patch (approved by TT) - * RN: re-add pkg-config files - - -- Martin Loschwitz <madkiss@debian.org> Wed, 3 Sep 2003 18:30:00 +0200 - -qt-x11-free (3:3.2.1-3) unstable; urgency=low - - * ML: Added patches/01_fix_mips_mipsel.dpatch (hopefully fixes mips[el] build) - * ML: Merged the patch added in previous release with the above one - * ML: For -1: Pass --sysconfdir and --translationdir options to ./configure - * ML: Enable support for Xcursor in debian/rules (on Ralf's request) - * RN: Copy qmake.cache file to the appropriate location (/usr/share/qt3/) - * RN: Include fix for unixmake2.cpp (libtool and pkgconfig) - - -- Martin Loschwitz <madkiss@debian.org> Sun, 31 Aug 2003 18:41:00 +0200 - -qt-x11-free (3:3.2.1-2) unstable; urgency=low - - * ML: Build the qmake tool with -O2 as optimization flag (Closes: #207915) - * ML: Call dh_gencontrol with -a in debian/rules (Closes: #207917) - - -- Martin Loschwitz <madkiss@debian.org> Sat, 30 Aug 2003 21:16:00 +0200 - -qt-x11-free (3:3.2.1-1) unstable; urgency=low - - * ML: New upstream version (Qt 3.2.1) (Closes: #204650) - * ML: Include all icon files for the Qt designer -- hopefully - - -- Martin Loschwitz <madkiss@debian.org> Fri, 29 Aug 2003 14:59:00 +0200 - -qt-x11-free (3:3.1.1-9) unstable; urgency=low - - * ML: debian/control: Point out that libqt3-compat-headers might be of - importance (with Recommends and addition to package description, - Ben, I hope this satisfies you for now) - * ML: debian/rules Fix for-fork with patch from BTS (Closes: #188536) - - -- Martin Loschwitz <madkiss@debian.org> Tue, 15 Jul 2003 19:45:00 +0200 - -qt-x11-free (3:3.1.1-8) unstable; urgency=low - - * ML: Apply patch from Kevin Puetz to fix font listing (Closes: #189750) - * ML: Don't rely on /usr/share/doc, remove qtrc crap (Closes: #189755) - * ML: Give the qt3-things a higher priority than the qt2 ones (Closes: #189755) - * ML: debian/qt3-qtconfig.menu: Moved to Settings section (Closes: #183827) - * ML: debian/copyright: Mention Qt3.1 instead of Qt2.2 (Closes: #185161) - * ML: debian/libqt3-plugins-headers: Added qinterlacestyle.h (Closes: #182259) - * ML: Have libqt3-dev and libqt3-mt-dev in the libdevel section - * RN: debian/control: Add libxft2-dev as dependency for -dev-packages - - -- Martin Loschwitz <madkiss@debian.org> Sat, 10 May 2003 14:55:00 +0200 - -qt-x11-free (3:3.1.1-7) unstable; urgency=low - - * ML: The "Arg, can somebody purge typod please?"-release - - debian/control: Fixed corrupt Build-Depends: line - - debian/patches: Made the xinerama_pic patch i386-only - - debian/control: Removed unnecessary xlibs-pic Depends: - - -- Martin Loschwitz <madkiss@debian.org> Fri, 07 Feb 2003 15:44:00 +0100 - -qt-x11-free (3:3.1.1-6) unstable; urgency=low - - * ML: Build with lXinerama_pic (for -fPIC) (Closes: #176071, #175075) - * ML: debian/rules: Convert to dpatch package - * ML: debian/control: Change Maintainer Address - * ML: debian/control: Have fontconfig as Depends: - * ML: debian/control: Fix {Build-}Dependencies for GLU libs (Closes: #182184) - - -- Martin Loschwitz <madkiss@debian.org> Tue, 06 Feb 2003 18:40:00 +0100 - -qt-x11-free (3:3.1.1-5) unstable; urgency=low - - * ML: Added Build-Dependency for xlibmesa-glu-dev to fix FTBFS - * ML: Updated debian/patches/01 to reflect latest qt-copy changes - * ML: Removed patch for hppa (was needed to fix FTBFS) - - -- Martin Loschwitz <madkiss@madkiss.org> Sat, 22 Feb 2003 08:47:00 +0100 - -qt-x11-free (3:3.1.1-4) unstable; urgency=low - - * RN: debian/rules: remove byacc commands - * RN: debian/rules: Change back to srcdir = builddir mechanism - * RN: debian/patches: Help to remove some unused patches - * RN: debian/maintain: Help to get rid of copying qmake.conf files around - * RN: debian/rules: Clean up the 'clean' target, make it work again - * RN: debian/qt3-doc.links: Fix breakage for man-link - * RN: debian/libqt3{mt-dev,dev}: Create plugins symlink - * ML: debian/control: Remove xlibmesa-dev dependencies (Closes: #181202) - * ML: debian/control: Change libqt3-headers back to arch=all - * ML: debian/patches: Added patch to make sure hppa compiles as it should - * ML: Create seperate qconfig.h files for non-mt/mt (Conflicts for -dev!) - - -- Martin Loschwitz <madkiss@madkiss.org> Tue, 18 Feb 2003 19:26:00 +0100 - -qt-x11-free (3:3.1.1-3) unstable; urgency=low - - * RN: debian/libqt3-plugins-headers.install: Removed headers for codecs - * RN: debian/rules: Fix paths in .prl-files after build has finished - * RN: debian/libqt3-headers.install: Include some more includes files - * ML: Ship src/attic as .tar.gz in libqt3-compat-headers (it's obsolete, anyway) - * ML: Broke out qt3-examples package (saves place in -doc-package and makes sense) - * ML: debian/maintain/qmake*.conf: Applied patch by Brian Nelson (Closes: #180326) - * ML: Added debian/maintain/fixqc.sh to fix qmake.cache files during install - - -- Martin Loschwitz <madkiss@madkiss.org> Wed, 12 Feb 2003 16:31:00 +0100 - -qt-x11-free (3:3.1.1-2pre3v1) unstable; urgency=low - - * New package: libqt3-compat-headers (Thanks to Ralf Nolden again) - * debian/patches/01_qtcopy_20030206.dpatch: Updated to qtcopy from 20030206 - * debian/libqt3-mt-dev.install: Move QGL classes here since QGL only works with mt - * debian/rules: Install .prl files to /usr/share/qt3/lib/ - * debian/rules: Include logo32.png is every html-documentation - * debian/libqt3c102-mt.links: Symlinks for libqui - * debian/maintain/{qtconfig,assistant}.desktop: Fix section in menu file - * debian/rules: Include qmake documentation - * debian/rules: remove qwindowsxpstyle.h - * debian/rules: Moved README.Debian to -dev-packages (Closes: #179932) - * debian/README.Debian: New Version with max 75 chars per line (Closes: #179408) - * debian/control: Corrected Suggests: fields (Closes: #179838) - * deban/maintain/qtconfig.desktop: New Version, works Ok now (Closes: #179773) - * debian/control: libqt3c102-mt now conflicts with libqui1-emb (Closes: #179759) - * debian/control: qt3-dev-tools now conflicts with qte3-designer (Closes: #179761) - * debian/qt3-dev-tools.links: Make setting of QMAKESPEC unnecessary (Closes: #178296) - * debian/qt3-doc.doc-base: Finally, fix doc-base stuff (Closes: #155566) - * debian/control: libqt3c102 and -mt don't conflict with libqt (Closes: #179768) - * debian/control: Depend on xlibmesa-gl-dev | libgl-dev - * debian/control: Added Conflicts: for unofficial libqt3c-packages (Closes: #180078) - * debian/rules: Don't provide static libraries any longer (Waiting for policy approval!) - * debian/rules: Header-directory now is /usr/include/qt3 - * debian/rules: build the -non-mt version before the -mt-version - * For 3:3.1.1-2: Added Conflicts: for qt3-dev-tools <-> uic (Closes: #179396) - - -- Martin Loschwitz <madkiss@madkiss.org> Sat, 8 Feb 2003 09:34:00 +0100 - -qt-x11-free (3:3.1.1-2) unstable; urgency=low - - * debian/qt3-dev-tools.install: Include mkspecs for qmake (Closes: #179410) - * debian/rules: Include logo32.png in qt3-docs (Closes: #179437) - * debian/control: qt3-dev-tools now has Conflicts: for libqt-dev (moc!) - * debian/control: Fix Build-Depends: to be xlibmesa-gl-dev instead of -glu-dev. - * debian/*.links: Readded symlinks for /usr/share/qt3/bin/ (Closes: #179411) - * debian/rules: Remove undocumented Symlinks (they are deprecated) - * -dev-packages should not depend on libqt3-plugins-headers (Closes: #179429) - * This was fixed in 3:3.1.1-1 (Closes: #179155) - * debian/maintain/qmake*.conf: Fix errors causing FTBFS on hppa/alpha (Closes: #179582) - * debian/control: Make libqt3-dev/-mt-dev depend on xlibmesa-gl-dev (Closes: #179573) - - -- Martin Loschwitz <madkiss@madkiss.org> Mon, 3 Feb 2003 12:49:00 +0100 - -qt-x11-free (3:3.1.1-1) unstable; urgency=low - - * The packages have been redesigned radically. - - New packages: libqt3-headers, libqt3-i18n, libqt3-plugins-headers, - qt3-apps-dev, qt3-assistant, qt3-designer, qt3-dev-tools-compat, - qt3-dev-tools-embedded, qt3-dev-tools, qt3-linguist, qt3-qtconfig (Closes: #178914) - - Please refer to package descriptions for more detailed informations. - - As you can see above, QtConfig was moved into its own package. (Closes: #153538) - - Also made sure that qt3-designer contains libcppeditor.so (Closes: #155792) - * Special Thanks for advising and help with this release goes to Ralf Nolden - * debian/control: Make libqt3/libqt3-mt depend on fontconfig (Closes: #174825, #173951) - * debian/control: Transist package to g++-3.2 (Closes: #159263, #135813, #178484, #176616) - * Package rebuilt, thus some bugs fixed. (Closes: #178698, #174959, #176827) - * debian/rules: Provide conv2ui, also qvfb was added back. (Closes: #173932) - * Bugs against packages in stable distribution don't make much sense. - Additionally, this is not a bug but a feature (Qt2 <-> Qt3 conflict) (Closes: #178660) - * Same as above. Additionally, please make sure to use libqt3-mt-dev instead - of libqt3-dev (Closes: #168317) - * This bug definetely can not happen anymore, since Qt3 takes care of - creation of debian/tmp-install (Closes: #163075) - * debian/README.Debian: Updated and extended by Ralf Nolden - * debian/patches/02_missing_manpages.dpatch: Don't apply against qt-copy - * debian/patches/10_qvfb_cpp.dpatch: Fix qvfb to meet our needs - * debian/patches/11_designer_fix.dpatch: Fix designer breakage - * debian/patches/12_plugins_fix.dpatch: Build all available plugins - * debian/patches/13_qtcopy_20030128.dpatch: Include qt-copy 20030128 - * debian/*: Various other little fixes and cleanups - * debian/rules: Moved /usr/share/qt to be /usr/share/qt3 - - -- Martin Loschwitz <madkiss@madkiss.org> Wed, 29 Jan 2003 16:58:00 +0100 - -qt-x11-free (2:3.1.1+cvs.20021220-1) unstable; urgency=low - - * New Upstream version (Qt 3.1.1, using qt-copy from KDE project) - * Special thanks goes to Kevin Puetz for support and work on this release - * debian/patches/: Removed patches 05 and 06 and added correct -I's to rules - * debian/rules: don't build unthreaded plugins with QT_THREAD_SUPPORT (Closes: #172793) - * debian/control: Fix description of libqt3-helper (Closes: #72754) - * debian/rules: Moved libqui to libqt3-helper (Closes: #173539, #173537) - * debian/libqt3-dev.install: Only include useful bits for qmake - * debian/maintain/qmake-hppa.conf: Added -ftemplate-depth-99 (Closes: #173086) - * debian/rules: Make sure OpenGL support is enabled on threaded builds - * debian/rules: Use new srcdir != builddir technology, large cleanup - * debian/rules: Fixed path for html-files (remove the double html) - * debian/control: Added Replaces: to libqt3-helper for libqt3 (Closes: #173288) - * debian/rules: Removed all those ugly wrapper scripts (bah!) - * debian/control: Added build-dependency for Xft2 - thus Xft2 enabled - - -- Martin Loschwitz <madkiss@madkiss.org> Fri, 20 Dec 2002 17:53:00 +0100 - -qt-x11-free (2:3.1.0+cvs.20021205-1) unstable; urgency=low - - * New Upstream version (Qt 3.1.0, using qt-copy from KDE project) (Closes: #167001) - * debian/control: Make libqt3-dev depending on correct packages (Closes: #167475) - * debian/rules: Enabled Qt support for cups - * debian/overrides/: Added overrides-files for various packages - * debian/control: depend on libaudio instead of nas-lib - * debian/control: Updated Standards-Version to 3.8.0 - * debian/rules: Use DH_COMPAT=4 - * debian/rules: Converted to dh_install - - -- Martin Loschwitz <madkiss@madkiss.org> Thu, 05 Dec 2002 14:10:00 +0100 - -qt-x11-free (2:3.0.5-4) unstable; urgency=low - - * debian/09_assistant.dpatch: Fix doc-dir-path for Qt-assistant (Closes: #148924) - * debian/10_sizet_64bit.dpatch: Fix for 64bit machines (Closes: #159364) - * debian/11_qsql_odbc.dpatch: build with libiodbc2-dev - * debian/control: Build-Depend on libiodbc2-dev (Closes: #161352, #161353) - * qt3-doc _should_ be Recommends (assistant/qt3-tools needs it) (Closes: #149428) - * debian/rules: Fixed the 'clean'-target (Closes: #159264) - * debian/libqt3-dev.links: Symlink for /usr/share/qt/lib (Closes: #152507, #152509) - * debian/control: Updates Standards-Version - * debian/control: Tried to solve the dependency hell a bit - * debian/control: Removed libqt3 Suggests for anti-aliasing-howto - * debian/rules: Re-enabled NAS (Network Audio System) - * Must be a local problem (there ARE files in libqt3-dev) (Closes: #159674) - * Not a Qt bug; has been fixed probably long time ago (Closes: #154976) - - -- Martin Loschwitz <madkiss@madkiss.org> Thu, 15 Oct 2002 09:29:00 +0200 - -qt-x11-free (2:3.0.5-3) unstable; urgency=low - - * Sometimes our buildds do strange things (Closes: #155258) - * debian/rules: added shlibdeps-path for libqt3-mt. - * debian/rules: libqt3-mysql, libqt3-odbc and libqt3-psql contain the - unthreaded plugins now (Closes: #152022) - - -- Martin Loschwitz <madkiss@madkiss.org> Thu, 9 Aug 2002 22:18:00 +0200 - -qt-x11-free (2:3.0.5-2) unstable; urgency=low - - * debian/control: qt3-dev and qt3-doc are "Priority: extra" now. - * debian/rules: Fix alpha and hppa build (Closes: #150917) - - -- Martin Loschwitz <madkiss@madkiss.org> Thu, 2 Aug 2002 12:43:00 +0200 - -qt-x11-free (2:3.0.5-1) unstable; urgency=low - - * debian/control: New Maintainer (Closes: #153534) - * debian/maintain: fix hppa build (qmake-hppa.conf) (Closes: #150917) - * debian/changelog: New upstream version 3.0.5 (Closes: #153266) - * debian/rules: We use dpatch now, thanks to Gergely Nagy - * Moved wrapper files and configs to debian/maintain/ - * debian/maintain/assistant.sh: not include content double - * configure: Set "QT_INSTALL_PLUGINS" correct - * Changed some includes in the SQL-files to make them working - * debian/control: Fix some build dependencies - * debian/patches: All patches against upstream can be found here now. - * debian/control: Depend on libpng3-dev (Closes: #154234). - - -- Martin Loschwitz <madkiss@madkiss.org> Sat, 27 Jul 2002 13:51:00 +0200 - -qt-x11-free (2:3.0.4-2) unstable; urgency=low - - * Fix hppa build hopefully (Closes: #150917) - * Build cleanup - - -- Ivan E. Moore II <rkrusty@debian.org> Wed, 26 Jun 2002 13:28:00 -0700 - -qt-x11-free (2:3.0.4-1) unstable; urgency=low - - * New upstream version - * Fix qt-designer html access (Closes: #149505) - * Build postgresql modules - * This was fixed a while ago. (Closes: #134637) - * Build static libs again. yuk! Who the heck uses these anymore? - (Closes: #147084) - - -- Ivan E. Moore II <rkrusty@debian.org> Sun, 16 Jun 2002 12:25:00 -0700 - -qt-copy (2:3.0.3-20020329-7) unstable; urgency=low - - * move html files to html subdir...really...I mean it. (Closes: #149076) - - -- Ivan E. Moore II <rkrusty@debian.org> Thu, 06 Jun 2002 11:31:00 -0700 - -qt-copy (2:3.0.3-20020329-6) unstable; urgency=low - - * Remove unused doc dirs. (Closes: #148595) - * move html files to html subdir - - -- Ivan E. Moore II <rkrusty@debian.org> Thu, 30 May 2002 22:58:00 -0700 - -qt-copy (2:3.0.3-20020329-5) unstable; urgency=low - - * Fix assistant by providing a wrapper (Closes: #146255) - - -- Ivan E. Moore II <rkrusty@debian.org> Wed, 08 May 2002 17:21:00 -0700 - -qt-copy (2:3.0.3-20020329-4) unstable; urgency=low - - * Remove extra .'s from descriptions - - -- Ivan E. Moore II <rkrusty@debian.org> Fri, 03 May 2002 23:20:00 -0700 - -qt-copy (2:3.0.3-20020329-3) unstable; urgency=low - - * Fix priority (Closes: #145193) - - -- Ivan E. Moore II <rkrusty@debian.org> Tue, 30 Apr 2002 00:27:00 -0700 - -qt-copy (2:3.0.3-20020329-2) unstable; urgency=low - - * Fix overwrite issue (Closes: #141803, #141639) - * Re-add all the additional man pages - - -- Ivan E. Moore II <rkrusty@debian.org> Tue, 23 Apr 2002 00:27:00 -0700 - -qt-copy (2:3.0.3-20020329-1) unstable; urgency=low - - * Updated qt-copy to fix a few other bugs (Closes: #140462) - - -- Ivan E. Moore II <rkrusty@debian.org> Fri, 29 Mar 2002 09:08:00 -0700 - -qt-copy (2:3.0.3-20020314-5) unstable; urgency=low - - * Fix potential crash...thanks Daniel - - -- Ivan E. Moore II <rkrusty@debian.org> Sat, 23 Mar 2002 02:30:00 -0700 - -qt-copy (2:3.0.3-20020314-4) unstable; urgency=low - - * Don't build motif style as a plugin. It's pretty much the default so - let's have that builtin. - * Fix plugin pathing...actually this was a bug in the configure script - where it wasn't setting the proper items in the qconfig.h file - (Closes: #139449) - - -- Ivan E. Moore II <rkrusty@debian.org> Fri, 22 Mar 2002 10:36:00 -0700 - -qt-copy (2:3.0.3-20020314-3) unstable; urgency=low - - * Since this is still in incoming..change from a build-conflict to a - versioned depend - - -- Ivan E. Moore II <rkrusty@debian.org> Sat, 16 Mar 2002 11:00:00 -0700 - -qt-copy (2:3.0.3-20020314-2) unstable; urgency=low - - * Build-Conflict with libpng2-dev since it provides libpng-dev and we don't - want any of those problems. - - -- Ivan E. Moore II <rkrusty@debian.org> Fri, 15 Mar 2002 20:00:00 -0700 - -qt-copy (2:3.0.3-20020314-1) unstable; urgency=low - - * New upstream version. - * Includes updated zlib code - - -- Ivan E. Moore II <rkrusty@debian.org> Thu, 14 Mar 2002 12:31:00 -0700 - -qt-copy (2:3.0.2-20020306-1) unstable; urgency=low - - * New upstream version. Using qt-copy as it provides a bunch of fixes - for 3.0.2. (Closes: #135865) - * Fix suggests for libqt3-psql - * link to new png. Need this otherwise we are stuck with using the old - png library for quite some time. - * Fix cleanup (Closes: #135859) - * Include -mt versions of plugins. - - -- Ivan E. Moore II <rkrusty@debian.org> Wed, 06 Mar 2002 23:37:00 -0700 - -qt-copy (2:3.0.0.0-4) unstable; urgency=low - - * Fix qmake.cache inclusion (Closes: #118623) - - -- Ivan E. Moore II <rkrusty@debian.org> Wed, 07 Nov 2001 11:37:00 -0700 - -qt-x11-free (2:3.0.0.0-3) unstable; urgency=low - - * wrap uic so QTDIR is set for it...makes plugins happier - - -- Ivan E. Moore II <rkrusty@debian.org> Wed, 31 Oct 2001 09:19:00 -0700 - -qt-x11-free (2:3.0.0.0-2) unstable; urgency=low - - * Enable gl support. If it get's whacky like qt2 did we'll break it - off into it's own package. But until then we'll just do it this way. - * Fix wrapper (Closes: #116734) - - -- Ivan E. Moore II <rkrusty@debian.org> Mon, 22 Oct 2001 12:55:00 -0700 - -qt-x11-free (2:3.0.0.0-1) unstable; urgency=low - - * New upstream version - - -- Ivan E. Moore II <rkrusty@debian.org> Mon, 15 Oct 2001 11:54:00 -0700 - -qt-x11-free (2:3.0.0-0beta6-4) unstable; urgency=low - - * Don't compile in xinerama support...lets actually build on all archs - - -- Ivan E. Moore II <rkrusty@debian.org> Tue, 09 Oct 2001 16:00:00 -0700 - -qt-x11-free (2:3.0.0-0beta6-3) unstable; urgency=low - - * Properly include private include files - * Provide links from /usr/bin/ qt bins to /usr/share/qt/bin - - -- Ivan E. Moore II <rkrusty@debian.org> Mon, 08 Oct 2001 16:00:00 -0700 - -qt-x11-free (2:3.0.0-0beta6-2) unstable; urgency=low - - * Properly include include files (Closes: #114357) - * Pass variables onto designer (Closes: #114271) - * Add new variable to qmake.sh (Closes: #113341) - - -- Ivan E. Moore II <rkrusty@debian.org> Wed, 03 Oct 2001 16:11:00 -0700 - -qt-x11-free (2:3.0.0-0beta6-1) unstable; urgency=low - - * New upstream beta - - -- Ivan E. Moore II <rkrusty@debian.org> Mon, 01 Oct 2001 11:04:00 -0700 - -qt-x11-free (2:3.0.0-0beta5-2) unstable; urgency=low - - * Fix shlibs (Closes: #113055) - - -- Ivan E. Moore II <rkrusty@debian.org> Sun, 23 Sep 2001 18:41:00 -0700 - -qt-x11-free (2:3.0.0-0beta5-1) unstable; urgency=low - - * New upstream beta - - -- Ivan E. Moore II <rkrusty@debian.org> Tue, 18 Sep 2001 09:56:00 -0700 - -qt-x11-free (2:3.0.0-0beta4-2) unstable; urgency=low - - * Provide threaded QT library - * Cleanup deps - * Set shlibs files - * Remove -O2 from alpha build and add -mieee - * don't use gcc3 for alpha build anymore - - -- Ivan E. Moore II <rkrusty@debian.org> Sat, 08 Sep 2001 09:57:00 -0700 - -qt-x11-free (2:3.0.0-0beta4-1) unstable; urgency=low - - * New upstream beta - * Lintian error cleanup - - -- Ivan E. Moore II <rkrusty@debian.org> Wed, 29 Aug 2001 20:52:00 -0700 - -qt-x11-free (2:3.0.0-0beta3-2) unstable; urgency=low - - * Fix path issues for documentation (Closes: #109255) - - -- Ivan E. Moore II <rkrusty@debian.org> Mon, 19 Aug 2001 00:01:00 -0700 - -qt-x11-free (2:3.0.0-0beta3-1) unstable; urgency=low - - * new upstream beta - * Include mkspecs bits for qmake - * include qmake wrapper - - -- Ivan E. Moore II <rkrusty@debian.org> Fri, 27 Jul 2001 03:36:00 -0700 - -qt-x11-free (2:3.0.0-0beta2-3) unstable; urgency=low - - * drop Optimization down for other archs - * *should* fix m68k build (Closes: #104043) - - -- Ivan E. Moore II <rkrusty@debian.org> Tue, 17 Jul 2001 15:47:00 -0700 - -qt-x11-free (2:3.0.0-0beta2-2) unstable; urgency=low - - * actually include libqxt.so so people can build packages against it - * Remove the suggests for anti-aliasing-howto from the plugin packages - - -- Ivan E. Moore II <rkrusty@debian.org> Sun, 08 Jul 2001 03:50:00 -0700 - -qt-x11-free (2:3.0.0-0beta2-1) unstable; urgency=low - - * New upstream beta - * Ok, now we break out libqxt0 - - -- Ivan E. Moore II <rkrusty@debian.org> Thu, 05 Jul 2001 12:46:00 -0700 - -qt-x11-free (3.0.0-0beta1-6) unstable; urgency=low - - * Add missing build-depend for flex (Closes: #102978, #102984) - * Add conflict with libqxt0 (Closes: #102959) - - -- Ivan E. Moore II <rkrusty@debian.org> Sun, 01 Jul 2001 08:32:00 -0700 - -qt-x11-free (3.0.0-0beta1-5) unstable; urgency=low - - * ok..I'll get this stuff worked out soon. Fix gl build bits - (Closes: #102849) - - -- Ivan E. Moore II <rkrusty@debian.org> Sat, 30 Jun 2001 00:27:00 -0700 - -qt-x11-free (3.0.0-0beta1-4) unstable; urgency=low - - * Include qmake in libqt3-dev package - * Build database modules and provide seperate packages for them - * Build styles and provide them in libqt3 package - * Actually install designer plugins...guess that might help. - * More build cleanup...properly build all the tools/* modules - * Update build-depends - * Actually include linguist desktop file - * Include interface files as well - - -- Ivan E. Moore II <rkrusty@debian.org> Thu, 28 Jun 2001 22:03:00 -0700 - -qt-x11-free (3.0.0-0beta1-3) unstable; urgency=low - - * Fix libqui1 deps (Closes: #100804) - * Fix qmake symlink (Closes: #100964) - - -- Ivan E. Moore II <rkrusty@debian.org> Mon, 18 Jun 2001 19:40:00 -0700 - -qt-x11-free (3.0.0-0beta1-2) unstable; urgency=low - - * Fix dependencies for libqt3-dev...grrr - * Fix description for qt3-tools - - -- Ivan E. Moore II <rkrusty@debian.org> Thu, 07 Jun 2001 21:00:00 -0700 - -qt-x11-free (3.0.0-0beta1-1) unstable; urgency=low - - * New upstream beta version - - -- Ivan E. Moore II <rkrusty@debian.org> Sat, 26 May 2001 11:06:00 -0700 - -qt-x11 (2:2.3.0-final-5) unstable; urgency=low - - * Fix LD PATH problems due to new fakeroot routines (Closes: #98068) - * Get rid of gl specific package and just build main package with gl support - - -- Ivan E. Moore II <rkrusty@debian.org> Fri, 25 May 2001 00:25:00 -0700 - -qt-x11 (2:2.3.0-final-4) unstable; urgency=low - - * Fix konsole accents (Closes: #96678) - - -- Ivan E. Moore II <rkrusty@debian.org> Fri, 11 May 2001 10:27:00 -0700 - -qt-x11 (2:2.3.0-final-3) unstable; urgency=low - - * More alpha tweaks (only remove optimization for CXXFLAGS) - * Update bulid flags (Closes: #90334) - * Updating shlibs to stop problem with people using old libqt2 packages - * Several upstream fixes pulled out of the qt-copy CVS tree on KDE's - CVS Repository - * Build fixes for systems that do not have qt installed on them already - * Remove old Xft build hacks since we are using x4.0.3 now - * Update build-depends since we now require x4.0.3 - * Build libqt2-mt with opengl support (Closes: #91989) - * Build static libs with opengl support as well - * Remove old -dev provides which fixes buildd problems - * Get rid of 2.2 dummy packages libqt2.2 and libqt2.2-gl - * Update Build-Depends and other Depends that were pointing to provided or - pseudo packages. Have them point to a real package | pseudo package. - * Add new kde menu tag to qt-designer - * Add new libqxt0 pacakge so that in the future we don't have a confliction - with libqt3 and libqt2 since most likely libqxt soname won't change. - * Adding in lintian overrides finally - * Updating standards version - * Remove old hacks in debian/rules - * Should fix pure_virtual problems (Closes: #94676) - * Apply i18n patches (qclipboard, qstring, xim) - * Building with system png again - - -- Ivan E. Moore II <rkrusty@debian.org> Tue, 01 May 2001 22:42:00 -0700 - -qt-x11 (2:2.3.0-final-2) unstable; urgency=low - - * test build - - -- Ivan E. Moore II <rkrusty@debian.org> Sun, 07 Mar 2001 13:26:00 -0700 - -qt-x11 (2:2.3.0-final-1) unstable; urgency=low - - * New upstream version - * Applied xft workaround patch - * versioning the depends - * Adding in alpha specific build code so that it will build out of the - box. - - -- Ivan E. Moore II <rkrusty@debian.org> Wed, 07 Mar 2001 13:26:00 -0700 - -qt-x11 (2:2.3.0-beta1-3) unstable; urgency=low - - * Various patches applied from qt-copy branch of kde cvs. These include - several upstream fixes that were done post beta-1 and will be a part of - the next release. - LANG=he_IL.iso8859-8 will work correctly now. - .fontguess file now accepts quoted font names (so you can use font anmes - with white space inside) - * Konq's combobox works again - * Include xt extension (Closes: #88147) - - -- Ivan E. Moore II <rkrusty@debian.org> Thu, 01 Mar 2001 09:17:00 -0700 - -qt-x11 (2:2.3.0-beta1-2) unstable; urgency=low - - * Fix grave bug with xft (Closes: #87758) - - -- Ivan E. Moore II <rkrusty@debian.org> Mon, 26 Feb 2001 23:22:00 -0700 - -qt-x11 (2:2.3.0-beta1-1) unstable; urgency=low - - * New upstream version - * Don't clean everything out of bin/ after each stage as some pieces are - scripts that don't get built - * Fix Depends for libqutil1 - * Change version for kde-designer replace/conflicts so that one can actually - install kde-designer (Closes: #87223) - * Change doc package to qt-doc - * Let's go back to libqt2 and get away from libqt2.x. Providing migration - packages as to not totally hose people up right away. These will go - away prior to freeze. - * Build with XFT support - Anti Aliasing - - -- Ivan E. Moore II <rkrusty@debian.org> Fri, 23 Feb 2001 06:23:00 -0700 - -qt-x11 (2:2.2.4-5) unstable; urgency=low - - * Fix qt-mt package (Closes: #85132) - building of the tools cause the mt library to get hosed somehow - * Fix -dev depends for mt-dev - - -- Ivan E. Moore II <rkrusty@debian.org> Sat, 17 Feb 2001 00:42:00 -0700 - -qt-x11 (2:2.2.4-4) unstable; urgency=low - - * Break out uic and libqutil. This allows for developers not to need - qt-designer to build packages and also takes care of the fact that - libqutil is common. - * Changing dev packages to libqt-dev and libqt-mt-dev - - -- Ivan E. Moore II <rkrusty@debian.org> Thu, 15 Feb 2001 02:30:00 -0700 - -qt-x11 (2:2.2.4-3) unstable; urgency=low - - * Fix pathing for qt-designer for #85493 - * Change qt-designer's Depends on qt2.2-doc to Recommends (Closes: #85486) - * Adding in Perl depends properly for libqt2.2-dev - - -- Ivan E. Moore II <rkrusty@debian.org> Sat, 10 Feb 2001 17:30:00 -0700 - -qt-x11 (2:2.2.4-2) unstable; urgency=low - - * Include findtr (Closes: 85439) - * Build against new libmng - - -- Ivan E. Moore II <rkrusty@debian.org> Fri, 09 Feb 2001 16:30:00 -0700 - -qt-x11 (2:2.2.4-1) unstable; urgency=low - - * New upstream version - On X11, popup menus do not grab the keyboard anymore, but rely on and - enforce the application to have focus. This works around an X11 bug - where deadkeys do not work while the keyboard is grabbed. - See QT changelog for full list of updates - * Installing ui templates so that Designer doesn't complain. - * Adding in suggests for tmake - * Moving libqutil and uic over to designer package where they belong - * Moving away from /usr/lib/qt2 - - /usr/share/qt would have links for include/docs/man - it will also store all other pieces such as the ui templates for - designer. - * Cleaning up post/pre scripts, docs, etc. libqt2.2 package doesn't need - development docs and information...move it into -dev package - * Creating createcw and associated libs for use with designer - - -- Ivan E. Moore II <rkrusty@debian.org> Fri, 02 Feb 2001 16:30:00 -0700 - -qt2.2 (2:2.2.3-12) unstable; urgency=low - - * Only build designer once, using the shared libraries. This will cut - down on build time. - * Moving man pages into /usr/share/man tree - * Do not duplicate header files for examples and tools. - * Don't copy the tools/ directory tree since we build them already, if - someone wants the source to them they can dl the orig.tar.gz - * Don't remove the Makefile's during a clean so that we can include them - with the examples and tutorial - * Adding in a Debian menu entry for QT Designer - * Cleaning up descriptions to show where man pages were (since they were - still being referenced in the -dev package - * Adding note in README.Debian on how to build the examples and tutorial - * Compressing tutorial and examples to save on space by default. People - can then uncompress them if them want to use them. - * Cleaning up post/pre scripts - * Cleaning up diff - * Upstream patch applied for "dead keys" in qpopups - this is part of a - fix for Bug 82967. - * fix for setNamedColor parsing problem - - -- Ivan E. Moore II <rkrusty@debian.org> Sat, 27 Jan 2001 07:25:00 -0700 - -qt2.2 (2:2.2.3-11) unstable; urgency=low - - * Removing libpth-dev from depends - * One more upstream crash/bug fix in qasyncimageio - - -- Ivan E. Moore II <rkrusty@debian.org> Wed, 24 Jan 2001 18:41:00 -0700 - -qt2.2 (2:2.2.3-10) unstable; urgency=low - - * Fixing libqt2.2-dev dependencies. Adding libz-dev, xlibs-dev, libpng2-dev, - libjpeg62-dev, libmng-dev. (Closes: #83298) - * Adding uic information to libqt2.2-dev's description - * More crash fixes for graphics manipulation - - -- Ivan E. Moore II <rkrusty@debian.org> Tue, 23 Jan 2001 14:13:00 -0700 - -qt2.2 (2:2.2.3-9) unstable; urgency=low - - * Fix a crash problem with qimage - * More i18n - - -- Ivan E. Moore II <rkrusty@debian.org> Mon, 22 Jan 2001 00:10:00 -0700 - -qt2.2 (2:2.2.3-8) unstable; urgency=low - - * More upstream fixes...moving towards 2.2.4 - i18n work - bug fixes - * Removing old i18n patches - * fixing qt-designer section - * Build against new version of MNG - * Update build-depends - - -- Ivan E. Moore II <rkrusty@debian.org> Sat, 20 Jan 2001 01:28:00 -0700 - -qt2.2 (2:2.2.3-7) unstable; urgency=low - - * Moving tools/ includes to /usr/share/doc/qt2.2-doc/tools/includes - Apparantly they were causing problems with some apps - * Updating build-depends - * New upstream fixes - printing when your display has a resolution != 75 dpi - true type and type1 fonts will now get embedded into the document. This - fixes printing in almost all 8bit locales, *if* you are using these - fonts. - OK button fix - - -- Ivan E. Moore II <rkrusty@debian.org> Wed, 17 Jan 2001 16:05:00 -0700 - -qt2.2 (2:2.2.3-6) unstable; urgency=low - - * New i18n patches - submitted upstream finally it seems - * Cleanup of build-depends and depends. - * Creating a non-kde designer package - * Upstream i18n updates out of future 2.2.4 release. - * Fix print dialog problem - thanks to Michael Lachmann <dirk@santafe.edu> - - -- Ivan E. Moore II <rkrusty@debian.org> Mon, 15 Jan 2001 15:30:00 -0700 - -qt2.2 (2:2.2.3-5) unstable; urgency=low - - * Cleaning up depends/provides/conflicts - We are the only qt package for unstable so lets act like it. - * new i18n patch for qpsprinter - - -- Ivan E. Moore II <rkrusty@debian.org> Wed, 10 Jan 2001 16:00:00 -0700 - -qt2.2 (2:2.2.3-4) unstable; urgency=low - - * New i18n patches - * More build fixes - - -- Ivan E. Moore II <rkrusty@debian.org> Mon, 01 Jan 2001 03:31:00 -0700 - -qt2.2 (2:2.2.3-3) unstable; urgency=low - - * Applying Anti-Aliasing patch - * Adjusting Build-Depends as we now must have the latest X4 - * Adding libfreetyp6-dev to Build-Depends - * Fixing document links (Closes: #79876) - * New i18n patch update for qpsprinter - - -- Ivan E. Moore II <rkrusty@debian.org> Mon, 18 Dec 2000 01:13:00 -0700 - -qt2.2 (2:2.2.3-2) unstable; urgency=low - - * More build fixes...arggg... - * Applying new i18n patches for 2.2.3 and removing old 2.2.2 hacks - - -- Ivan E. Moore II <rkrusty@debian.org> Thu, 14 Dec 2000 16:27:00 -0700 - -qt2.2 (2:2.2.3-1) unstable; urgency=low - - * New upstream version - * Cleaning up build process - * Removing Mesa specific GL code as before - * Including new tools - qconfig, qvfb, makeqpf, and qembed - * Applying qscrollview patch from QT via <j.w.greven@student.utwente.nl> - - -- Ivan E. Moore II <rkrusty@debian.org> Wed, 13 Dec 2000 14:45:00 -0700 - -qt2.2 (2:2.2.2-12) unstable; urgency=low - - * New ad hoc xim patch - amazing what happens when you have no other choice - * Updating shlibs - * More build-depends and depends work - - -- Ivan E. Moore II <rkrusty@debian.org> Mon, 11 Dec 2000 09:09:00 -0700 - -qt2.2 (2:2.2.2-11) unstable; urgency=low - - * Removing xim patch since it's been weeks without a fix for the problems - it causes - - -- Ivan E. Moore II <rkrusty@debian.org> Sat, 09 Dec 2000 06:30:00 -0700 - -qt2.2 (2:2.2.2-10) unstable; urgency=low - - * Friggen dependency loops. - - -- Ivan E. Moore II <rkrusty@debian.org> Thu, 07 Dec 2000 01:00:00 -0700 - -qt2.2 (2:2.2.2-9) unstable; urgency=low - - * Fixing broken shlibs...arggg - - -- Ivan E. Moore II <rkrusty@debian.org> Sat, 02 Dec 2000 23:12:00 -0700 - -qt2.2 (2:2.2.2-8) unstable; urgency=low - - * Creating libqt2.2-gl package. Recommendations from upstream folks to - only compile in GL support as necessary due to stability issues and the - fact that we do have users that require GL support in QT has led me to - move GL support out of the main QT package. libqt2.2 conflicts/replaces - libqt2.2-gl while libqt2.2-gl replaces libqt2.2. - * Adding in missing build-depends - * More build cleanup - - -- Ivan E. Moore II <rkrusty@debian.org> Thu, 30 Nov 2000 15:15:00 -0700 - -qt2.2 (2:2.2.2-7) unstable; urgency=low - - * New i18n patches - - -- Ivan E. Moore II <rkrusty@debian.org> Wed, 29 Nov 2000 07:52:00 -0700 - -qt2.2 (2:2.2.2-6) unstable; urgency=low - - * New i18n patches - * Adding in a replaces for libqt1g-dev and qt1g-dev - - -- Ivan E. Moore II <rkrusty@debian.org> Sat, 25 Nov 2000 03:40:00 -0700 - -qt2.2 (2:2.2.2-5) unstable; urgency=low - - * Removing nas support per popular demand - - -- Ivan E. Moore II <rkrusty@debian.org> Mon, 20 Nov 2000 15:45:00 -0700 - -qt2.2 (2:2.2.2-4) unstable; urgency=low - - * Moving threaded version of libqt to libqt2.2-mt to cut down on size of - main package and still allow for those who need the threaded version to - obtain it. - * Fixing up dependencies for xlibs vs xlib6g for ports that do not have - xlibs - * Fixing shlibs - - -- Ivan E. Moore II <rkrusty@debian.org> Sat, 18 Nov 2000 20:14:00 -0700 - -qt2.2 (2:2.2.2-4) unstable; urgency=low - - * Fixing up thread support again - * Fixing the last lintian error - - -- Ivan E. Moore II <rkrusty@debian.org> Sat, 18 Nov 2000 08:30:00 -0700 - -qt2.2 (2:2.2.2-3.1) unstable; urgency=low - - * Fixing QGLWidget problem (Closes: #77248) - - -- Ivan E. Moore II <rkrusty@debian.org> Thu, 16 Nov 2000 21:30:00 -0700 - -qt2.2 (2:2.2.2-3) unstable; urgency=low - - * Applying uic patch from upstream - * Adding in versioned replace (Closes: #77147) - - -- Ivan E. Moore II <rkrusty@debian.org> Thu, 16 Nov 2000 07:15:00 -0700 - -qt2.2 (2:2.2.2-2.1) unstable; urgency=low - - * Removing thread support as it still seems unstable - - -- Ivan E. Moore II <rkrusty@debian.org> Thu, 16 Nov 2000 07:15:00 -0700 - -qt2.2 (2:2.2.2-2) unstable; urgency=low - - * contains new i18n patches - - -- Ivan E. Moore II <rkrusty@debian.org> Thu, 16 Nov 2000 02:00:00 -0700 - -qt2.2 (2:2.2.2-1) unstable; urgency=low - - * New upstream version - * Does not contain any i18n patches - * compiled with nas sound support - * mesa specific GL code removed manually - - -- Ivan E. Moore II <rkrusty@debian.org> Tue, 14 Nov 2000 20:00:00 -0700 - -qt2.2 (2:2.2.1-11) unstable; urgency=low - - * Manually removing Mesa specific GL code from qt - * New i18n patch - * Cleaned up diff file - - -- Ivan E. Moore II <rkrusty@debian.org> Sun, 12 Nov 2000 03:00:00 -0700 - -qt2.2 (2:2.2.1-10) unstable; urgency=low - - * New i18n patches (Closes: #75830) - - -- Ivan E. Moore II <rkrusty@debian.org> Wed, 08 Nov 2000 16:00:00 -0700 - -qt2.2 (2:2.2.1-9.2) unstable; urgency=low - - * Fix to /usr/lib/qt2/man link problem (Closes: #75622) - - -- Ivan E. Moore II <rkrusty@debian.org> Sun, 05 Nov 2000 22:00:00 -0700 - -qt2.2 (2:2.2.1-9.1) unstable; urgency=low - - * Build against X4 libs - - -- Ivan E. Moore II <rkrusty@debian.org> Sat, 04 Nov 2000 12:00:00 -0700 - -qt2.2 (2:2.2.1-9) unstable; urgency=low - - * More opengl cleanup - * Removing i18n patches as they are causing problems in some apps - - -- Ivan E. Moore II <rkrusty@debian.org> Wed, 01 Nov 2000 23:00:00 -0700 - -qt2.2 (2:2.2.1-8) unstable; urgency=low - - * Re-adding opengl support until another solution is created - - -- Ivan E. Moore II <rkrusty@debian.org> Mon, 23 Oct 2000 16:28:00 -0700 - -qt2.2 (2:2.2.1-7) unstable; urgency=low - - * Round 42..heh...let's try the png fix again - - -- Ivan E. Moore II <rkrusty@debian.org> Wed, 18 Oct 2000 23:54:00 -0700 - -qt2.2 (2:2.2.1-6) unstable; urgency=low - - * Hopefully fix png image viewing crashing - * adding in links for /usr/lib/qt2/man and /usr/lib/qt2/doc - * Fixing compression of html files - - -- Ivan E. Moore II <rkrusty@debian.org> Wed, 18 Oct 2000 00:15:00 -0700 - -qt2.2 (2:2.2.1-5) unstable; urgency=low - - * Minor dependency fix for libqt2.2-dev's perl necessesity - - -- Ivan E. Moore II <rkrusty@debian.org> Sat, 14 Oct 2000 01:00:00 -0700 - -qt2.2 (2:2.2.1-4) unstable; urgency=low - - * Ok, I'm not sure what i did but somehow the i18n patches missed getting - applied when I updated the source. Re-Applying them. (Closes: #74713) - - -- Ivan E. Moore II <rkrusty@debian.org> Fri, 13 Oct 2000 23:30:00 -0700 - -qt2.2 (2:2.2.1-3) unstable; urgency=low - - * Putting includes for examples into qt2.2-doc package (Closes: #74479) - * adding in some build options recommended by upstream that will reduce - the amount of memory used by apps linked against qt as well as reduce - the size of the resulting library significantly - - -- Ivan E. Moore II <rkrusty@debian.org> Wed, 11 Oct 2000 02:30:00 -0700 - -qt2.2 (2:2.2.1-2) unstable; urgency=low - - * More build cleanup - - -- Ivan E. Moore II <rkrusty@debian.org> Sun, 08 Oct 2000 03:45:00 -0700 - -qt2.2 (2:2.2.1-1) unstable; urgency=low - - * Including new version of upstream source code (they buggered something) - * Applying i18n patches for 2.2.1 - - -- Ivan E. Moore II <rkrusty@debian.org> Sat, 07 Oct 2000 22:00:00 -0700 - -qt2.2 (2:2.2.1-0) unstable; urgency=low - - * New upstream version - * Building with thread support turned on (Closes: #72994) - - -- Ivan E. Moore II <rkrusty@debian.org> Thu, 05 Oct 2000 20:00:00 -0700 - -qt2.2 (2:2.2.0-20000906-9) unstable; urgency=low - - * Fixing up some dependencies and build-depends - - -- Ivan E. Moore II <rkrusty@debian.org> Tue, 26 Sep 2000 17:30:00 -0700 - -qt2.2 (2:2.2.0-20000906-8) unstable; urgency=low - - * Appling font patch to fix infinate loop and XFree4 (Closes: #72374) - * Fixing /usr/include/qt after removing alternatives - * Adding in a conflict for libqt1g-dev - - -- Ivan E. Moore II <rkrusty@debian.org> Sun, 24 Sep 2000 22:00:00 -0700 - -qt2.2 (2:2.2.0-20000906-7) unstable; urgency=low - - * Finally adding in a fix for dangling manpage (Closes: #67375) - * Getting rid of alternatives since this will be the only qt package - * Adding libmng support - * Fixing up build-depends - - -- Ivan E. Moore II <rkrusty@debian.org> Sat, 23 Sep 2000 00:30:00 -0700 - -qt2.2 (2:2.2.0-20000906-6) unstable; urgency=low - - * More cleanup of build process to better handle mergetr and msg2qm - * Should fix problem with mesa linking (Closes: #71829) - * Applying m17n patches (Closes: #71820) - - -- Ivan E. Moore II <rkrusty@debian.org> Mon, 18 Sep 2000 17:30:00 -0700 - -qt2.2 (2:2.2.0-20000906-5) unstable; urgency=low - - * Fixing problem with missing mergetr and msg2qm - - -- Ivan E. Moore II <rkrusty@debian.org> Tue, 12 Sep 2000 09:00:00 -0700 - -qt2.2 (2:2.2.0-20000906-4) unstable; urgency=low - - * Building against utahglx instead of mesa to get around hardcoded Mesa - items - - -- Ivan E. Moore II <rkrusty@debian.org> Sun, 10 Sep 2000 19:00:00 -0700 - -qt2.2 (2:2.2.0-20000906-3) unstable; urgency=low - - * Fixing src -> sub-src problem in rules file (should help alpha build) - - -- Ivan E. Moore II <rkrusty@debian.org> Sat, 09 Sep 2000 15:15:00 -0700 - -qt2.2 (2:2.2.0-20000906-2) unstable; urgency=low - - * Removing designer build pieces - - -- Ivan E. Moore II <rkrusty@debian.org> Fri, 08 Sep 2000 00:15:00 -0700 - -qt2.2 (2:2.2.0-20000906-1) unstable; urgency=low - - * Working out build issues - - -- Ivan E. Moore II <rkrusty@debian.org> Thu, 07 Sep 2000 15:00:00 -0700 - -qt2.2 (2:2.2.0-20000906-0) unstable; urgency=low - - * New upstream stable release - * Includes designer and is under a dual license. QPL and GPL - - -- Ivan E. Moore II <rkrusty@debian.org> Wed, 06 Sep 2000 07:45:00 -0700 - -qt2.2-copy (2:2.2.0-20000821-0.3) unstable; urgency=low - - * Building other tools (mergetr, msg2qm, qconfig) - * removing replace/conflict with libqt2.1 - - -- Ivan E. Moore II <rkrusty@debian.org> Tue, 05 Sep 2000 18:00:00 -0700 - -qt2.2-copy (2:2.2.0-20000821-0.2) unstable; urgency=low - - * Fixing library issues when building designer - - -- Ivan E. Moore II <rkrusty@debian.org> Fri, 01 Sep 2000 17:00:00 -0700 - -qt2.2-copy (2:2.2.0-20000821-0.1) unstable; urgency=low - - * Updating version number to be higher than Debian one - - -- Ivan E. Moore II <rkrusty@debian.org> Mon, 28 Aug 2000 06:00:00 -0700 - -qt2.2-copy (2:2.2.0-20000821-0) unstable; urgency=low - - * New upstream CVS version - * Providing designer - - -- Ivan E. Moore II <rkrusty@debian.org> Mon, 21 Aug 2000 18:00:00 -0700 - -qt2.2-copy (2:2.2.0-1.copy.1) unstable; urgency=low - - * New upstream beta version - - -- Ivan E. Moore II <rkrusty@debian.org> Sun, 20 Aug 2000 00:30:00 -0700 - -qt2.2-beta1 (2:2.2.0-0.beta1.0) unstable; urgency=low - - * New upstream beta version - - -- Ivan E. Moore II <rkrusty@debian.org> Thu, 10 Aug 2000 02:30:00 -0700 - -qt2.1 (2:2.1.0-1.1) unstable; urgency=low - - * Upping the epoch number since the upstream version changes made 2.1.0 - full release lower than the 2.1.0beta - - -- Ivan E. Moore II <rkrusty@debian.org> Thu, 18 May 2000 08:30:00 -0700 - -qt2.1 (2.1.0-1.1) unstable; urgency=low - - * Fixing qt_windows/mac.h include errors - * Adding in build depends - - -- Ivan E. Moore II <rkrusty@debian.org> Mon, 15 May 2000 02:30:00 -0700 - -qt2.1 (2.1.0-1) unstable; urgency=low - - * Applying patches for international support issues provided by - Oliver Bolzer - - -- Ivan E. Moore II <rkrusty@debian.org> Tue, 25 Apr 2000 17:45:00 -0700 - -qt2.1 (2.1.0-0) unstable; urgency=low - - * New upstream version - - -- Ivan E. Moore II <rkrusty@debian.org> Wed, 19 Apr 2000 05:30:00 -0700 - -qt2.1beta3 (2.1.0beta3-0) unstable; urgency=low - - * New upstream beta version - - -- Ivan E. Moore II <rkrusty@debian.org> Wed, 22 Mar 2000 18:00:00 -0700 - -qt2.1beta2 (2.1.0beta2-1.1) unstable; urgency=low - - * Applying qsortedlist.h patch - - -- Ivan E. Moore II <rkrusty@debian.org> Tue, 07 Mar 2000 10:30:00 -0700 - -qt2.1beta2 (2.1.0beta2-1) unstable; urgency=low - - * New upstream beta version - * Fixing prerm script - - -- Ivan E. Moore II <rkrusty@debian.org> Mon, 06 Mar 2000 00:30:00 -0700 - -qt2.1 (2.1.0-0.beta1.0) unstable; urgency=medium - - * New upstream beta version - * Taking over maintainership temporarily with permission from Heiko - * Fixing alternatives issue (Closes: #56997) - - -- Ivan E. Moore II <rkrusty@debian.org> Mon, 28 Feb 2000 18:00:00 -0700 - -qt2 (2.0.2-0.7) unstable; urgency=medium - - * Taking out old qt1g confliction (Closes: #54414) - * Fixing problem with overwriting moc man pages (Closes: #53067) - * NMU - - -- Ivan E. Moore II <rkrusty@debian.org> Sun, 09 Jan 2000 12:15:23 -0700 - -qt2 (2.0.2-0.6) unstable; urgency=medium - - * Compressing man pages (Closes: #51336) - * Fixing self dependencies issue with resident qt libs - * Adding in an alternative for -dev's libqt.so - * NMU - - -- Ivan E. Moore II <rkrusty@debian.org> Tue, 30 Nov 1999 23:15:23 -0400 - -qt2 (2.0.2-0.5) unstable; urgency=medium - - * Adding in a conflict for qt1g..sorry.. (Closes #49507, #49347, #48827) - * NMU - - -- Ivan E. Moore II <rkrusty@debian.org> Wed, 03 Nov 1999 00:15:23 -0400 - -qt2 (2.0.2-0.4) unstable; urgency=medium - - * Creating an alternative for /usr/include/qt - * NMU - - -- Ivan E. Moore II <rkrusty@debian.org> Wed, 03 Nov 1999 00:15:23 -0400 - -qt2 (2.0.2-0.3) unstable; urgency=medium - - * Changing pathing for doc-base (Closes: #47583) - * Setting sections properly in control file - * NMU - - -- Ivan E. Moore II <rkrusty@debian.org> Mon, 1 Nov 1999 00:15:23 -0400 - -qt2 (2.0.2-0.2) unstable; urgency=medium - - * Fixing self dependency (Closes: #48254) - * Including msg2qm and mergetr (Closes: #47897) - * Creating an alternative for moc between qt1 and qt2 (Closes: #44844) - * Linking /usr/lib/qt2/include to /usr/include/qt2 - * Fixing up post/pre scripts to work with debian policy (doc linking stuff) - * NMU - - -- Ivan E. Moore II <rkrusty@debian.org> Mon, 25 Oct 1999 08:15:23 -0400 - -qt2 (2.0.2-0.1) unstable; urgency=medium - - * New upstream version - * Changing package names to meet policy (Closes: 46229) - * NMU - - -- Ivan E. Moore II <rkrusty@debian.org> Thu, 07 Oct 1999 08:15:23 -0400 - -qt2 (2.0.1-0.1) unstable; urgency=medium - - * Rebuild with new gcc (2.95) libs - * Changing requirement for -doc from recommends to suggests - * Migrating to /usr/share/doc - * NMU for the above changes - - -- Ivan E. Moore II <rkrusty@debian.org> Sun, 12 Sep 1999 14:15:23 -0400 - -qt2 (2.0.1-0) unstable; urgency=medium - - * bug fix release (new upstream) - - -- Heiko Schlittermann <heiko@lotte.sax.de> Tue, 20 Jul 1999 09:15:23 +0200 - -qt2 (2.00-0) unstable; urgency=medium - - * final release - - -- Heiko Schlittermann <heiko@lotte.sax.de> Mon, 28 Jun 1999 18:08:19 +0200 - -qt2beta (2.00beta3-19990619-1) unstable; urgency=low - - * new upstream - * included below mentioned changes from J.M. Dassen - * included extensions: imageio, opengl, xt - - -- Heiko Schlittermann <heiko@lotte.sax.de> Sat, 19 Jun 1999 13:14:36 +0200 - -qt2beta (2.0-19990516-2.1) unstable; urgency=low - - * UNRELEASED. - * Bumped Standards-Version. - * [debian/control] Updated descriptions. - * [debian/rules] Strengthened 'clean' to produce better diffs. - * [src/Makefile.in] Disabled building of the libraries in "3rdparty" and - make use of the Debian libpng and libz packages instead. - * [debian/TODO] New. - * [debian/shlibs-dbg] Updated. - * Added doc-base support. - * Fixed a number of lintian complaints: - * [debian/control] Section "x11", not "main/x11". - * [debian/rules] Install changelogs. - * [debian/rules] Correct permission of documentation files. - * [debian/rules] Don't install LICENSE.QPL; it's in the copyright file - already. - * [debian/copyright.in] License is in LICENSE.QPL in the source - distribution. - - -- J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl> Fri, 21 May 1999 18:59:25 +0200 - -qt2beta (2.0-19990516-2) unstable; urgency=low - - * skipping the man page steps entirely, since - the source doesn't seem to contain manpages, does it? - * built on a potato system - Thanks to: "Ivan E. Moore II" <rkrusty@tdyc.com> - - -- Heiko Schlittermann <heiko@lotte.sax.de> Mon, 17 May 1999 13:01:18 -0700 - -qt2beta (2.0-19990516-1) unstable; urgency=low - - * new checkout. - * gif enabled - - -- Heiko Schlittermann <heiko@lotte.sax.de> Mon, 10 May 1999 15:57:05 +0200 - -qt2beta (2.0-19990406-1) unstable; urgency=low - - * new checkout. - - -- Heiko Schlittermann <heiko@lotte.sax.de> Tue, 6 Apr 1999 09:07:14 +0200 - -qt2beta (2.0-19990316-1) unstable; urgency=low - - * new checkout. - - -- Heiko Schlittermann <heiko@lotte.sax.de> Tue, 16 Mar 1999 23:35:59 +0100 - -qt2beta (2.0-19990308-1) unstable; urgency=low - - * new checkout. - - -- Heiko Schlittermann <heiko@lotte.sax.de> Tue, 9 Mar 1999 00:03:32 +0100 - -qt2beta (2.0-19990302-1) unstable; urgency=low - - * new upstream beta ... (for coolo@kde.org) - - -- Heiko Schlittermann <heiko@lotte.sax.de> Tue, 2 Mar 1999 16:08:30 +0100 - -qt1-snapshot (1.39.19980414-2) unstable; urgency=low - - * insert the correct place (/usr/lib/qt1-snapshot/bin/moc) - of moc into the example Makefiles. - - -- Heiko Schlittermann <heiko@lotte.sax.de> Thu, 16 Apr 1998 17:45:00 +0200 - -qt1-snapshot (1.39.19980414-1) unstable; urgency=low - - * new upstream - * can now coexist with qt1 - * for further information read /usr/doc/qt1-snapshot/README.Debian - - -- Heiko Schlittermann <heiko@lotte.sax.de> Wed, 15 Apr 1998 22:41:36 +0200 - -qt1 (1.39.19980406-2) unstable; urgency=low - - * added the /usr/lib/qt dir w/ two symlinks - -> /usr/include and ->/usr/X11R6/lib - to make the QTDIR approach work (now - you can set QTDIR=/usr/lib/qt) - - -- Heiko Schlittermann <heiko@lotte.sax.de> Wed, 8 Apr 1998 11:18:16 +0200 - -qt1 (1.39.19980406-1) unstable; urgency=low - - * new upstream, used to compile qtscape - - -- Heiko Schlittermann <heiko@lotte.sax.de> Tue, 7 Apr 1998 11:22:02 +0200 - -qt1 (1.33-5) frozen; urgency=low - - * correct include and lib dir for the mesa stuff - - -- Heiko Schlittermann <heiko@lotte.sax.de> Mon, 6 Apr 1998 11:13:40 +0200 - -qt1 (1.33-4) frozen; urgency=low - - * next try to upload it. Build with mesa2g-dev - instead of the libc5 mesa libs. - * /usr/doc/example/qt-doc removed (#16921) - - -- Heiko Schlittermann <heiko@lotte.sax.de> Sun, 5 Apr 1998 13:58:13 +0200 - -qt1 (1.33-3) frozen; urgency=low - - * shlibs files now mention the current verion of libqt - * include libqgl (#16942, #14410) - * include tutorial in qt-doc - - -- Heiko Schlittermann <heiko@lotte.sax.de> Fri, 27 Mar 1998 13:07:30 +0100 - -qt1 (1.33-2) frozen; urgency=medium - - * dependency on xlib6 removed (#15905) - * include all .html files (#11567) - * hopefully lintian proof - * used the debhelper tools - - -- Heiko Schlittermann <heiko@lotte.sax.de> Tue, 24 Mar 1998 23:30:38 +0100 - -qt1 (1.33-1) unstable; urgency=medium - - * new upstream - - -- Heiko Schlittermann <heiko@lotte.sax.de> Mon, 23 Mar 1998 20:06:31 +0100 - -qt1 (1.31-1.3) unstable; urgency=low - - * -1.1 is not processed. maybe a new upload will work ? - * non-maintainer release by Andreas Jellinghaus <aj@debian.org>. - - -- Andreas Jellinghaus <aj@debian.org> Tue, 14 Oct 1997 10:47:14 +0200 - -qt1 (1.31-1.1) unstable; urgency=low - - * libc6 version. - * non-maintainer release by Andreas Jellinghaus <aj@debian.org>. - - -- Andreas Jellinghaus <aj@debian.org> Tue, 14 Oct 1997 10:47:14 +0200 - -qt1 (1.31-1) unstable; urgency=medium - - * new upstream release - - -- Heiko Schlittermann <heiko@lotte.sax.de> Mon, 13 Oct 1997 08:55:58 +0200 - -qt1 (1.30-1) unstable; urgency=medium - - * new upstream release - * changes: examples/tetris/Makefile clean target changed to - remove the *.moc file too - * src/moc/Makefile touches y.tab.h after cleanup since the - original source from troll tech contains it too (but - is useless) - - -- Heiko Schlittermann <heiko@lotte.sax.de> Tue, 30 Sep 1997 22:58:40 +0200 - -qt1 (1.2.1-1) stable unstable non-free; urgency=medium - - * new upstream release (Bugfix only!) - - -- Heiko Sclittermann <heiko@lotte.sax.de> Tue, 12 Aug 1997 21:26:13 +0200 - -qt1 (1.2-5) frozen non-free; urgency=low - - * set the new moc location in the examples and - tutorial makefiles. - - -- Heiko Schlittermann <heiko@lotte.sax.de> Tue, 29 Apr 1997 12:09:03 +0200 - -qt1 (1.2-4) frozen non-free; urgency=low - - * shlibs file lists version 1.2, since applications compiled - agains 1.2 doesn't work with < 1.2 - - -- Heiko Schlittermann <heiko@lotte.sax.de> Fri, 25 Apr 1997 20:04:04 +0200 - -qt1 (1.2-3) non-free; urgency=low - - * doc no longer depends on the library/binary package, - it only suggests it - - -- Heiko Schlittermann <heiko@lotte.sax.de> Mon, 21 Apr 1997 16:23:49 +0200 - -qt1 (1.2-2) non-free; urgency=low - - * moc goes to /usr/bin instead of /usr/X11R6/bin - - -- Heiko Schlittermann <heiko@lotte.sax.de> Thu, 17 Apr 1997 11:49:24 +0200 - -qt1 (1.2-1) non-free; urgency=medium - - * new upstream version - * bug8432 fixed: dependency on xlib6 - * New include dir is /usr/X11R6/include/qt (according to Xm, XmCxx, ...) - * bug8449 fixed: (suggestion) symlink - /usr/include/qt -> /usr/X11R6/include/qt (shouldn't do - to much harm) - * bug8507/8184 fixed: symlink in example dir - - -- Heiko Schlittermann <heiko@lotte.sax.de> Fri, 11 Apr 1997 12:46:12 +0200 - -qt1 (1.1-2) non-free; urgency=low - - * optional instead of extra .... - * correctly replace old qt0-doc and old qt0-dev with - qt-doc resp. qt-dev - - -- Heiko Schlittermann <heiko@lotte.sax.de> Fri, 28 Feb 1997 17:08:02 +0100 - -qt1 (1.1-0) non-free; urgency=medium - - * new upstream release out for about 3 months - - -- Heiko Schlittermann <heiko@lotte.sax.de> Wed, 12 Feb 1997 09:18:40 +0100 - -qt1 (1.0-3) contrib; urgency=low - - * should appear in non-free now - - -- Heiko Schlittermann <heiko@lotte.sax.de> Wed, 11 Dec 1996 19:02:08 +0100 - -qt1 (1.0-2) frozen unstable; urgency=low - - * nothing new unless distribution code and debian version - number -- I hope this will finally place all *deb files - in place on master. - - -- Heiko Schlittermann <heiko@lotte.sax.de> Thu, 5 Dec 1996 09:40:14 +0100 - -qt1 (1.0-1) unstable; urgency=low - - * new upstream version - * dev and doc package are now installed as qt-dev and qt-doc, - since only one qt-dev/qt-doc may exist at any time (but - qt may exist as qt0 and qt1) - - -- Heiko Schlittermann <heiko@lotte.sax.de> Fri, 18 Oct 1996 13:32:24 +0200 - -qt0 (0.99-1) unstable; urgency=low - - * new upstream version - - -- Heiko Schlittermann <heiko@lotte.sax.de> Mon, 9 Sep 1996 13:22:03 +0200 - -qt0 (0.98-1) unstable; urgency=low - - * initial release - - -- Heiko Schlittermann <heiko@lotte.sax.de> Sun, 8 Sep 1996 13:40:31 +0200 diff --git a/ubuntu/_base/dependencies/qt3/debian/compat b/ubuntu/_base/dependencies/qt3/debian/compat deleted file mode 100644 index 7f8f011eb..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/compat +++ /dev/null @@ -1 +0,0 @@ -7 diff --git a/ubuntu/_base/dependencies/qt3/debian/control b/ubuntu/_base/dependencies/qt3/debian/control deleted file mode 100644 index 3862353cd..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/control +++ /dev/null @@ -1,372 +0,0 @@ -Source: qt-x11-free -Maintainer: Kubuntu Developers <kubuntu-devel@lists.ubuntu.com> -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 (>= 7.0.50~), 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, - libxcursor-dev, libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg-dev, - libmng-dev (>= 1.0.3), libpng-dev, libfontconfig1-dev, - libfreetype6-dev, libxft-dev, unixodbc-dev, uuid-dev, libglib2.0-dev, - default-libmysqlclient-dev | libmysqlclient-dev, flex, libpq-dev, postgresql-server-dev-all (>= 117~) | libpq-dev (<< 9.3.3-2~), libaudio-dev, libcups2-dev, - libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev, - firebird-dev | firebird2.1-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc armel] | firebird2-dev [i386 amd64] -Section: libs -Priority: optional -Standards-Version: 3.8.4 -Homepage: http://www.trinitydesktop.org/ - -Package: libqt3-mt -Architecture: any -Multi-Arch: same -Section: libs -Replaces: libqt3-mt (<< 4:14.0.0~) -Breaks: libqt3-mt (<< 4:14.0.0~) -Depends: libqt3-mt-data (= ${binary:Version}), ${shlibs:Depends}, fontconfig -Recommends: libgl1-mesa-glx | libgl1, libglu1-mesa | libglu1, libxmu6 (>= 4.3.0.dfsg.1-4) -Conflicts: libqt3c102-mt, libqui1-emb, libqt3c-mt -Suggests: libqt3-mt-psql, libqt3-mt-mysql, libqt3-mt-odbc -Description: Qt GUI Library (Threaded runtime version), Version 3 - This is the Trolltech Qt library, version 3. It's necessary for - applications that link against the libqt-mt.so.3, e.g. all Trinity - applications. - -Package: libqt3-mt-data -Architecture: all -Multi-Arch: foreign -Section: libs -Conflicts: libqt3-mt (<< 4:14.1.0~) -Depends: ${shlibs:Depends} -Description: Data for Qt GUI Library (Threaded runtime version), Version 3 - This is the Trolltech Qt library, version 3. It's necessary for - applications that link against the libqt-mt.so.3, e.g. all Trinity - applications. - -Package: libqt3-mt-mysql -Architecture: any -Multi-Arch: same -Section: libs -Replaces: libqt3-mt-mysql (<< 4:14.0.0~) -Breaks: libqt3-mt-mysql (<< 4:14.0.0~) -Depends: ${shlibs:Depends} -Conflicts: libqt3c102-mt-mysql, libqt3c-mt-mysql -Description: MySQL database driver for Qt3 (Threaded) - This package contains the threaded MySQL plugin for Qt3. Install it if - you intend to use or write Qt programs that are to access a MySQL DB. - -Package: libqt3-mt-odbc -Architecture: any -Multi-Arch: same -Section: libs -Replaces: libqt3-mt-odbc (<< 4:14.0.0~) -Breaks: libqt3-mt-odbc (<< 4:14.0.0~) -Depends: ${shlibs:Depends} -Conflicts: libqt3c102-mt-odbc, libqt3c-mt-odbc -Description: ODBC database driver for Qt3 (Threaded) - This package contains the threaded ODBC plugin for Qt3. Install it if - you intend to use or write Qt programs that are to access an ODBC DB. - -Package: libqt3-mt-psql -Architecture: any -Multi-Arch: same -Section: libs -Replaces: libqt3-mt-psql (<< 4:14.0.0~) -Breaks: libqt3-mt-psql (<< 4:14.0.0~) -Depends: ${shlibs:Depends} -Conflicts: libqt3c102-mt-psql, libqt3c-mt-psql -Description: PostgreSQL database driver for Qt3 (Threaded) - This package contains the threaded PostgreSQL plugin for Qt3. - Install it if you intend to use or write Qt programs that are - to access a PostgreSQL DB. - -Package: libqt3-mt-ibase -Architecture: i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc -Multi-Arch: same -Section: libs -Depends: ${shlibs:Depends} -Conflicts: libqt3c102-mt-ibase -Replaces: libqt3c102-mt-ibase -Description: InterBase/FireBird database driver for Qt3 (Threaded) - This package contains the threaded InterBase/FireBird plugin - for Qt3. Install it if you intend to use or write Qt programs - that are to access an InterBase/FireBird DB. - -Package: libqt3-mt-sqlite -Architecture: any -Multi-Arch: same -Section: libs -Replaces: libqt3-mt-sqlite (<< 4:14.0.0~) -Breaks: libqt3-mt-sqlite (<< 4:14.0.0~) -Depends: ${shlibs:Depends} -Conflicts: libqt3c102-mt-sqlite -Description: SQLite database driver for Qt3 (Threaded) - This package contains the threaded SQLite plugin for Qt3. Install - it if you intend to use or write Qt programs that are to access an - SQLite DB. - -Package: libqt3-mt-sqlite3 -Architecture: any -Multi-Arch: same -Section: libs -Depends: ${shlibs:Depends} -Description: SQLite3 database driver for Qt3 (Threaded) - This package contains the threaded SQLite3 plugin for Qt3. Install - it if you intend to use or write Qt programs that are to access an - SQLite3 DB. - -Package: libqt3-mt-dev -Architecture: any -Multi-Arch: no -Section: libdevel -Replaces: libqt3-mt-dev (<< 4:14.0.0~) -Breaks: libqt3-mt-dev (<< 4:14.0.0~) -Conflicts: libqt3-mt (<< 4:14.1.0~) -Depends: 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, libxcursor-dev, uuid-dev, - libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg-dev, libmng-dev (>= 1.0.3), - libpng-dev, libfontconfig1-dev, libfreetype6-dev, - libxft-dev, libaudio-dev, libcups2-dev, libgl1-mesa-dev | libgl-dev, - libglu1-mesa-dev | libglu-dev, libc6-dev, libqt3-mt (= ${binary:Version}), - libqt3-headers (= ${binary:Version}), qt3-dev-tools (= ${binary:Version}) -Conflicts: libqt-mt-dev, libqt3-emb (<= 3:3.0.3-1), libqt3-dev -Recommends: libqt3-compat-headers -Suggests: libqt3-i18n, qt3-doc -Description: Qt development files (Threaded) - Qt is a C++ class library optimized for graphical user interface - development. This package contains the libqt-mt.so symlink, necessary - for building threaded Qt applications as well as the libqui.so symlink - and the necessary header files for libqui.so. (See README.Debian and - the Qt Documentation for instructions on libqui.so) - . - WARNING: If you plan to build some older Qt3 applications, you will - most probably have to install the libqt3-compat-headers package. It - contains all the headers which are not part of the official Qt3 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: libqt3-headers -Architecture: all -Multi-Arch: foreign -Section: devel -Replaces: libqt3-headers (<< 4:14.0.0~) -Breaks: libqt3-headers (<< 4:14.0.0~) -Recommends: libqt3-mt-dev -Description: Qt3 header files - This package contains all header files for libqt and libqt-mt which come - with Qt3. If you want to compile or develop programs which use Qt3, you - have to install this package. - -Package: libqt3-compat-headers -Architecture: all -Multi-Arch: foreign -Section: devel -Replaces: libqt3-compat-headers (<< 4:14.0.0~) -Breaks: libqt3-compat-headers (<< 4:14.0.0~) -Depends: libqt3-headers (= ${binary:Version}) -Recommends: libqt3-mt-dev -Description: Qt 1.x and 2.x compatibility includes - This package contains header files that are intended for build - compatibility for applications that build with Qt3 but still use - deprecated includes. It is meant as an intermediate solution and - these header files are not part of the official Qt3 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 - libqt3-headers. - -Package: qt3-dev-tools -Architecture: any -Multi-Arch: foreign -Section: devel -Replaces: qt3-dev-tools (<< 4:14.0.0~) -Breaks: qt3-dev-tools (<< 4:14.0.0~) -Depends: ${shlibs:Depends} -Recommends: libqt3-mt-dev -Conflicts: libqt-dev (<< 3:2.3.2-10), uic (<= 3:2.3.2-9) -Description: Qt3 development tools - This package contains all tools that are necessary to build programs - that are written using Qt3. These are: qmake, uic and moc. - For Qt3 development, you most likely want to install this package. - -Package: qt3-designer -Architecture: any -Multi-Arch: foreign -Section: devel -Replaces: qt3-designer (<< 4:14.0.0~) -Breaks: qt3-designer (<< 4:14.0.0~) -Depends: qt3-designer-plugins (= ${binary:Version}), ${shlibs:Depends} -Recommends: qt3-dev-tools -Suggests: qt3-assistant, qt3-doc -Conflicts: qt-designer (<= 3:2.3.2-9), qt-designer-doc -Description: Qt3 Designer - The Qt Designer is a GUI design program that interactively lets you - construct user interfaces for the Qt library. Additionally it lets you - create whole project and works together with the database drivers - provided by Qt to create applications with easy database access through - Qt. The resulting user interface files can then be converted to - C++ classes using the uic commandline utility which is usually done - automatically for the developer with a project management with qmake - or automake. - -Package: qt3-designer-plugins -Architecture: any -Multi-Arch: same -Section: devel -Conflicts: qt3-designer (<< 4:14.1.0~) -Depends: ${shlibs:Depends} -Description: Qt3 Designer plugins - This package contains plugins for Qt3 Designer - -Package: qt3-apps-dev -Architecture: any -Multi-Arch: no -Section: devel -Replaces: qt3-apps-dev (<< 4:14.0.0~) -Breaks: qt3-apps-dev (<< 4:14.0.0~) -Depends: libqt3-mt-dev -Description: Qt3 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 Qt; the Qt Designer and the Qt Assistant. - It allows integrating additional enhancements into the Qt Designer - respectively faciliate the Qt Assistant from within your Qt application - to interactively call the Assistant for displaying online help that the - developer includes with his application. - -Package: qt3-linguist -Architecture: any -Multi-Arch: foreign -Section: devel -Replaces: qt3-linguist (<< 4:14.0.0~) -Breaks: qt3-linguist (<< 4:14.0.0~) -Suggests: qt3-assistant -Depends: ${shlibs:Depends} -Description: The Qt3 Linguist - This package contains the Qt3 Linguist which provides translators a - tool perfect for translating any Qt-based application into other - languages and can be used and installed independently of any Qt - development files by the translator. - -Package: qt3-assistant -Architecture: any -Multi-Arch: foreign -Section: x11 -Replaces: qt3-assistant (<< 4:14.0.0~) -Breaks: qt3-assistant (<< 4:14.0.0~) -Depends: ${shlibs:Depends}, qt3-doc -Description: The Qt3 assistant application - This package contains the Qt3 Assistant, an easy to use frontend for - the complete Qt3 documentation and serves as an online help viewer for - any Qt program that wants to give the usesr access to online help. - Within the Qt tools it is used as the help viewer for the online help - for the Qt3 Designer and Linguist as well as qmake and the Qt 3 API - documentation. - . - Developers of Qt Application who want to faciliate the Qt Assistant for online - help display should refer to the README.Debian file for libqt3-mt-dev and - the package qt3-apps-dev. - -Package: qt3-qtconfig -Architecture: any -Multi-Arch: foreign -Section: x11 -Replaces: qt3-qtconfig (<< 4:14.0.0~) -Breaks: qt3-qtconfig (<< 4:14.0.0~) -Depends: ${shlibs:Depends} -Description: The Qt3 Configuration Application - The Qt Configuration program allows endusers to configure the look - and behavior of any Qt3 application. It is mostly only necessary - on systems which don't run TDE because the Trinity control center already - covers this configuration automatically for the users Qt3 applications - according to his desktop settings in TDE. However, if you need to run - CJK-fonts or other non-latin scripts, you will most likely want to - install this package. - -Package: qt3-dev-tools-embedded -Architecture: any -Multi-Arch: foreign -Section: devel -Replaces: qt3-dev-tools-embedded (<< 4:14.0.0~) -Breaks: qt3-dev-tools-embedded (<< 4:14.0.0~) -Recommends: libqt3-mt-dev -Depends: ${shlibs:Depends} -Description: Tools to develop embedded Qt applications - This package contains applications only suitable for developing - applications with Qt Embedded and/or Qtopia. It provides the QVFB - program for simulating an embedded device desktop as well as makeqpf - for converting fonts to embedded fonts suitable for being utilized - by Qt Embedded applications. - -Package: qt3-dev-tools-compat -Architecture: any -Multi-Arch: foreign -Section: devel -Replaces: qt3-dev-tools-compat (<< 4:14.0.0~) -Breaks: qt3-dev-tools-compat (<< 4:14.0.0~) -Recommends: libqt3-mt-dev -Depends: ${shlibs:Depends} -Description: Conversion utilities for Qt3 development - This package contains some older Qt tools (namely qtrename140, - qm2ts, mergetr, findtr and msg2qm). These tools are needed only by - application developers who need to migrate any Qt application written - for Qt 1.x or 2.x over to Qt 3.x. The purpose of the tools are to - help fixing the changes with include file renaming as well as migrating - the message file format of Qt 2 translation files or any gettext-based - translation system to the Qt 3 system. - -Package: libqt3-i18n -Architecture: all -Multi-Arch: foreign -Section: libs -Replaces: libqt3-i18n (<< 4:14.0.0~) -Breaks: libqt3-i18n (<< 4:14.0.0~) -Recommends: libqt3-mt -Description: i18n files for Qt3 library - This package contains the internationalization files for the Qt library. - Qt applications that are internationalized will need to depend on this package - for full internationalization support of the application towards the end user. - -Package: qt3-doc -Architecture: all -Multi-Arch: foreign -Section: doc -Replaces: qt3-doc (<< 4:14.0.0~) -Breaks: qt3-doc (<< 4:14.0.0~) -Priority: extra -Suggests: libqt3-headers, qt3-assistant | www-browser -Description: Qt3 API documentation - This package contains the complete API documentation for Qt3. - Examples to coding are in qt3-examples. The documentation is provided - in HTML and manpage format; the HTML version can be viewed in conjunction - with the Qt Assistant. - -Package: qt3-examples -Architecture: all -Multi-Arch: foreign -Section: doc -Replaces: qt3-examples (<< 4:14.0.0~) -Breaks: qt3-examples (<< 4:14.0.0~) -Priority: extra -Depends: libqt3-mt-dev (>= ${binary:Version}) -Suggests: qt3-apps-dev -Description: Examples for Qt3 - These are examples provided with Qt3. They may be especially useful for - you if you are learning to program in Qt as they cover quite a lot of - things that are possible with Qt3. - -Package: qt-x11-free-dbg -Section: libdevel -Architecture: any -Multi-Arch: no -Replaces: qt-x11-free-dbg (<< 4:14.0.0~) -Breaks: qt-x11-free-dbg (<< 4:14.0.0~) -Priority: extra -Depends: libqt3-mt (= ${binary:Version}), gdb -Conflicts: libqt3-mt-dbg -Description: debugging symbols for qt-x11-free binaries - This package contains the debugging symbols associated with qt-x11-free. - They will automatically be used by gdb for debugging Qt-related - issues. diff --git a/ubuntu/_base/dependencies/qt3/debian/copyright b/ubuntu/_base/dependencies/qt3/debian/copyright deleted file mode 100644 index 78872c85b..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/copyright +++ /dev/null @@ -1,145 +0,0 @@ -This is Debian GNU/Linux's prepackaged version of the Qt GUI Development -library. - -This package was put together originally by me, Heiko Schlittermann -<heiko@lotte.sax.de>, from the sources, which I obtained from -ftp.troll.no. The changes were very minimal to nothing, - merely -adding support for the Debian package maintenance scheme, by adding -various debian/* files and by changing the propagate script to fit the -Debian GNU/Linux filesystem structure. - -This package has since been temporarily taken over by Ivan Moore -<rkrusty@debian.org> until Heiko has time to work on it all again. - -In Jul 2002, Martin Loschwitz <madkiss@madkiss.org> overtook the package -maintenance for the QT3-packages. - -This packaged is maintained inside the Debian Qt/KDE Maintainers Team -<debian-qt-kde@lists.debian.org> since Tue, 26 Jul 2005 19:06:03 +0200 - -Qt 3.3 is triple licensed under the QPL, GPL 2 and GPL 3. - -It was downloaded from ftp://ftp.troll.no/qt/source - - This file may be used under the terms of the GNU General - Public License versions 2.0 or 3.0 as published by the Free - Software Foundation and appearing in the files LICENSE.GPL2 - and LICENSE.GPL3 included in the packaging of this file. - Alternatively you may (at your option) use any later version - of the GNU General Public License if such license has been - publicly approved by Trolltech ASA (or its successors, if any) - and the KDE Free Qt Foundation. - -Please refer to /usr/share/common-licenses/GPL-2 for complete GPL 2 -licence and /usr/share/common-licenses/GPL-3 for complete GPL 3 -licence. - - THE Q PUBLIC LICENSE - version 1.0 - - Copyright (C) 1999-2000 Troll Tech AS, Norway. - Everyone is permitted to copy and - distribute this license document. - -The intent of this license is to establish freedom to share and change the -software regulated by this license under the open source model. - -This license applies to any software containing a notice placed by the -copyright holder saying that it may be distributed under the terms of -the Q Public License version 1.0. Such software is herein referred to as -the Software. This license covers modification and distribution of the -Software, use of third-party application programs based on the Software, -and development of free software which uses the Software. - - Granted Rights - -1. You are granted the non-exclusive rights set forth in this license - provided you agree to and comply with any and all conditions in this - license. Whole or partial distribution of the Software, or software - items that link with the Software, in any form signifies acceptance of - this license. - -2. You may copy and distribute the Software in unmodified form provided - that the entire package, including - but not restricted to - copyright, - trademark notices and disclaimers, as released by the initial developer - of the Software, is distributed. - -3. You may make modifications to the Software and distribute your - modifications, in a form that is separate from the Software, such as - patches. The following restrictions apply to modifications: - - a. Modifications must not alter or remove any copyright notices in - the Software. - - b. When modifications to the Software are released under this - license, a non-exclusive royalty-free right is granted to the - initial developer of the Software to distribute your modification - in future versions of the Software provided such versions remain - available under these terms in addition to any other license(s) of - the initial developer. - -4. You may distribute machine-executable forms of the Software or - machine-executable forms of modified versions of the Software, provided - that you meet these restrictions: - - a. You must include this license document in the distribution. - - b. You must ensure that all recipients of the machine-executable forms - are also able to receive the complete machine-readable source code - to the distributed Software, including all modifications, without - any charge beyond the costs of data transfer, and place prominent - notices in the distribution explaining this. - - c. You must ensure that all modifications included in the - machine-executable forms are available under the terms of this - license. - -5. You may use the original or modified versions of the Software to - compile, link and run application programs legally developed by you - or by others. - -6. You may develop application programs, reusable components and other - software items that link with the original or modified versions of the - Software. These items, when distributed, are subject to the following - requirements: - - a. You must ensure that all recipients of machine-executable forms of - these items are also able to receive and use the complete - machine-readable source code to the items without any charge - beyond the costs of data transfer. - - b. You must explicitly license all recipients of your items to use - and re-distribute original and modified versions of the items in - both machine-executable and source code forms. The recipients must - be able to do so without any charges whatsoever, and they must be - able to re-distribute to anyone they choose. - - - c. If the items are not available to the general public, and the - initial developer of the Software requests a copy of the items, - then you must supply one. - - Limitations of Liability - -In no event shall the initial developers or copyright holders be liable -for any damages whatsoever, including - but not restricted to - lost -revenue or profits or other direct, indirect, special, incidental or -consequential damages, even if they have been advised of the possibility -of such damages, except to the extent invariable law, if any, provides -otherwise. - - No Warranty - -The Software and this license document are provided AS IS with NO WARRANTY -OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS -FOR A PARTICULAR PURPOSE. - Choice of Law - -This license is governed by the Laws of Norway. Disputes shall be settled -by Oslo City Court. - - The Qt GUI Toolkit is Copyright (C) 1994-2000 Trolltech AS. - - You may use, distribute and copy the Qt GUI Toolkit under the terms of - GNU General Public License version 2, which is display below. - diff --git a/ubuntu/_base/dependencies/qt3/debian/libqt3-compat-headers.install b/ubuntu/_base/dependencies/qt3/debian/libqt3-compat-headers.install deleted file mode 100644 index cad31c7a9..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/libqt3-compat-headers.install +++ /dev/null @@ -1,51 +0,0 @@ -usr/include/qt3/qapp.h -usr/include/qt3/qarray.h -usr/include/qt3/qbitarry.h -usr/include/qt3/qbttngrp.h -usr/include/qt3/qchkbox.h -usr/include/qt3/qclipbrd.h -usr/include/qt3/qcollect.h -usr/include/qt3/qcollection.h -usr/include/qt3/qcombo.h -usr/include/qt3/qconnect.h -usr/include/qt3/qdatetm.h -usr/include/qt3/qdrawutl.h -usr/include/qt3/qdstream.h -usr/include/qt3/qfiledef.h -usr/include/qt3/qfiledlg.h -usr/include/qt3/qfileinf.h -usr/include/qt3/qfontinf.h -usr/include/qt3/qfontmet.h -usr/include/qt3/qgrpbox.h -usr/include/qt3/qintcach.h -usr/include/qt3/qiodev.h -usr/include/qt3/qlcdnum.h -usr/include/qt3/qlined.h -usr/include/qt3/qlist.h -usr/include/qt3/qmenudta.h -usr/include/qt3/qmetaobj.h -usr/include/qt3/qmlined.h -usr/include/qt3/qmsgbox.h -usr/include/qt3/qmultilinedit.h -usr/include/qt3/qobjcoll.h -usr/include/qt3/qobjdefs.h -usr/include/qt3/qpdevmet.h -usr/include/qt3/qpmcache.h -usr/include/qt3/qpntarry.h -usr/include/qt3/qpopmenu.h -usr/include/qt3/qprndlg.h -usr/include/qt3/qprogbar.h -usr/include/qt3/qprogdlg.h -usr/include/qt3/qpsprn.h -usr/include/qt3/qpushbt.h -usr/include/qt3/qqueue.h -usr/include/qt3/qradiobt.h -usr/include/qt3/qrangect.h -usr/include/qt3/qscrbar.h -usr/include/qt3/qsocknot.h -usr/include/qt3/qstack.h -usr/include/qt3/qtabdlg.h -usr/include/qt3/qtstream.h -usr/include/qt3/qvector.h -usr/include/qt3/qwidcoll.h -usr/include/qt3/qwindefs.h diff --git a/ubuntu/_base/dependencies/qt3/debian/libqt3-headers.install b/ubuntu/_base/dependencies/qt3/debian/libqt3-headers.install deleted file mode 100644 index 567f444a3..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/libqt3-headers.install +++ /dev/null @@ -1,270 +0,0 @@ -usr/include/qt3/private/* -usr/include/qt3/qabstractlayout.h -usr/include/qt3/qaccel.h -usr/include/qt3/qaccessible.h -usr/include/qt3/qaction.h -usr/include/qt3/qapplication.h -usr/include/qt3/qasciicache.h -usr/include/qt3/qasciidict.h -usr/include/qt3/qasyncimageio.h -usr/include/qt3/qasyncio.h -usr/include/qt3/qbig5codec.h -usr/include/qt3/qbitarray.h -usr/include/qt3/qbitmap.h -usr/include/qt3/qbrush.h -usr/include/qt3/qbuffer.h -usr/include/qt3/qbutton.h -usr/include/qt3/qbuttongroup.h -usr/include/qt3/qcache.h -usr/include/qt3/qcanvas.h -usr/include/qt3/qcdestyle.h -usr/include/qt3/qcheckbox.h -usr/include/qt3/qcleanuphandler.h -usr/include/qt3/qclipboard.h -usr/include/qt3/qcolor.h -usr/include/qt3/qcolordialog.h -usr/include/qt3/qcombobox.h -usr/include/qt3/qcommonstyle.h -usr/include/qt3/qcompactstyle.h -usr/include/qt3/qconnection.h -usr/include/qt3/qcstring.h -usr/include/qt3/qcursor.h -usr/include/qt3/qdatabrowser.h -usr/include/qt3/qdatastream.h -usr/include/qt3/qdatatable.h -usr/include/qt3/qdataview.h -usr/include/qt3/qdatetime.h -usr/include/qt3/qdatetimeedit.h -usr/include/qt3/qdeepcopy.h -usr/include/qt3/qdesktopwidget.h -usr/include/qt3/qdial.h -usr/include/qt3/qdialog.h -usr/include/qt3/qdict.h -usr/include/qt3/qdir.h -usr/include/qt3/qdns.h -usr/include/qt3/qdockarea.h -usr/include/qt3/qdockwindow.h -usr/include/qt3/qdom.h -usr/include/qt3/qdragobject.h -usr/include/qt3/qdrawutil.h -usr/include/qt3/qdropsite.h -usr/include/qt3/qeditorfactory.h -usr/include/qt3/qerrormessage.h -usr/include/qt3/qeucjpcodec.h -usr/include/qt3/qeuckrcodec.h -usr/include/qt3/qevent.h -usr/include/qt3/qeventloop.h -usr/include/qt3/qfeatures.h -usr/include/qt3/qfile.h -usr/include/qt3/qfiledialog.h -usr/include/qt3/qfileinfo.h -usr/include/qt3/qfocusdata.h -usr/include/qt3/qfont.h -usr/include/qt3/qfontdatabase.h -usr/include/qt3/qfontdialog.h -usr/include/qt3/qfontinfo.h -usr/include/qt3/qfontmetrics.h -usr/include/qt3/qframe.h -usr/include/qt3/qftp.h -usr/include/qt3/qgarray.h -usr/include/qt3/qgb18030codec.h -usr/include/qt3/qgbkcodec.h -usr/include/qt3/qgcache.h -usr/include/qt3/qgdict.h -usr/include/qt3/qgeneric.h -usr/include/qt3/qgif.h -usr/include/qt3/qglist.h -usr/include/qt3/qglobal.h -usr/include/qt3/qgplugin.h -usr/include/qt3/qgrid.h -usr/include/qt3/qgridview.h -usr/include/qt3/qgroupbox.h -usr/include/qt3/qguardedptr.h -usr/include/qt3/qgvector.h -usr/include/qt3/qhbox.h -usr/include/qt3/qhbuttongroup.h -usr/include/qt3/qheader.h -usr/include/qt3/qhgroupbox.h -usr/include/qt3/qhostaddress.h -usr/include/qt3/qhttp.h -usr/include/qt3/qiconset.h -usr/include/qt3/qiconview.h -usr/include/qt3/qimage.h -usr/include/qt3/qimageformatplugin.h -usr/include/qt3/qinputdialog.h -usr/include/qt3/qintcache.h -usr/include/qt3/qintdict.h -usr/include/qt3/qinterlacestyle.h -usr/include/qt3/qiodevice.h -usr/include/qt3/qjiscodec.h -usr/include/qt3/qjpegio.h -usr/include/qt3/qjpunicode.h -usr/include/qt3/qkeycode.h -usr/include/qt3/qkeysequence.h -usr/include/qt3/qlabel.h -usr/include/qt3/qlayout.h -usr/include/qt3/qlcdnumber.h -usr/include/qt3/qlibrary.h -usr/include/qt3/qlineedit.h -usr/include/qt3/qlistbox.h -usr/include/qt3/qlistview.h -usr/include/qt3/qlocale.h -usr/include/qt3/qlocalfs.h -usr/include/qt3/qmainwindow.h -usr/include/qt3/qmap.h -usr/include/qt3/qmemarray.h -usr/include/qt3/qmenubar.h -usr/include/qt3/qmenudata.h -usr/include/qt3/qmessagebox.h -usr/include/qt3/qmetaobject.h -usr/include/qt3/qmime.h -usr/include/qt3/qmngio.h -usr/include/qt3/qmotifstyle.h -usr/include/qt3/qmotifplusstyle.h -usr/include/qt3/qmovie.h -usr/include/qt3/qmultilineedit.h -usr/include/qt3/qmutex.h -usr/include/qt3/qnamespace.h -usr/include/qt3/qnetwork.h -usr/include/qt3/qnetworkprotocol.h -usr/include/qt3/qnp.h -usr/include/qt3/qobject.h -usr/include/qt3/qobjectcleanuphandler.h -usr/include/qt3/qobjectdefs.h -usr/include/qt3/qobjectdict.h -usr/include/qt3/qobjectlist.h -usr/include/qt3/qpaintdevice.h -usr/include/qt3/qpaintdevicemetrics.h -usr/include/qt3/qpainter.h -usr/include/qt3/qpair.h -usr/include/qt3/qpalette.h -usr/include/qt3/qpen.h -usr/include/qt3/qpicture.h -usr/include/qt3/qpixmap.h -usr/include/qt3/qpixmapcache.h -usr/include/qt3/qplatinumstyle.h -usr/include/qt3/qpngio.h -usr/include/qt3/qpoint.h -usr/include/qt3/qpointarray.h -usr/include/qt3/qpolygonscanner.h -usr/include/qt3/qpopupmenu.h -usr/include/qt3/qprintdialog.h -usr/include/qt3/qprinter.h -usr/include/qt3/qprocess.h -usr/include/qt3/qprogressbar.h -usr/include/qt3/qprogressdialog.h -usr/include/qt3/qptrcollection.h -usr/include/qt3/qptrdict.h -usr/include/qt3/qptrlist.h -usr/include/qt3/qptrqueue.h -usr/include/qt3/qptrstack.h -usr/include/qt3/qptrvector.h -usr/include/qt3/qpushbutton.h -usr/include/qt3/qradiobutton.h -usr/include/qt3/qrangecontrol.h -usr/include/qt3/qrect.h -usr/include/qt3/qregexp.h -usr/include/qt3/qregion.h -usr/include/qt3/qrtlcodec.h -usr/include/qt3/qscrollbar.h -usr/include/qt3/qscrollview.h -usr/include/qt3/qsemaphore.h -usr/include/qt3/qsemimodal.h -usr/include/qt3/qserversocket.h -usr/include/qt3/qsession.h -usr/include/qt3/qsessionmanager.h -usr/include/qt3/qsettings.h -usr/include/qt3/qsgistyle.h -usr/include/qt3/qshared.h -usr/include/qt3/qsignal.h -usr/include/qt3/qsignalmapper.h -usr/include/qt3/qsignalslotimp.h -usr/include/qt3/qsimplerichtext.h -usr/include/qt3/qsize.h -usr/include/qt3/qsizegrip.h -usr/include/qt3/qsizepolicy.h -usr/include/qt3/qsjiscodec.h -usr/include/qt3/qslider.h -usr/include/qt3/qsocket.h -usr/include/qt3/qsocketdevice.h -usr/include/qt3/qsocketnotifier.h -usr/include/qt3/qsortedlist.h -usr/include/qt3/qsound.h -usr/include/qt3/qspinbox.h -usr/include/qt3/qsplashscreen.h -usr/include/qt3/qsplitter.h -usr/include/qt3/qsql.h -usr/include/qt3/qsqlcursor.h -usr/include/qt3/qsqldatabase.h -usr/include/qt3/qsqldriver.h -usr/include/qt3/qsqldriverplugin.h -usr/include/qt3/qsqleditorfactory.h -usr/include/qt3/qsqlerror.h -usr/include/qt3/qsqlfield.h -usr/include/qt3/qsqlform.h -usr/include/qt3/qsqlindex.h -usr/include/qt3/qsqlpropertymap.h -usr/include/qt3/qsqlquery.h -usr/include/qt3/qsqlrecord.h -usr/include/qt3/qsqlresult.h -usr/include/qt3/qsqlselectcursor.h -usr/include/qt3/qstatusbar.h -usr/include/qt3/qstring.h -usr/include/qt3/qstringlist.h -usr/include/qt3/qstrlist.h -usr/include/qt3/qstrvec.h -usr/include/qt3/qstyle.h -usr/include/qt3/qstylefactory.h -usr/include/qt3/qstyleplugin.h -usr/include/qt3/qstylesheet.h -usr/include/qt3/qsyntaxhighlighter.h -usr/include/qt3/qt.h -usr/include/qt3/qtabbar.h -usr/include/qt3/qtabdialog.h -usr/include/qt3/qtable.h -usr/include/qt3/qtabwidget.h -usr/include/qt3/qtextbrowser.h -usr/include/qt3/qtextcodec.h -usr/include/qt3/qtextcodecfactory.h -usr/include/qt3/qtextcodecplugin.h -usr/include/qt3/qtextedit.h -usr/include/qt3/qtextstream.h -usr/include/qt3/qtextview.h -usr/include/qt3/qthread.h -usr/include/qt3/qthreadstorage.h -usr/include/qt3/qtimer.h -usr/include/qt3/qtl.h -usr/include/qt3/qtoolbar.h -usr/include/qt3/qtoolbox.h -usr/include/qt3/qtoolbutton.h -usr/include/qt3/qtooltip.h -usr/include/qt3/qtranslator.h -usr/include/qt3/qtsciicodec.h -usr/include/qt3/qurl.h -usr/include/qt3/qurlinfo.h -usr/include/qt3/qurloperator.h -usr/include/qt3/qutfcodec.h -usr/include/qt3/quuid.h -usr/include/qt3/qvalidator.h -usr/include/qt3/qvaluelist.h -usr/include/qt3/qvaluestack.h -usr/include/qt3/qvaluevector.h -usr/include/qt3/qvariant.h -usr/include/qt3/qvbox.h -usr/include/qt3/qvbuttongroup.h -usr/include/qt3/qvfbhdr.h -usr/include/qt3/qvgroupbox.h -usr/include/qt3/qwaitcondition.h -usr/include/qt3/qwhatsthis.h -usr/include/qt3/qwidget.h -usr/include/qt3/qwidgetintdict.h -usr/include/qt3/qwidgetlist.h -usr/include/qt3/qwidgetplugin.h -usr/include/qt3/qwidgetstack.h -usr/include/qt3/qwindowdefs.h -usr/include/qt3/qwindowsstyle.h -usr/include/qt3/qwinexport.h -usr/include/qt3/qwizard.h -usr/include/qt3/qwmatrix.h -usr/include/qt3/qworkspace.h -usr/include/qt3/qxml.h diff --git a/ubuntu/_base/dependencies/qt3/debian/libqt3-i18n.install b/ubuntu/_base/dependencies/qt3/debian/libqt3-i18n.install deleted file mode 100644 index ac62f216d..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/libqt3-i18n.install +++ /dev/null @@ -1,8 +0,0 @@ -usr/share/qt3/translations/qt_ar.qm -usr/share/qt3/translations/qt_cs.qm -usr/share/qt3/translations/qt_de.qm -usr/share/qt3/translations/qt_es.qm -usr/share/qt3/translations/qt_fr.qm -usr/share/qt3/translations/qt_he.qm -usr/share/qt3/translations/qt_ru.qm -usr/share/qt3/translations/qt_sk.qm diff --git a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-data.install b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-data.install deleted file mode 100644 index e58f09b34..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-data.install +++ /dev/null @@ -1 +0,0 @@ -../../debian/qtrc etc/qt3/ diff --git a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-dev.docs b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-dev.docs deleted file mode 100644 index dbd9a5d19..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-dev.docs +++ /dev/null @@ -1,4 +0,0 @@ -README -README.immodule -README-QT.TXT -PLATFORMS diff --git a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-dev.install b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-dev.install deleted file mode 100644 index 67cc0c4c9..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-dev.install +++ /dev/null @@ -1,9 +0,0 @@ -usr/lib/$(DEB_HOST_MULTIARCH)/libqt-mt.la -usr/lib/$(DEB_HOST_MULTIARCH)/libqt-mt.prl -usr/lib/$(DEB_HOST_MULTIARCH)/libqt-mt.so -usr/lib/$(DEB_HOST_MULTIARCH)/libqui.prl -usr/lib/$(DEB_HOST_MULTIARCH)/libqui.so -usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/qt-mt.pc -usr/include/qt3/qgl.h -usr/include/qt3/qglcolormap.h -usr/include/qt3/qwidgetfactory.h diff --git a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-dev.links b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-dev.links deleted file mode 100644 index 50d008c6b..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-dev.links +++ /dev/null @@ -1,11 +0,0 @@ -/usr/lib/$(DEB_HOST_MULTIARCH)/libqt-mt.la /usr/share/qt3/lib/libqt-mt.la -/usr/lib/$(DEB_HOST_MULTIARCH)/libqui.prl /usr/share/qt3/lib/libqui.prl -/usr/lib/$(DEB_HOST_MULTIARCH)/libqui.so.1.0.0 /usr/share/qt3/lib/libqui.so -/usr/lib/$(DEB_HOST_MULTIARCH)/libqui.so.1.0.0 /usr/share/qt3/lib/libqui.so.1 -/usr/lib/$(DEB_HOST_MULTIARCH)/libqui.so.1.0.0 /usr/share/qt3/lib/libqui.so.1.0 -/usr/lib/$(DEB_HOST_MULTIARCH)/libqt-mt.prl /usr/share/qt3/lib/libqt-mt.prl -/usr/lib/$(DEB_HOST_MULTIARCH)/libqt-mt.so.3.3.8 /usr/share/qt3/lib/libqt-mt.so -/usr/lib/$(DEB_HOST_MULTIARCH)/libqt-mt.so.3.3.8 /usr/share/qt3/lib/libqt-mt.so.3 -/usr/lib/$(DEB_HOST_MULTIARCH)/libqt-mt.so.3.3.8 /usr/share/qt3/lib/libqt-mt.so.3.3 -/usr/lib/$(DEB_HOST_MULTIARCH)/qt3/plugins /usr/share/qt3/plugins -/usr/include/qt3 /usr/share/qt3/include diff --git a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-ibase.install b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-ibase.install deleted file mode 100644 index 284782279..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-ibase.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/$(DEB_HOST_MULTIARCH)/qt3/plugins/sqldrivers/libqsqlibase.so diff --git a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-mysql.install b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-mysql.install deleted file mode 100644 index 43c82fd7b..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-mysql.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/$(DEB_HOST_MULTIARCH)/qt3/plugins/sqldrivers/libqsqlmysql.so diff --git a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-odbc.install b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-odbc.install deleted file mode 100644 index 202c0fff1..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-odbc.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/$(DEB_HOST_MULTIARCH)/qt3/plugins/sqldrivers/libqsqlodbc.so diff --git a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-psql.install b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-psql.install deleted file mode 100644 index cf2800373..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-psql.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/$(DEB_HOST_MULTIARCH)/qt3/plugins/sqldrivers/libqsqlpsql.so diff --git a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-sqlite.install b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-sqlite.install deleted file mode 100644 index f65aac492..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-sqlite.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/$(DEB_HOST_MULTIARCH)/qt3/plugins/sqldrivers/libqsqlite.so diff --git a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-sqlite3.install b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-sqlite3.install deleted file mode 100644 index 8c5a97c4b..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-sqlite3.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/$(DEB_HOST_MULTIARCH)/qt3/plugins/sqldrivers/libqsqlite3.so diff --git a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt.docs b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt.docs deleted file mode 100644 index dbd9a5d19..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt.docs +++ /dev/null @@ -1,4 +0,0 @@ -README -README.immodule -README-QT.TXT -PLATFORMS diff --git a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt.install b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt.install deleted file mode 100644 index b0c767003..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt.install +++ /dev/null @@ -1,4 +0,0 @@ -usr/lib/$(DEB_HOST_MULTIARCH)/libqt-mt.so.* -usr/lib/$(DEB_HOST_MULTIARCH)/libqui.so.1.* -usr/lib/$(DEB_HOST_MULTIARCH)/qt3/plugins/imageformats/libqmng.so -usr/lib/$(DEB_HOST_MULTIARCH)/qt3/plugins/inputmethods/*.so diff --git a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt.links b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt.links deleted file mode 100644 index abaab3c97..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt.links +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/$(DEB_HOST_MULTIARCH)/libqui.so.1.0.0 /usr/lib/$(DEB_HOST_MULTIARCH)/libqui.so.1 diff --git a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt.postrm b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt.postrm deleted file mode 100644 index 5f09e318d..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt.postrm +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -if [ "$1" = "purge" ]; then - if [ -d "/usr/share/doc/libqt3-mt/" ]; then - rm -rf /usr/share/doc/libqt3-mt/ - fi -fi - -#DEBHELPER# diff --git a/ubuntu/_base/dependencies/qt3/debian/maintain/assistant-qt3.desktop b/ubuntu/_base/dependencies/qt3/debian/maintain/assistant-qt3.desktop deleted file mode 100644 index 42a16e80e..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/maintain/assistant-qt3.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Exec=assistant-qt3 -Name=Qt3 Assistant -Name[de]=Qt3 Assistent -Comment=Qt3 Helpcenter -Comment[de]= Qt3 Hilfezentrum -MimeType=application/x-assistant; -Icon=assistant -Terminal=false -Type=Application -Categories=Qt;Development; diff --git a/ubuntu/_base/dependencies/qt3/debian/maintain/build-examples.sh b/ubuntu/_base/dependencies/qt3/debian/maintain/build-examples.sh deleted file mode 100644 index b56d51e42..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/maintain/build-examples.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -BUILDDIR=$PWD -export QTDIR=/usr/share/qt3 - -# first copy over the libqt-mt.so build configuration of .qmake.cache -cp /usr/share/qt3/.qmake.cache ./.qmake.cache - -# Now compile the examples. The themes example -# won't work since qconfig.h is not really correct with the -# ifdef's for the QT_NO_xyz_STYLE, so we use make -k to continue -cd examples; qmake -o Makefile examples.pro; make -k - -# Now compile the tutorial. -cd $BUILDDIR/tutorial; qmake -o Makefile tutorial.pro; make - -# Then the designer examples. -cd $BUILDDIR/tools/designer/examples -for a in `find . -type d -maxdepth 1 -mindepth 1`; do - cd $a && qmake -o Makefile $a.pro; make; cd ..; -done - -# There is a bigger sql example in book/ with more subdirectories: -cd book -for a in `find . -type d -maxdepth 1 -mindepth 1`; do - cd $a && qmake -o Makefile $a.pro; make; cd ..; -done - -# Finally, build the linguist tutorials: -cd $BUILDDIR/tools/linguist/tutorial -for a in `find . -type d -maxdepth 1 -mindepth 1`; do - cd $a && qmake -o Makefile $a.pro; make; cd ..; -done - -# Return to the build directory -cd $BUILDDIR diff --git a/ubuntu/_base/dependencies/qt3/debian/maintain/designer-qt3.desktop b/ubuntu/_base/dependencies/qt3/debian/maintain/designer-qt3.desktop deleted file mode 100644 index fc9f4394c..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/maintain/designer-qt3.desktop +++ /dev/null @@ -1,77 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Exec=designer-qt3 -Name=Qt3 Designer -Name[bg]=Qt3 Дизайнер -Name[br]=Ergrafer Qt3 -Name[ca]=Dissenyador Qt3 -Name[cs]=Qt3 designer -Name[de]=Qt3-Designer -Name[eo]=Qt3-Desegnilo -Name[es]=Diseñador Qt3 -Name[et]=Qt3 disainer -Name[eu]=Qt3 Diseinatzailea -Name[gl]=Deseñador de Qt3 -Name[he]=Qt בצעמ -Name[it]=Designer Qt3 -Name[ja]=Qtデザイナー -Name[ko]=Qt 디자이너 -Name[lv]=Qt3 Dizainers -Name[mk]=Qt дизајнер -Name[no]=Qt3-designer -Name[oc]=Dessinador Qt3 -Name[pl]=Projektant Qt3 -Name[sk]=Qt3 Dizajnér -Name[sl]=Snovalnik Qt3 -Name[ta]=Qt À¨¼ôÀ¡Ç÷ -Name[uk]=Дизайнер Qt -Name[zh_CN.GB2312]=Qt 设计者 -Name[zh_TW.Big5]=Qt 設計器 -Comment=Qt3 interface designer -Comment[az]=Qt3 axtar üz dizayn proqramı -Comment[bg]=Qt3 interface дизайнер -Comment[br]=Ergrafer etrefas Qt3 -Comment[ca]=Dissenyador d'interfícies Qt3 -Comment[cs]=Editor UI pro Qt3 -Comment[da]=Qt3 grænseflade designer -Comment[de]=Schnittstellen-Designer für Qt3 -Comment[el]=Σχεδιασμός περιβάλλοντων Qt -Comment[eo]=Qt3-Interfacdesegnilo -Comment[es]=Diseñador de interfaces de Qt3 -Comment[et]=Qt3 dialoogide redaktor -Comment[eu]=Qt3 interfaze diseinatzailea -Comment[fi]=Qt:n käyttöliittymäsuunnittelija -Comment[fr]=Conception d'interfaces avec Qt3 -Comment[gl]=Editor de interfaces de Qt3 -Comment[he]=Qt-ל םיקשממ בצעמ -Comment[hu]=Qt3 felülettervező -Comment[is]=Viðmótshönnunartól fyrir Qt3 -Comment[it]=Editor per le interfaccie Qt3 -Comment[ja]=Qtインターフェースデザイナー -Comment[ko]=Qt 인터페이스 디자이너 -Comment[lt]=Qt3 sąsajos redaktorius -Comment[lv]=Qt3 starsejas dizainers -Comment[mk]=Дизајнер на Qt дијалози -Comment[nl]=Qt3 interface-ontwerper -Comment[no]=Qt3-grensesnittdesigner -Comment[no_NY]=Redigering av Qt3-miljø -Comment[oc]=Dessinador d'interfacies Qt3 -Comment[pl]=Projektant interfejsu Qt3 -Comment[pt]=Editor de interfaces do Qt3 -Comment[pt_BR]=Designer de interface Qt3 -Comment[ro]=Dezvoltator de interfeţe Qt3 -Comment[ru]=редактор интерфейсов приложений Qt -Comment[sk]=Qt3 dizajnér rozhrania -Comment[sl]=Snovalnik vmesnikov za Qt3 -Comment[sr]=Dizajner Qt3 interfejsa -Comment[sv]=Editor för gränssnitt till Qt3 -Comment[ta]=Qt À¨¼ôÀ¡Ç÷ -Comment[tr]=Qt3 arayüz tasarım programı -Comment[uk]=Редактор інтерфейсу для Qt -Comment[zh_CN.GB2312]=Qt 界面设计程序 -Comment[zh_TW.Big5]=Qt 介面編輯器 -MimeType=application/x-designer; -Icon=designer -Terminal=false -Type=Application -Categories=Qt;Development; diff --git a/ubuntu/_base/dependencies/qt3/debian/maintain/linguist-qt3.desktop b/ubuntu/_base/dependencies/qt3/debian/maintain/linguist-qt3.desktop deleted file mode 100644 index e0094dbd4..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/maintain/linguist-qt3.desktop +++ /dev/null @@ -1,25 +0,0 @@ -[Desktop Entry] -Exec=linguist-qt3 -Name=Qt3 Linguist -Name[de]=Qt3-Linguist -Name[eo]=Qt3-Lingvisto -Name[es]=Lingüista Qt3 -Name[ko]=Qt 언어학자 -Name[lv]=Qt3 Lingvists -Comment=Tool for translating message catalogues of Qt3 based programs -Comment[da]=Redskab til at oversætte Qt3 baserede programmer -Comment[de]=Dienstprogramm zur Übersetzung von Programmen, die auf Qt3 basieren -Comment[eo]=Ilo por tradukado de mesaĝaroj de Qt3-bazitaj programoj -Comment[es]=Herramienta para la traducción de catálogos de mensajes de programas basados en Qt3 -Comment[he]=Qt תוססובמ תוינכות לש תועדוה יגולטק םוגרתל ילכ -Comment[hu]=Segédprogram a Qt3-alapú programok üzenetfájljainak lefordításához -Comment[ko]=Qt를 바탕으로 하는 프로그램에서 쓸 번역된 메세지 목록을 관리하는 도구 -Comment[lv]=Rīks ziņojumu katalogu tulkošanai uz Qt3 bāzētās programmās -Comment[pt]=Ferramenta para traduzir os catálogos de mensagens de programas do Qt3 -Comment[pt_BR]=Ferramenta para traduzir os catálogos de mensagens de programas do Qt3 -Comment[sv]=Verktyg för att översätta meddelandekataloger från Qt3-baserade program -MimeType=application/x-linguist; -Terminal=false -Icon=linguist -Type=Application -Categories=Qt;Development diff --git a/ubuntu/_base/dependencies/qt3/debian/maintain/mkpatch.sh b/ubuntu/_base/dependencies/qt3/debian/maintain/mkpatch.sh deleted file mode 100644 index 609a44bc1..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/maintain/mkpatch.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -diff -Nru -x Makefile.cvs -x README.qt-copy -x upgrade_script.qt -x .cvsignore -x CVS -x include -x debian -x doc -x examples -x 3rdparty -x images -x mkspecs -I '^\*\*\( $\| \$Id\)' -I '^\#\( $\| \$Id\)' qt-x11-free-3.1.1.old/ qt-x11-free-3.1.1/ > qtcopy.diff diff --git a/ubuntu/_base/dependencies/qt3/debian/maintain/qt3config.desktop b/ubuntu/_base/dependencies/qt3/debian/maintain/qt3config.desktop deleted file mode 100644 index 22d0ca6a5..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/maintain/qt3config.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Exec=qtconfig-qt3 -Name=Qt3 Configuration -Name[de]=Qt3 Konfiguration -Comment=A graphical configuration tool for programs using Qt 3 -Comment[de]=Ein grafisches Konfigurationstool für Qt3-Programme -MimeType=application/x-qtconfig; -Terminal=false -Icon=qtconfig -Type=Application -Categories=Qt;Settings; diff --git a/ubuntu/_base/dependencies/qt3/debian/patches/06_disable_rpath.diff b/ubuntu/_base/dependencies/qt3/debian/patches/06_disable_rpath.diff deleted file mode 100644 index a3d74ffce..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/patches/06_disable_rpath.diff +++ /dev/null @@ -1,30 +0,0 @@ -author: Martin Loschwitz <madkiss@madkiss.org> - -Disables the rpath settings in qmake.conf - -Index: b/mkspecs/linux-g++/qmake.conf -=================================================================== ---- a/mkspecs/linux-g++/qmake.conf -+++ b/mkspecs/linux-g++/qmake.conf -@@ -55,7 +55,7 @@ - QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB - QMAKE_LFLAGS_SONAME = -Wl,-soname, - QMAKE_LFLAGS_THREAD = --QMAKE_RPATH = -Wl,-rpath, -+QMAKE_RPATH = - - QMAKE_LIBS = -luuid - QMAKE_LIBS_DYNLOAD = -ldl -Index: b/mkspecs/linux-g++-64/qmake.conf -=================================================================== ---- a/mkspecs/linux-g++-64/qmake.conf -+++ b/mkspecs/linux-g++-64/qmake.conf -@@ -58,7 +58,7 @@ - QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB - QMAKE_LFLAGS_SONAME = -Wl,-soname, - QMAKE_LFLAGS_THREAD = --QMAKE_RPATH = -Wl,-rpath, -+QMAKE_RPATH = - - QMAKE_LIBS = -luuid - QMAKE_LIBS_DYNLOAD = -ldl diff --git a/ubuntu/_base/dependencies/qt3/debian/patches/09_amd64_lib64.diff b/ubuntu/_base/dependencies/qt3/debian/patches/09_amd64_lib64.diff deleted file mode 100644 index 538e93044..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/patches/09_amd64_lib64.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- a/mkspecs/linux-g++-64/qmake.conf -+++ b/mkspecs/linux-g++-64/qmake.conf -@@ -43,11 +43,11 @@ QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_T - QMAKE_INCDIR = - QMAKE_LIBDIR = - QMAKE_INCDIR_X11 = /usr/X11R6/include --QMAKE_LIBDIR_X11 = /usr/X11R6/lib64 -+QMAKE_LIBDIR_X11 = /usr/X11R6/lib - QMAKE_INCDIR_QT = $(QTDIR)/include - QMAKE_LIBDIR_QT = $(QTDIR)/lib64 - QMAKE_INCDIR_OPENGL = /usr/X11R6/include --QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib64 -+QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib - - QMAKE_LINK = g++ - QMAKE_LINK_SHLIB = g++ diff --git a/ubuntu/_base/dependencies/qt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff b/ubuntu/_base/dependencies/qt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff deleted file mode 100644 index b4e71d35b..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff +++ /dev/null @@ -1,50 +0,0 @@ -author: Sune Vuorela <debian@pusling.com> - ---- a/configure -+++ b/configure -@@ -34,7 +34,44 @@ SUPPORTED= - #------------------------------------------------------------------------------- - - # need that throughout the script --UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown -+DPKG_ARCH=`(dpkg-architecture -qDEB_HOST_ARCH) 2>/dev/null` || UNAME_MACHINE=unknown -+case $DPKG_ARCH in -+ amd64) -+ UNAME_MACHINE="x86_64" -+ ;; -+ arm) -+ UNAME_MACHINE="armv4l" -+ ;; -+ armel) -+ UNAME_MACHINE="armv5tel" -+ ;; -+ hppa) -+ UNAME_MACHINE="parisc64" -+ ;; -+ hurd-i386) -+ UNAME_MACHINE="i686-AT386" -+ ;; -+ i386) -+ UNAME_MACHINE="i686" -+ ;; -+ kfreebsd-amd64) -+ UNAME_MACHINE="x86_64" -+ ;; -+ kfreebsd-i386) -+ UNAME_MACHINE="i586" -+ ;; -+ mipsel) -+ UNAME_MACHINE="mips" -+ ;; -+ powerpc) -+ UNAME_MACHINE="ppc" -+ ;; -+ *) -+ UNAME_MACHINE="$DPKG_ARCH" -+ ;; -+ -+ -+esac - UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown - UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown - UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown diff --git a/ubuntu/_base/dependencies/qt3/debian/patches/series b/ubuntu/_base/dependencies/qt3/debian/patches/series deleted file mode 100644 index e6bdb92af..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/patches/series +++ /dev/null @@ -1,3 +0,0 @@ -06_disable_rpath.diff -09_amd64_lib64.diff -72_dont_trust_uname-m_use_dpkg-arch_instead.diff diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-apps-dev.install b/ubuntu/_base/dependencies/qt3/debian/qt3-apps-dev.install deleted file mode 100644 index 30fd28dce..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/qt3-apps-dev.install +++ /dev/null @@ -1,4 +0,0 @@ -usr/lib/$(DEB_HOST_MULTIARCH)/libeditor.* -usr/lib/$(DEB_HOST_MULTIARCH)/libdesignercore.* -usr/lib/$(DEB_HOST_MULTIARCH)/libqassistantclient.* -usr/include/qt3/qassistantclient.h diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-apps-dev.links b/ubuntu/_base/dependencies/qt3/debian/qt3-apps-dev.links deleted file mode 100644 index 04098d9bd..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/qt3-apps-dev.links +++ /dev/null @@ -1,8 +0,0 @@ -/usr/lib/$(DEB_HOST_MULTIARCH)/libeditor.prl /usr/share/qt3/lib/libeditor.prl -/usr/lib/$(DEB_HOST_MULTIARCH)/libeditor.a /usr/share/qt3/lib/libeditor.a -/usr/lib/$(DEB_HOST_MULTIARCH)/libdesignercore.prl /usr/share/qt3/lib/libdesignercore.prl -/usr/lib/$(DEB_HOST_MULTIARCH)/libdesignercore.a /usr/share/qt3/lib/libdesignercore.a -/usr/lib/$(DEB_HOST_MULTIARCH)/libqassistantclient.prl /usr/share/qt3/lib/libqassistantclient.prl -/usr/lib/$(DEB_HOST_MULTIARCH)/libqassistantclient.a /usr/share/qt3/lib/libqassistantclient.a -/usr/include/qt3 /usr/share/qt3/tools/designer/editor -/usr/include/qt3 /usr/share/qt3/tools/designer/interfaces diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.install b/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.install deleted file mode 100644 index 4ca90e4b7..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin/assistant -usr/share/qt3/doc/html/assistant*html -usr/share/qt3/doc/html/assistant*dcf diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.links b/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.links deleted file mode 100644 index 6d9889d21..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.links +++ /dev/null @@ -1 +0,0 @@ -/usr/bin/assistant-qt3 /usr/share/qt3/bin/assistant diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.menu b/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.menu deleted file mode 100644 index 1b4c81243..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.menu +++ /dev/null @@ -1,6 +0,0 @@ -?package(qt3-assistant):\ - needs="x11"\ - section="Applications/Programming"\ - hints="TDE"\ - title="Qt3 Assistant"\ - command="/usr/bin/assistant-qt3" diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.postinst b/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.postinst deleted file mode 100644 index 137ecd777..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.postinst +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -set -e - -update-alternatives --install \ - /usr/bin/assistant assistant "/usr/bin/assistant-qt3" "45" \ - -#DEBHELPER# diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.prerm b/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.prerm deleted file mode 100644 index 9bcf8c713..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.prerm +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -set -e - -case "$1" in - upgrade) ;; - remove|failed-upgrade|deconfigure) - update-alternatives --remove assistant "/usr/bin/assistant-qt3" - ;; -esac - -#DEBHELPER# diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-designer-plugins.install b/ubuntu/_base/dependencies/qt3/debian/qt3-designer-plugins.install deleted file mode 100644 index 96c6ff294..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/qt3-designer-plugins.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/$(DEB_HOST_MULTIARCH)/qt3/plugins/designer/* diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-designer.install b/ubuntu/_base/dependencies/qt3/debian/qt3-designer.install deleted file mode 100644 index 56064e08f..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/qt3-designer.install +++ /dev/null @@ -1,7 +0,0 @@ -usr/bin/designer -usr/bin/createcw -usr/bin/conv2ui -usr/share/qt3/templates/* -usr/share/qt3/doc/html/designer*html -usr/share/qt3/doc/html/designer*dcf -usr/share/qt3/doc/html/designer*jpg diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-designer.links b/ubuntu/_base/dependencies/qt3/debian/qt3-designer.links deleted file mode 100644 index d25356b76..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/qt3-designer.links +++ /dev/null @@ -1 +0,0 @@ -/usr/bin/designer-qt3 /usr/share/qt3/bin/designer diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-designer.menu b/ubuntu/_base/dependencies/qt3/debian/qt3-designer.menu deleted file mode 100644 index 9b15d7bb5..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/qt3-designer.menu +++ /dev/null @@ -1,7 +0,0 @@ -?package(qt3-designer):\ - needs="x11"\ - section="Applications/Programming"\ - hints="TDE"\ - title="Qt3 Designer"\ - command="/usr/bin/designer-qt3" - diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-designer.postinst b/ubuntu/_base/dependencies/qt3/debian/qt3-designer.postinst deleted file mode 100644 index 147bf1bf8..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/qt3-designer.postinst +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -set -e - -update-alternatives --install \ - /usr/bin/designer designer "/usr/bin/designer-qt3" "45" \ - --slave /usr/share/man/man1/designer.1.gz designer.1.gz \ - "/usr/share/man/man1/designer-qt3.1.gz" - -#DEBHELPER# diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-designer.prerm b/ubuntu/_base/dependencies/qt3/debian/qt3-designer.prerm deleted file mode 100644 index c66496fd1..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/qt3-designer.prerm +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -set -e - -case "$1" in - upgrade) ;; - remove|failed-upgrade|deconfigure) - update-alternatives --remove designer "/usr/bin/designer-qt3" - ;; -esac - -#DEBHELPER# diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools-compat.install b/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools-compat.install deleted file mode 100644 index ce6f037cc..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools-compat.install +++ /dev/null @@ -1,5 +0,0 @@ -usr/bin/qtrename140 -usr/bin/qm2ts -usr/bin/mergetr -usr/bin/findtr -usr/bin/msg2qm diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools-embedded.install b/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools-embedded.install deleted file mode 100644 index 2954f7a4c..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools-embedded.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin/makeqpf -usr/bin/qvfb diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools-embedded.links b/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools-embedded.links deleted file mode 100644 index feacdd2c4..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools-embedded.links +++ /dev/null @@ -1,2 +0,0 @@ -/usr/bin/makeqpf /usr/share/qt3/bin/makeqpf -/usr/bin/qvfb /usr/share/qt3/bin/qvfb diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools.install b/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools.install deleted file mode 100644 index 57f9636e5..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools.install +++ /dev/null @@ -1,9 +0,0 @@ -usr/share/qt3/mkspecs/* -usr/share/qt3/doc/html/qmake*html -usr/share/qt3/doc/html/qmake*dcf -usr/bin/qmake -usr/bin/lupdate -usr/bin/lrelease -usr/bin/uic -usr/bin/moc -usr/bin/qembed diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools.links b/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools.links deleted file mode 100644 index 3a9ee784c..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools.links +++ /dev/null @@ -1,7 +0,0 @@ -/usr/share/qt3/mkspecs/linux-g++ /usr/share/qt3/mkspecs/default -/usr/bin/qmake-qt3 /usr/share/qt3/bin/qmake -/usr/bin/lupdate-qt3 /usr/share/qt3/bin/lupdate -/usr/bin/lrelease-qt3 /usr/share/qt3/bin/lrelease -/usr/bin/uic-qt3 /usr/share/qt3/bin/uic -/usr/bin/moc-qt3 /usr/share/qt3/bin/moc -/usr/bin/qembed /usr/share/qt3/bin/qembed diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools.postinst b/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools.postinst deleted file mode 100644 index 70ca043fe..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools.postinst +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -update-alternatives --install \ - /usr/bin/moc moc "/usr/bin/moc-qt3" "45" \ - --slave /usr/share/man/man1/moc.1.gz moc.1.gz \ - "/usr/share/man/man1/moc-qt3.1.gz" - -update-alternatives --install \ - /usr/bin/uic uic "/usr/bin/uic-qt3" "45" \ - --slave /usr/share/man/man1/uic.1.gz uic.1.gz \ - "/usr/share/man/man1/uic-qt3.1.gz" - -update-alternatives --install \ - /usr/bin/lupdate lupdate "/usr/bin/lupdate-qt3" "45" \ - --slave /usr/share/man/man1/lupdate.1.gz lupdate.1.gz \ - "/usr/share/man/man1/lupdate-qt3.1.gz" - -update-alternatives --install \ - /usr/bin/lrelease lrelease "/usr/bin/lrelease-qt3" "45" \ - --slave /usr/share/man/man1/lrelease.1.gz lrelease.1.gz \ - "/usr/share/man/man1/lrelease-qt3.1.gz" - -update-alternatives --install \ - /usr/bin/qmake qmake "/usr/bin/qmake-qt3" "45" \ - -#DEBHELPER# diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools.prerm b/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools.prerm deleted file mode 100644 index 3db3df44b..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools.prerm +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -set -e - -case "$1" in - upgrade) ;; - remove|failed-upgrade|deconfigure) - update-alternatives --remove moc "/usr/bin/moc-qt3" - update-alternatives --remove uic "/usr/bin/uic-qt3" - update-alternatives --remove lupdate "/usr/bin/lupdate-qt3" - update-alternatives --remove lrelease "/usr/bin/lrelease-qt3" - update-alternatives --remove qmake "/usr/bin/qmake-qt3" - ;; -esac - -#DEBHELPER# diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-doc.doc-base b/ubuntu/_base/dependencies/qt3/debian/qt3-doc.doc-base deleted file mode 100644 index 7a11cb2dc..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/qt3-doc.doc-base +++ /dev/null @@ -1,11 +0,0 @@ -Document: qt3-doc -Title: Qt Reference Documentation -Author: Troll Tech, The TDE Team -Abstract: Qt (TM) is a multi-platform C++ GUI toolkit. It is a product of - Troll Tech. It is supported on all major variants of Microsoft Windows and - Unix/X Windows. -Section: Apps/Programming - -Format: HTML -Index: /usr/share/doc/qt3-doc/html/index.html -Files: /usr/share/doc/qt3-doc/html/*.html diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-doc.docs b/ubuntu/_base/dependencies/qt3/debian/qt3-doc.docs deleted file mode 100644 index f08fd0f02..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/qt3-doc.docs +++ /dev/null @@ -1,2 +0,0 @@ -FAQ -README-QT.TXT diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-doc.links b/ubuntu/_base/dependencies/qt3/debian/qt3-doc.links deleted file mode 100644 index e8b1a344c..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/qt3-doc.links +++ /dev/null @@ -1,2 +0,0 @@ -/usr/share/man/man3 /usr/share/qt3/doc/man/man3 -/usr/share/qt3/doc/html /usr/share/doc/qt3-doc/html diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.install b/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.install deleted file mode 100644 index ff9ac89a1..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.install +++ /dev/null @@ -1,4 +0,0 @@ -usr/bin/linguist -usr/share/qt3/phrasebooks/* -usr/share/qt3/doc/html/linguist*html -usr/share/qt3/doc/html/linguist*dcf diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.links b/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.links deleted file mode 100644 index be3092258..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.links +++ /dev/null @@ -1 +0,0 @@ -/usr/bin/linguist-qt3 /usr/share/qt3/bin/linguist diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.menu b/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.menu deleted file mode 100644 index ebd7e43b7..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.menu +++ /dev/null @@ -1,6 +0,0 @@ -?package(qt3-linguist):\ - needs="x11"\ - section="Applications/Programming"\ - hints="TDE"\ - title="Qt3 Linguist"\ - command="/usr/bin/linguist-qt3" diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.postinst b/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.postinst deleted file mode 100644 index ed27c328b..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.postinst +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -set -e - -update-alternatives --install \ - /usr/bin/linguist linguist "/usr/bin/linguist-qt3" "45" \ - --slave /usr/share/man/man1/linguist.1.gz linguist.1.gz \ - "/usr/share/man/man1/linguist-qt3.1.gz" - -#DEBHELPER# diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.prerm b/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.prerm deleted file mode 100644 index 74b010627..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.prerm +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -set -e - -case "$1" in - upgrade) ;; - remove|failed-upgrade|deconfigure) - update-alternatives --remove linguist "/usr/bin/linguist-qt3" - ;; -esac - -#DEBHELPER# diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.install b/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.install deleted file mode 100644 index 8fcee756b..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.install +++ /dev/null @@ -1 +0,0 @@ -usr/bin/qtconfig diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.links b/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.links deleted file mode 100644 index 9a168aec4..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.links +++ /dev/null @@ -1 +0,0 @@ -/usr/bin/qtconfig-qt3 /usr/share/qt3/bin/qtconfig diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.menu b/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.menu deleted file mode 100644 index c8b243496..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.menu +++ /dev/null @@ -1,8 +0,0 @@ -?package(qt3-qtconfig):\ - needs="x11"\ - section="Applications/System/Administration"\ - title="Qt3 Config"\ - longtitle="Qt3 Configuration Utility"\ - hints="Qt3 config tool"\ - command="/usr/bin/qtconfig-qt3" - diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.postinst b/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.postinst deleted file mode 100644 index be89a0151..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.postinst +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -set -e - -update-alternatives --install \ - /usr/bin/qtconfig qtconfig "/usr/bin/qtconfig-qt3" "45" \ - --slave /usr/share/man/man1/qtconfig.1.gz qtconfig.1.gz \ - "/usr/share/man/man1/qtconfig-qt3.1.gz" - -#DEBHELPER# diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.prerm b/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.prerm deleted file mode 100644 index 3985383b4..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.prerm +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -set -e - -case "$1" in - upgrade) ;; - remove|failed-upgrade|deconfigure) - update-alternatives --remove qtconfig "/usr/bin/qtconfig-qt3" - ;; -esac - -#DEBHELPER# diff --git a/ubuntu/_base/dependencies/qt3/debian/qt_plugins_3.3rc b/ubuntu/_base/dependencies/qt3/debian/qt_plugins_3.3rc deleted file mode 100644 index 9fb7f9711..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/qt_plugins_3.3rc +++ /dev/null @@ -1,4 +0,0 @@ -[usr] -lib/trinity/plugins/styles/plastik.so=30306^e3^ei686 Linux g++-4.* full-config^e2006-09-29T20:06:31^e -lib/qt3/plugins/imageformats/libqmng.so=30306^e3^ei686 Linux g++-4.* full-config^e2006-08-25T18:22:18^e - diff --git a/ubuntu/_base/dependencies/qt3/debian/qtrc b/ubuntu/_base/dependencies/qt3/debian/qtrc deleted file mode 100644 index 4f44006ae..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/qtrc +++ /dev/null @@ -1,28 +0,0 @@ -[General] -GUIEffects=general^eanimatecombo^e -embedFonts=true -enableXft=true -font=Sans Serif,9,-1,5,50,0,0,0,0,0 -fontPath=\0 -useXft=true -style=Plastik - -[KDE] -contrast=7 - -[KWinPalette] -activeBackground=#1f26ad -activeBlend=#259bb8 -activeForeground=#ffffff -activeTitleBtnBg=#e6e6e6 -frame=#efefef -inactiveBackground=#cdcdcd -inactiveBlend=#ababab -inactiveForeground=#dddddd -inactiveFrame=#efefef -inactiveTitleBtnBg=#ebebeb - -[Palette] -active=#000000^e#dddfe4^e#ffffff^e#ffffff^e#555555^e#c7c7c7^e#000000^e#ffffff^e#000000^e#ffffff^e#efefef^e#000000^e#678db2^e#ffffff^e#0000ee^e#52188b^e -disabled=#808080^e#dddfe4^e#ffffff^e#ffffff^e#555555^e#c7c7c7^e#c7c7c7^e#ffffff^e#808080^e#ffffff^e#efefef^e#000000^e#567594^e#ffffff^e#0000ee^e#52188b^e -inactive=#000000^e#dddfe4^e#ffffff^e#ffffff^e#555555^e#c7c7c7^e#000000^e#ffffff^e#000000^e#ffffff^e#efefef^e#000000^e#678db2^e#ffffff^e#0000ee^e#52188b^e diff --git a/ubuntu/_base/dependencies/qt3/debian/rules b/ubuntu/_base/dependencies/qt3/debian/rules deleted file mode 100755 index 8666bebc4..000000000 --- a/ubuntu/_base/dependencies/qt3/debian/rules +++ /dev/null @@ -1,496 +0,0 @@ -#!/usr/bin/make -f - -# build variables -export QTDIR=$(shell pwd) - -# re-set $(LD_LIBRARY_PATH) -OLD_LD_LIBRARY_PATH := $(LD_LIBRARY_PATH) -export LD_LIBRARY_PATH=$(QTDIR)/lib:$(OLD_LD_LIBRARY_PATH) - -# fix path -OLD_PATH := $(PATH) -export PATH=$(QTDIR)/bin:$(OLD_PATH) - -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - -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) - -ifeq ($(DEB_HOST_ARCH_OS),hurd) - PLATFORM_ARG = hurd-g++ -else #hurd -ifeq ($(DEB_HOST_ARCH),sparc) - PLATFORM_ARG = linux-g++-sparc -else #sparc - PLATFORM_ARG = linux-g++ -endif #sparc -endif #hurd - -# quilt stuff -#include /usr/share/cdbs/1/rules/patchsys-quilt.mk - -# build variables (directorys) -DEBIAN = $(shell pwd)/debian -P_LIBS = $(DEBIAN)/libqt3-mt -P_DOC = $(DEBIAN)/qt3-doc -P_APPSDEV = $(DEBIAN)/qt3-apps-dev -P_HEADERS = $(DEBIAN)/libqt3-headers -P_QTMTDEV = $(DEBIAN)/libqt3-mt-dev - -TMP_INSTALL = $(DEBIAN)/tmp-install - -CONFIGURE_OPTS = \ - -prefix "/usr" \ - -sysconfdir "/etc/qt3" \ - -datadir "/usr/share/qt3" \ - -headerdir "/usr/include/qt3" \ - -docdir "/usr/share/qt3/doc" \ - -libdir "/usr/lib/$(DEB_HOST_MULTIARCH)" \ - -plugindir "/usr/lib/$(DEB_HOST_MULTIARCH)/qt3/plugins" \ - -translationdir "/usr/share/qt3/translations" \ - \ - -thread \ - -shared \ - -fast \ - -no-exceptions \ - -platform $(PLATFORM_ARG) \ - \ - -nis \ - -no-pch \ - -cups \ - -stl \ - -ipv6 \ - \ - -sm \ - -xshape \ - -xinerama \ - -xcursor \ - -xrandr \ - -xrender \ - -xft \ - -tablet \ - -xkb \ - \ - -system-zlib \ - -system-libpng \ - -system-libmng \ - -system-libjpeg \ - -system-nas-sound \ - \ - -enable-opengl \ - -dlopen-opengl \ - \ - -qt-gif \ - -qt-imgfmt-png \ - -qt-imgfmt-jpeg \ - -plugin-imgfmt-mng \ - \ - -plugin-sql-odbc \ - -plugin-sql-psql \ - -plugin-sql-mysql \ - -plugin-sql-ibase \ - -plugin-sql-sqlite \ - -plugin-sql-sqlite3 \ - \ - -I/usr/include/mysql \ - -I/usr/include/freetype2 \ - -I`pg_config --includedir` \ - -I`pg_config --includedir-server` \ - -L/usr/lib/$(DEB_HOST_MULTIARCH)\ - \ - -lfontconfig \ - -inputmethod \ - -glibmainloop \ - # End of CONFIGURE_OPTS - -interbase_archs := i386 amd64 sparc powerpc -ifneq ($(DEB_HOST_ARCH_CPU),$(findstring $(DEB_HOST_ARCH_CPU),$(interbase_archs))) - CONFIGURE_OPTS += -no-sql-ibase - IBASE = -Nlibqt3-mt-ibase -else - IBASE = -endif - -ifeq ($(DEB_HOST_ARCH_OS),hurd) - CONFIGURE_OPTS += -no-sql-ibase - IBASE = -Nlibqt3-mt-ibase -endif - -ifeq ($(DEB_HOST_ARCH),arm) - CONFIGURE_OPTS += -DQT_QLOCALE_USES_FCVT -endif - -post-patches:: - dh_testdir - -build build-arch: libqt-thread-stamp -build-indep: - - touch build-stamp - -libqt-thread-stamp: post-patches - - @echo "QTDIR is ${QTDIR}" - - dh_testdir - - echo yes | ./configure $(CONFIGURE_OPTS) - - rm -rf include/qinputcontext.h include/qinputcontextfactory.h include/qinputcontextplugin.h - ln -s ../src/kernel/qinputcontext.h include/qinputcontext.h - ln -s ../src/inputmethod/qinputcontextfactory.h include/qinputcontextfactory.h - ln -s ../src/inputmethod/qinputcontextplugin.h include/qinputcontextplugin.h - - # proceed - $(MAKE) sub-src sub-plugins sub-tools - $(MAKE) -C src INSTALL_ROOT=$(TMP_INSTALL) install_target - $(MAKE) INSTALL_ROOT=$(TMP_INSTALL) install - $(MAKE) INSTALL_ROOT=$(TMP_INSTALL) plugins-install - - # archives get accidentally stripped by make install. Copy over unstripped ones for now. - -cp lib/lib*.a $(TMP_INSTALL)/usr/lib/ - - cp bin/qtrename140 $(TMP_INSTALL)/usr/bin/ - cp bin/findtr $(TMP_INSTALL)/usr/bin/ - - # build conv2ui - cd tools/designer/tools/conv2ui && $(MAKE) - cp bin/conv2ui $(TMP_INSTALL)/usr/bin/conv2ui - - # build qvfb - cd tools/qvfb/ && $(MAKE) - cp tools/qvfb/qvfb $(TMP_INSTALL)/usr/bin/qvfb - - # install qmake.cache file - install -d $(P_QTMTDEV)/usr/share/qt3/ - cat .qmake.cache | sed "s#$(QTDIR)#/usr/share/qt3#g" > $(P_QTMTDEV)/usr/share/qt3/.qmake.cache - - # install qconfig.h for the mt - install -m 644 -D include/qconfig.h $(P_QTMTDEV)/usr/include/qt3/qconfig.h - install -m 644 -D include/qmodules.h $(P_QTMTDEV)/usr/include/qt3/qmodules.h - - install -m 644 -D include/qinputcontext.h $(P_HEADERS)/usr/include/qt3/qinputcontext.h - install -m 644 -D include/qinputcontextfactory.h $(P_HEADERS)/usr/include/qt3/qinputcontextfactory.h - install -m 644 -D include/qinputcontextplugin.h $(P_HEADERS)/usr/include/qt3/qinputcontextplugin.h - - touch libqt-thread-stamp - -clean:: - - dh_testdir - - -rm -rf debian/patched - -rm -rf build-stamp libqt-thread-stamp - - -chmod -R u+w * - -chmod a-x doc/html/layout?.png - - if [ -f "src/Makefile" ]; then \ - $(MAKE) -C src clean; $(MAKE) -C plugins/src distclean; $(MAKE) -C tools distclean; \ - $(MAKE) -C tools/makeqpf distclean; $(MAKE) -C tools/qconfig distclean; $(MAKE) -C tools/qvfb distclean; \ - $(MAKE) -C tools/msg2qm distclean; $(MAKE) -C tools/mergetr distclean; $(MAKE) -C tools/qembed distclean; \ - $(MAKE) -C tools/designer/tools/conv2ui distclean; $(MAKE) -C tools/designer/tools/createcw distclean; \ - $(MAKE) -C tools/designer/plugins/glade distclean; $(MAKE) -C tools/designer/plugins/qglwidget distclean; \ - $(MAKE) -C config.tests/unix/largefile distclean; $(MAKE) -C qmake distclean; \ - fi - - -rm -rf .qmake.cache src/.qmake.internal.cache tools/designer/designer/.qmake.internal.cache qmake/GNUmakefile \ - config.status bin/moc bin/qmake src/moc/*.o mkspecs/default lib/lib* `pwd`/debian/doc $(TMP_INSTALL) \ - src/tools/qconfig.cpp include/qconfig.h include/qmodules.h plugins/accessibleqtwidgets.prl \ - config.tests/unix/ipv6/ipv6test config.tests/unix/ipv6/ipv6test.o config.tests/unix/ptrsize/ptrsizetest.o \ - config.tests/unix/ptrsize/ptrsizetest config.tests/unix/endian/endiantest.o \ - config.tests/unix/endian/endiantest lib/qt-mt.pc extensions/nsplugin/examples/trivial/libtrivial.prl \ - extensions/nsplugin/examples/grapher/libgrapher.prl bin/designer - - rm -f qmake/*o - rm -rf include/qinputcontext.h include/qinputcontextfactory.h include/qinputcontextplugin.h - rm -f src/.obj/debug-shared-mt/*o plugins/src/inputmethods/imsw-multi/.obj/debug-shared-mt/*o plugins/inputmethods/*so - rm -f plugins/src/inputmethods/imsw-none/.obj/debug-shared-mt/*o plugins/src/inputmethods/simple/.obj/debug-shared-mt/*o plugins/src/inputmethods/xim/.obj/debug-shared-mt/*o - - # delete generated Makefiles but save the toplevel Makefile - -mv Makefile Makefile.save - for a in `find . -name 'Makefile'`; do rm -f "$$a"; done - -mv Makefile.save Makefile - - cd examples/ && find . -name '.obj' | xargs rm -rf - - # revert multi-arch path in install files - for a in debian/*install debian/*links; do \ - [ ! -f $$a.arch ] || \ - mv $$a.arch $$a; \ - done - - dh_clean - -install: build - - dh_testdir - dh_testroot - - dh_clean -i - dh_installdirs - - # update multi-arch path in install files - for a in debian/*install debian/*links; do \ - [ -d $$a ] || [ -f $$a.arch ] || \ - sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ - done - - # fix .prl files - for a in $(TMP_INSTALL)/usr/lib/$(DEB_HOST_MULTIARCH)/*prl; do cat "$$a" | sed \ - "s#$(QTDIR)#/usr/share/qt3#g" > "$$a".new && mv "$$a".new "$$a"; done - - dh_install $(IBASE) --sourcedir=$(TMP_INSTALL) - - ## build qt3-doc package - # copy all docs there first - install -d $(P_DOC)/usr/share/qt3/doc/html/ - for a in `cd $(TMP_INSTALL)/usr/share/qt3/doc/html/ && find`; do cp $(TMP_INSTALL)/usr/share/qt3/doc/html/"$$a" $(P_DOC)/usr/share/qt3/doc/html/; done - #typo bugfix - sed -i -e 's/reveives/receives/' $(P_DOC)/usr/share/qt3/doc/html/qwidget.html - - ## build designer package documentation - # qt3-designer - install -d `pwd`/debian/qt3-designer/usr/share/qt3/doc/html/ - for a in `cat doc/html/designer*.html doc/html/designer*.dcf | grep png | sed 's/^.*src=\"\([^\"]+\)\".*$$/\1/' | \ - perl -pe 's#<\?p[^>]+>##' | tee outputfile | perl -ne '/<img [^>]*(src=\"[^"]+\")/; print $$1' | \ - sed 's/src=//g' | sed 's/"/ /g'`; do cp doc/html/"$$a" `pwd`/debian/qt3-designer/usr/share/qt3/doc/html/ && \ - rm -rf $(P_DOC)/usr/share/qt3/doc/html/"$$a" || true; done - rm -rf outputfile `pwd`/debian/qt3-designer/usr/share/qt3/doc/html/logo32.png - rm -rf `pwd`/debian/qt3-doc/usr/share/qt3/doc/html/designer* - - ## build linguist package documentation - # qt3-linguist - install -d `pwd`/debian/qt3-linguist/usr/share/qt3/doc/html/ - for a in `cat doc/html/linguist*.html doc/html/linguist*.dcf | grep png | sed 's/^.*src=\"\([^\"]+\)\".*$$/\1/' | \ - perl -pe 's#<\?p[^>]+>##' | tee outputfile | perl -ne '/<img [^>]*(src=\"[^"]+\")/; print $$1' | \ - sed 's/src=//g' | sed 's/"/ /g'`; do cp doc/html/"$$a" `pwd`/debian/qt3-linguist/usr/share/qt3/doc/html/ && \ - rm -rf $(P_DOC)/usr/share/qt3/doc/html/"$$a" || true; done - rm -rf outputfile `pwd`/debian/qt3-linguist/usr/share/qt3/doc/html/logo32.png - rm -rf `pwd`/debian/qt3-doc/usr/share/qt3/doc/html/linguist* - - ## qt3-assistant - # remove docs from qt3-doc for qt-assistant - rm -rf `pwd`/debian/qt3-doc/usr/share/qt3/doc/html/assistant* - - ## all packages - # install the overrides files - #for a in debian/overrides/*; do install -d debian/`echo "$$a" | sed 's/debian\/overrides\///g'`/usr/share/lintian/overrides; done - #for a in debian/overrides/*; do cp "$$a" debian/`echo "$$a" | sed 's/debian\/overrides\///g'`/usr/share/lintian/overrides/`echo "$$a" | sed 's/debian\/overrides\///g'`; done - - chmod 644 debian/qt3-dev-tools/usr/share/qt3/mkspecs/aix-g++-64/qplatformdefs.h - chmod 644 debian/qt3-dev-tools/usr/share/qt3/mkspecs/macx-pbuilder/Info.plist.app - -binary-indep: build install - - # Build architecture-independent files here. - dh_testdir - dh_testroot - - dh_installdocs -i -XREADME.Debian - dh_installchangelogs -i changes-3.3.8 - dh_installchangelogs -i changes-3.3.8b - - find doc/man -path \*/CVS -prune -o -print | cpio -pmd $(P_DOC)/usr/share/qt3/doc/ - - -rm -f `find $(P_DOC)/usr/share/qt3/doc/ -name "*.o"` - find $(P_DOC) -type f -perm +0100 | xargs --no-run-if-empty rm -f - - install -d $(P_DOC)/usr/share/man/man3/ - - for i in $(P_DOC)/usr/share/qt3/doc/doc/man/man3/* ; do mv $$i $(P_DOC)/usr/share/man/man3/ ; done - - -rm -rf $(P_DOC)/usr/share/qt3/doc/doc - - # other i18n files - for a in `cd translations/ && find . -name 'qt_*.qm' | sed 's/qt_//' | sed 's/\.qm//' | sed 's/\.\///g'`; do \ - install -m644 -D `pwd`/translations/qt_"$$a".qm `pwd`/debian/libqt3-i18n/usr/share/qt3/translations/qt_"$$a".qm; done - - # logo32.png - cp `pwd`/doc/html/logo32.png `pwd`/debian/qt3-doc/usr/share/qt3/doc/html/ - - # remove qmake html docu from qt3-doc - rm -rf `pwd`/debian/qt3-doc/usr/share/qt3/doc/html/qmake* - - # create examples package - install -d `pwd`/debian/doc/qt3-examples/tools/designer - install -d `pwd`/debian/doc/qt3-examples/tools/linguist - cp -ax examples `pwd`/debian/doc/qt3-examples - cp -ax tutorial `pwd`/debian/doc/qt3-examples - cp -ax tools/designer/examples `pwd`/debian/doc/qt3-examples/tools/designer/ - cp -ax tools/linguist/tutorial `pwd`/debian/doc/qt3-examples/tools/linguist/ - for a in `cd $(DEBIAN)/doc/qt3-examples/ && find $(DEBIAN)/doc/qt3-examples/ -name 'tt1'`; do rm -f "$$a"; done - for a in `cd $(DEBIAN)/doc/qt3-examples/ && find $(DEBIAN)/doc/qt3-examples/ -name 'tt2'`; do rm -f "$$a"; done - for a in `cd $(DEBIAN)/doc/qt3-examples/ && find $(DEBIAN)/doc/qt3-examples/ -name 'tt3'`; do rm -f "$$a"; done - for a in `cd $(DEBIAN)/doc/qt3-examples/ && find $(DEBIAN)/doc/qt3-examples/ -name '.moc'`; do rm -rf "$$a"; done - for a in `cd $(DEBIAN)/doc/qt3-examples/ && find $(DEBIAN)/doc/qt3-examples/ -name '.obj'`; do rm -rf "$$a"; done - for a in `cd $(DEBIAN)/doc/qt3-examples/ && find $(DEBIAN)/doc/qt3-examples/ -name 'Makefile'`; do rm -f "$$a"; done - install -D `pwd`/debian/maintain/build-examples.sh `pwd`/debian/doc/qt3-examples/build-examples - chmod 755 `pwd`/debian/doc/qt3-examples/build-examples - cd `pwd`/debian/doc/ && tar cvvfz qt3-examples.tar.gz qt3-examples/ - install -D `pwd`/debian/doc/qt3-examples.tar.gz `pwd`/debian/qt3-examples/usr/share/doc/qt3-examples/qt3-examples.tar.gz - - # proceed - dh_compress -i -Xhtml/ - dh_link -i - - dh_fixperms -i - dh_installdeb -i - - dh_perl -i - dh_shlibdeps -i - - # fix shlibdeps madness - for a in `find debian/ -name '*.substvars'`; do cat "$$a" | sed 's/, xlibs (>> 4.1.0)//g' > "$$a".new && mv "$$a.new" "$$a"; done - - dh_gencontrol -i - dh_md5sums -i - - dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS) - -binary-arch: build install - - dh_testdir - dh_testroot - dh_installdirs -a - - ## create qt3-apps-dev-package - install -d $(P_APPSDEV)/usr/include/qt3/ - cp `pwd`/tools/designer/interfaces/*.h $(P_APPSDEV)/usr/include/qt3/ - cp `pwd`/tools/designer/editor/*.h $(P_APPSDEV)/usr/include/qt3/ - rm -rf `pwd`/debian/qt3-apps-dev/usr/include/qt3/preferences.ui.h - - ## qvfb package - install -m644 -D `pwd`/tools/qvfb/pda.skin `pwd`/debian/qt3-dev-tools-embedded/etc/qt3/qvfb/pda.skin - install -m644 -D `pwd`/tools/qvfb/pda_down.png `pwd`/debian/qt3-dev-tools-embedded/usr/share/qvfb/pda_down.png - install -m644 -D `pwd`/tools/qvfb/pda_up.png `pwd`/debian/qt3-dev-tools-embedded/usr/share/qvfb/pda_up.png - - # remove utterly ugle symlink - rm -rf `pwd`/debian/qt3-dev-tools//usr/share/qt3/mkspecs/linux-g++/linux-g++ - - # language file for linguist - install -d `pwd`/debian/qt3-linguist/usr/share/doc/qt3-linguist/ - cp translations/template.ts `pwd`/debian/qt3-linguist/usr/share/doc/qt3-linguist/qt_untranslated.ts - - # fix that stupid friggin professional file - perl -pi -e 's{\$$\$$QT_SOURCE_TREE}{$(QTDIR)}' src/qt_professional.pri - - ## i18n files for designer, linguist and assistant - (cd `pwd`/tools/designer/designer/ && lrelease designer.pro) - for a in `cd tools/designer/designer/ && find . -name 'designer_*.qm' | sed 's/designer_//' | sed 's/\.qm//' | sed 's/\.\///g'`; do \ - install -m644 -D tools/designer/designer/designer_"$$a".qm `pwd`/debian/qt3-designer/usr/share/qt3/translations/designer_"$$a".qm; done - rm -rf `pwd`/tools/designer/designer/*.qm - - (cd `pwd`/tools/assistant/ && lrelease assistant.pro) - for a in `cd tools/assistant/ && find . -name 'assistant_*.qm' | sed 's/assistant_//' | sed 's/\.qm//' | sed 's/\.\///g'`; do \ - install -m644 -D tools/assistant/assistant_"$$a".qm `pwd`/debian/qt3-assistant/usr/share/qt3/translations/assistant_"$$a".qm; done - rm -rf `pwd`/tools/assistant/*.qm `pwd`/debian/libqt3-i18n/usr/share/qt3/translations/assistant_de.qm - - (cd `pwd`/tools/linguist/linguist/ && lrelease linguist.pro) - for a in `cd tools/linguist/linguist/ && find . -name 'linguist_*.qm' | sed 's/linguist_//' | sed 's/\.qm//' | sed 's/\.\///g'`; do \ - install -m644 -D tools/linguist/linguist/linguist_"$$a".qm `pwd`/debian/qt3-linguist/usr/share/qt3/translations/linguist_"$$a".qm; done - rm -rf `pwd`/tools/linguist/linguist/*.qm - - # desktop lnk files - install -m644 -D debian/maintain/designer-qt3.desktop `pwd`/debian/qt3-designer/usr/share/applications/designer-qt3.desktop - install -m644 -D debian/maintain/linguist-qt3.desktop `pwd`/debian/qt3-linguist/usr/share/applications/linguist-qt3.desktop - - install -m644 -D debian/maintain/assistant-qt3.desktop `pwd`/debian/qt3-assistant/usr/share/applications/assistant-qt3.desktop - install -m644 -D debian/maintain/qt3config.desktop `pwd`/debian/qt3-qtconfig/usr/share/applications/qt3config.desktop - - # include logo32 for every program - cd `pwd`/debian/qt3-designer/usr/share/qt3/doc/html && for a in `find . -name '*.html'`; \ - do cat "$$a" | sed 's/logo32/logo32-designer/g' > "$$a".new && mv "$$a".new "$$a"; done - - cd `pwd`/debian/qt3-linguist/usr/share/qt3/doc/html && for a in `find . -name '*.html'`; \ - do cat "$$a" | sed 's/logo32/logo32-linguist/g' > "$$a".new && mv "$$a".new "$$a"; done - - cd `pwd`/debian/qt3-assistant/usr/share/qt3/doc/html && for a in `find . -name '*.html'`; \ - do cat "$$a" | sed 's/logo32/logo32-assistant/g' > "$$a".new && mv "$$a".new "$$a"; done - - cd `pwd`/debian/qt3-dev-tools/usr/share/qt3/doc/html && for a in `find . -name '*.html'`; \ - do cat "$$a" | sed 's/logo32/logo32-qmake/g' > "$$a".new && mv "$$a".new "$$a"; done - - for a in designer linguist assistant; do install -m644 -D `pwd`/doc/html/logo32.png `pwd`/debian/qt3-"$$a"/usr/share/qt3/doc/html/logo32-"$$a".png; done - install -m644 -D `pwd`/doc/html/logo32.png `pwd`/debian/qt3-dev-tools/usr/share/qt3/doc/html/logo32-qmake.png - - # fix qmake.conf files - cd `pwd`/debian/qt3-dev-tools/usr/share/qt3/mkspecs/ && for a in *; do cd "$$a" && cat qmake.conf | sed 's/\$$(QTDIR)\/include/\/usr\/share\/qt3\/include/g' | sed 's/\$$(QTDIR)/\/usr\/share\/qt3/g' | \ - sed 's/\-I\/usr\/include/&\/qt3/g' >> qmake.conf.new && mv qmake.conf.new qmake.conf && cd ../; done - - # build attic package and copy it to libqt3-ompat-headers - cd `pwd`/src/ && tar cvvfz attic.tar.gz attic/ - install -D `pwd`/src/attic.tar.gz `pwd`/debian/libqt3-compat-headers/usr/share/doc/libqt3-compat-headers/attic.tar.gz - rm -rf `pwd`/src/attic.tar.gz - - # rename some binaries to make qt3/4 installations possible - mv `pwd`/debian/qt3-designer/usr/bin/designer `pwd`/debian/qt3-designer/usr/bin/designer-qt3 - mv `pwd`/debian/qt3-dev-tools/usr/bin/uic `pwd`/debian/qt3-dev-tools/usr/bin/uic-qt3 - mv `pwd`/debian/qt3-dev-tools/usr/bin/moc `pwd`/debian/qt3-dev-tools/usr/bin/moc-qt3 - mv `pwd`/debian/qt3-dev-tools/usr/bin/lupdate `pwd`/debian/qt3-dev-tools/usr/bin/lupdate-qt3 - mv `pwd`/debian/qt3-dev-tools/usr/bin/lrelease `pwd`/debian/qt3-dev-tools/usr/bin/lrelease-qt3 - mv `pwd`/debian/qt3-dev-tools/usr/bin/qmake `pwd`/debian/qt3-dev-tools/usr/bin/qmake-qt3 - mv `pwd`/debian/qt3-qtconfig/usr/bin/qtconfig `pwd`/debian/qt3-qtconfig/usr/bin/qtconfig-qt3 - mv `pwd`/debian/qt3-assistant/usr/bin/assistant `pwd`/debian/qt3-assistant/usr/bin/assistant-qt3 - mv `pwd`/debian/qt3-linguist/usr/bin/linguist `pwd`/debian/qt3-linguist/usr/bin/linguist-qt3 - - install -D doc/man/man1/moc.1 `pwd`/debian/qt3-dev-tools/usr/share/man/man1/moc-qt3.1 - install -D doc/man/man1/uic.1 `pwd`/debian/qt3-dev-tools/usr/share/man/man1/uic-qt3.1 - install -D doc/man/man1/lrelease.1 `pwd`/debian/qt3-dev-tools/usr/share/man/man1/lrelease-qt3.1 - install -D doc/man/man1/lupdate.1 `pwd`/debian/qt3-dev-tools/usr/share/man/man1/lupdate-qt3.1 - - dh_link -pqt3-designer usr/share/qt3/doc/html usr/share/doc/qt3-designer/html - dh_link -pqt3-assistant usr/share/qt3/doc/html usr/share/doc/qt3-assistant/html - dh_link -pqt3-linguist usr/share/qt3/doc/html usr/share/doc/qt3-linguist/html - dh_link -pqt3-dev-tools usr/share/qt3/doc/html usr/share/doc/qt3-dev-tools/html - - # copy README.Debian - for a in libqt3-mt-dev libqt3-mt qt3-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/qt3-dev-tools/usr/bin/qmake - install -D `pwd`/qmake/qmake `pwd`/debian/qt3-dev-tools/usr/bin/qmake-qt3 - - # Install source for the designer tools, such as createcw. - cp -ra tools/designer/tools debian/qt3-designer/usr/share/qt3/tools - rm -f debian/qt3-designer/usr/share/qt3/tools/createcw/createcw - rm -rf debian/qt3-designer/usr/share/qt3/tools/createcw/.moc - rm -rf debian/qt3-designer/usr/share/qt3/tools/createcw/.obj - rm -f debian/qt3-designer/usr/share/qt3/tools/createcw/Makefile - rm -f debian/qt3-designer/usr/share/qt3/tools/conv2ui/conv2ui - rm -rf debian/qt3-designer/usr/share/qt3/tools/conv2ui/.moc - rm -rf debian/qt3-designer/usr/share/qt3/tools/conv2ui/.obj - rm -f debian/qt3-designer/usr/share/qt3/tools/conv2ui/Makefile - - # run remaining debhelper scripts - dh_installdocs -a $(IBASE) -XREADME.Debian - dh_installmenu -a $(IBASE) - - dh_installchangelogs -a $(IBASE) changes-3.3.8 - dh_installchangelogs -a $(IBASE) changes-3.3.8b - - dh_link -a $(IBASE) - dh_strip -a $(IBASE) --dbg-package=qt-x11-free-dbg - dh_compress -a $(IBASE) - dh_fixperms -a $(IBASE) - - # run remaining debhelper scripts - dh_makeshlibs -a $(IBASE) -V - dh_installdeb -a $(IBASE) - dh_perl -a $(IBASE) - dh_shlibdeps -a $(IBASE) -l`pwd`/debian/libqt3-mt/usr/lib - - # fix shlibdeps madness - for a in `find debian/ -name '*.substvars'`; do cat "$$a" | sed 's/, xlibs (>> 4.1.0)//g' > "$$a".new && mv "$$a.new" "$$a"; done - - # fix conffiles file for qt3-dev-tools-embedded - echo "/etc/qt3/qvfb/pda.skin" > `pwd`/debian/qt3-dev-tools-embedded/DEBIAN/conffiles - - dh_gencontrol -a $(IBASE) - dh_md5sums -a $(IBASE) - dh_builddeb -a $(IBASE) $(DEB_DH_BUILDDEB_ARGS) - -binary: binary-indep binary-arch -.PHONY: build build-arch binary-indep binary-arch binary install clean diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/compat b/ubuntu/_base/dependencies/sip4-tqt/debian/compat index 7f8f011eb..f599e28b8 100644 --- a/ubuntu/_base/dependencies/sip4-tqt/debian/compat +++ b/ubuntu/_base/dependencies/sip4-tqt/debian/compat @@ -1 +1 @@ -7 +10 diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/control b/ubuntu/_base/dependencies/sip4-tqt/debian/control index d7187b9e0..2c7df285c 100644 --- a/ubuntu/_base/dependencies/sip4-tqt/debian/control +++ b/ubuntu/_base/dependencies/sip4-tqt/debian/control @@ -1,63 +1,82 @@ Source: sip4-tqt Section: devel Priority: optional -Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +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 (>= 7.0.50~), python-all-dev (>= 2.3.5-10), python-all-dbg, 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 +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 -Replaces: python-sip-tqt-dbg (<< 4:14.0.0~) -Breaks: python-sip-tqt-dbg (<< 4:14.0.0~) 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/ubuntu/_base/dependencies/sip4-tqt/debian/dh_py3sip_tqt b/ubuntu/_base/dependencies/sip4-tqt/debian/dh_py3sip_tqt new file mode 100644 index 000000000..a59025f15 --- /dev/null +++ b/ubuntu/_base/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/ubuntu/_base/dependencies/sip4-tqt/debian/dh_sip_tqt b/ubuntu/_base/dependencies/sip4-tqt/debian/dh_sip_tqt deleted file mode 100644 index b1a8c19e3..000000000 --- a/ubuntu/_base/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/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1 b/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/dh_py3sip_tqt.1 index ea429fe9a..8539600cf 100644 --- a/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1 +++ b/ubuntu/_base/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/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/sip.1 b/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/sip-tqt.1 index ce178cc7e..ef824974f 100644 --- a/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/sip.1 +++ b/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/sip-tqt.1 @@ -1,26 +1,26 @@ .\" .\" Created by Ricardo Crdenes Medina <ricardo@conysis.com> -.\" for the Debian 'sip' package +.\" for the Debian 'sip-tqt' package .\" -.TH SIP 1 "2010/02/02" +.TH SIP-TQT 1 "2010/02/02" .SH NAME -sip \- generates C++/Python bindings +sip-tqt \- generates C++/Python bindings .SH SYNOPSIS -.B sip +.B sip-tqt [\fI-h\fR] [\fI-V\fR] [\fI-a file\fR] [\fI-c dir\fR] [\fI-d file\fR] [\fI-e\fR] [\fI-g\fR] [\fI-I dir\fR] [\fI-j #\fR] [\fI-k\fR] [\fI-m file\fR] [\fI-o\fR] [\fI-p module\fR] [\fI-P\fR] [\fI-r\fR] [\fI-s suffix\fR] [\fI-t tag\fR] [\fI-w\fR] [\fI-x feature\fR] [\fI-z file\fR] [\fIfile\fR] .SH DESCRIPTION -.B sip +.B sip-tqt takes a set of specification files and generates C++ code, documentation and build files. The format of the needed specification file is similar to a C++ header. -sip includes run-time support for the generated code. +sip-tqt includes run-time support for the generated code. .SH OPTIONS .TP .B \-h Show summary of options. .TP .B \-V -Display the sip version number +Display the sip-tqt version number .TP .B \-a file The name of the QScintilla API file. If not indicated, it will not @@ -43,7 +43,7 @@ Enable support for exceptions. Disabled by default. Always release and reaquire the GIL. .TP .B -I dir -Directory where sip can search for included files. +Directory where sip-tqt can search for included files. .TP .B -j number Splits the generated code in \fInumber\fR files (1 by default). This @@ -66,7 +66,7 @@ The suffix used for generated C or C++ files (".c" or ".cpp" if none specified) .TP .B -t tag The primary version to tag generate code for. You only can specify those -defined with a %Timeline directive. If you don't specify one, sip +defined with a %Timeline directive. If you don't specify one, sip-tqt will generate the latest available. .TP .B -w @@ -80,7 +80,7 @@ The name of a file containing additional command line flags .TP .B file The name of the file containing the specification. If you skip it, -sip will expect to be fed by stdin. +sip-tqt will expect to be fed by stdin. .SH AUTHOR This manual page was written by Ricardo Javier Cardenes Medina <rcardenes@debian.org> and Torsten Marek <shlomme@debian.org>, for the Debian GNU/Linux system (but may be used by others). diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/patches/series b/ubuntu/_base/dependencies/sip4-tqt/debian/patches/series index 0b31a69ff..e69de29bb 100644 --- a/ubuntu/_base/dependencies/sip4-tqt/debian/patches/series +++ b/ubuntu/_base/dependencies/sip4-tqt/debian/patches/series @@ -1,2 +0,0 @@ -# siputils_debian_changes.diff -# siputils_objdir_module_fix.diff diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff b/ubuntu/_base/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff deleted file mode 100644 index 2640f57c2..000000000 --- a/ubuntu/_base/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/ubuntu/_base/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff b/ubuntu/_base/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff deleted file mode 100644 index 3c4570b21..000000000 --- a/ubuntu/_base/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/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install b/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install deleted file mode 100644 index 1df36c612..000000000 --- a/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install +++ /dev/null @@ -1 +0,0 @@ -usr/bin/* diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.links b/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.links deleted file mode 100644 index fdd5af4cc..000000000 --- a/ubuntu/_base/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/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages b/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages deleted file mode 100644 index ba33bb512..000000000 --- a/ubuntu/_base/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/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install b/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install deleted file mode 100644 index 9639c2814..000000000 --- a/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python*/*-packages/sip4_tqt/sip.so diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.docs b/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.docs index 416a453aa..416a453aa 100644 --- a/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.docs +++ b/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.docs diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.install b/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.install new file mode 100644 index 000000000..8c6fee21f --- /dev/null +++ b/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.install @@ -0,0 +1 @@ +../dh_py3sip_tqt /usr/bin/ diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.links b/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.links new file mode 100644 index 000000000..47086f7df --- /dev/null +++ b/ubuntu/_base/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/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.manpages b/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.manpages new file mode 100644 index 000000000..42f51bda1 --- /dev/null +++ b/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.manpages @@ -0,0 +1 @@ +debian/manpages/dh_py3sip_tqt.1 diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt.install b/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt.install new file mode 100644 index 000000000..5603520f7 --- /dev/null +++ b/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt.install @@ -0,0 +1 @@ +usr/lib/python3.*/*-packages/sip_tqt.so diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/pyversions b/ubuntu/_base/dependencies/sip4-tqt/debian/pyversions deleted file mode 100644 index 57a7586e4..000000000 --- a/ubuntu/_base/dependencies/sip4-tqt/debian/pyversions +++ /dev/null @@ -1 +0,0 @@ -2.3- diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/rules b/ubuntu/_base/dependencies/sip4-tqt/debian/rules index 86a541601..7050c5431 100755 --- a/ubuntu/_base/dependencies/sip4-tqt/debian/rules +++ b/ubuntu/_base/dependencies/sip4-tqt/debian/rules @@ -2,11 +2,25 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +# 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 + +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= @@ -17,12 +31,9 @@ else CFLAGS += -O2 -g endif -PYTHONS := $(shell pyversions -vr debian/control) +PYTHONS := $(shell py3versions -vr) -DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport) -DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport) - --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 @@ -40,8 +51,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="" touch $@ @@ -50,9 +60,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 $@ @@ -74,12 +82,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, @@ -90,36 +99,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 -ifneq (dh_pysupport,${DH_PYTHON2}) - # install *_d.py into wrong package to prevent deletion in dh_python2 - install -m 644 -o root -g root dbg-build-$*/sipconfig.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/sipconfig_d.py -else - 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 -endif - 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 @@ -135,24 +137,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 - ${DH_PYTHON2} -ifneq (dh_pysupport,${DH_PYTHON2}) - # move *_d.py back into right package - find debian/python-sip-tqt -name "*_d.py" | \ - while read f; do \ - f1="debian/python-sip-tqt-dbg/$${f#debian/python-sip-tqt/}"; \ - mkdir -p "$${f1%/*}"; \ - mv "$${f}" "$${f1}" ; \ - done -endif + dh_python3 --no-dbg-cleaning dh_installdeb dh_shlibdeps dh_gencontrol diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/sip-tqt-dev.install b/ubuntu/_base/dependencies/sip4-tqt/debian/sip-tqt-dev.install new file mode 100644 index 000000000..07438bc04 --- /dev/null +++ b/ubuntu/_base/dependencies/sip4-tqt/debian/sip-tqt-dev.install @@ -0,0 +1 @@ +usr/bin/sip-tqt diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/sip-tqt-dev.manpages b/ubuntu/_base/dependencies/sip4-tqt/debian/sip-tqt-dev.manpages new file mode 100644 index 000000000..1570b539a --- /dev/null +++ b/ubuntu/_base/dependencies/sip4-tqt/debian/sip-tqt-dev.manpages @@ -0,0 +1 @@ +debian/manpages/sip-tqt.1 diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py b/ubuntu/_base/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py new file mode 100644 index 000000000..a937df69a --- /dev/null +++ b/ubuntu/_base/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/ubuntu/_base/dependencies/sip4-tqt/debian/sipconfig.py b/ubuntu/_base/dependencies/sip4-tqt/debian/sipconfig.py deleted file mode 100644 index a9e761f08..000000000 --- a/ubuntu/_base/dependencies/sip4-tqt/debian/sipconfig.py +++ /dev/null @@ -1,13 +0,0 @@ -# import the sipconfig.py for the normal or the debug build - -import sys - -if getattr(sys, "pydebug", False): - try: - from sipconfig_d import * - from sipconfig_d import _pkg_config, _default_macros - except ImportError, msg: - raise ImportError, 'No module named sipconfig; package python-sip-tqt-dbg not installed' -else: - from sipconfig_nd import * - from sipconfig_nd import _pkg_config, _default_macros diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/watch b/ubuntu/_base/dependencies/sip4-tqt/debian/watch deleted file mode 100644 index 1ff1f0839..000000000 --- a/ubuntu/_base/dependencies/sip4-tqt/debian/watch +++ /dev/null @@ -1,3 +0,0 @@ -version=3 -http://www.riverbankcomputing.co.uk/software/sip/download \ - /static/Downloads/sip4/sip-([\d\.]*)\.tar\.gz debian uupdate diff --git a/ubuntu/_base/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl b/ubuntu/_base/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl new file mode 100644 index 000000000..6bbbec325 --- /dev/null +++ b/ubuntu/_base/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/ubuntu/_base/dependencies/tde-cmake/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/tde-cmake/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..aba508624 --- /dev/null +++ b/ubuntu/_base/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_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el + +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +DEB_BUILD_PARALLEL ?= true + +cdbs_configure_flags += \ + --with-qt-dir=/usr/share/qt3 \ + --disable-rpath \ + --with-xinerama \ + $(cdbs_kde_enable_final) \ + $(cdbs_kde_enable_debug) + + +# This is a convenience target for calling manually. +# It's not part of the build process. +buildprep: clean apply-patches +ifndef _cdbs_class_cmake + $(MAKE) -f admin/Makefile.common dist +endif + debian/rules clean + +.tdepkginfo: + echo "# TDE package information" >.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo + date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo + +post-patches:: .tdepkginfo + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + # update multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ + sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ + done + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + # revert multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ ! -f $$a.arch ] || \ + mv $$a.arch $$a; \ + done + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \ + test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f .tdepkginfo + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/ubuntu/_base/dependencies/tde-cmake/debian/cdbs/versions.pl b/ubuntu/_base/dependencies/tde-cmake/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/ubuntu/_base/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/ubuntu/_base/dependencies/tde-cmake/debian/changelog b/ubuntu/_base/dependencies/tde-cmake/debian/changelog new file mode 100644 index 000000000..368e8ed98 --- /dev/null +++ b/ubuntu/_base/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/ubuntu/_base/dependencies/tde-cmake/debian/compat b/ubuntu/_base/dependencies/tde-cmake/debian/compat new file mode 100644 index 000000000..f599e28b8 --- /dev/null +++ b/ubuntu/_base/dependencies/tde-cmake/debian/compat @@ -0,0 +1 @@ +10 diff --git a/ubuntu/_base/dependencies/tde-cmake/debian/control b/ubuntu/_base/dependencies/tde-cmake/debian/control new file mode 100644 index 000000000..54248affb --- /dev/null +++ b/ubuntu/_base/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/ubuntu/_base/dependencies/tde-cmake/debian/copyright b/ubuntu/_base/dependencies/tde-cmake/debian/copyright new file mode 100644 index 000000000..82d825030 --- /dev/null +++ b/ubuntu/_base/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/ubuntu/_base/dependencies/tde-cmake/debian/patches/series b/ubuntu/_base/dependencies/tde-cmake/debian/patches/series new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/ubuntu/_base/dependencies/tde-cmake/debian/patches/series diff --git a/ubuntu/_base/dependencies/tde-cmake/debian/rules b/ubuntu/_base/dependencies/tde-cmake/debian/rules new file mode 100755 index 000000000..95a42b3f7 --- /dev/null +++ b/ubuntu/_base/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/ubuntu/_base/dependencies/tqca-tls/debian/source/format b/ubuntu/_base/dependencies/tde-cmake/debian/source/format index 163aaf8d8..163aaf8d8 100644 --- a/ubuntu/_base/dependencies/tqca-tls/debian/source/format +++ b/ubuntu/_base/dependencies/tde-cmake/debian/source/format diff --git a/ubuntu/_base/dependencies/tqca-tls/debian/source/options b/ubuntu/_base/dependencies/tde-cmake/debian/source/options index 72f1f5450..72f1f5450 100644 --- a/ubuntu/_base/dependencies/tqca-tls/debian/source/options +++ b/ubuntu/_base/dependencies/tde-cmake/debian/source/options diff --git a/ubuntu/_base/dependencies/tqca-tls/debian/changelog b/ubuntu/_base/dependencies/tqca-tls/debian/changelog deleted file mode 100644 index 7f1c440b0..000000000 --- a/ubuntu/_base/dependencies/tqca-tls/debian/changelog +++ /dev/null @@ -1,84 +0,0 @@ -tqca-tls (1.0-0) maverick; urgency=low - - * TQt upload - - -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 17 Dec 2011 19:48:00 -0600 - -qca-tls (1.0-5) natty; urgency=low - - * Natty upload - - -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 15 Aug 2011 13:51:00 -0600 - -qca-tls (1.0-4) unstable; urgency=low - - * Honour DEB_BUILD_OPTIONS=nostrip (Closes: Bug#437850) - * Fixed a intian warning - - -- Jan Niehusmann <jan@debian.org> Tue, 14 Aug 2007 17:13:06 +0200 - -qca-tls (1.0-3) unstable; urgency=low - - * Changed two type conversions to const to make gcc happy - (Closes: Bug#337449) - * Set Standards-Version to 3.6.2.0 - - -- Jan Niehusmann <jan@debian.org> Thu, 15 Dec 2005 22:59:09 +0100 - -qca-tls (1.0-2) unstable; urgency=low - - * Recompiled for C++ ABI transition. - - -- Jan Niehusmann <jan@debian.org> Fri, 26 Aug 2005 18:10:30 +0000 - -qca-tls (1.0-1) unstable; urgency=low - - * Most of the following changes were done by Peter Palfrader - <weasel@debian.org> - many thanks to him! - * New upstream version (closes: #235093). - * qca-tls is a non-native package now (closes: #235084). - * Clean up properly in clean target: - rm -rf .ui .moc .obj Makefile conf.log conf.pri extra.pri - (closes: #235089). - * Do not copy over config.{sub,guess} from /usr/share during - build. They are not needed at all (closes: #235085). - * Remove debian/qca.doc-base.EX example file (closes: #235092). - * Do not ship readme in the binary package: it's just install - instructions (closes: #234939). - * Something changed that makes the configure script make the - Makefile install the .so into usr/lib, as opposed to usr/share - (closes: #233530). At any rate, we will not claim to have - built a working package if it happens again: - * Make the build fail if we don't have a - usr/lib/qt3/plugins/crypto/libqca-tls.so file after install. - * Make stamps in debian/rules actually work. - * Update copyright file to list current download link - * Added QMAKE_PROJECT_DEPTH=0 to .pro file to make qca-tls build in - nested directory structures. - - -- Jan Niehusmann <jan@debian.org> Sat, 28 Feb 2004 13:35:28 +0100 - -qca-tls (0.0-CVS-20031209-1.3) unstable; urgency=low - - * Damn. Added build-depends on libssl-dev... - - -- Jan Niehusmann <jan@debian.org> Fri, 13 Feb 2004 15:06:45 +0100 - -qca-tls (0.0-CVS-20031209-1.2) unstable; urgency=low - - * Added build-depends on libqt3-mt-dev - - -- Jan Niehusmann <jan@debian.org> Fri, 13 Feb 2004 13:27:34 +0100 - -qca-tls (0.0-CVS-20031209-1.1) unstable; urgency=low - - * Upload to unstable - - -- Jan Niehusmann <jan@debian.org> Thu, 12 Feb 2004 20:28:19 +0100 - -qca-tls (0.0-CVS-20031209-1) experimental; urgency=low - - * Initial Release. - * New upstream version - - -- Jan Niehusmann <jan@debian.org> Wed, 10 Dec 2003 12:21:07 +0100 diff --git a/ubuntu/_base/dependencies/tqca-tls/debian/compat b/ubuntu/_base/dependencies/tqca-tls/debian/compat deleted file mode 100644 index 7f8f011eb..000000000 --- a/ubuntu/_base/dependencies/tqca-tls/debian/compat +++ /dev/null @@ -1 +0,0 @@ -7 diff --git a/ubuntu/_base/dependencies/tqca-tls/debian/copyright b/ubuntu/_base/dependencies/tqca-tls/debian/copyright deleted file mode 100644 index e64397c08..000000000 --- a/ubuntu/_base/dependencies/tqca-tls/debian/copyright +++ /dev/null @@ -1,20 +0,0 @@ -This package was debianized by Jan Niehusmann <jan@debian.org> on -Tue, 9 Dec 2003 19:30:45 +0100. - -It was downloaded from http://psi.affinix.com/?page=download - - -Upstream Author: Justin Karneges <justin-psi@affinix.com> - -Copyright: - -Copyright (C) 2003 Justin Karneges - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -On Debian systems, the complete text of the GNU Lesser General Public -License can be found in /usr/share/common-licenses/LGPL file. - diff --git a/ubuntu/_base/dependencies/tqca-tls/debian/rules b/ubuntu/_base/dependencies/tqca-tls/debian/rules deleted file mode 100755 index 22ec88d79..000000000 --- a/ubuntu/_base/dependencies/tqca-tls/debian/rules +++ /dev/null @@ -1,120 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - - -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) - - -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif - -# shared library versions, option 1 -version=2.0.5 -major=2 -# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so -#version=`ls src/.libs/lib*.so.* | \ -# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` -#major=`ls src/.libs/lib*.so.* | \ -# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` - -configure: configure-stamp -configure-stamp: - dh_testdir - # Add here commands to configure the package. - CFLAGS="$(CFLAGS)" ./configure - touch configure-stamp - -build: configure-stamp build-stamp -build-stamp: - dh_testdir - - # Add here commands to compile the package. - $(MAKE) - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - - # Add here commands to clean up after the build process. - [ ! -f Makefile ] || $(MAKE) distclean - rm -rf .ui .moc .obj Makefile conf.log conf.pri extra.pri - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # update multi-arch path in install files - for a in debian/*install; do \ - [ -d $$a ] || [ -f $$a.arch ] || \ - sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ - done - - # Add here commands to install the package into debian/tmp - $(MAKE) install INSTALL_ROOT=$(CURDIR)/debian/tmp/ - [ -e $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/crypto/libtqca-tls.so ] || ( echo "libtqca-tls.so not in usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/crypto/libtqca-tls.so" && exit 1 ) - - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples - dh_install --sourcedir=debian/tmp --list-missing -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_installinit -# dh_installcron -# dh_installinfo - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_perl -# dh_python -# dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb $(DEB_DH_BUILDDEB_ARGS) - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install diff --git a/ubuntu/_base/dependencies/tqca-tls/debian/tqca-tls.install b/ubuntu/_base/dependencies/tqca-tls/debian/tqca-tls.install deleted file mode 100644 index bf57d3931..000000000 --- a/ubuntu/_base/dependencies/tqca-tls/debian/tqca-tls.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/crypto/* diff --git a/ubuntu/_base/dependencies/tqca/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/tqca/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..aba508624 --- /dev/null +++ b/ubuntu/_base/dependencies/tqca/debian/cdbs/debian-tde.mk @@ -0,0 +1,251 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Copyright © 2019 TDE Team +# Description: A class for TDE packages; sets TDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch debian/stamp-cvs-make + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +ifdef _cdbs_class_cmake +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif +endif + +ifndef _cdbs_rules_patchsys_quilt +DEB_PATCHDIRS := debian/patches/common debian/patches +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el + +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +DEB_BUILD_PARALLEL ?= true + +cdbs_configure_flags += \ + --with-qt-dir=/usr/share/qt3 \ + --disable-rpath \ + --with-xinerama \ + $(cdbs_kde_enable_final) \ + $(cdbs_kde_enable_debug) + + +# This is a convenience target for calling manually. +# It's not part of the build process. +buildprep: clean apply-patches +ifndef _cdbs_class_cmake + $(MAKE) -f admin/Makefile.common dist +endif + debian/rules clean + +.tdepkginfo: + echo "# TDE package information" >.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo + date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo + +post-patches:: .tdepkginfo + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + # update multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ + sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ + done + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + # revert multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ ! -f $$a.arch ] || \ + mv $$a.arch $$a; \ + done + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \ + test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f .tdepkginfo + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/ubuntu/_base/dependencies/tqca/debian/cdbs/versions.pl b/ubuntu/_base/dependencies/tqca/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/ubuntu/_base/dependencies/tqca/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/_base/dependencies/tqca/debian/changelog b/ubuntu/_base/dependencies/tqca/debian/changelog new file mode 100644 index 000000000..b560f163e --- /dev/null +++ b/ubuntu/_base/dependencies/tqca/debian/changelog @@ -0,0 +1,11 @@ +tqca (4:14.1.0~s39-0debian10.0.0+0) buster; urgency=low + + * Merge libtqca and tqca-tls into one source package. + + -- Slávek Banko <slavek.banko@axis.cz> Thu, 20 May 2021 01:20:50 +0200 + +libtqca (4:14.1.0~s3-0debian10.0.0+0) buster; urgency=low + + * Initial git build + + -- Slávek Banko <slavek.banko@axis.cz> Fri, 03 Jan 2020 14:50:41 +0100 diff --git a/ubuntu/_base/dependencies/tqca/debian/compat b/ubuntu/_base/dependencies/tqca/debian/compat new file mode 100644 index 000000000..f599e28b8 --- /dev/null +++ b/ubuntu/_base/dependencies/tqca/debian/compat @@ -0,0 +1 @@ +10 diff --git a/ubuntu/_base/dependencies/tqca-tls/debian/control b/ubuntu/_base/dependencies/tqca/debian/control index 8c719a019..91abded59 100644 --- a/ubuntu/_base/dependencies/tqca-tls/debian/control +++ b/ubuntu/_base/dependencies/tqca/debian/control @@ -1,9 +1,28 @@ -Source: tqca-tls +Source: tqca Section: libs Priority: optional -Maintainer: Jan Niehusmann <jan@debian.org> -Build-Depends: debhelper (>= 7.0.50~), libtqtinterface-dev, libssl-dev -Standards-Version: 3.8.4 +Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libtqtinterface-dev, libssl-dev +Standards-Version: 3.8.3 + +Package: libtqca +Architecture: any +Multi-Arch: same +Section: libs +Depends: ${shlibs:Depends} +Description: + libtqca provides TQt interface for security plugins + +Package: libtqca-dev +Architecture: any +Multi-Arch: foreign +Section: libdevel +Depends: libtqca (= ${binary:Version}), libtqtinterface-dev +Description: + libtqca provides TQt interface for security plugins + . + This is the development package containing header files and link + libraries for libtqca. Package: tqca-tls Section: libs @@ -16,7 +35,7 @@ Description: TLS plugin for the TQt Cryptographic Architecture (TQCA) This is a plugin to provide SSL/TLS capability to programs that utilize the TQt Cryptographic Architecture (TQCA). . - TQCA is a library providing an easy API for several cryptographic algorithms + TQCA is a library providing an easy API for several cryptographic algorithms to TQt programs. . At the moment only the tqca-tls plugin is packaged for debian, as it's diff --git a/ubuntu/_base/dependencies/tqca/debian/copyright b/ubuntu/_base/dependencies/tqca/debian/copyright new file mode 100644 index 000000000..4cc18ef1e --- /dev/null +++ b/ubuntu/_base/dependencies/tqca/debian/copyright @@ -0,0 +1,12 @@ +This package was debianized by Slávek Banko <slavek.banko@axis.cz> + +Copyright: + +Copyright 2003 Justin Karneges <justin@affinix.com> +Copyright 2010-2020 TDE Team + +License: + +All libraries in this package are released under the GPL +(/usr/share/common-licenses/GPL-3). The programs and examples are +under the GPL (/usr/share/common-licenses/GPL). diff --git a/ubuntu/_base/dependencies/tqca/debian/libtqca-dev.install b/ubuntu/_base/dependencies/tqca/debian/libtqca-dev.install new file mode 100644 index 000000000..c8926e8cd --- /dev/null +++ b/ubuntu/_base/dependencies/tqca/debian/libtqca-dev.install @@ -0,0 +1,4 @@ +debian/tmp/usr/include/tqt3/* +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libtqca.la +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libtqca.so +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/* diff --git a/ubuntu/_base/dependencies/tqca/debian/libtqca.docs b/ubuntu/_base/dependencies/tqca/debian/libtqca.docs new file mode 100644 index 000000000..e845566c0 --- /dev/null +++ b/ubuntu/_base/dependencies/tqca/debian/libtqca.docs @@ -0,0 +1 @@ +README diff --git a/ubuntu/_base/dependencies/tqca/debian/libtqca.install b/ubuntu/_base/dependencies/tqca/debian/libtqca.install new file mode 100644 index 000000000..f9fa13568 --- /dev/null +++ b/ubuntu/_base/dependencies/tqca/debian/libtqca.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libtqca.so.* diff --git a/ubuntu/_base/dependencies/tqca/debian/patches/series b/ubuntu/_base/dependencies/tqca/debian/patches/series new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/ubuntu/_base/dependencies/tqca/debian/patches/series diff --git a/ubuntu/_base/dependencies/tqca/debian/rules b/ubuntu/_base/dependencies/tqca/debian/rules new file mode 100755 index 000000000..bcf875516 --- /dev/null +++ b/ubuntu/_base/dependencies/tqca/debian/rules @@ -0,0 +1,20 @@ +#! /usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk +include debian/cdbs/debian-tde.mk + +ifdef DEB_HOST_MULTIARCH + CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH) +else + CMAKE_INSTALL_LIBDIR = lib +endif + +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" diff --git a/ubuntu/_base/dependencies/tqca/debian/source/format b/ubuntu/_base/dependencies/tqca/debian/source/format new file mode 100644 index 000000000..163aaf8d8 --- /dev/null +++ b/ubuntu/_base/dependencies/tqca/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/ubuntu/_base/dependencies/tqca/debian/source/options b/ubuntu/_base/dependencies/tqca/debian/source/options new file mode 100644 index 000000000..72f1f5450 --- /dev/null +++ b/ubuntu/_base/dependencies/tqca/debian/source/options @@ -0,0 +1,6 @@ +# Use xz instead of gzip +compression = "xz" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/_base/dependencies/tqca/debian/tqca-tls.docs b/ubuntu/_base/dependencies/tqca/debian/tqca-tls.docs new file mode 100644 index 000000000..e845566c0 --- /dev/null +++ b/ubuntu/_base/dependencies/tqca/debian/tqca-tls.docs @@ -0,0 +1 @@ +README diff --git a/ubuntu/_base/dependencies/tqca/debian/tqca-tls.install b/ubuntu/_base/dependencies/tqca/debian/tqca-tls.install new file mode 100644 index 000000000..02d23f437 --- /dev/null +++ b/ubuntu/_base/dependencies/tqca/debian/tqca-tls.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/tqscintilla/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..aba508624 --- /dev/null +++ b/ubuntu/_base/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)/opt/trinity/lib && \ + test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f .tdepkginfo + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/cdbs/versions.pl b/ubuntu/_base/dependencies/tqscintilla/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/ubuntu/_base/dependencies/tqscintilla/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/compat b/ubuntu/_base/dependencies/tqscintilla/debian/compat index 7f8f011eb..f599e28b8 100644 --- a/ubuntu/_base/dependencies/tqscintilla/debian/compat +++ b/ubuntu/_base/dependencies/tqscintilla/debian/compat @@ -1 +1 @@ -7 +10 diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/control b/ubuntu/_base/dependencies/tqscintilla/debian/control index c92ea8db1..0ce7442c2 100644 --- a/ubuntu/_base/dependencies/tqscintilla/debian/control +++ b/ubuntu/_base/dependencies/tqscintilla/debian/control @@ -1,17 +1,19 @@ Source: tqscintilla Section: libs Priority: optional -Maintainer: Ricardo Javier Cardenes Medina <rcardenes@debian.org> +Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Torsten Marek <shlomme@debian.org> -Build-Depends: debhelper (>= 7.0.50~), 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: all +Architecture: any +Multi-Arch: foreign Replaces: libtqscintilla-dev (<< 4:14.0.0~) Breaks: libtqscintilla-dev (<< 4:14.0.0~) Depends: libtqscintilla7 (>= ${source:Version}) @@ -36,6 +52,7 @@ Description: TQt source code editing component - development files Package: libtqscintilla-doc Section: doc Architecture: all +Multi-Arch: foreign Replaces: libtqscintilla-doc (<< 4:14.0.0~) Breaks: libtqscintilla-doc (<< 4:14.0.0~) Suggests: libtqscintilla-dev diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/dirs b/ubuntu/_base/dependencies/tqscintilla/debian/dirs deleted file mode 100644 index ca882bbb7..000000000 --- a/ubuntu/_base/dependencies/tqscintilla/debian/dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin -usr/sbin diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/docs b/ubuntu/_base/dependencies/tqscintilla/debian/docs index edc007104..50bd824bb 100644 --- a/ubuntu/_base/dependencies/tqscintilla/debian/docs +++ b/ubuntu/_base/dependencies/tqscintilla/debian/docs @@ -1 +1,2 @@ NEWS +README diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-dev.install b/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-dev.install index e183cf963..8a9449faa 100644 --- a/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-dev.install +++ b/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-dev.install @@ -1,2 +1,3 @@ usr/include -usr/lib/*.so +usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig +usr/lib/$(DEB_HOST_MULTIARCH)/*.so diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-doc.install b/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-doc.install index 005276324..d66379c9a 100644 --- a/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-doc.install +++ b/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-doc.install @@ -1 +1 @@ -usr/share/doc/libtqscintilla-doc +usr/share/doc/libtqscintilla/HTML diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla7-i18n.install b/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla7-i18n.install new file mode 100644 index 000000000..8fc621fc3 --- /dev/null +++ b/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla7-i18n.install @@ -0,0 +1 @@ +usr/share/tqt3/translations/*.qm diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla7.install b/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla7.install index 2cfef7f8a..b3c140659 100644 --- a/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla7.install +++ b/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla7.install @@ -1,3 +1,2 @@ -usr/lib/*.so.* -usr/lib/tqt3/plugins/designer/*.so -usr/share/tqt3/translations/*.qm +usr/lib/$(DEB_HOST_MULTIARCH)/*.so.* +usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/designer/*.so diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/rules b/ubuntu/_base/dependencies/tqscintilla/debian/rules index 750a1294a..bcf875516 100755 --- a/ubuntu/_base/dependencies/tqscintilla/debian/rules +++ b/ubuntu/_base/dependencies/tqscintilla/debian/rules @@ -1,110 +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 -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - -# This is the debhelper compatibility version to use. -export TQTDIR=/usr/share/tqt3 -export QMAKESPEC=$(TQTDIR)/mkspecs/linux-g++ -DOCDEST=$(CURDIR)/debian/tmp/usr/share/doc/libtqscintilla-doc/html -HEADERDEST=$(CURDIR)/debian/tmp/usr/include/tqscintilla -LIBSDEST=$(CURDIR)/debian/tmp/usr/lib -TRANSDEST=$(CURDIR)/debian/tmp/$(TQTDIR)/translations -PLUGINDEST=$(CURDIR)/debian/tmp/usr/lib/tqt3/plugins/designer - - -ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) - CFLAGS += -g -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s +ifdef DEB_HOST_MULTIARCH + CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH) +else + CMAKE_INSTALL_LIBDIR = lib endif -configure: configure-stamp -configure-stamp: - dh_testdir - cd qt; qmake "DESTDIR=$(CURDIR)/tmplib" - cd designer; qmake - touch configure-stamp - -build build-arch: build-stamp -build-indep: - -build-stamp: configure-stamp - dh_testdir - - install -d $(CURDIR)/tmplib - $(MAKE) -C qt - $(MAKE) -C designer - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - - [ ! -f qt/Makefile ] || $(MAKE) -C qt clean - [ ! -f designer/Makefile ] || $(MAKE) -C designer clean - -find -name 'Makefile' -exec rm {} \; - -rm -rf tmplib - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - install -d $(HEADERDEST)/private - install -d $(DOCDEST) - install -d $(TRANSDEST) - install -d $(LIBSDEST) - install -d $(PLUGINDEST) - for i in qt/qextscintilla*.h; do install -m 644 $$i $(HEADERDEST); done - for i in include/*.h; do install -m 644 $$i $(HEADERDEST)/private; done - for i in doc/html/*; do install -m 644 $$i $(DOCDEST); done - for i in qt/*.qm; do install -m 644 $$i $(TRANSDEST); done - mv designer/*.so $(PLUGINDEST) - for i in tmplib/*; do mv $$i $(LIBSDEST); done - - -# Build architecture-independent files here. -binary-indep: build install - dh_testdir -i - dh_testroot -i - dh_install -i --sourcedir=$(CURDIR)/debian/tmp - dh_installdocs -i - dh_installchangelogs -i ChangeLog - dh_link -i - dh_compress -i - dh_fixperms -i - dh_installdeb -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS) - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir -a - dh_testroot -a - dh_install -a --sourcedir=$(CURDIR)/debian/tmp - dh_installdocs -a - dh_installchangelogs -a ChangeLog - dh_link -a - dh_strip -a - dh_compress -a - dh_fixperms -a - dh_makeshlibs -a -V - dh_installdeb -a - dh_shlibdeps -a - dh_gencontrol -a - dh_md5sums -a - dh_builddeb -a $(DEB_DH_BUILDDEB_ARGS) - -binary: binary-indep binary-arch -.PHONY: build build-arch clean binary-indep binary-arch binary install configure +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" diff --git a/ubuntu/_base/dependencies/tqt3/debian/README.Debian b/ubuntu/_base/dependencies/tqt3/debian/README.Debian index e48fe37ea..6d5c135e2 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/README.Debian +++ b/ubuntu/_base/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/ubuntu/_base/dependencies/tqt3/debian/compat b/ubuntu/_base/dependencies/tqt3/debian/compat index 7f8f011eb..f599e28b8 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/compat +++ b/ubuntu/_base/dependencies/tqt3/debian/compat @@ -1 +1 @@ -7 +10 diff --git a/ubuntu/_base/dependencies/tqt3/debian/control b/ubuntu/_base/dependencies/tqt3/debian/control index bdae88783..cfb831620 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/control +++ b/ubuntu/_base/dependencies/tqt3/debian/control @@ -1,8 +1,8 @@ Source: tqt-x11-free -Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +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 (>= 7.0.50~), 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, @@ -124,7 +124,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, 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 @@ -132,13 +132,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 @@ -152,23 +145,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 @@ -210,17 +186,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 @@ -299,7 +285,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 @@ -313,7 +299,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/ubuntu/_base/dependencies/tqt3/debian/libtqt3-apps-dev.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-apps-dev.install new file mode 100644 index 000000000..eea094136 --- /dev/null +++ b/ubuntu/_base/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/ubuntu/_base/dependencies/tqt3/debian/libtqt3-compat-headers.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-compat-headers.install deleted file mode 100644 index de0099e62..000000000 --- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-compat-headers.install +++ /dev/null @@ -1,49 +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/ntqstack.h -usr/include/tqt3/ntqtabdlg.h -usr/include/tqt3/ntqtstream.h -usr/include/tqt3/ntqwidcoll.h -usr/include/tqt3/ntqwindefs.h diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install index be1e2d79c..fc421f516 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install +++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install @@ -91,6 +91,9 @@ usr/include/tqt3/ntqiconset.h usr/include/tqt3/ntqiconview.h usr/include/tqt3/ntqimage.h usr/include/tqt3/ntqimageformatplugin.h +usr/include/tqt3/ntqinputcontext.h +usr/include/tqt3/ntqinputcontextfactory.h +usr/include/tqt3/ntqinputcontextplugin.h usr/include/tqt3/ntqinputdialog.h usr/include/tqt3/ntqintcache.h usr/include/tqt3/ntqintdict.h @@ -169,7 +172,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 +190,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/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.docs b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.docs index dbd9a5d19..59a51ee13 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.docs +++ b/ubuntu/_base/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/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install index a022db2cc..c86cba1b1 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install +++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install @@ -4,6 +4,8 @@ usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.so usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.prl usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/tqt-mt.pc +usr/include/tqt3/ntqconfig.h usr/include/tqt3/ntqgl.h usr/include/tqt3/ntqglcolormap.h +usr/include/tqt3/ntqmodules.h usr/include/tqt3/ntqwidgetfactory.h diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.docs b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.docs index dbd9a5d19..59a51ee13 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.docs +++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.docs @@ -1,4 +1,5 @@ -README +README.md README.immodule +README.Qt3 README-QT.TXT PLATFORMS diff --git a/ubuntu/_base/dependencies/tqt3/debian/maintain/assistant-tqt3.desktop b/ubuntu/_base/dependencies/tqt3/debian/maintain/assistant-tqt3.desktop deleted file mode 100644 index 3072b99aa..000000000 --- a/ubuntu/_base/dependencies/tqt3/debian/maintain/assistant-tqt3.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Exec=tqassistant -Name=TQt3 Assistant -Name[de]=TQt3 Assistent -Comment=TQt3 Helpcenter -Comment[de]= TQt3 Hilfezentrum -MimeType=application/x-assistant; -Icon=assistant -Terminal=false -Type=Application -Categories=Qt;Development; diff --git a/ubuntu/_base/dependencies/tqt3/debian/maintain/designer-tqt3.desktop b/ubuntu/_base/dependencies/tqt3/debian/maintain/designer-tqt3.desktop deleted file mode 100644 index cc95cead5..000000000 --- a/ubuntu/_base/dependencies/tqt3/debian/maintain/designer-tqt3.desktop +++ /dev/null @@ -1,77 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Exec=tqdesigner -Name=TQt3 Designer -Name[bg]=TQt3 Дизайнер -Name[br]=Ergrafer TQt3 -Name[ca]=Dissenyador TQt3 -Name[cs]=TQt3 designer -Name[de]=TQt3-Designer -Name[eo]=TQt3-Desegnilo -Name[es]=Diseñador TQt3 -Name[et]=TQt3 disainer -Name[eu]=TQt3 Diseinatzailea -Name[gl]=Deseñador de TQt3 -Name[he]=TQt3 בצעמ -Name[it]=Designer TQt3 -Name[ja]=TQt3デザイナー -Name[ko]=TQt3 디자이너 -Name[lv]=TQt3 Dizainers -Name[mk]=TQt3 дизајнер -Name[no]=TQt3-designer -Name[oc]=Dessinador TQt3 -Name[pl]=Projektant TQt3 -Name[sk]=TQt3 Dizajnér -Name[sl]=Snovalnik TQt3 -Name[ta]=TQt3 À¨¼ôÀ¡Ç÷ -Name[uk]=Дизайнер TQt3 -Name[zh_CN.GB2312]=TQt3 设计者 -Name[zh_TW.Big5]=TQt3 設計器 -Comment=TQt3 interface designer -Comment[az]=TQt3 axtar üz dizayn proqramı -Comment[bg]=TQt3 interface дизайнер -Comment[br]=Ergrafer etrefas TQt3 -Comment[ca]=Dissenyador d'interfícies TQt3 -Comment[cs]=Editor UI pro TQt3 -Comment[da]=TQt3 grænseflade designer -Comment[de]=Schnittstellen-Designer für TQt3 -Comment[el]=Σχεδιασμός περιβάλλοντων TQt3 -Comment[eo]=TQt3-Interfacdesegnilo -Comment[es]=Diseñador de interfaces de TQt3 -Comment[et]=TQt3 dialoogide redaktor -Comment[eu]=TQt3 interfaze diseinatzailea -Comment[fi]=TQt3:n käyttöliittymäsuunnittelija -Comment[fr]=Conception d'interfaces avec TQt3 -Comment[gl]=Editor de interfaces de TQt3 -Comment[he]=TQt3-ל םיקשממ בצעמ -Comment[hu]=TQt3 felülettervező -Comment[is]=Viðmótshönnunartól fyrir TQt3 -Comment[it]=Editor per le interfaccie TQt3 -Comment[ja]=TQt3インターフェースデザイナー -Comment[ko]=TQt3 인터페이스 디자이너 -Comment[lt]=TQt3 sąsajos redaktorius -Comment[lv]=TQt3 starsejas dizainers -Comment[mk]=Дизајнер на TQt3 дијалози -Comment[nl]=TQt3 interface-ontwerper -Comment[no]=TQt3-grensesnittdesigner -Comment[no_NY]=Redigering av TQt3-miljø -Comment[oc]=Dessinador d'interfacies TQt3 -Comment[pl]=Projektant interfejsu TQt3 -Comment[pt]=Editor de interfaces do TQt3 -Comment[pt_BR]=Designer de interface TQt3 -Comment[ro]=Dezvoltator de interfeţe TQt3 -Comment[ru]=редактор интерфейсов приложений TQt3 -Comment[sk]=TQt3 dizajnér rozhrania -Comment[sl]=Snovalnik vmesnikov za TQt3 -Comment[sr]=Dizajner TQt3 interfejsa -Comment[sv]=Editor för gränssnitt till TQt3 -Comment[ta]=TQt3 À¨¼ôÀ¡Ç÷ -Comment[tr]=TQt3 arayüz tasarım programı -Comment[uk]=Редактор інтерфейсу для TQt3 -Comment[zh_CN.GB2312]=TQt3 界面设计程序 -Comment[zh_TW.Big5]=TQt3 介面編輯器 -MimeType=application/x-designer; -Icon=designer -Terminal=false -Type=Application -Categories=Qt;Development; diff --git a/ubuntu/_base/dependencies/tqt3/debian/maintain/linguist-tqt3.desktop b/ubuntu/_base/dependencies/tqt3/debian/maintain/linguist-tqt3.desktop deleted file mode 100644 index d879d32db..000000000 --- a/ubuntu/_base/dependencies/tqt3/debian/maintain/linguist-tqt3.desktop +++ /dev/null @@ -1,25 +0,0 @@ -[Desktop Entry] -Exec=tqlinguist -Name=TQt3 Linguist -Name[de]=TQt3-Linguist -Name[eo]=TQt3-Lingvisto -Name[es]=Lingüista TQt3 -Name[ko]=TQt3 언어학자 -Name[lv]=TQt3 Lingvists -Comment=Tool for translating message catalogues of TQt3 based programs -Comment[da]=Redskab til at oversætte TQt3 baserede programmer -Comment[de]=Dienstprogramm zur Übersetzung von Programmen, die auf TQt3 basieren -Comment[eo]=Ilo por tradukado de mesaĝaroj de TQt3-bazitaj programoj -Comment[es]=Herramienta para la traducción de catálogos de mensajes de programas basados en TQt3 -Comment[he]=TQt3 תוססובמ תוינכות לש תועדוה יגולטק םוגרתל ילכ -Comment[hu]=Segédprogram a TQt3-alapú programok üzenetfájljainak lefordításához -Comment[ko]=TQt3를 바탕으로 하는 프로그램에서 쓸 번역된 메세지 목록을 관리하는 도구 -Comment[lv]=Rīks ziņojumu katalogu tulkošanai uz TQt3 bāzētās programmās -Comment[pt]=Ferramenta para traduzir os catálogos de mensagens de programas do TQt3 -Comment[pt_BR]=Ferramenta para traduzir os catálogos de mensagens de programas do TQt3 -Comment[sv]=Verktyg för att översätta meddelandekataloger från TQt3-baserade program -MimeType=application/x-linguist; -Terminal=false -Icon=linguist -Type=Application -Categories=Qt;Development diff --git a/ubuntu/_base/dependencies/tqt3/debian/maintain/mkpatch.sh b/ubuntu/_base/dependencies/tqt3/debian/maintain/mkpatch.sh deleted file mode 100644 index 609a44bc1..000000000 --- a/ubuntu/_base/dependencies/tqt3/debian/maintain/mkpatch.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -diff -Nru -x Makefile.cvs -x README.qt-copy -x upgrade_script.qt -x .cvsignore -x CVS -x include -x debian -x doc -x examples -x 3rdparty -x images -x mkspecs -I '^\*\*\( $\| \$Id\)' -I '^\#\( $\| \$Id\)' qt-x11-free-3.1.1.old/ qt-x11-free-3.1.1/ > qtcopy.diff diff --git a/ubuntu/_base/dependencies/tqt3/debian/maintain/tqt3config.desktop b/ubuntu/_base/dependencies/tqt3/debian/maintain/tqt3config.desktop deleted file mode 100644 index b3535c06f..000000000 --- a/ubuntu/_base/dependencies/tqt3/debian/maintain/tqt3config.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Exec=tqtconfig -Name=TQt3 Configuration -Name[de]=TQt3 Konfiguration -Comment=A graphical configuration tool for programs using TQt 3 -Comment[de]=Ein grafisches Konfigurationstool für TQt3-Programme -MimeType=application/x-qtconfig; -Terminal=false -Icon=qtconfig -Type=Application -Categories=Qt;Settings; diff --git a/ubuntu/_base/dependencies/tqt3/debian/rules b/ubuntu/_base/dependencies/tqt3/debian/rules index 50b75c5df..36a8cc408 100755 --- a/ubuntu/_base/dependencies/tqt3/debian/rules +++ b/ubuntu/_base/dependencies/tqt3/debian/rules @@ -11,16 +11,30 @@ export LD_LIBRARY_PATH=$(QTDIR)/lib:$(OLD_LD_LIBRARY_PATH) OLD_PATH := $(PATH) export PATH=$(QTDIR)/bin:$(OLD_PATH) +# 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 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 +DEB_BUILD_PARALLEL ?= true ifeq ($(DEB_HOST_ARCH_OS),hurd) PLATFORM_ARG = hurd-g++ @@ -37,12 +51,14 @@ endif #hurd # 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 P_QTMTDEV = $(DEBIAN)/libtqt3-mt-dev +RPC_INCLUDES = $(if $(wildcard /usr/include/tirpc),-I/usr/include/tirpc,) + TMP_INSTALL = $(DEBIAN)/tmp-install CONFIGURE_OPTS = \ @@ -102,6 +118,8 @@ CONFIGURE_OPTS = \ -I/usr/include/freetype2 \ -I`pg_config --includedir` \ -I`pg_config --includedir-server` \ + $(RPC_INCLUDES) \ + \ -L/usr/lib/$(DEB_HOST_MULTIARCH)\ \ -lfontconfig \ @@ -128,6 +146,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: @@ -142,11 +176,6 @@ libqt-thread-stamp: post-patches echo yes | ./configure $(CONFIGURE_OPTS) - rm -rf include/ntqinputcontext.h include/ntqinputcontextfactory.h include/ntqinputcontextplugin.h - ln -s ../src/kernel/ntqinputcontext.h include/ntqinputcontext.h - ln -s ../src/inputmethod/ntqinputcontextfactory.h include/ntqinputcontextfactory.h - ln -s ../src/inputmethod/ntqinputcontextplugin.h include/ntqinputcontextplugin.h - # proceed $(MAKE) sub-src sub-plugins sub-tools $(MAKE) -C src INSTALL_ROOT=$(TMP_INSTALL) install_target @@ -156,7 +185,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 @@ -171,14 +199,6 @@ libqt-thread-stamp: post-patches install -d $(P_QTMTDEV)/usr/share/tqt3/ cat .qmake.cache | sed "s#$(QTDIR)#/usr/share/tqt3#g" > $(P_QTMTDEV)/usr/share/tqt3/.qmake.cache - # install ntqconfig.h for the mt - install -m 644 -D include/ntqconfig.h $(P_QTMTDEV)/usr/include/tqt3/ntqconfig.h - install -m 644 -D include/ntqmodules.h $(P_QTMTDEV)/usr/include/tqt3/ntqmodules.h - - install -m 644 -D include/ntqinputcontext.h $(P_HEADERS)/usr/include/tqt3/ntqinputcontext.h - install -m 644 -D include/ntqinputcontextfactory.h $(P_HEADERS)/usr/include/tqt3/ntqinputcontextfactory.h - install -m 644 -D include/ntqinputcontextplugin.h $(P_HEADERS)/usr/include/tqt3/ntqinputcontextplugin.h - touch libqt-thread-stamp clean:: @@ -209,7 +229,6 @@ clean:: extensions/nsplugin/examples/grapher/libgrapher.prl bin/designer rm -f qmake/*o - rm -rf include/ntqinputcontext.h include/ntqinputcontextfactory.h include/ntqinputcontextplugin.h rm -f src/.obj/debug-shared-mt/*o plugins/src/inputmethods/imsw-multi/.obj/debug-shared-mt/*o plugins/inputmethods/*so rm -f plugins/src/inputmethods/imsw-none/.obj/debug-shared-mt/*o plugins/src/inputmethods/simple/.obj/debug-shared-mt/*o plugins/src/inputmethods/xim/.obj/debug-shared-mt/*o @@ -228,6 +247,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 @@ -252,8 +285,6 @@ install: build # copy all docs there first install -d $(P_DOC)/usr/share/tqt3/doc/html/ for a in `cd $(TMP_INSTALL)/usr/share/tqt3/doc/html/ && find`; do cp $(TMP_INSTALL)/usr/share/tqt3/doc/html/"$$a" $(P_DOC)/usr/share/tqt3/doc/html/; done - #typo bugfix - sed -i -e 's/reveives/receives/' $(P_DOC)/usr/share/tqt3/doc/html/ntqwidget.html ## build designer package documentation # tqt3-designer @@ -297,6 +328,8 @@ binary-indep: build install dh_installchangelogs -i changes-3.3.8 dh_installchangelogs -i changes-3.3.8b + dh_installman -i + find doc/man -path \*/CVS -prune -o -print | cpio -pmd $(P_DOC)/usr/share/tqt3/doc/ -rm -f `find $(P_DOC)/usr/share/tqt3/doc/ -name "*.o"` @@ -331,9 +364,13 @@ binary-indep: build install for a in `cd $(DEBIAN)/doc/tqt3-examples/ && find $(DEBIAN)/doc/tqt3-examples/ -name '.moc'`; do rm -rf "$$a"; done for a in `cd $(DEBIAN)/doc/tqt3-examples/ && find $(DEBIAN)/doc/tqt3-examples/ -name '.obj'`; do rm -rf "$$a"; done for a in `cd $(DEBIAN)/doc/tqt3-examples/ && find $(DEBIAN)/doc/tqt3-examples/ -name 'Makefile'`; do rm -f "$$a"; done - install -D `pwd`/debian/maintain/build-examples.sh `pwd`/debian/doc/tqt3-examples/build-examples - chmod 755 `pwd`/debian/doc/tqt3-examples/build-examples - cd `pwd`/debian/doc/ && tar cvvfz tqt3-examples.tar.gz tqt3-examples/ + install -Dpm 755 `pwd`/debian/maintain/build-examples.sh `pwd`/debian/doc/tqt3-examples/build-examples + cd `pwd`/debian/doc/ && \ + find tqt3-examples/ -type f -print0 | LC_ALL=C sort -z | \ + tar cvv --no-recursion --null -T - \ + --mode=u+rw,go=rX,a-s \ + --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime | \ + gzip -n > tqt3-examples.tar.gz install -D `pwd`/debian/doc/tqt3-examples.tar.gz `pwd`/debian/tqt3-examples/usr/share/doc/tqt3-examples/tqt3-examples.tar.gz # proceed @@ -397,13 +434,6 @@ binary-arch: build install install -m644 -D tools/linguist/linguist/linguist_"$$a".qm `pwd`/debian/tqt3-linguist/usr/share/tqt3/translations/linguist_"$$a".qm; done rm -rf `pwd`/tools/linguist/linguist/*.qm - # desktop lnk files - install -m644 -D debian/maintain/designer-tqt3.desktop `pwd`/debian/tqt3-designer/usr/share/applications/designer-tqt3.desktop - install -m644 -D debian/maintain/linguist-tqt3.desktop `pwd`/debian/tqt3-linguist/usr/share/applications/linguist-tqt3.desktop - - install -m644 -D debian/maintain/assistant-tqt3.desktop `pwd`/debian/tqt3-assistant/usr/share/applications/assistant-tqt3.desktop - install -m644 -D debian/maintain/tqt3config.desktop `pwd`/debian/tqt3-qtconfig/usr/share/applications/tqt3config.desktop - # include logo32 for every program cd `pwd`/debian/tqt3-designer/usr/share/tqt3/doc/html && for a in `find . -name '*.html'`; \ do cat "$$a" | sed 's/logo32/logo32-designer/g' > "$$a".new && mv "$$a".new "$$a"; done @@ -424,23 +454,13 @@ binary-arch: build install cd `pwd`/debian/tqt3-dev-tools/usr/share/tqt3/mkspecs/ && for a in *; do cd "$$a" && cat qmake.conf | sed 's/\$$(QTDIR)\/include/\/usr\/share\/tqt3\/include/g' | sed 's/\$$(QTDIR)/\/usr\/share\/tqt3/g' | \ sed 's/\-I\/usr\/include/&\/tqt3/g' >> qmake.conf.new && mv qmake.conf.new qmake.conf && cd ../; done - # build attic package and copy it to libtqt3-ompat-headers - cd `pwd`/src/ && tar cvvfz attic.tar.gz attic/ - install -D `pwd`/src/attic.tar.gz `pwd`/debian/libtqt3-compat-headers/usr/share/doc/libtqt3-compat-headers/attic.tar.gz - rm -rf `pwd`/src/attic.tar.gz - - install -D doc/man/man1/moc.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/moc-tqt3.1 - install -D doc/man/man1/uic.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/uic-tqt3.1 - install -D doc/man/man1/lrelease.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/lrelease-tqt3.1 - install -D doc/man/man1/lupdate.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/lupdate-tqt3.1 - dh_link -ptqt3-designer usr/share/tqt3/doc/html usr/share/doc/tqt3-designer/html dh_link -ptqt3-assistant usr/share/tqt3/doc/html usr/share/doc/tqt3-assistant/html dh_link -ptqt3-linguist usr/share/tqt3/doc/html usr/share/doc/tqt3-linguist/html 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 @@ -464,8 +484,12 @@ binary-arch: build install dh_installchangelogs -a $(IBASE) changes-3.3.8 dh_installchangelogs -a $(IBASE) changes-3.3.8b + dh_installman -a $(IBASE) + dh_link -a $(IBASE) dh_strip -a $(IBASE) --dbg-package=tqt-x11-free-dbg + $(if $(wildcard /usr/bin/dh_strip_nondeterminism),\ + dh_strip_nondeterminism -a $(IBASE)) dh_compress -a $(IBASE) dh_fixperms -a $(IBASE) @@ -473,7 +497,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 # fix shlibdeps madness for a in `find debian/ -name '*.substvars'`; do cat "$$a" | sed 's/, xlibs (>> 4.1.0)//g' > "$$a".new && mv "$$a.new" "$$a"; done diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.install b/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.install index d60b07fc7..43dc0a94a 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.install +++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.install @@ -1,4 +1,4 @@ -usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.* -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/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.links b/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.links index 72bd7093a..60fe91b77 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.links +++ b/ubuntu/_base/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/ubuntu/_base/dependencies/tqt3/debian/tqt3-assistant.install b/ubuntu/_base/dependencies/tqt3/debian/tqt3-assistant.install index fa797854e..4cfd10cf1 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-assistant.install +++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-assistant.install @@ -1,4 +1,6 @@ usr/bin/tqassistant +usr/share/applications/tqassistant.desktop +usr/share/pixmaps/tqassistant.png usr/share/tqt3/doc/html/assistant*html usr/share/tqt3/doc/html/assistant*dcf usr/share/tqt3/doc/html/assistant*png diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.install b/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.install index 829c9a96e..6cfffd9cd 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.install +++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.install @@ -1,6 +1,8 @@ usr/bin/tqdesigner usr/bin/tqtcreatecw usr/bin/tqtconv2ui +usr/share/applications/tqdesigner.desktop +usr/share/pixmaps/tqdesigner.png usr/share/tqt3/templates/* usr/share/tqt3/doc/html/designer*html usr/share/tqt3/doc/html/designer*dcf diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.manpages b/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.manpages new file mode 100644 index 000000000..5fcb29982 --- /dev/null +++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.manpages @@ -0,0 +1 @@ +doc/man/man1/tqdesigner.1 diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.postinst b/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.postinst index 91d69ce08..54bc5ea75 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.postinst +++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.postinst @@ -5,6 +5,6 @@ set -e update-alternatives --install \ /usr/bin/designer designer "/usr/bin/tqdesigner" "45" \ --slave /usr/share/man/man1/designer.1.gz designer.1.gz \ - "/usr/share/man/man1/designer-tqt3.1.gz" + "/usr/share/man/man1/tqdesigner.1.gz" #DEBHELPER# diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools-compat.install b/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools-compat.install index 56e0156b5..5975d4bb9 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools-compat.install +++ b/ubuntu/_base/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/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools.manpages b/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools.manpages new file mode 100644 index 000000000..2976f6c84 --- /dev/null +++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools.manpages @@ -0,0 +1,5 @@ +doc/man/man1/tqembed.1 +doc/man/man1/tqlrelease.1 +doc/man/man1/tqlupdate.1 +doc/man/man1/tqmoc.1 +doc/man/man1/tquic.1 diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools.postinst b/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools.postinst index b6c833de8..e7f14ec70 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools.postinst +++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools.postinst @@ -5,22 +5,22 @@ set -e update-alternatives --install \ /usr/bin/moc moc "/usr/bin/tqmoc" "45" \ --slave /usr/share/man/man1/moc.1.gz moc.1.gz \ - "/usr/share/man/man1/moc-tqt3.1.gz" + "/usr/share/man/man1/tqmoc.1.gz" update-alternatives --install \ /usr/bin/uic uic "/usr/bin/tquic" "45" \ --slave /usr/share/man/man1/uic.1.gz uic.1.gz \ - "/usr/share/man/man1/uic-tqt3.1.gz" + "/usr/share/man/man1/tquic.1.gz" update-alternatives --install \ /usr/bin/lupdate lupdate "/usr/bin/tqlupdate" "45" \ --slave /usr/share/man/man1/lupdate.1.gz lupdate.1.gz \ - "/usr/share/man/man1/lupdate-tqt3.1.gz" + "/usr/share/man/man1/tqlupdate.1.gz" update-alternatives --install \ /usr/bin/lrelease lrelease "/usr/bin/tqlrelease" "45" \ --slave /usr/share/man/man1/lrelease.1.gz lrelease.1.gz \ - "/usr/share/man/man1/lrelease-tqt3.1.gz" + "/usr/share/man/man1/tqlrelease.1.gz" update-alternatives --install \ /usr/bin/qmake qmake "/usr/bin/tqmake" "45" \ diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-doc.docs b/ubuntu/_base/dependencies/tqt3/debian/tqt3-doc.docs index f08fd0f02..2630a416c 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-doc.docs +++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-doc.docs @@ -1,2 +1,3 @@ FAQ +README.md README-QT.TXT diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.install b/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.install index 8602850aa..c02015323 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.install +++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.install @@ -1,4 +1,6 @@ usr/bin/tqlinguist +usr/share/applications/tqlinguist.desktop +usr/share/pixmaps/tqlinguist.png usr/share/tqt3/phrasebooks/* usr/share/tqt3/doc/html/linguist*html usr/share/tqt3/doc/html/linguist*dcf diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.manpages b/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.manpages new file mode 100644 index 000000000..14380e5ab --- /dev/null +++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.manpages @@ -0,0 +1 @@ +doc/man/man1/tqlinguist.1 diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.postinst b/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.postinst index 4c51e97bf..48b3216db 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.postinst +++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.postinst @@ -5,6 +5,6 @@ set -e update-alternatives --install \ /usr/bin/linguist linguist "/usr/bin/tqlinguist" "45" \ --slave /usr/share/man/man1/linguist.1.gz linguist.1.gz \ - "/usr/share/man/man1/linguist-tqt3.1.gz" + "/usr/share/man/man1/tqlinguist.1.gz" #DEBHELPER# diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.install b/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.install index a1ae089bc..6b1f88962 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.install +++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.install @@ -1 +1,3 @@ usr/bin/tqtconfig +usr/share/applications/tqtconfig.desktop +usr/share/pixmaps/tqtconfig.png diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.manpages b/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.manpages new file mode 100644 index 000000000..025ff0ad8 --- /dev/null +++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.manpages @@ -0,0 +1 @@ +doc/man/man1/tqtconfig.1 diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.postinst b/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.postinst index 68671a6ef..773022f72 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.postinst +++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.postinst @@ -5,6 +5,6 @@ set -e update-alternatives --install \ /usr/bin/qtconfig qtconfig "/usr/bin/tqtconfig" "45" \ --slave /usr/share/man/man1/qtconfig.1.gz qtconfig.1.gz \ - "/usr/share/man/man1/qtconfig-tqt3.1.gz" + "/usr/share/man/man1/tqtconfig.1.gz" #DEBHELPER# diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/tqtinterface/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..aba508624 --- /dev/null +++ b/ubuntu/_base/dependencies/tqtinterface/debian/cdbs/debian-tde.mk @@ -0,0 +1,251 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Copyright © 2019 TDE Team +# Description: A class for TDE packages; sets TDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch debian/stamp-cvs-make + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +ifdef _cdbs_class_cmake +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif +endif + +ifndef _cdbs_rules_patchsys_quilt +DEB_PATCHDIRS := debian/patches/common debian/patches +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el + +# The default gzip compressor has been changed in dpkg >= 1.17.0. +deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +DEB_BUILD_PARALLEL ?= true + +cdbs_configure_flags += \ + --with-qt-dir=/usr/share/qt3 \ + --disable-rpath \ + --with-xinerama \ + $(cdbs_kde_enable_final) \ + $(cdbs_kde_enable_debug) + + +# This is a convenience target for calling manually. +# It's not part of the build process. +buildprep: clean apply-patches +ifndef _cdbs_class_cmake + $(MAKE) -f admin/Makefile.common dist +endif + debian/rules clean + +.tdepkginfo: + echo "# TDE package information" >.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo + date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo + +post-patches:: .tdepkginfo + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + # update multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ + sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ + done + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + # revert multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ ! -f $$a.arch ] || \ + mv $$a.arch $$a; \ + done + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \ + test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f .tdepkginfo + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/cdbs/versions.pl b/ubuntu/_base/dependencies/tqtinterface/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/ubuntu/_base/dependencies/tqtinterface/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/compat b/ubuntu/_base/dependencies/tqtinterface/debian/compat index 7f8f011eb..f599e28b8 100644 --- a/ubuntu/_base/dependencies/tqtinterface/debian/compat +++ b/ubuntu/_base/dependencies/tqtinterface/debian/compat @@ -1 +1 @@ -7 +10 diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/control b/ubuntu/_base/dependencies/tqtinterface/debian/control index d1787eeb6..88c437114 100644 --- a/ubuntu/_base/dependencies/tqtinterface/debian/control +++ b/ubuntu/_base/dependencies/tqtinterface/debian/control @@ -1,8 +1,8 @@ Source: libtqtinterface Section: tde Priority: optional -Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Build-Depends: debhelper (>= 7.0.50~), quilt, libtqt3-mt-dev, tqt3-apps-dev, cmake, cdbs +Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libtqt3-mt-dev, tqt3-apps-dev Standards-Version: 3.8.4 Package: libtqtinterface @@ -19,7 +19,7 @@ Description: The Trinity Qt Interface Libraries although some code has been added for useful functions that are no longer part of Qt. Package: libtqtinterface-dev -Architecture: any +Architecture: all Multi-Arch: foreign Section: libs Replaces: libtqtinterface-dev (<< 4:14.0.0~) @@ -32,7 +32,7 @@ Description: The Trinity Qt Interface Libraries (Development Files) although some code has been added for useful functions that are no longer part of Qt. Package: libtqtinterface-doc -Architecture: any +Architecture: all Multi-Arch: foreign Section: libs Replaces: libtqtinterface-doc (<< 4:14.0.0~) diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/docs b/ubuntu/_base/dependencies/tqtinterface/debian/docs index e69de29bb..ca0272abf 100644 --- a/ubuntu/_base/dependencies/tqtinterface/debian/docs +++ b/ubuntu/_base/dependencies/tqtinterface/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +README +TODO diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/rules b/ubuntu/_base/dependencies/tqtinterface/debian/rules index d642db97b..0db17ad7b 100755 --- a/ubuntu/_base/dependencies/tqtinterface/debian/rules +++ b/ubuntu/_base/dependencies/tqtinterface/debian/rules @@ -1,28 +1,21 @@ #! /usr/bin/make -f -# see debian/rules file for tdesvn for cmake examples include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk -#include /usr/share/cdbs/1/rules/patchsys-quilt.mk -include /usr/share/cdbs/1/rules/utils.mk - -DEB_KDE_APIDOX := yes +include debian/cdbs/debian-tde.mk version=Debian Package $(DEB_VERSION) DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + +ifdef DEB_HOST_MULTIARCH + CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH) +else + CMAKE_INSTALL_LIBDIR = lib +endif DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/usr" \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DBUILD_ALL="ON" - -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - -# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to -# never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL = true - -DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) + -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) |