diff options
Diffstat (limited to 'debian/squeeze/applications')
6 files changed, 29 insertions, 67 deletions
diff --git a/debian/squeeze/applications/fusion-icon/debian/rules b/debian/squeeze/applications/fusion-icon/debian/rules index 88040a563..3fe3dd8ea 100755 --- a/debian/squeeze/applications/fusion-icon/debian/rules +++ b/debian/squeeze/applications/fusion-icon/debian/rules @@ -14,8 +14,17 @@ binary-install/fusion-icon-trinity:: mkdir -p debian/fusion-icon-trinity/usr/local/lib cp -Rp debian/fusion-icon-trinity/usr/local/* debian/fusion-icon-trinity/usr/ rm -rf debian/fusion-icon-trinity/usr/local + mkdir -p debian/fusion-icon-trinity/temp + mv debian/fusion-icon-trinity/usr/lib debian/fusion-icon-trinity/temp mkdir -p debian/fusion-icon-trinity/opt/trinity cp -Rp debian/fusion-icon-trinity/usr/* debian/fusion-icon-trinity/opt/trinity/ rm -rf debian/fusion-icon-trinity/usr dh_pysupport -pfusion-icon-trinity + ### + # Must be done after invoking dh_pysupport, otherwise python scripts will + # end up in /usr/share/pyshare instead of dist-packages + mkdir -p debian/fusion-icon-trinity/usr + mv debian/fusion-icon-trinity/temp/lib debian/fusion-icon-trinity/usr + rm -rf debian/fusion-icon-trinity/temp + ### dh_icons diff --git a/debian/squeeze/applications/k3b/debian/control b/debian/squeeze/applications/k3b/debian/control index 53af49174..330946e77 100644 --- a/debian/squeeze/applications/k3b/debian/control +++ b/debian/squeeze/applications/k3b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> 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: libdvdread4, libdvdread-dev, alsa, libasound2-dev, lame, libmp3lame-dev, debhelper (>= 6), quilt, cdbs (>= 0.4.52ubuntu18), tdelibs14-trinity-dev (>= 3.5.0), libflac++-dev (>= 1.1.2), flac, libdbus-tqt-1-dev, libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmad0-dev, chrpath, libavformat-dev, libavcodec-dev, libvorbis-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: libdvdread4, libdvdread-dev, libasound2-dev, lame, libmp3lame-dev, debhelper (>= 6), quilt, cdbs (>= 0.4.52ubuntu18), tdelibs14-trinity-dev (>= 3.5.0), libflac++-dev (>= 1.1.2), flac, libdbus-tqt-1-dev, libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmad0-dev, chrpath, libavformat-dev, libavcodec-dev, libvorbis-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://www.k3b.org diff --git a/debian/squeeze/applications/koffice/debian/control b/debian/squeeze/applications/koffice/debian/control index 185457e43..fbb788ed1 100644 --- a/debian/squeeze/applications/koffice/debian/control +++ b/debian/squeeze/applications/koffice/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Ral Snchez Siles <rasasi78@gmail.com> -Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), quilt, binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby, ruby-dev, libwpd-dev, libpqxx-dev | libpqxx3-dev, libmysqlclient15-dev | libmysqlclient16-dev | libmysqlclient18-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev, liblcms1-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), quilt, binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby, ruby-dev, libwpd-dev, librevenge-dev | libwpd-dev (<< 0.10~) | libwpd8-dev, libpqxx-dev | libpqxx3-dev, libmysqlclient15-dev | libmysqlclient16-dev | libmysqlclient18-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev, liblcms1-dev, automake, autoconf, libtool, libltdl-dev Build-Depends-Indep: libtqtinterface-doc, graphviz, gsfonts-x11 Standards-Version: 3.8.4 Homepage: http://www.koffice.org diff --git a/debian/squeeze/applications/kopete-otr/debian/control b/debian/squeeze/applications/kopete-otr/debian/control index acc205091..07dfe076a 100644 --- a/debian/squeeze/applications/kopete-otr/debian/control +++ b/debian/squeeze/applications/kopete-otr/debian/control @@ -3,9 +3,8 @@ Section: tde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Harald Sitter <apachelogger@ubuntu.com> -Build-Depends: cdbs, debhelper (>= 5), tdenetwork-trinity-dev, libotr2-dev (>= 3.0.0), automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 5), tdenetwork-trinity-dev, libotr5-dev | libotr2-dev (>= 3.0.0), automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 -Homepage: http://kopete-otr.follefuder.org/ Package: kopete-otr-trinity Architecture: any diff --git a/debian/squeeze/applications/tde-guidance/debian/rules b/debian/squeeze/applications/tde-guidance/debian/rules index 5046494ad..217eea9ed 100755 --- a/debian/squeeze/applications/tde-guidance/debian/rules +++ b/debian/squeeze/applications/tde-guidance/debian/rules @@ -1,6 +1,9 @@ #!/usr/bin/make -f DEB_PYTHON_SYSTEM = pysupport +PYSUPPORT_INST_PATH = /opt/trinity/share/python-support +GUIDANCE_INST_PATH = $(PYSUPPORT_INST_PATH)/tde-guidance-trinity +export EXTRA_MODULE_DIR=$(GUIDANCE_INST_PATH) include /usr/share/cdbs/1/rules/debhelper.mk #include /usr/share/cdbs/1/class/python-distutils.mk @@ -11,7 +14,7 @@ include /usr/share/cdbs/1/rules/utils.mk DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_UPDATE_RCD_PARAMS := multiuser DEB_INSTALL_MANPAGES_tde-guidance-trinity := debian/mountconfig-trinity.1 debian/serviceconfig-trinity.1 debian/userconfig-trinity.1 -PYSUPPORT_PATH = $(DEB_DESTDIR)/opt/trinity/share/python-support +PYSUPPORT_PATH = $(DEB_DESTDIR)$(PYSUPPORT_INST_PATH) DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde LDFLAGS_APPEND := -L/opt/trinity/lib @@ -43,11 +46,11 @@ install/tde-guidance-trinity:: # fix the link properly mkdir -p debian/tde-guidance-trinity/opt/trinity/bin - (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/mountconfig.py mountconfig) - (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/serviceconfig.py serviceconfig) - (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/userconfig.py userconfig) - (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/wineconfig.py wineconfig) -# (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf /opt/trinity/share/python-support/tde-guidance-trinity/grubconfig.py grubconfig) + (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/mountconfig.py mountconfig) + (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/serviceconfig.py serviceconfig) + (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/userconfig.py userconfig) + (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/wineconfig.py wineconfig) +# (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/grubconfig.py grubconfig) # move python modules in PYSUPPORT_PATH mkdir -p $(PYSUPPORT_PATH)/tde-guidance-trinity @@ -87,51 +90,6 @@ install/guidance-backends-trinity:: cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/wineread.py $(PYSUPPORT_PATH)/guidance-backends-trinity cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/winewrite.py $(PYSUPPORT_PATH)/guidance-backends-trinity -install/tde-guidance-powermanager-trinity:: - # install icon to right place - install -D -p -m0644 kde/powermanager/pics/battery-charging-100.png \ - $(DEB_DESTDIR)/opt/trinity/share/icons/hicolor/22x22/apps/power-manager.png - install -D -p -m0644 kde/powermanager/pics/*.png \ - $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/ - - # install desktop file - install -D -p -m0644 powermanager/guidance-power-manager.desktop \ - $(DEB_DESTDIR)/opt/trinity/share/autostart/guidance-power-manager.desktop - - # copy python modules in PYSUPPORT_PATH - mkdir -p $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity - cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/MicroHAL.py $(PYSUPPORT_PATH)/guidance-backends-trinity - cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/guidance-power-manager.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity - cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/powermanage.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity - cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/gpmhelper.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity - cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/powermanager_ui.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity - cp powermanager/guidance_power_manager_ui.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity - cp powermanager/notify.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity - cp powermanager/tooltip.py $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity - - # generate guidance-power-manager script - echo "#!/bin/sh" > $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager - echo "/opt/trinity/share/python-support/tde-guidance-powermanager-trinity/guidance-power-manager.py &" >> $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager - chmod +x $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager - - # fix script-not-executable - chmod 0755 $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity/powermanage.py - chmod 0755 $(PYSUPPORT_PATH)/tde-guidance-powermanager-trinity/gpmhelper.py - - : # Replace all '#!' calls to python with /usr/bin/python - : # and make them executable - for i in `find debian/tde-guidance-powermanager-trinity -type f`; do \ - sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \ - $$i > $$i.temp; \ - if cmp --quiet $$i $$i.temp; then \ - rm -f $$i.temp; \ - else \ - mv -f $$i.temp $$i; \ - chmod 755 $$i; \ - echo "fixed interpreter: $$i"; \ - fi; \ - done - clean:: rm -rf build @@ -155,9 +113,6 @@ clean:: common-install-prehook-impl:: # generate form implementation using pytde user interface compiler - (cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n guidance_power_manager_ui.ui) - (cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n tooltip.ui) - (cd powermanager; /opt/trinity/bin/tdepyuic --usetdei18n notify.ui) mkdir -p po touch list @@ -190,4 +145,3 @@ common-install-prehook-impl:: fi rm -f tde-guidance-trinity/usr/share/python-support/tde-guidance-trinity/.version - rm -f tde-guidance-trinity/usr/share/python-support/tde-guidance-powermanager-trinity/.version diff --git a/debian/squeeze/applications/tde-guidance/debian/tde-guidance-trinity.install b/debian/squeeze/applications/tde-guidance/debian/tde-guidance-trinity.install index 7a0a28549..fe690a9c2 100644 --- a/debian/squeeze/applications/tde-guidance/debian/tde-guidance-trinity.install +++ b/debian/squeeze/applications/tde-guidance/debian/tde-guidance-trinity.install @@ -1,7 +1,7 @@ -opt/trinity/lib/trinity/kcm_serviceconfig.la opt/trinity/lib/ -opt/trinity/lib/trinity/kcm_userconfig.la opt/trinity/lib/ -opt/trinity/lib/trinity/kcm_mountconfig.la opt/trinity/lib/ -opt/trinity/lib/trinity/kcm_wineconfig.la opt/trinity/lib/ +opt/trinity/lib/trinity/kcm_serviceconfig.la +opt/trinity/lib/trinity/kcm_userconfig.la +opt/trinity/lib/trinity/kcm_mountconfig.la +opt/trinity/lib/trinity/kcm_wineconfig.la opt/trinity/share/icons/crystalsvg/32x32/apps/daemons.png opt/trinity/share/icons/crystalsvg/32x32/apps/disksfilesystems.png opt/trinity/share/icons/crystalsvg/32x32/apps/userconfig.png @@ -57,8 +57,8 @@ opt/trinity/share/python-support/tde-guidance-trinity/sizeview.py opt/trinity/share/python-support/tde-guidance-trinity/unixauthdb.py opt/trinity/share/python-support/tde-guidance-trinity/userconfig.py opt/trinity/share/python-support/tde-guidance-trinity/wineconfig.py -opt/trinity/lib/trinity/kcm_serviceconfig.so opt/trinity/lib/ -opt/trinity/lib/trinity/kcm_userconfig.so opt/trinity/lib/ -opt/trinity/lib/trinity/kcm_mountconfig.so opt/trinity/lib/ -opt/trinity/lib/trinity/kcm_wineconfig.so opt/trinity/lib/ +opt/trinity/lib/trinity/kcm_serviceconfig.so +opt/trinity/lib/trinity/kcm_userconfig.so +opt/trinity/lib/trinity/kcm_mountconfig.so +opt/trinity/lib/trinity/kcm_wineconfig.so usr/share/lintian/overrides/tde-guidance-trinity |