diff options
Diffstat (limited to 'debian/_base/applications')
26 files changed, 64 insertions, 96 deletions
diff --git a/debian/_base/applications/development/kxmleditor/debian/patches/series b/debian/_base/applications/development/kxmleditor/debian/patches/series index 8b1378917..e69de29bb 100644 --- a/debian/_base/applications/development/kxmleditor/debian/patches/series +++ b/debian/_base/applications/development/kxmleditor/debian/patches/series @@ -1 +0,0 @@ - diff --git a/debian/_base/applications/development/piklab/debian/control b/debian/_base/applications/development/piklab/debian/control index 733219472..5ae69eb30 100644 --- a/debian/_base/applications/development/piklab/debian/control +++ b/debian/_base/applications/development/piklab/debian/control @@ -2,8 +2,8 @@ Source: piklab-trinity Section: electronics Priority: extra Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 10~), autotools-dev, quilt, chrpath, - libusb-dev, tdelibs14-trinity-dev, libreadline-dev | libreadline6-dev | libreadline5-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, + libusb-dev, libreadline-dev | libreadline6-dev | libreadline5-dev Standards-Version: 3.8.4 Homepage: http://piklab.sourceforge.net/ diff --git a/debian/_base/applications/development/piklab/debian/install b/debian/_base/applications/development/piklab/debian/install index 4b76727ec..36f006452 100644 --- a/debian/_base/applications/development/piklab/debian/install +++ b/debian/_base/applications/development/piklab/debian/install @@ -1,3 +1 @@ debian/*.xpm opt/trinity/share/pixmaps/ -#debian/*.desktop usr/share/applications/ -#debian/overrides/piklab usr/share/lintian/overrides/ diff --git a/debian/_base/applications/development/piklab/debian/rules b/debian/_base/applications/development/piklab/debian/rules index f21c51790..a6797f19a 100755 --- a/debian/_base/applications/development/piklab/debian/rules +++ b/debian/_base/applications/development/piklab/debian/rules @@ -1,17 +1,17 @@ #!/usr/bin/make -f -# Currently is not possible to build piklab with --enable-final -DEB_BUILD_OPTIONS += noopt - include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) - -binary-install/piklab-trinity:: - mv debian/$(cdbs_curpkg)/opt/trinity/share/man/man1/piklab.1x debian/$(cdbs_curpkg)/opt/trinity/share/man/man1/piklab.1 +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" diff --git a/debian/_base/applications/internet/kvirc/debian/control b/debian/_base/applications/internet/kvirc/debian/control index 6b9931399..febe78475 100644 --- a/debian/_base/applications/internet/kvirc/debian/control +++ b/debian/_base/applications/internet/kvirc/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Raúl Sánchez Siles <rasasi78@gmail.com> -Build-Depends: cdbs (>= 0.4.12), debhelper (>= 10~), quilt, tdelibs14-trinity-dev (>= 4:3.1.3), libperl-dev, automake, autoconf, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.12), debhelper (>= 10~), quilt, tdelibs14-trinity-dev (>= 4:3.1.3), libperl-dev, libssl-dev, automake, autoconf, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://kvirc.net/ diff --git a/debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install b/debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install index 6ba0b5d33..010c6f400 100644 --- a/debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install +++ b/debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install @@ -1,6 +1,7 @@ debian/tmp/opt/trinity/bin/kvi_run_netscape debian/tmp/opt/trinity/bin/kvi_search_help debian/tmp/opt/trinity/share/applnk/Internet/kvirc.desktop +debian/tmp/opt/trinity/share/apps/tdeconf_update/ debian/tmp/opt/trinity/share/icons/hicolor/ debian/tmp/opt/trinity/share/kvirc/*/config/ debian/tmp/opt/trinity/share/kvirc/*/defscript/ diff --git a/debian/_base/applications/multimedia/codeine/debian/patches/series b/debian/_base/applications/multimedia/codeine/debian/patches/series index 8b1378917..e69de29bb 100644 --- a/debian/_base/applications/multimedia/codeine/debian/patches/series +++ b/debian/_base/applications/multimedia/codeine/debian/patches/series @@ -1 +0,0 @@ - diff --git a/debian/_base/applications/multimedia/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/_base/applications/multimedia/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES index 7b99dabec..7b65b9a3f 100644 --- a/debian/_base/applications/multimedia/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES +++ b/debian/_base/applications/multimedia/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES @@ -1,8 +1,5 @@ remove build-dep on libdvdread-dev -libk3b3-extracodecs conflicts libk3b2-extracodecs -transitional libk3b2-extracodecs package - Do not recommend on tdebase-tdeio-plugins, kcontrol, Change recommend to suggest for vcdimager diff --git a/debian/_base/applications/multimedia/k3b/debian/control b/debian/_base/applications/multimedia/k3b/debian/control index d036d1d22..ca1eb6f17 100644 --- a/debian/_base/applications/multimedia/k3b/debian/control +++ b/debian/_base/applications/multimedia/k3b/debian/control @@ -63,7 +63,7 @@ Section: libs Architecture: any Replaces: libk3b3-trinity (<< 4:14.0.0~) Breaks: libk3b3-trinity (<< 4:14.0.0~) -Conflicts: libk3bcore-trinity, libk3bplugin-trinity, libk3btools-trinity, libk3bproject-trinity, k3blibs-trinity, libk3b2-trinity +Conflicts: libk3bcore-trinity, libk3bplugin-trinity, libk3btools-trinity, libk3bproject-trinity, k3blibs-trinity Depends: ${shlibs:Depends} Description: The TDE cd burning application library - runtime files [Trinity] K3b is a GUI frontend to the cd recording programs cdrdao and cdrecord. @@ -78,7 +78,6 @@ Architecture: any Replaces: libk3b3-extracodecs-trinity (<< 4:14.0.0~) Breaks: libk3b3-extracodecs-trinity (<< 4:14.0.0~) Depends: ${shlibs:Depends} -Conflicts: libk3b2-mp3-trinity Description: The TDE cd burning application library - extra decoders [Trinity] K3b is a GUI frontend to the cd recording programs cdrdao and cdrecord. Its aim is to provide a very user friendly interface to all the tasks @@ -86,17 +85,6 @@ Description: The TDE cd burning application library - extra decoders [Trinity] . This package contains runtime libraries for the MP3 and FFMPEG decoder plugin. -Package: libk3b2-extracodecs-trinity -Architecture: all -Priority: extra -Replaces: libk3b2-extracodecs-trinity (<< 4:14.0.0~) -Breaks: libk3b2-extracodecs-trinity (<< 4:14.0.0~) -Depends: libk3b3-extracodecs-trinity -Description: transitional package for K3b's extra decoders [Trinity] - This is a dummy transitional package to enable a smooth transition from - libk3b2-extracodecs to libk3b3-extracodecs. - It may safely be removed after installation. - Package: k3b-trinity-dbg Priority: extra Architecture: any diff --git a/debian/_base/applications/multimedia/k3b/debian/k3b-data.files b/debian/_base/applications/multimedia/k3b/debian/k3b-data.files deleted file mode 100644 index 3b3a0add7..000000000 --- a/debian/_base/applications/multimedia/k3b/debian/k3b-data.files +++ /dev/null @@ -1,5 +0,0 @@ -usr/share/apps/* -usr/share/icons/* -usr/share/kde/* -usr/share/sounds/* -usr/share/doc/tde/* diff --git a/debian/_base/applications/multimedia/k3b/debian/k3b-data.install b/debian/_base/applications/multimedia/k3b/debian/k3b-data.install deleted file mode 100644 index b7175c514..000000000 --- a/debian/_base/applications/multimedia/k3b/debian/k3b-data.install +++ /dev/null @@ -1,11 +0,0 @@ -debian/tmp/usr/share/applnk/.hidden/* -debian/tmp/usr/share/apps/* -debian/tmp/usr/share/icons/* -debian/tmp/usr/share/doc/tde/* -debian/tmp/usr/share/sounds/* -debian/tmp/usr/share/mimelnk/* -debian/tmp/usr/share/services/* -debian/k3b-rip-audiocd.desktop usr/share/kde4/apps/solid/actions -debian/k3b-rip-videodvd.desktop usr/share/kde4/apps/solid/actions -debian/k3b-write-iso-image.desktop usr/share/kde4/services/ServiceMenus -debian/k3b-write-bin-image.desktop usr/share/kde4/services/ServiceMenus diff --git a/debian/_base/applications/multimedia/k3b/debian/libk3b-dev.files b/debian/_base/applications/multimedia/k3b/debian/libk3b-dev.files deleted file mode 100644 index d45003d06..000000000 --- a/debian/_base/applications/multimedia/k3b/debian/libk3b-dev.files +++ /dev/null @@ -1,3 +0,0 @@ -usr/include/* -usr/lib/*.la -usr/lib/*.so diff --git a/debian/_base/applications/multimedia/k3b/debian/libk3b-dev.install b/debian/_base/applications/multimedia/k3b/debian/libk3b-dev.install deleted file mode 100644 index 6257a06d1..000000000 --- a/debian/_base/applications/multimedia/k3b/debian/libk3b-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -debian/tmp/usr/lib/libk3b.so -debian/tmp/usr/lib/libk3bdevice.so -debian/tmp/usr/include/* diff --git a/debian/_base/applications/multimedia/k3b/debian/libk3b3-extracodecs.install b/debian/_base/applications/multimedia/k3b/debian/libk3b3-extracodecs.install deleted file mode 100644 index 0e57a97dc..000000000 --- a/debian/_base/applications/multimedia/k3b/debian/libk3b3-extracodecs.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/lib/trinity/libk3bmaddecoder.* -#debian/tmp/usr/lib/trinity/libk3bffmpegdecoder.* diff --git a/debian/_base/applications/multimedia/k3b/debian/libk3b3.files b/debian/_base/applications/multimedia/k3b/debian/libk3b3.files deleted file mode 100644 index d77e53e7c..000000000 --- a/debian/_base/applications/multimedia/k3b/debian/libk3b3.files +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/*.so.* -usr/lib/libk3baudio*.{so,la} -usr/lib/trinity/* diff --git a/debian/_base/applications/multimedia/k3b/debian/libk3b3.install b/debian/_base/applications/multimedia/k3b/debian/libk3b3.install deleted file mode 100644 index 69b7f7909..000000000 --- a/debian/_base/applications/multimedia/k3b/debian/libk3b3.install +++ /dev/null @@ -1,25 +0,0 @@ -debian/tmp/usr/lib/libk3b.so.* -debian/tmp/usr/lib/libk3bdevice.so.* -debian/tmp/usr/lib/*.la -debian/tmp/usr/lib/trinity/libk3balsaoutputplugin.la -debian/tmp/usr/lib/trinity/libk3balsaoutputplugin.so -debian/tmp/usr/lib/trinity/libk3bexternalencoder.la -debian/tmp/usr/lib/trinity/libk3bexternalencoder.so -debian/tmp/usr/lib/trinity/libk3bflacdecoder.la -debian/tmp/usr/lib/trinity/libk3bflacdecoder.so -debian/tmp/usr/lib/trinity/libk3bmpcdecoder.la -debian/tmp/usr/lib/trinity/libk3bmpcdecoder.so -debian/tmp/usr/lib/trinity/libk3boggvorbisdecoder.la -debian/tmp/usr/lib/trinity/libk3boggvorbisdecoder.so -debian/tmp/usr/lib/trinity/libk3boggvorbisencoder.la -debian/tmp/usr/lib/trinity/libk3boggvorbisencoder.so -debian/tmp/usr/lib/trinity/libk3bsoxencoder.la -debian/tmp/usr/lib/trinity/libk3bsoxencoder.so -debian/tmp/usr/lib/trinity/libk3bwavedecoder.la -debian/tmp/usr/lib/trinity/libk3bwavedecoder.so -debian/tmp/usr/lib/trinity/libk3baudioprojectcddbplugin.so -debian/tmp/usr/lib/trinity/libk3baudioprojectcddbplugin.la -debian/tmp/usr/lib/trinity/libk3baudiometainforenamerplugin.so -debian/tmp/usr/lib/trinity/libk3baudiometainforenamerplugin.la -debian/tmp/usr/lib/trinity/tdeio_videodvd.so -debian/tmp/usr/lib/trinity/tdeio_videodvd.la diff --git a/debian/_base/applications/multimedia/k3b/debian/rules b/debian/_base/applications/multimedia/k3b/debian/rules index 72db8e489..0cd87b24d 100755 --- a/debian/_base/applications/multimedia/k3b/debian/rules +++ b/debian/_base/applications/multimedia/k3b/debian/rules @@ -4,6 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk +DEB_TIME64_API = $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false) +ifeq ($(DEB_TIME64_API),true) +DEB_TIME64_SUFFIX = t64 +else +DEB_TIME64_SUFFIX = +endif + + DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ @@ -14,3 +22,41 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_SKIP_RPATH="OFF" \ -DWITH_ALL_OPTIONS="ON" + + +post-patches:: + dh_testdir +ifeq ($(DEB_TIME64_API),true) + # update library package name for TIME64 ABI + ls -d debian/* | \ + grep -E "/libk3b3-trinity\." | \ + grep -v "\.t64$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.t64 ] || \ + (cp -a $$a debian/libk3b3$(DEB_TIME64_SUFFIX)-$${a##*-} && mv $$a $$a.t64); \ + done + [ -f debian/control.t64 ] || \ + sed -i.t64 \ + -e "s/^Package: \\(libk3b3\\)-trinity$$/Package: \\1$(DEB_TIME64_SUFFIX)-trinity/" \ + -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(libk3b3-trinity\\)\\( [^,]*\|$$\)/\\1:\\2\\3/" \ + -e "s/\\(libk3b3\\)-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 "/libk3b3$(DEB_TIME64_SUFFIX)-" | \ + xargs -r rm + [ ! -f debian/control.t64 ] || \ + mv debian/control.t64 debian/control +endif diff --git a/debian/_base/applications/multimedia/kplayer/debian/patches/series b/debian/_base/applications/multimedia/kplayer/debian/patches/series index 8b1378917..e69de29bb 100644 --- a/debian/_base/applications/multimedia/kplayer/debian/patches/series +++ b/debian/_base/applications/multimedia/kplayer/debian/patches/series @@ -1 +0,0 @@ - diff --git a/debian/_base/applications/system/knetload/debian/patches/series b/debian/_base/applications/system/knetload/debian/patches/series index 8b1378917..e69de29bb 100644 --- a/debian/_base/applications/system/knetload/debian/patches/series +++ b/debian/_base/applications/system/knetload/debian/patches/series @@ -1 +0,0 @@ - diff --git a/debian/_base/applications/system/tastymenu/debian/patches/series b/debian/_base/applications/system/tastymenu/debian/patches/series index 8b1378917..e69de29bb 100644 --- a/debian/_base/applications/system/tastymenu/debian/patches/series +++ b/debian/_base/applications/system/tastymenu/debian/patches/series @@ -1 +0,0 @@ - diff --git a/debian/_base/applications/themes/tde-style-baghira/debian/patches/series b/debian/_base/applications/themes/tde-style-baghira/debian/patches/series index 8b1378917..e69de29bb 100644 --- a/debian/_base/applications/themes/tde-style-baghira/debian/patches/series +++ b/debian/_base/applications/themes/tde-style-baghira/debian/patches/series @@ -1 +0,0 @@ - diff --git a/debian/_base/applications/themes/tde-style-domino/debian/patches/series b/debian/_base/applications/themes/tde-style-domino/debian/patches/series index 8b1378917..e69de29bb 100644 --- a/debian/_base/applications/themes/tde-style-domino/debian/patches/series +++ b/debian/_base/applications/themes/tde-style-domino/debian/patches/series @@ -1 +0,0 @@ - diff --git a/debian/_base/applications/themes/tde-style-ia-ora/debian/control b/debian/_base/applications/themes/tde-style-ia-ora/debian/control index a61fbc7aa..9daa84f38 100644 --- a/debian/_base/applications/themes/tde-style-ia-ora/debian/control +++ b/debian/_base/applications/themes/tde-style-ia-ora/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> X-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net> -Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdebase-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdebase-trinity-dev, libgtk2.0-dev Standards-Version: 3.8.0 Package: tde-style-ia-ora-trinity diff --git a/debian/_base/applications/themes/tde-style-ia-ora/debian/patches/series b/debian/_base/applications/themes/tde-style-ia-ora/debian/patches/series index 8b1378917..e69de29bb 100644 --- a/debian/_base/applications/themes/tde-style-ia-ora/debian/patches/series +++ b/debian/_base/applications/themes/tde-style-ia-ora/debian/patches/series @@ -1 +0,0 @@ - diff --git a/debian/_base/applications/themes/tde-style-polyester/debian/patches/series b/debian/_base/applications/themes/tde-style-polyester/debian/patches/series index 8b1378917..e69de29bb 100644 --- a/debian/_base/applications/themes/tde-style-polyester/debian/patches/series +++ b/debian/_base/applications/themes/tde-style-polyester/debian/patches/series @@ -1 +0,0 @@ - diff --git a/debian/_base/applications/utilities/qalculate-tde/debian/patches/series b/debian/_base/applications/utilities/qalculate-tde/debian/patches/series index 8b1378917..e69de29bb 100644 --- a/debian/_base/applications/utilities/qalculate-tde/debian/patches/series +++ b/debian/_base/applications/utilities/qalculate-tde/debian/patches/series @@ -1 +0,0 @@ - |