diff options
Diffstat (limited to 'debian/_base/applications/multimedia')
79 files changed, 229 insertions, 1243 deletions
diff --git a/debian/_base/applications/multimedia/amarok/debian/amarok-trinity.install b/debian/_base/applications/multimedia/amarok/debian/amarok-trinity.install index ed34bb3c2..0dbd9f84e 100644 --- a/debian/_base/applications/multimedia/amarok/debian/amarok-trinity.install +++ b/debian/_base/applications/multimedia/amarok/debian/amarok-trinity.install @@ -1,28 +1,32 @@ -debian/tmp/opt/trinity/share/applications/tde/amarok.desktop -debian/tmp/opt/trinity/share/services/amarokitpc.protocol -debian/tmp/opt/trinity/share/services/amaroklastfm.protocol -debian/tmp/opt/trinity/share/services/amarokpcast.protocol -debian/tmp/opt/trinity/share/servicetypes/amarok_plugin.desktop -debian/tmp/opt/trinity/share/servicetypes/amarok_codecinstall.desktop -debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_append.desktop -debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_addaspodcast.desktop -debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_play_audiocd.desktop -debian/tmp/opt/trinity/lib/trinity/libamarok_void-engine_plugin.la -debian/tmp/opt/trinity/lib/trinity/libamarok_void-engine_plugin.so +debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.la +debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.so debian/tmp/opt/trinity/lib/trinity/libamarok_generic-mediadevice.la debian/tmp/opt/trinity/lib/trinity/libamarok_generic-mediadevice.so debian/tmp/opt/trinity/lib/trinity/libamarok_ipod-mediadevice.la debian/tmp/opt/trinity/lib/trinity/libamarok_ipod-mediadevice.so -debian/tmp/opt/trinity/lib/trinity/libamarok_njb-mediadevice.la -debian/tmp/opt/trinity/lib/trinity/libamarok_njb-mediadevice.so -debian/tmp/opt/trinity/lib/trinity/libamarok_smb-device.la -debian/tmp/opt/trinity/lib/trinity/libamarok_smb-device.so debian/tmp/opt/trinity/lib/trinity/libamarok_massstorage-device.la debian/tmp/opt/trinity/lib/trinity/libamarok_massstorage-device.so debian/tmp/opt/trinity/lib/trinity/libamarok_nfs-device.la debian/tmp/opt/trinity/lib/trinity/libamarok_nfs-device.so -debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.la -debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.so +debian/tmp/opt/trinity/lib/trinity/libamarok_njb-mediadevice.la +debian/tmp/opt/trinity/lib/trinity/libamarok_njb-mediadevice.so +debian/tmp/opt/trinity/lib/trinity/libamarok_smb-device.la +debian/tmp/opt/trinity/lib/trinity/libamarok_smb-device.so +debian/tmp/opt/trinity/lib/trinity/libamarok_void-engine_plugin.la +debian/tmp/opt/trinity/lib/trinity/libamarok_void-engine_plugin.so +debian/tmp/opt/trinity/share/applications/tde/amarok.desktop +debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_addaspodcast.desktop +debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_append.desktop +debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_play_audiocd.desktop +debian/tmp/opt/trinity/share/man/man1/amarokapp.1 +debian/tmp/opt/trinity/share/man/man1/amarokcollectionscanner.1 +debian/tmp/opt/trinity/share/man/man1/amarok_libvisual.1 +debian/tmp/opt/trinity/share/man/man1/amarok.1 +debian/tmp/opt/trinity/share/services/amarokitpc.protocol +debian/tmp/opt/trinity/share/services/amaroklastfm.protocol +debian/tmp/opt/trinity/share/services/amarokpcast.protocol +debian/tmp/opt/trinity/share/servicetypes/amarok_codecinstall.desktop +debian/tmp/opt/trinity/share/servicetypes/amarok_plugin.desktop #libkarma is not in MAIN yet #debian/tmp/opt/trinity/lib/trinity/libamarok_riokarma-mediadevice.la diff --git a/debian/_base/applications/multimedia/amarok/debian/amarok-trinity.manpages b/debian/_base/applications/multimedia/amarok/debian/amarok-trinity.manpages deleted file mode 100644 index 8094eebb9..000000000 --- a/debian/_base/applications/multimedia/amarok/debian/amarok-trinity.manpages +++ /dev/null @@ -1,4 +0,0 @@ -debian/man/amarokapp-trinity.1 -debian/man/amarok-trinity.1 -debian/man/amarokcollectionscanner-trinity.1 -debian/man/amarok_libvisual-trinity.1 diff --git a/debian/_base/applications/multimedia/amarok/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/amarok/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/debian/_base/applications/multimedia/amarok/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/multimedia/amarok/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/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; \ diff --git a/debian/_base/applications/multimedia/amarok/debian/compat b/debian/_base/applications/multimedia/amarok/debian/compat index ec635144f..f599e28b8 100644 --- a/debian/_base/applications/multimedia/amarok/debian/compat +++ b/debian/_base/applications/multimedia/amarok/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/_base/applications/multimedia/amarok/debian/control b/debian/_base/applications/multimedia/amarok/debian/control index e0593e503..a71ba59fc 100644 --- a/debian/_base/applications/multimedia/amarok/debian/control +++ b/debian/_base/applications/multimedia/amarok/debian/control @@ -4,14 +4,14 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Modestas Vainius <modestas@vainius.eu> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, bzip2, +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, bzip2, tdelibs14-trinity-dev, tdebase-trinity-dev, libakode-dev, libxine2-dev | libxine-dev, libtag1-dev, libsqlite3-dev, default-libmysqlclient-dev | libmysqlclient-dev, libpq-dev, libvisual-0.4-dev, libsdl1.2-dev, libusb-dev, libgpod-nogtk-dev (>= 0.4.2) | libgpod-dev (>> 0.8.3-8), libnjb-dev, libmtp-dev, libmp4v2-dev, - ruby, ruby-dev + ruby, ruby-dev, dh-python Standards-Version: 3.8.4 Homepage: http://amarok.kde.org @@ -21,7 +21,7 @@ Depends: libamarok-trinity (= ${binary:Version}), amarok-common-trinity (>= ${so Replaces: amarok-trinity (<< 4:14.0.0~) Breaks: amarok-trinity (<< 4:14.0.0~) Suggests: amarok-konqsidebar-trinity, moodbar, konqueror-trinity | www-browser, - python-all, python-tqt, libqt0-ruby-trinity, libvisual-0.4-plugins + python3-all, python3-pytqt, libqt0-ruby-trinity, libvisual-0.4-plugins Description: versatile and easy to use audio player for Trinity Amarok tries to be a little different, providing a simple drag and drop interface that really makes playlist handling easy. @@ -57,18 +57,18 @@ Description: base library for Amarok [Trinity] Package: amarok-common-trinity Architecture: all -Depends: ruby +Depends: ruby, ${python3:Depends} Replaces: amarok-common-trinity (<< 4:14.0.0~) Breaks: amarok-common-trinity (<< 4:14.0.0~) Recommends: amarok-trinity (>= ${source:Version}) -Suggests: libqt0-ruby-trinity, python-all, python-tqt +Suggests: libqt0-ruby-trinity, python3-all, python3-pytqt Description: architecture independent files for Amarok [Trinity] This package contains architecture independent files needed for Amarok to run properly. It also provides Amarok documentation. Therefore, unless you have 'amarok' package installed, you will hardly find this package useful. . You need to install Python if you intend to use Zeroconf support, WebControl - and/or playlist2html scripts. You will also need python-qt3 for the + and/or playlist2html scripts. You will also need python3-pytqt for the WebControl script. Package: amarok-konqsidebar-trinity diff --git a/debian/_base/applications/multimedia/amarok/debian/man/amarok-trinity.1 b/debian/_base/applications/multimedia/amarok/debian/man/amarok-trinity.1 deleted file mode 100644 index 821ec48c7..000000000 --- a/debian/_base/applications/multimedia/amarok/debian/man/amarok-trinity.1 +++ /dev/null @@ -1,181 +0,0 @@ -.\" Generated by kdemangen.pl and edited by hand -.TH AMAROK 1 "Mar 2004" "Trinity Desktop Environment" "An audio player for TDE" -.SH NAME -amarok -\- An audio player for TDE -.SH SYNOPSIS -amarok [Qt-options] [TDE-options] [URL(s)] -.SH DESCRIPTION -amaroK is a multimedia player based on the soundserver-independent framework. -There are many media players around these days, true. What's missing from most -players is a user interface, that doesn't get in the way of the user. -.SH OPTIONS -.SS Generic options: -.TP -.B \-\-help -Show help about options -.TP -.B \-\-help\-qt -Show Qt specific options -.TP -.B \-\-help\-tde -Show TDE specific options -.TP -.B \-\-help\-all -Show all options -.TP -.B \-\-author -Show author information -.TP -.B \-v, \-\-version -Show version information -.TP -.B \-\-license -Show license information -.TP -.B \-\- -End of options -.SS -.SS Qt options: -.TP -.B \-\-display <displayname> -Use the X-server display 'displayname'. -.TP -.B \-\-session <sessionId> -Restore the application for the given 'sessionId'. -.TP -.B \-\-cmap -Causes the application to install a private color -map on an 8-bit display. -.TP -.B \-\-ncols <count> -Limits the number of colors allocated in the color -cube on an 8-bit display, if the application is -using the QApplication::ManyColor color -specification. -.TP -.B \-\-nograb -tells Qt to never grab the mouse or the keyboard. -.TP -.B \-\-dograb -running under a debugger can cause an implicit -\-\-nograb, use \-\-dograb to override. -.TP -.B \-\-sync -switches to synchronous mode for debugging. -.TP -.B \-\-fn, \-\-font <fontname> -defines the application font. -.TP -.B \-\-bg, \-\-background <color> -sets the default background color and an -application palette (light and dark shades are -calculated). -.TP -.B \-\-fg, \-\-foreground <color> -sets the default foreground color. -.TP -.B \-\-btn, \-\-button <color> -sets the default button color. -.TP -.B \-\-name <name> -sets the application name. -.TP -.B \-\-title <title> -sets the application title (caption). -.TP -.B \-\-visual TrueColor -forces the application to use a TrueColor visual on -an 8-bit display. -.TP -.B \-\-inputstyle <inputstyle> -sets XIM (X Input Method) input style. Possible -values are onthespot, overthespot, offthespot and -root. -.TP -.B \-\-im <XIM server> -set XIM server. -.TP -.B \-\-noxim -disable XIM. -.TP -.B \-\-reverse -mirrors the whole layout of widgets. -.SS -.SS TDE options: -.TP -.B \-\-caption <caption> -Use 'caption' as name in the titlebar. -.TP -.B \-\-icon <icon> -Use 'icon' as the application icon. -.TP -.B \-\-miniicon <icon> -Use 'icon' as the icon in the titlebar. -.TP -.B \-\-config <filename> -Use alternative configuration file. -.TP -.B \-\-dcopserver <server> -Use the DCOP Server specified by 'server'. -.TP -.B \-\-nocrashhandler -Disable crash handler, to get core dumps. -.TP -.B \-\-waitforwm -Waits for a WM_NET compatible windowmanager. -.TP -.B \-\-style <style> -sets the application GUI style. -.TP -.B \-\-geometry <geometry> -sets the client geometry of the main widget. -.SS -.SS Arguments: -URL(s) Files/URLs to Open -.SS -.SS Options: -.TP -.B \-r, \-\-previous -Skip backwards in playlist -.TP -.B \-p, \-\-play -Start playing current playlist -.TP -.B \-s, \-\-stop -Stop playback -.TP -.B \-\-pause -Pause playback -.TP -.B \-f, \-\-next -Skip forwards in playlist -.SS -.SS Additional options: -.TP -.B \-e, \-\-enqueue -Enqueue Files/URLs - -.SH SEE ALSO -Full user documentation is available through the TDE Help Center. You can also enter the URL -.BR help:/amarok/ -directly into konqueror or you can run -.BR "`khelpcenter help:/amarok/'" -from the command-line. -.BR -.SH AUTHORS -.nf -Christian Muehlhaeuser <chris@chris.de> -.BR -Mark Kretschmann <markey@web.de> -.BR -Max Howell <max.howell@methylblue.com> -.BR -Stanislav Karchebny <berk@upnet.ru> -.BR -Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly. -.BR -.SH OTHER -This manual page was written by Alejandro Exojo <suy@badopi.org> for the Debian -system (but may be used by others). -.BR diff --git a/debian/_base/applications/multimedia/amarok/debian/man/amarok_libvisual-trinity.1 b/debian/_base/applications/multimedia/amarok/debian/man/amarok_libvisual-trinity.1 deleted file mode 100644 index c932b9b0c..000000000 --- a/debian/_base/applications/multimedia/amarok/debian/man/amarok_libvisual-trinity.1 +++ /dev/null @@ -1,14 +0,0 @@ -.\" This file was generated by kdemangen.pl and edited manually by Modestas Vainius -.TH AMAROK_LIBVISUAL 1 "Feb 2008" "Amarok" "LibVisual support utility for Amarok" -.SH NAME -amarok_libvisual \- LibVisual support utility for Amarok -.SH SYNOPSIS -amarok_libvisual -.SH DESCRIPTION -This is LibVisual support helper utility for Amarok. It's used internally by Amarok -itself when needed and is not supposed to be invoked manually by user. -.SS -.SH AUTHORS -Amarok Developers -.SH OTHER -This manual page was written by Modestas Vainius <modestas@vainius.eu> for Debian. diff --git a/debian/_base/applications/multimedia/amarok/debian/man/amarokapp-trinity.1 b/debian/_base/applications/multimedia/amarok/debian/man/amarokapp-trinity.1 deleted file mode 100644 index 91ff8b6aa..000000000 --- a/debian/_base/applications/multimedia/amarok/debian/man/amarokapp-trinity.1 +++ /dev/null @@ -1,23 +0,0 @@ -.\" Generated by kdemangen.pl and edited by hand -.TH AMAROK 1 "Feb 2008" "Amarok" "An audio player for TDE" -.SH NAME -amarokapp -\- A direct executable for Amarok. -.SH SYNOPSIS -amarokapp [Qt-options] [TDE-options] [URL(s)] -.SH DESCRIPTION -Amarok is a multimedia player based on the soundserver-independent framework. -There are many media players around these days, true. What's missing from most -players is a user interface, that doesn't get in the way of the user. -.P -This is direct Amarok executable. The recommend way to run Amarok is using -\fBamarok(1)\fP, which is a wrapper script around \fBamarokapp\fP. However, if you're -debugging Amarok with gdb, valgrind or similar program, you will probably want to -run it against this binary directly. -.P -\fBamarokapp(1)\fP takes the same command line options and arguments as -\fBamarok(1)\fP. See its manual page for more information how to run \fBamarokapp\fP. -.SH SEE ALSO -amarok(1) -.SH OTHER -This manual page was written by Modestas Vainius <modestas@vainius.eu> for Debian. diff --git a/debian/_base/applications/multimedia/amarok/debian/man/amarokcollectionscanner-trinity.1 b/debian/_base/applications/multimedia/amarok/debian/man/amarokcollectionscanner-trinity.1 deleted file mode 100644 index c67cd917f..000000000 --- a/debian/_base/applications/multimedia/amarok/debian/man/amarokcollectionscanner-trinity.1 +++ /dev/null @@ -1,63 +0,0 @@ -.\" This file was generated by kdemangen.pl and edited manually by Modestas Vainius -.TH AMAROKCOLLECTIONSCANNER 1 "Feb 2008" "Amarok" "Collection Scanner for Amarok" -.SH NAME -amarokcollectionscanner \- Collection Scanner for Amarok -.SH SYNOPSIS -amarokcollectionscanner [Qt\-options] [TDE\-options] Folder(s) -.SH DESCRIPTION -This Amarok helper utility scans folder(s) given on the command line or -restarts previous scan if \fB\-\-restart\fP option was given and writes a -specially structured XML file to standard output with extensive information -(including tags) about audio files it was able to find. XML file schema used -by this utility is Amarok specific. -.P -You may find his utility useful if you need to retreive and/or display extended -information about collection of audio files. -.SH OPTIONS -.SS -.SS Arguments: -Folder(s) Folders to scan -.SS -.SS Options: -.TP -.B \-r, \-\-recursive -Scan folders recursively -.TP -.B \-i, \-\-incremental -Incremental Scan (modified folders only) -.TP -.B \-p, \-\-importplaylists -Import playlist -.TP -.B \-s, \-\-restart -Restart the scanner at last position, after a crash [] -.SS Generic options: -.TP -.B \-\-help -Show help about options -.TP -.B \-\-help\-qt -Show Qt specific options -.TP -.B \-\-help\-tde -Show TDE specific options -.TP -.B \-\-help\-all -Show all options -.TP -.B \-\-author -Show author information -.TP -.B \-v, \-\-version -Show version information -.TP -.B \-\-license -Show license information -.TP -.B \-\- -End of options -.SS -.SH AUTHORS -Amarok Developers -.SH OTHER -This manual page was written by Modestas Vainius <modestas@vainius.eu> for Debian. diff --git a/debian/_base/applications/multimedia/amarok/debian/rules b/debian/_base/applications/multimedia/amarok/debian/rules index 55c147b76..09544563a 100755 --- a/debian/_base/applications/multimedia/amarok/debian/rules +++ b/debian/_base/applications/multimedia/amarok/debian/rules @@ -17,3 +17,9 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_ALL_OPTIONS="ON" \ -DWITH_YAUAP="OFF" \ -DWITH_IFP="OFF" + +binary-install/amarok-common-trinity:: + dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 \ + /opt/trinity/share/apps/amarok/scripts/playlist2html + dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 \ + /opt/trinity/share/apps/amarok/scripts/webcontrol diff --git a/debian/_base/applications/multimedia/codeine/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/codeine/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/debian/_base/applications/multimedia/codeine/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/multimedia/codeine/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/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; \ diff --git a/debian/_base/applications/multimedia/codeine/debian/compat b/debian/_base/applications/multimedia/codeine/debian/compat index ec635144f..f599e28b8 100644 --- a/debian/_base/applications/multimedia/codeine/debian/compat +++ b/debian/_base/applications/multimedia/codeine/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/_base/applications/multimedia/codeine/debian/control b/debian/_base/applications/multimedia/codeine/debian/control index 03cba509a..e1ca4d568 100644 --- a/debian/_base/applications/multimedia/codeine/debian/control +++ b/debian/_base/applications/multimedia/codeine/debian/control @@ -2,7 +2,7 @@ Source: codeine-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev, libxine2-dev | libxine-dev, libxtst-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, libxine2-dev | libxine-dev, libxtst-dev Standards-Version: 3.7.3 Homepage: http://codeine.sourceforge.net/ 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-i18n/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/k3b-i18n/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/debian/_base/applications/multimedia/k3b-i18n/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/multimedia/k3b-i18n/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/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; \ diff --git a/debian/_base/applications/multimedia/k3b-i18n/debian/compat b/debian/_base/applications/multimedia/k3b-i18n/debian/compat index ec635144f..f599e28b8 100644 --- a/debian/_base/applications/multimedia/k3b-i18n/debian/compat +++ b/debian/_base/applications/multimedia/k3b-i18n/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/_base/applications/multimedia/k3b-i18n/debian/control b/debian/_base/applications/multimedia/k3b-i18n/debian/control index a33db1b1e..426d3811a 100644 --- a/debian/_base/applications/multimedia/k3b-i18n/debian/control +++ b/debian/_base/applications/multimedia/k3b-i18n/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Francois Marier <francois@debian.org>, Fathi Boudra <fabo@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build Build-Depends-Indep: tdelibs14-trinity-dev Standards-Version: 3.8.3 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/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/k3b/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/debian/_base/applications/multimedia/k3b/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/multimedia/k3b/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/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; \ diff --git a/debian/_base/applications/multimedia/k3b/debian/compat b/debian/_base/applications/multimedia/k3b/debian/compat index ec635144f..f599e28b8 100644 --- a/debian/_base/applications/multimedia/k3b/debian/compat +++ b/debian/_base/applications/multimedia/k3b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/_base/applications/multimedia/k3b/debian/control b/debian/_base/applications/multimedia/k3b/debian/control index 8cc2b03b8..ca1eb6f17 100644 --- a/debian/_base/applications/multimedia/k3b/debian/control +++ b/debian/_base/applications/multimedia/k3b/debian/control @@ -5,7 +5,7 @@ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Francois Marier <francois@debian.org>, Fathi Boudra <fabo@debian.org> Build-Depends: - cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, + cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libdvdread-dev, libasound2-dev, lame, libmp3lame-dev, libflac++-dev (>= 1.1.2), flac, libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmad0-dev, libavformat-dev, libavcodec-dev, libvorbis-dev, libsamplerate0-dev, libsndfile1-dev @@ -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/k3b-trinity.1 b/debian/_base/applications/multimedia/k3b/debian/k3b-trinity.1 deleted file mode 100644 index 08ca27b5f..000000000 --- a/debian/_base/applications/multimedia/k3b/debian/k3b-trinity.1 +++ /dev/null @@ -1,207 +0,0 @@ -.TH K3B "1" "December 2002" TDE "TDE Application" -.SH NAME -k3b \- TDE CD burning program -.SH SYNOPSIS -.B k3b -[\fIQt-options\fR] [\fITDE-options\fR] [\fIFile\fR] -.SH DESCRIPTION -This manual page documents briefly the -.B k3b -TDE Application. -This manual page was written for the Debian GNU/Linux distribution -because the original program does not have a manual page. -.PP -K3b is a CD burning program that has two aims: -usability and as many features as possible. -.P -This program is part of the official TDE extra gear #1 module. -.SH OPTIONS -.SS "Arguments:" -.TP -File(s) -file(s) to open -.SS "General Options" -.B \-\-help -Show help about options -.TP -.B \-\-help\-qt -Show Qt specific options -.TP -.B \-\-help\-tde -Show TDE specific options -.TP -.B \-\-help\-all -Show all options -.TP -.B \-\-author -Show author information -.TP -.B \-v\fR, \fB\-\-version -Show version information -.TP -.B \-\-license -Show license information -.TP -.B \-\- -End of options -.SS "Options:" -.B \-\-datacd -Create a new data CD project and add all given files -.TP -.B \-\-audiocd -Create a new audio CD project and add all given files -.TP -.B \-\-videocd -Create a new video CD project and add all given files -.TP -.B \-\-mixedcd -Create a new mixed mode CD project and add all given files -.TP -.B \-\-emovixcd -Create a new eMovix CD project and add all given files -.TP -.B \-\-datadvd -Create a new data DVD project and add all given files -.TP -.B \-\-emovixdvd -Create a new eMovix DVD project and add all given files -.TP -.B \-\-copycd -Open the CD copy dialog -.TP -.B \-\-clonecd -Open the CD cloning dialog -.TP -.B \-\-cdimage -Write an ISO image or Bin/Cue image to cd -.TP -.B \-\-erasecd -Erase a CDRW -.TP -.B \-\-formatdvd -Format a DVD-RW or DVD+RW -.TP -.BI \-\-lang \ language -Set the GUI language -.SS "Qt options:" -.TP -.BI \-\-display \ displayname -Use the X-server display \fIdisplayname\fP. -.TP -.BI \-\-session \ sessionId -Restore the application for the given \fIsessionId\fP. -.TP -.B \-\-cmap -Causes the application to install a private color -map on an 8-bit display. -.TP -.BI \-\-ncols \ count -Limits the number of colors allocated in the color -cube on an 8-bit display, if the application is -using the QApplication::ManyColor color -specification. -.TP -.B \-\-nograb -tells Qt to never grab the mouse or the keyboard. -.TP -.B \-\-dograb -running under a debugger can cause an implicit -.B \-nograb, use \fB\-dograb\fR to override. -.TP -.B \-\-sync -switches to synchronous mode for debugging. -.TP -.BI "\-\-fn\fR, \fP\-\-font" \ fontname -defines the application font. -.TP -.BI "-\-bg\fR, \fB\-\-background" \ color -sets the default background color and an -application palette (light and dark shades are -calculated). -.TP -.BI "\-\-fg\fR, \fB\-\-foreground" \ color -sets the default foreground color. -.TP -.BI \-\-btn\fR, \fB\-\-button \ color -sets the default button color. -.TP -.BI \-\-name \ name -sets the application name. -.TP -.BI \-\-title \ title -sets the application title (caption). -.TP -.B \-\-visual TrueColor -forces the application to use a TrueColor visual on -an 8-bit display. -.TP -.BI \-\-inputstyle \ inputstyle -sets XIM (X Input Method) input style. Possible -values are -.BR onthespot ", " overthespot ", " offthespot and root . -.TP -.BI \-\-im " XIM-server" -set XIM server. -.TP -.B \-\-noxim -disable XIM. -.TP -.B \-\-reverse -mirrors the whole layout of widgets. -.SS "TDE options:" -.TP -.BI \-\-caption \ caption -Use \fIcaption\fP as name in the titlebar. -.TP -.BI \-\-icon \ icon -Use \fIicon\fP as the application icon. -.TP -.BI \-\-miniicon \ icon -Use \fIicon\fP as the icon in the titlebar. -.TP -.BI \-\-config \ filename -Use alternative configuration file. -.TP -.BI \-\-dcopserver \ server -Use the DCOP Server specified by \fIserver\fP. -.TP -.B \-\-nocrashhandler -Disable crash handler, to get core dumps. -.TP -.B \-\-waitforwm -Waits for a WM_NET compatible windowmanager. -.TP -.BI \-\-style \ style -sets the application GUI style. -.TP -.BI \-\-geometry \ geometry -sets the client geometry of the main widget. -.SH AUTHOR -K3b was written by -.nh -.ad l -Sebastian Trueg <trueg@informatik.uni-freiburg.de> -and Thomas Froescher <tfroescher@gmx.de>. -.hy -.br -Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly. -.br -This manual page was prepared by -.nh -.ad l -Karolina Lindqvist <pgd\-karolinali@algonet.se> -.hy -for the Debian GNU/Linux system (but may be used by others). -.SH "SEE ALSO" -If the -.B khelpcenter -program is properly installed at your site, the command -.IP -.B khelpcenter help:/k3b -.PP -should give you access to the complete manual. -.P -Alternatively the manual can be browsed in -.B konqueror -giving it the URL help:/k3b - diff --git a/debian/_base/applications/multimedia/k3b/debian/k3b-trinity.install b/debian/_base/applications/multimedia/k3b/debian/k3b-trinity.install index a72c0b374..8c6643cf2 100644 --- a/debian/_base/applications/multimedia/k3b/debian/k3b-trinity.install +++ b/debian/_base/applications/multimedia/k3b/debian/k3b-trinity.install @@ -1,5 +1,7 @@ debian/tmp/opt/trinity/bin/* -debian/tmp/opt/trinity/share/applications/* -debian/k3b.xpm /opt/trinity/share/pixmaps/ debian/tmp/opt/trinity/lib/trinity/tdefile_k3b.so debian/tmp/opt/trinity/lib/trinity/tdefile_k3b.la +debian/tmp/opt/trinity/share/applications/* +debian/tmp/opt/trinity/share/man/man1/k3b.1 + +debian/k3b.xpm /opt/trinity/share/pixmaps/ diff --git a/debian/_base/applications/multimedia/k3b/debian/k3b-trinity.manpages b/debian/_base/applications/multimedia/k3b/debian/k3b-trinity.manpages deleted file mode 100644 index 328f16efe..000000000 --- a/debian/_base/applications/multimedia/k3b/debian/k3b-trinity.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/k3b-trinity.1 diff --git a/debian/_base/applications/multimedia/k3b/debian/k3b.files b/debian/_base/applications/multimedia/k3b/debian/k3b.files deleted file mode 100644 index d6388a5b6..000000000 --- a/debian/_base/applications/multimedia/k3b/debian/k3b.files +++ /dev/null @@ -1,6 +0,0 @@ -usr/share/applications/* -usr/share/mimelnk/* -usr/share/pixmaps/* -usr/share/services/* -usr/bin/* -etc/* diff --git a/debian/_base/applications/multimedia/k3b/debian/k3b.install b/debian/_base/applications/multimedia/k3b/debian/k3b.install deleted file mode 100644 index 134bb0bf2..000000000 --- a/debian/_base/applications/multimedia/k3b/debian/k3b.install +++ /dev/null @@ -1,5 +0,0 @@ -debian/tmp/usr/bin/* -debian/tmp/usr/share/applications/* -debian/k3b.xpm usr/share/pixmaps/ -debian/tmp/usr/lib/trinity/tdefile_k3b.so -debian/tmp/usr/lib/trinity/tdefile_k3b.la diff --git a/debian/_base/applications/multimedia/k3b/debian/k3b.manpages b/debian/_base/applications/multimedia/k3b/debian/k3b.manpages deleted file mode 100644 index 60dde70bc..000000000 --- a/debian/_base/applications/multimedia/k3b/debian/k3b.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/k3b.1 diff --git a/debian/_base/applications/multimedia/k3b/debian/k3b.menu b/debian/_base/applications/multimedia/k3b/debian/k3b.menu deleted file mode 100644 index e3ec0ef1f..000000000 --- a/debian/_base/applications/multimedia/k3b/debian/k3b.menu +++ /dev/null @@ -1,6 +0,0 @@ -?package(k3b-trinity):\ - needs="X11"\ - section="Applications/File Management"\ - title="K3b"\ - command="/opt/trinity/bin/k3b"\ - icon="/opt/trinity/share/pixmaps/k3b.xpm" diff --git a/debian/_base/applications/multimedia/k3b/debian/k3b.postinst b/debian/_base/applications/multimedia/k3b/debian/k3b.postinst deleted file mode 100644 index 3807d55e6..000000000 --- a/debian/_base/applications/multimedia/k3b/debian/k3b.postinst +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -e - -case "$1" in - configure) - - # Remove bad files - if dpkg --compare-versions "$2" eq "0.10.3-1"; then - rm -rf /usr/share/applnk/.hidden - rm -rf /usr/share/applnk/System/k3b.desktop - fi - - if dpkg --compare-versions "$2" lt "0.10.3-1"; then - rm -rf /usr/share/applnk/System/k3b.desktop - rm -rf /usr/share/applnk/System/k3bsetup.desktop - fi - - ;; -abort-upgrade|abort-remove|abort-deconfigure) - ;; - -*) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - 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/k3b/debian/watch b/debian/_base/applications/multimedia/k3b/debian/watch deleted file mode 100644 index 7e3c554ae..000000000 --- a/debian/_base/applications/multimedia/k3b/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://sf.net/k3b/k3b-([\d.]*).tar.bz2 diff --git a/debian/_base/applications/multimedia/k9copy/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/k9copy/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/debian/_base/applications/multimedia/k9copy/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/multimedia/k9copy/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/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; \ diff --git a/debian/_base/applications/multimedia/k9copy/debian/compat b/debian/_base/applications/multimedia/k9copy/debian/compat index 48c962ffa..021ea30c0 100644 --- a/debian/_base/applications/multimedia/k9copy/debian/compat +++ b/debian/_base/applications/multimedia/k9copy/debian/compat @@ -1,2 +1,2 @@ -9 +10 diff --git a/debian/_base/applications/multimedia/k9copy/debian/control b/debian/_base/applications/multimedia/k9copy/debian/control index 9899669c7..e94e97d8c 100644 --- a/debian/_base/applications/multimedia/k9copy/debian/control +++ b/debian/_base/applications/multimedia/k9copy/debian/control @@ -3,7 +3,8 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com> -Build-Depends: debhelper (>= 9~), quilt, cdbs, tdelibs14-trinity-dev, docbook2x, docbook-xml, libdvdread-dev, libdbus-1-dev, libk3b-trinity-dev, libavformat-dev, libswscale-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 10~), quilt, cdbs, tde-cmake, ninja-build, tdelibs14-trinity-dev, + libdvdread-dev, libk3b-trinity-dev, libavformat-dev, libswscale-dev Standards-Version: 3.8.4 Package: k9copy-trinity diff --git a/debian/_base/applications/multimedia/k9copy/debian/k9copy.1.docbook b/debian/_base/applications/multimedia/k9copy/debian/k9copy.1.docbook deleted file mode 100644 index 96001a6ad..000000000 --- a/debian/_base/applications/multimedia/k9copy/debian/k9copy.1.docbook +++ /dev/null @@ -1,113 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" -"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ -]> -<refentry> - <refentryinfo> - <author> - <firstname>Mercatante</firstname> - <surname>Anthony</surname> - <email>anthony.mercatante@laposte.net</email> - </author> - <copyright> - <year>2005</year> - <holder>Anthony Mercatante</holder> - </copyright> - <!-- XXX IMPORTANT XXX --> - <!-- Keep this date up to date: --> - <date>2005-07-28</date> - <!-- ^^^^^^^^^^ --> - </refentryinfo> - <refmeta> - <refentrytitle>k9copy</refentrytitle> - <manvolnum>1</manvolnum> - </refmeta> - <refnamediv> - <refname>k9copy</refname> - <refpurpose>DVD copy tool for TDE</refpurpose> - </refnamediv> - <refsynopsisdiv> - <cmdsynopsis> - <command>k9copy</command> - <arg choice="opt"> - <option><replaceable>Qt-options</replaceable></option> - </arg> - <arg choice="opt"> - <option><replaceable>TDE-options</replaceable></option> - </arg> - </cmdsynopsis> - </refsynopsisdiv> - <refsect1> - <title>DESCRIPTION</title> - <para> - DVD copy tool for TDE. - </para> - <para> - k9copy is a DVD backup utility which allow the copy of one or more titles from a DVD9 to a DVD5. - </para> - </refsect1> - <refsect1> - <title>OPTIONS</title> - <para> - All <productname>TDE</productname> and <productname>Qt</productname> - programs accept a some common command-line options. k9copy has no - application-specific options. - </para> - <para> - <variablelist> - <title>Generic options:</title> - <varlistentry> - <term> <option>--help</option> </term> - <listitem> <para>Show help about options</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>--help-qt</option> </term> - <listitem> <para>Show Qt specific options</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>--help-tde</option> </term> - <listitem> <para>Show TDE specific options</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>--help-all</option> </term> - <listitem> <para>Show all options</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>--author</option> </term> - <listitem> <para>Show author information</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>-v</option>, <option>--version</option> </term> - <listitem> <para>Show version information</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>--license</option> </term> - <listitem> <para>Show license information</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>--</option> </term> - <listitem> <para>Indicates end of options</para> </listitem> - </varlistentry> - </variablelist> - <!-- TODO * add all the rest of the options, but maybe find an automated - way to keep it up to date --> - </para> - </refsect1> - <refsect1> - <title>COPYRIGHT</title> - <para> - This manual page was written by Anthony Mercatante - <email>anthony.mercatante@laposte.net</email> for the - <productname>Debian</productname> system (but may be used by others). - Permission is granted to copy, distribute and/or modify this document - under the terms of the <acronym>GNU</acronym> 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 - <filename>/usr/share/common-licenses/GPL</filename>. - </para> - </refsect1> -</refentry> - diff --git a/debian/_base/applications/multimedia/k9copy/debian/rules b/debian/_base/applications/multimedia/k9copy/debian/rules index aca7b475b..a6797f19a 100755 --- a/debian/_base/applications/multimedia/k9copy/debian/rules +++ b/debian/_base/applications/multimedia/k9copy/debian/rules @@ -1,43 +1,17 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) - -DEB_INSTALL_MANPAGES_k9copy = k9copy-trinity.1 - -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" --enable-k3bdevices - -post-patches:: debian/stamp-bootstrap - -debian/stamp-bootstrap: -ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" - cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" - cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" - cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh -endif - cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in - - make -f admin/Makefile.common cvs - touch debian/stamp-bootstrap - -install/k9copy-trinity:: - dh_installman k9copy.1 - mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/ - dh_link opt/trinity/share/doc/tde/HTML/en/k9copy usr/share/doc/$(cdbs_curpkg)/html - -build/k9copy-trinity:: - docbook2x-man debian/k9copy.1.docbook - -clean:: - rm -f k9copy.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/multimedia/kaffeine-mozilla/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/debian/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/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; \ diff --git a/debian/_base/applications/multimedia/kaffeine-mozilla/debian/compat b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/compat index ec635144f..f599e28b8 100644 --- a/debian/_base/applications/multimedia/kaffeine-mozilla/debian/compat +++ b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/_base/applications/multimedia/kaffeine-mozilla/debian/control b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/control index fc66a5b21..f5edfda31 100644 --- a/debian/_base/applications/multimedia/kaffeine-mozilla/debian/control +++ b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/control @@ -3,7 +3,7 @@ Section: web Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Riku Voipio <riku.voipio@iki.fi> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, pkg-config, libxaw7-dev, libnspr4-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, pkg-config, libxaw7-dev, libnspr4-dev Standards-Version: 3.8.4 Package: kaffeine-mozilla-trinity diff --git a/debian/_base/applications/multimedia/kaffeine/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/kaffeine/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/debian/_base/applications/multimedia/kaffeine/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/multimedia/kaffeine/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/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; \ diff --git a/debian/_base/applications/multimedia/kaffeine/debian/compat b/debian/_base/applications/multimedia/kaffeine/debian/compat index ec635144f..f599e28b8 100644 --- a/debian/_base/applications/multimedia/kaffeine/debian/compat +++ b/debian/_base/applications/multimedia/kaffeine/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/_base/applications/multimedia/kaffeine/debian/control b/debian/_base/applications/multimedia/kaffeine/debian/control index e78bee9c1..e0a2aa138 100644 --- a/debian/_base/applications/multimedia/kaffeine/debian/control +++ b/debian/_base/applications/multimedia/kaffeine/debian/control @@ -5,7 +5,7 @@ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Riku Voipio <riku.voipio@iki.fi>, Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libcdparanoia0-dev, libogg-dev, libxine2-dev | libxine-dev (>= 1.1.7), libxcb1-dev, libxtst-dev, libgstreamer1.0-dev | libgstreamer0.10-dev, libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev, diff --git a/debian/_base/applications/multimedia/kmplayer/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/kmplayer/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/debian/_base/applications/multimedia/kmplayer/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/multimedia/kmplayer/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/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; \ diff --git a/debian/_base/applications/multimedia/kmplayer/debian/compat b/debian/_base/applications/multimedia/kmplayer/debian/compat index ec635144f..f599e28b8 100644 --- a/debian/_base/applications/multimedia/kmplayer/debian/compat +++ b/debian/_base/applications/multimedia/kmplayer/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/_base/applications/multimedia/kmplayer/debian/control b/debian/_base/applications/multimedia/kmplayer/debian/control index 7aaebc969..72e4988de 100644 --- a/debian/_base/applications/multimedia/kmplayer/debian/control +++ b/debian/_base/applications/multimedia/kmplayer/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libnspr4-dev, libcairo2-dev, libdbus-1-dev, libdbus-glib-1-dev, libdbus-tqt-1-dev, libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev, libgtk2.0-dev, libxine2-dev | libxine-dev, libxv-dev, libxtst-dev, diff --git a/debian/_base/applications/multimedia/kplayer/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/kplayer/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/debian/_base/applications/multimedia/kplayer/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/multimedia/kplayer/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/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; \ diff --git a/debian/_base/applications/multimedia/kplayer/debian/compat b/debian/_base/applications/multimedia/kplayer/debian/compat index ec635144f..f599e28b8 100644 --- a/debian/_base/applications/multimedia/kplayer/debian/compat +++ b/debian/_base/applications/multimedia/kplayer/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/_base/applications/multimedia/kplayer/debian/control b/debian/_base/applications/multimedia/kplayer/debian/control index b964e58cb..20fdf0f39 100644 --- a/debian/_base/applications/multimedia/kplayer/debian/control +++ b/debian/_base/applications/multimedia/kplayer/debian/control @@ -2,7 +2,7 @@ Source: kplayer-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev Standards-Version: 3.8.4 Homepage: http://kplayer.sourceforge.net/ #Vcs-Git: git://anonscm.debian.org/collab-maint/kplayer-trinity.git diff --git a/debian/_base/applications/multimedia/kplayer/debian/docs b/debian/_base/applications/multimedia/kplayer/debian/docs new file mode 100644 index 000000000..76c3076c9 --- /dev/null +++ b/debian/_base/applications/multimedia/kplayer/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +README.md +TODO 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/multimedia/mplayerthumbs/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/mplayerthumbs/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/debian/_base/applications/multimedia/mplayerthumbs/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/multimedia/mplayerthumbs/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/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; \ diff --git a/debian/_base/applications/multimedia/mplayerthumbs/debian/compat b/debian/_base/applications/multimedia/mplayerthumbs/debian/compat index ec635144f..f599e28b8 100644 --- a/debian/_base/applications/multimedia/mplayerthumbs/debian/compat +++ b/debian/_base/applications/multimedia/mplayerthumbs/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/_base/applications/multimedia/mplayerthumbs/debian/control b/debian/_base/applications/multimedia/mplayerthumbs/debian/control index aed8fbc85..675c8fd5f 100644 --- a/debian/_base/applications/multimedia/mplayerthumbs/debian/control +++ b/debian/_base/applications/multimedia/mplayerthumbs/debian/control @@ -2,7 +2,7 @@ Source: mplayerthumbs-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.2 Package: mplayerthumbs-trinity diff --git a/debian/_base/applications/multimedia/rosegarden/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/rosegarden/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/debian/_base/applications/multimedia/rosegarden/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/multimedia/rosegarden/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/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; \ diff --git a/debian/_base/applications/multimedia/rosegarden/debian/compat b/debian/_base/applications/multimedia/rosegarden/debian/compat index ec635144f..f599e28b8 100644 --- a/debian/_base/applications/multimedia/rosegarden/debian/compat +++ b/debian/_base/applications/multimedia/rosegarden/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/_base/applications/multimedia/rosegarden/debian/control b/debian/_base/applications/multimedia/rosegarden/debian/control index b3a1a57d7..d2fdae5f5 100644 --- a/debian/_base/applications/multimedia/rosegarden/debian/control +++ b/debian/_base/applications/multimedia/rosegarden/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Multimedia Team <debian-multimedia@lists.debian.org> Uploaders: Mike O'Connor <stew@debian.org>, Free Ekanayaka <freee@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblircclient-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, libfftw3-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblirc-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, libfftw3-dev Standards-Version: 3.8.4 Homepage: http://www.rosegardenmusic.com/ diff --git a/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-audiofile-importer.1 b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-audiofile-importer.1 deleted file mode 100644 index b420ba197..000000000 --- a/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-audiofile-importer.1 +++ /dev/null @@ -1,76 +0,0 @@ -.\" This is free documentation; you can redistribute it and/or -.\" modify it under the terms of the GNU General Public License as -.\" published by the Free Software Foundation; either version 2 of -.\" the License, or (at your option) any later version. -.\" -.\" The GNU General Public License's references to "object code" -.\" and "executables" are to be interpreted as the output of any -.\" document formatting or typesetting system, including -.\" intermediate and printed output. -.\" -.\" This manual 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 manual; if not, write to the Free -.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, -.\" USA. -.\" -.TH ROSEGARDEN-AUDIOFILE-IMPORTER 1 "19 March 2006" - -.SH NAME - -rosegarden-audiofile-importer - Helper application to convert and -import audio files for Rosegarden. - -.SH SYNOPSIS - -rosegarden-audiofile-importer -t [<version>] -rosegarden-audiofile-importer --conftest [<version>] -rosegarden-audiofile-importer -l [<version>] -rosegarden-audiofile-importer [-r <rate>] -w <inputfile> -rosegarden-audiofile-importer [-r <rate>] -c <inputfile> <outputfile> - - -.SH OPTIONS - -.BR -t " " [<version>], -.BR --conftest " " [<version>] - -Exit successfully if the importer is available and working [and is -of at least version <version>]. If some of the required helper -applications are missing, also print to stdout a line saying -"Required: application1, application2", listing the missing -programs. - -.BR \-l " " [<version>] - -List known file extensions (e.g. ogg wav flac). Return code is same -as for -t (so can combine two calls into one) - -.BR \-r " " <rate> - -Test whether any work is needed to convert the input, either because -it isn't in a Rosegarden-compatible format or because its samplerate -differs from <rate>. Exit successfully if no work is required; return -error code 2 if conversion required, 3 if resampling required, 4 if -both required, 1 for other error. - -.SH DESCRIPTION - -Helper application to convert and import audio files for Rosegarden. - -Can take audio files of various kinds as input, always produces WAV -files that are compatible with Rosegarden as output. - -Not actually specific to Rosegarden in any way, except that -Rosegarden needs to know it can rely on its presence and calling -interface. - -.SH SEE ALSO - rosegarden(1), rosegarden-lilypondview(1), rosegarden-project-page(1) - - - diff --git a/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-lilypondview.1 b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-lilypondview.1 deleted file mode 100644 index e2aa9f951..000000000 --- a/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-lilypondview.1 +++ /dev/null @@ -1,57 +0,0 @@ -.\" This is free documentation; you can redistribute it and/or -.\" modify it under the terms of the GNU General Public License as -.\" published by the Free Software Foundation; either version 2 of -.\" the License, or (at your option) any later version. -.\" -.\" The GNU General Public License's references to "object code" -.\" and "executables" are to be interpreted as the output of any -.\" document formatting or typesetting system, including -.\" intermediate and printed output. -.\" -.\" This manual 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 manual; if not, write to the Free -.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, -.\" USA. -.\" -.TH ROSEGARDEN-LILIPONDVIEW 1 "10 February 2006" -i -.SH NAME - -rosegardern-lilypondview - display a lilypond file in a postscript -viewer. - -.SH SYNOPSIS - -rosegarden-lilypondview [-g] [FILE].ly - -.SH DESCRIPTION - -This script takes a Lilypond file as input. It creates a temporary -sandbox, runs Lilypond against the input file, then opens a PostScript -viewer against the results in order to provide a graphical, printable -preview. - -This script is used internally by Rosegarden, as the backend for the File -> -Export -> Preview Lilypond file feature. - -.SH OPTIONS -.BR \-g " " Use graphical mode - -.SH REQUIREMENTS - -Working installation of Lilypond 2.0 or later KGhostView or KPDF or -XPDF or GhostView or GS XDialog or Konsole or RXVT or Xterm [for -graphical mode only] - -.SH AUTHOR -Chris Cannam - -.SH COPYRIGHT -2005-2006 Fervent Software. - - diff --git a/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-project-package.1 b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-project-package.1 deleted file mode 100644 index 0da30c2a5..000000000 --- a/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-project-package.1 +++ /dev/null @@ -1,76 +0,0 @@ -.\" This is free documentation; you can redistribute it and/or -.\" modify it under the terms of the GNU General Public License as -.\" published by the Free Software Foundation; either version 2 of -.\" the License, or (at your option) any later version. -.\" -.\" The GNU General Public License's references to "object code" -.\" and "executables" are to be interpreted as the output of any -.\" document formatting or typesetting system, including -.\" intermediate and printed output. -.\" -.\" This manual 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 manual; if not, write to the Free -.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, -.\" USA. -.\" -.TH ROSEGARDEN-PROJECT-PACKAGE 1 "10 February 2006" - -.SH NAME - -rosegarden-project-package - converts between Rosegarden (.rg) files -and Rosegarden Project (.rgp) files. - -.SH SYNOPSIS - -orosegarden-project-package [--quiet] [--pack] [--unpack] [--conftest] [FILE] [.rg|.rgp] - -.SH OPTIONS -.BR \-\-quiet " " Be silent -.BR \-\-unpack " " Unpack .rgp file -.BR \-\-pack " " Pack .rg file plus associated external data files into .rgp file -.BR \-\-conftest " " Test environment for necessary installed components - -.SH DESCRIPTION - -This program converts between Rosegarden (.rg) files and Rosegarden -Project (.rgp) files. It is primarily intended to be used internally and -transparently by the Rosegarden application. - -A Rosegarden file (.rg) is a single file (in gzipped XML format) -that defines a Rosegarden composition in terms of events, segments, -programs, plugin data, references to audio files, and so on. Some -of these types of information depend on the presence of external -files such as the audio files or plugin preset data, without which -the file cannot be used. - -A Rosegarden Project (.rgp) file is a bundle of files, including the -Rosegarden file itself, as well as any audio file or other external -data it requires, in compressed form. A Rosegarden Project file is -intended to be portable and self-contained, but the Rosegarden -program itself does not (at the time of writing) understand these -files directly. - -This program can take a Rosegarden file, examine it to find out -which other data files it uses, and pack it to create the -corresponding Rosegarden Project file. Conversely, it can also take -a Rosegarden Project file and unpack it as a project directory for -use with Rosegarden. - -.SH REQUIREMENTS - -Working installation of Lilypond 2.0 or later KGhostView or KPDF or -XPDF or GhostView or GS XDialog or Konsole or RXVT or Xterm [for -graphical mode only] - -.SH AUTHOR -Chris Cannam - -.SH COPYRIGHT -2005-2006 Fervent Software. - - diff --git a/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.install b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.install index 50a0bcdaa..ac05f6185 100644 --- a/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.install +++ b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.install @@ -1,4 +1,8 @@ debian/tmp/opt/trinity/bin/rosegarden* debian/tmp/opt/trinity/bin/rosegardensequencer* -debian/tmp/opt/trinity/share/mimelnk debian/tmp/opt/trinity/share/applications +debian/tmp/opt/trinity/share/mimelnk +debian/tmp/opt/trinity/share/man/man1/rosegarden.1 +debian/tmp/opt/trinity/share/man/man1/rosegarden-lilypondview.1 +debian/tmp/opt/trinity/share/man/man1/rosegarden-project-package.1 +debian/tmp/opt/trinity/share/man/man1/rosegarden-audiofile-importer.1 diff --git a/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.manpages b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.manpages deleted file mode 100644 index 6e3b96ee0..000000000 --- a/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.manpages +++ /dev/null @@ -1,4 +0,0 @@ -debian/rosegarden.1 -debian/rosegarden-lilypondview.1 -debian/rosegarden-project-package.1 -debian/rosegarden-audiofile-importer.1 diff --git a/debian/_base/applications/multimedia/rosegarden/debian/rosegarden.1 b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden.1 deleted file mode 100644 index fe750e0b2..000000000 --- a/debian/_base/applications/multimedia/rosegarden/debian/rosegarden.1 +++ /dev/null @@ -1,155 +0,0 @@ -.TH ROSEGARDEN 1 "23 July 2006" - -.SH NAME - -rosegarden, rosegarden-sequencer - MIDI and audio sequencer and -musical notation editor. - -.SH SYNOPSIS - -rosegarden [Qt-options] [TDE-options] [options] [File] - -rosegardensequencer [Qt-options] [TDE-options] [playback_1 playback_2 capture_1 capture_2] - -.SH DESCRIPTION - -This manual page documents briefly the rosegarden and rosegardensequencer commands. - -rosegarden is a MIDI and audio sequencer, notation editor, and general-purpose music composition and editing application for Unix and Linux. It is a TDE application, which means to build it you need the TDE libraries. However, once installed it can be run within the TDE environment or any other desktop or window manager environment. - -rosegardensequencer is part of the rosegarden application, the part which knows about and audio MIDI devices, and about real time. rosegardensequencer is executed automatically when rosegarden starts, so you will probably never need to execute it directly. You may want to specify command line options, though, to change the JACK ports used for audio capture and playback. In order to do that, you can invoque rosegardensequencer directly before running rosegarden, or you can specify the sequencer command line arguments using the rosegarden configuration dialog, and restarting the application. This program follows the usual GNU command line syntax, with long options starting with two dashes ('-'). A summary of options is included below. - -.SH OPTIONS -.BR \-\-author " " - Show author information. - -.BR \-\-help " " - Show help about options. - -.BR \-\-help-all - Show all options. - -.BR \-\-help-tde - Show TDE specific options. - -.BR \-\-help-qt - Show Qt specific options. - -.BR \-\-license - Show license information. - -.BR \-v, \-\-version - Show version information. - - -.SH OPTIONS for rosegarden - -.BR \-\-nosplash - Don\'t show splash screen. - - -.BR \-\-nosequencer - Don\'t use an external sequencer. - -.BR \-\-nofork - Don\'t automatically run in the background. - -.BR \ \--existingsequencer - Attach to a running sequencer process, if found. - -.BR File - File to load at startup. Typically a rosegarden (.rg) file, but it can also be a rosegarden2.1 file or a MIDI file. - -.SH OPTIONS -.BR \-g " " Use graphical mode> - -.SH QT OPTIONS -.BR \-\-bg, --background color - Sets the default background color and an application palette (light and dark shades are calculated). - -.BR \-\-btn, --button color - Sets the default button color. - -.BR \-\-cmap - Causes the application to install a private color map on an 8-bit display. - -.BR \-\-display displayname - Use the X-server display 'displayname'. - -.BR \-\-dograb - Running under a debugger can cause an implicit --nograb, use --dograb to override. - -.BR \-\-fg, \-\-foreground color - Sets the default foreground color. - -.BR \-\-fn, \-\-font fontname - Defines the application font. - -.BR \-\-im XIMserver - Set XIM server. - -.BR \-\-inputstyle inputstyle - Sets XIM (X Input Method) input style. Possible values are onthespot, overthespot, offthespot and root. - -.BR \-\-name name - Sets the application name. - -.BR \-\-ncols count - Limits the number of colors allocated in the color cube on an 8-bit display, if the application is using the QApplication::ManyColor color specification. - -.BR \-\-nograb - Tells Qt to never grab the mouse or the keyboard. - -.BR \-\-noxim - Disable XIM. - -.BR \-\-reverse - Mirrors the whole layout of widgets. - -.BR \-\-session sessionId - Restore the application for the given 'sessionId'. - -.BR \-\-sync - Switches to synchronous mode for debugging. - -.BR \-\-title title - Sets the application title (caption). - -.BR \-\-visual TrueColor - Forces the application to use a TrueColor visual on an 8-bit display. - - -.SH TDE OPTIONS -.BR \-\-caption caption - Use 'caption' as name in the titlebar. - -.BR \-\-config filename - Use alternative configuration file. - -.BR \-\-dcopserver server - Use the DCOP Server specified by 'server'. - -.BR \-\-geometry geometry - Sets the client geometry of the main widget. - -.BR \-\-icon icon - Use 'icon' as the application icon. - -.BR \-\-miniicon icon - Use 'icon' as the icon in the titlebar. - -.BR \-\-nocrashhandler - Disable crash handler, to get core dumps. - -.BR \-\-style style - Sets the application GUI style. - -.BR \-\-waitforwm - Waits for a WM_NET compatible windowmanager. - -.SH SEE ALSO - jackd(1), rosegarden-lilypondview(1), rosegarden-project-package(1), rosegarden-audiofile-importer(1) - - -.SH AUTHOR -This manual page was written by Enrique Robledo Arnuncio <era@debian.org> and later ammended by Mike O'Connor <stew@vireo.org> 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 Free Documentation License, Version 1.1 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front Cover Texts and no Back Cover Texts. diff --git a/debian/_base/applications/multimedia/rosegarden/debian/rules b/debian/_base/applications/multimedia/rosegarden/debian/rules index 94fe8c0a8..5839a4d6d 100755 --- a/debian/_base/applications/multimedia/rosegarden/debian/rules +++ b/debian/_base/applications/multimedia/rosegarden/debian/rules @@ -21,13 +21,11 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEB_COMPRESS_EXCLUDE += .rg .wav .docbook +DEB_COMPRESS_EXCLUDE_ALL += .rg .wav .docbook binary-install/rosegarden-trinity:: dh_testdir find debian/rosegarden-trinity/usr/share/doc/rosegarden-trinity/examples -type f -exec chmod 664 {} \; - cp -Rp debian/rosegarden-trinity/usr/share/man/* debian/rosegarden-trinity/opt/trinity/share/man/ - rm -rf debian/rosegarden-trinity/usr/share/man clean:: dh_testdir diff --git a/debian/_base/applications/multimedia/soundkonverter/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/soundkonverter/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/debian/_base/applications/multimedia/soundkonverter/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/multimedia/soundkonverter/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/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; \ diff --git a/debian/_base/applications/multimedia/soundkonverter/debian/compat b/debian/_base/applications/multimedia/soundkonverter/debian/compat index ec635144f..f599e28b8 100644 --- a/debian/_base/applications/multimedia/soundkonverter/debian/compat +++ b/debian/_base/applications/multimedia/soundkonverter/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/_base/applications/multimedia/soundkonverter/debian/control b/debian/_base/applications/multimedia/soundkonverter/debian/control index 730a04490..d5d1bbcd5 100644 --- a/debian/_base/applications/multimedia/soundkonverter/debian/control +++ b/debian/_base/applications/multimedia/soundkonverter/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org>, Michael Meskes <meskes@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, tdelibs14-trinity-dev, libcdparanoia0-dev, libtag1-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libcdparanoia0-dev, libtag1-dev Standards-Version: 3.8.4 Homepage: http://www.kde-apps.org/content/show.php?content=29024 diff --git a/debian/_base/applications/multimedia/soundkonverter/debian/patches/.gitignore b/debian/_base/applications/multimedia/soundkonverter/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/debian/_base/applications/multimedia/soundkonverter/debian/patches/.gitignore +++ b/debian/_base/applications/multimedia/soundkonverter/debian/patches/series diff --git a/debian/_base/applications/multimedia/soundkonverter/debian/rules b/debian/_base/applications/multimedia/soundkonverter/debian/rules index fa0a1f580..a6797f19a 100755 --- a/debian/_base/applications/multimedia/soundkonverter/debian/rules +++ b/debian/_base/applications/multimedia/soundkonverter/debian/rules @@ -1,38 +1,17 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) - -DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp -DEB_CONFIGURE_EXTRA_FLAGS = --with-extra-libs=/opt/trinity/lib - -install/soundkonverter-trinity:: - install -D -p -m0644 debian/soundkonverter-trinity.lintian-overrides \ - debian/soundkonverter-trinity/usr/share/lintian/overrides/soundkonverter-trinity - -install/soundkonverter-amarok-trinity:: - chmod 0755 debian/tmp/opt/trinity/share/apps/soundkonverter/amarokscript/soundKonverter.rb - -post-patches:: debian/stamp-bootstrap - -debian/stamp-bootstrap: -ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" - cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" - cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" - cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh -endif - cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in - - make -f admin/Makefile.common cvs - touch debian/stamp-bootstrap +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/multimedia/soundkonverter/debian/soundkonverter-trinity.install b/debian/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.install index fcfaef212..485f58a96 100644 --- a/debian/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.install +++ b/debian/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.install @@ -2,10 +2,10 @@ opt/trinity/bin/soundkonverter opt/trinity/share/applications/tde/soundkonverter.desktop opt/trinity/share/apps/soundkonverter/soundkonverterui.rc opt/trinity/share/apps/konqueror/servicemenus/audiocd_extract_with_soundkonverter.desktop -opt/trinity/share/apps/soundkonverter/format_infos/ -opt/trinity/share/apps/soundkonverter/pics/ -opt/trinity/share/apps/soundkonverter/plugins/ -opt/trinity/share/doc/ -opt/trinity/share/icons/ -opt/trinity/share/locale/ -opt/trinity/share/mimelnk/ +opt/trinity/share/apps/soundkonverter/format_infos +opt/trinity/share/apps/soundkonverter/pics +opt/trinity/share/apps/soundkonverter/plugins +opt/trinity/share/doc +opt/trinity/share/icons +opt/trinity/share/locale +opt/trinity/share/mimelnk diff --git a/debian/_base/applications/multimedia/tderadio/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/tderadio/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/debian/_base/applications/multimedia/tderadio/debian/cdbs/debian-tde.mk +++ b/debian/_base/applications/multimedia/tderadio/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/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; \ diff --git a/debian/_base/applications/multimedia/tderadio/debian/compat b/debian/_base/applications/multimedia/tderadio/debian/compat index ec635144f..f599e28b8 100644 --- a/debian/_base/applications/multimedia/tderadio/debian/compat +++ b/debian/_base/applications/multimedia/tderadio/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/_base/applications/multimedia/tderadio/debian/control b/debian/_base/applications/multimedia/tderadio/debian/control index 2c44da7f2..655104221 100644 --- a/debian/_base/applications/multimedia/tderadio/debian/control +++ b/debian/_base/applications/multimedia/tderadio/debian/control @@ -2,8 +2,8 @@ Source: tderadio-trinity Section: sound Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, - liblircclient-dev, libsndfile1-dev, libmp3lame-dev, libogg-dev, libvorbis-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, + liblirc-dev, libsndfile1-dev, libmp3lame-dev, libogg-dev, libvorbis-dev Standards-Version: 3.8.4 Package: tderadio-trinity |