diff options
Diffstat (limited to 'debian')
38 files changed, 118 insertions, 198 deletions
diff --git a/debian/lenny/applications/amarok/debian/control b/debian/lenny/applications/amarok/debian/control index 9805dce74..0f2456165 100644 --- a/debian/lenny/applications/amarok/debian/control +++ b/debian/lenny/applications/amarok/debian/control @@ -8,7 +8,7 @@ Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, bzip2, tdelibs4-trinity-dev, libxine-dev, libdbus-tqt-1-dev, libtag1-dev, libsqlite3-dev, - libmysqlclient15-dev | libmysqlclient16-dev, libpq-dev, + libmysqlclient15-dev | libmysqlclient16-dev | libmysqlclient18-dev, libpq-dev, libvisual-0.4-dev, libsdl1.2-dev, libifp-dev, libusb-dev, libgpod-nogtk-dev (>= 0.4.2), libnjb-dev, libmtp-dev, ruby, ruby1.8-dev, diff --git a/debian/lenny/applications/kchmviewer/debian/control b/debian/lenny/applications/kchmviewer/debian/control index dfb229d24..7e5b19c42 100644 --- a/debian/lenny/applications/kchmviewer/debian/control +++ b/debian/lenny/applications/kchmviewer/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net> -Build-Depends: debhelper (>= 5.0.0), tdelibs4-trinity-dev, libchm-dev, dpatch, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5.0.0), quilt, tdelibs4-trinity-dev, libchm-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://www.kchmviewer.net/ diff --git a/debian/lenny/applications/kchmviewer/debian/rules b/debian/lenny/applications/kchmviewer/debian/rules index 72c3fd5bb..a496effa9 100755 --- a/debian/lenny/applications/kchmviewer/debian/rules +++ b/debian/lenny/applications/kchmviewer/debian/rules @@ -42,11 +42,10 @@ endif -include debian/debiandirs -build: patch debian/build-kde +build: debian/build-kde -patch: patch-stamp -patch-stamp: - dpatch apply-all +debian/build-kde: + dh_testdir ! [ -f /usr/share/libtool/ltmain.sh ] || \ cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ @@ -54,15 +53,6 @@ patch-stamp: cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in make -f admin/Makefile.common cvs - touch debian/stamp-bootstrap - touch patch-stamp - -unpatch: - dpatch deapply-all - $(RM) -rf patch-stamp debian/patched - -debian/build-kde: - dh_testdir # automake # autoconf test -e config.sub -a -L config.sub || \ @@ -74,7 +64,7 @@ debian/build-kde: $(MAKE) -C build-kde touch debian/build-kde -clean: unpatch +clean: dh_testdir dh_testroot $(RM) -f build-stamp diff --git a/debian/lenny/applications/knights/debian/control b/debian/lenny/applications/knights/debian/control index 0e64bc23f..8c281d27e 100644 --- a/debian/lenny/applications/knights/debian/control +++ b/debian/lenny/applications/knights/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Jose Carlos Medeiros <debian@psabs.com.br> Uploaders: Ola Lundqvist <opal@debian.org> -Build-Depends: debhelper (>= 5.0.0), tdelibs4-trinity-dev, poxml, dpatch, imagemagick, libx11-dev, libxext-dev, libxinerama-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, libasound2-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5.0.0), quilt, tdelibs4-trinity-dev, poxml, imagemagick, libx11-dev, libxext-dev, libxinerama-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, libasound2-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://knights.sourceforge.net/ diff --git a/debian/lenny/applications/knights/debian/rules b/debian/lenny/applications/knights/debian/rules index fc447c09a..7bbbd796f 100755 --- a/debian/lenny/applications/knights/debian/rules +++ b/debian/lenny/applications/knights/debian/rules @@ -18,7 +18,6 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -include /usr/share/dpatch/dpatch.make CFLAGS = -Wall -g @@ -37,7 +36,7 @@ debian/knights.xpm: media/hi32-app-knights.png convert $< $@ -config.status: configure patch +config.status: configure dh_testdir ! [ -f /usr/share/libtool/ltmain.sh ] || \ @@ -61,9 +60,7 @@ build-stamp: config.status debian/knights.xpm $(MAKE) touch build-stamp -clean: clean-patched unpatch - -clean-patched: +clean: dh_testdir dh_testroot rm -f po/de.gmo diff --git a/debian/lenny/applications/koffice/debian/control b/debian/lenny/applications/koffice/debian/control index b48e508be..d6984e7eb 100644 --- a/debian/lenny/applications/koffice/debian/control +++ b/debian/lenny/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), binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, tdelibs4-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff4-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev | libpqxx3-dev, libmysqlclient15-dev | libmysqlclient16-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, tdelibs4-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff4-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev | libpqxx3-dev, libmysqlclient15-dev | libmysqlclient16-dev | libmysqlclient18-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev-la, 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/lenny/applications/ksquirrel/debian/control b/debian/lenny/applications/ksquirrel/debian/control index d2c01e591..2c9b9b633 100644 --- a/debian/lenny/applications/ksquirrel/debian/control +++ b/debian/lenny/applications/ksquirrel/debian/control @@ -4,7 +4,7 @@ Priority: extra Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Paul Gevers <paul@climbing.nl> Build-Depends: debhelper (>= 5), - dpatch, + quilt, libksquirrel-trinity-dev, libkonq4-trinity-dev, kipi-plugins-trinity, diff --git a/debian/lenny/applications/ksquirrel/debian/rules b/debian/lenny/applications/ksquirrel/debian/rules index 8f8161523..797fc4a08 100755 --- a/debian/lenny/applications/ksquirrel/debian/rules +++ b/debian/lenny/applications/ksquirrel/debian/rules @@ -22,7 +22,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -config.status: patch configure +config.status: configure dh_testdir # Add here commands to configure the package. ifneq "$(wildcard /usr/share/misc/config.sub)" "" @@ -54,37 +54,17 @@ build-stamp: config.status touch $@ -clean: clean-patched unpatch - -clean-patched: +clean: dh_testdir dh_testroot rm -f build-stamp - ! [ -f /usr/share/libtool/ltmain.sh ] || \ - cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh - ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ - cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh - cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in - - make -f admin/Makefile.common cvs - # Add here commands to clean up after the build process. [ ! -f Makefile ] || $(MAKE) distclean rm -f config.sub config.guess dh_clean -patch: patch-stamp - -patch-stamp: - dpatch apply-all - dpatch cat-all >patch-stamp - -unpatch: - dpatch deapply-all - rm -rf patch-stamp debian/patched - install: build dh_testdir dh_testroot diff --git a/debian/lenny/applications/ktechlab/debian/control b/debian/lenny/applications/ktechlab/debian/control index 4b14b24b4..765916f8a 100644 --- a/debian/lenny/applications/ktechlab/debian/control +++ b/debian/lenny/applications/ktechlab/debian/control @@ -2,7 +2,7 @@ Source: ktechlab-trinity Section: tde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Build-Depends: debhelper (>= 6.0.0), imagemagick, tdelibs4-trinity-dev, dpatch, gpsim-dev (>= 0.21.11-2), libgtk2.0-dev, libreadline6-dev, libopts25-dev, chrpath, libpopt-dev, tdesdk-scripts-trinity, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 6.0.0), quilt, imagemagick, tdelibs4-trinity-dev, gpsim-dev (>= 0.21.11-2), libgtk2.0-dev, libreadline6-dev, libopts25-dev, chrpath, libpopt-dev, tdesdk-scripts-trinity, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: ktechlab-trinity diff --git a/debian/lenny/applications/ktechlab/debian/rules b/debian/lenny/applications/ktechlab/debian/rules index 1e1e53c9c..40b9f2d14 100755 --- a/debian/lenny/applications/ktechlab/debian/rules +++ b/debian/lenny/applications/ktechlab/debian/rules @@ -28,7 +28,6 @@ debian/ktechlab.xpm: icons/hi32-app-ktechlab.png config.status: configure.in dh_testdir - dpatch apply-all ! [ -f /usr/share/libtool/ltmain.sh ] || \ cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh @@ -63,8 +62,6 @@ clean: dh_testroot rm -f build-stamp [ ! -f po/Makefile ] || $(MAKE) -C po clean - dpatch deapply-all - rm -rf debian/patched ! [ -f /usr/share/libtool/ltmain.sh ] || \ cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh diff --git a/debian/lenny/applications/ktorrent/debian/control b/debian/lenny/applications/ktorrent/debian/control index ea953a555..3918b6093 100644 --- a/debian/lenny/applications/ktorrent/debian/control +++ b/debian/lenny/applications/ktorrent/debian/control @@ -2,7 +2,7 @@ Source: ktorrent-trinity Section: tde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Build-Depends: debhelper (>= 5.0), cdbs, docbook2x, tdelibs4-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, libavahi-tqt-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5.0), cdbs, docbook2x, tdelibs4-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, libavahi-tqt-dev, libgeoip-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: ktorrent-trinity diff --git a/debian/lenny/applications/tde-style-lipstik/debian/control b/debian/lenny/applications/tde-style-lipstik/debian/control index 540fbebf2..0b5857188 100644 --- a/debian/lenny/applications/tde-style-lipstik/debian/control +++ b/debian/lenny/applications/tde-style-lipstik/debian/control @@ -2,7 +2,7 @@ Source: tde-style-lipstik-trinity Section: tde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Build-Depends: debhelper (>= 4.0.0), tdelibs4-trinity-dev (>= 4:3.2), dpatch, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 4.0.0), quilt, tdelibs4-trinity-dev (>= 4:3.2), automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: tde-style-lipstik-trinity diff --git a/debian/lenny/applications/tde-style-lipstik/debian/rules b/debian/lenny/applications/tde-style-lipstik/debian/rules index b20ff9228..f24b21716 100755 --- a/debian/lenny/applications/tde-style-lipstik/debian/rules +++ b/debian/lenny/applications/tde-style-lipstik/debian/rules @@ -51,8 +51,7 @@ build-stamp: config.status touch build-stamp -clean: clean-patched unpatch -clean-patched: +clean: dh_testdir dh_testroot rm -f build-stamp @@ -70,10 +69,7 @@ endif dh_clean -patch: patch-stamp -patch-stamp: - dpatch apply-all - #dpatch call-all -a=pkg-info > patch-stamp +patch: ! [ -f /usr/share/libtool/ltmain.sh ] || \ cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ @@ -83,10 +79,6 @@ patch-stamp: make -f admin/Makefile.common cvs touch debian/stamp-bootstrap -unpatch: - dpatch deapply-all - rm -rf patch-stamp debian/patched - install: build dh_testdir dh_testroot diff --git a/debian/lenny/libraries/libksquirrel/debian/control b/debian/lenny/libraries/libksquirrel/debian/control index 1d03926a0..51d6401d5 100644 --- a/debian/lenny/libraries/libksquirrel/debian/control +++ b/debian/lenny/libraries/libksquirrel/debian/control @@ -6,7 +6,7 @@ XSBC-Original-Maintainer: Harald Sitter <apachelogger@ubuntu.com> Build-Depends: debhelper (>= 5), cdbs, pkg-config, libmng-dev,librsvg2-bin, medcon, libjasper-dev, libungif4-dev, libwmf-dev, libopenexr-dev, djvulibre-bin, transfig, x11proto-core-dev, netpbm, libtiff4-dev, - libkonq4-trinity-dev, kipi-plugins-trinity, libkipi0-trinity-dev, dpatch, build-essential, + libkonq4-trinity-dev, kipi-plugins-trinity, libkipi0-trinity-dev, build-essential, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homagepage: http://ksquirrel.sourceforge.net diff --git a/debian/lenny/libraries/libksquirrel/debian/rules b/debian/lenny/libraries/libksquirrel/debian/rules index fa07f7f8c..37e6b3f83 100755 --- a/debian/lenny/libraries/libksquirrel/debian/rules +++ b/debian/lenny/libraries/libksquirrel/debian/rules @@ -22,7 +22,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -config.status: patch configure +config.status: configure dh_testdir ! [ -f /usr/share/libtool/ltmain.sh ] || \ @@ -56,38 +56,6 @@ build-stamp: config.status touch $@ -clean: clean-patched unpatch - -clean-patched: - dh_testdir - dh_testroot - rm -f build-stamp - - ! [ -f /usr/share/libtool/ltmain.sh ] || \ - cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh - ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ - cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh - cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in - - make -f admin/Makefile.common cvs - touch debian/stamp-bootstrap - - # Add here commands to clean up after the build process. - [ ! -f Makefile ] || $(MAKE) distclean - rm -f config.sub config.guess - - dh_clean - -patch: patch-stamp - -patch-stamp: - dpatch apply-all - dpatch cat-all >patch-stamp - -unpatch: - dpatch deapply-all - rm -rf patch-stamp debian/patched - install: build dh_testdir dh_testroot diff --git a/debian/lenny/tdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff b/debian/lenny/tdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff index 6e443209c..f93aa0706 100644 --- a/debian/lenny/tdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff +++ b/debian/lenny/tdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff @@ -1,6 +1,6 @@ diff -urN kscreensaver/krootbacking/Makefile.am kscreensaver/krootbacking/Makefile.am ---- kscreensaver/krootbacking/Makefile.am -+++ kscreensaver/krootbacking/Makefile.am +--- a/kscreensaver/krootbacking/Makefile.am ++++ b/kscreensaver/krootbacking/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = $(all_includes) diff --git a/debian/lenny/tdebase/debian/control b/debian/lenny/tdebase/debian/control index cdb37d461..d9b400750 100644 --- a/debian/lenny/tdebase/debian/control +++ b/debian/lenny/tdebase/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>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com> -Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs4c2a-trinity, libogg-dev, libogg-dev-la, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libdbus-1-tqt-dev, libart-2.0-dev (>= 2.3.17), libtool, libltdl-dev, cmake +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs4c2a-trinity, libogg-dev, libogg-dev-la, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libdbus-1-tqt-dev, libart-2.0-dev (>= 2.3.17), libtool, libltdl-dev, cmake Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc Build-Conflicts: nvidia-glx (<< 1.0.8774-6) Standards-Version: 3.8.4 diff --git a/debian/lenny/tdemultimedia/debian/kmix-trinity.install b/debian/lenny/tdemultimedia/debian/kmix-trinity.install index 22044f305..fd8ea15e1 100644 --- a/debian/lenny/tdemultimedia/debian/kmix-trinity.install +++ b/debian/lenny/tdemultimedia/debian/kmix-trinity.install @@ -36,6 +36,7 @@ debian/tmp/opt/trinity/share/apps/kmix/pics/mix_unknown.png debian/tmp/opt/trinity/share/apps/kmix/pics/mix_video.png debian/tmp/opt/trinity/share/apps/kmix/pics/mix_volume.png debian/tmp/opt/trinity/share/autostart/restore_kmix_volumes.desktop +debian/tmp/opt/trinity/share/autostart/kmix.desktop debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmix/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmix/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmix/index.docbook diff --git a/debian/lenny/tdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff b/debian/lenny/tdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff new file mode 100644 index 000000000..a794f17ff --- /dev/null +++ b/debian/lenny/tdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff @@ -0,0 +1,35 @@ +diff --git a/klaptopdaemon/acpi.cpp b/klaptopdaemon/acpi.cpp +index 4dfb247..cd8f4b0 100644 +--- a/klaptopdaemon/acpi.cpp ++++ b/klaptopdaemon/acpi.cpp +@@ -178,7 +178,7 @@ void AcpiConfig::setupHelper() + proc << tdesu; + proc << "-u"; + proc << "root"; +- proc << "chown root "+helper+"; chmod +s "+helper; ++ proc << "dpkg-statoverride --update --add root root 6755 "+helper; + proc.start(KProcess::Block); // run it sync so has_acpi below sees the results + } + } else { +diff --git a/klaptopdaemon/apm.cpp b/klaptopdaemon/apm.cpp +index 9de0c85..e348943 100644 +--- a/klaptopdaemon/apm.cpp ++++ b/klaptopdaemon/apm.cpp +@@ -166,7 +166,7 @@ void ApmConfig::setupHelper() + proc << tdesu; + proc << "-u"; + proc << "root"; +- proc << TQString("chown root ")+apm_name+TQString("; chmod +s ")+apm_name; ++ proc << TQString("dpkg-statoverride --update --add root root 6755 ")+apm_name; + proc.start(KProcess::Block); // run it sync so has_apm below sees the results + } + } else { +@@ -200,7 +200,7 @@ void ApmConfig::setupHelper2() // we use the acpi helper to do software suspend + proc << tdesu; + proc << "-u"; + proc << "root"; +- proc << "chown root "+helper+"; chmod +s "+helper; ++ proc << "dpkg-statoverride --update --add root root 6755 "+helper; + proc.start(KProcess::Block); // run it sync so has_acpi below sees the results + } + } else { diff --git a/debian/squeeze/applications/amarok/debian/control b/debian/squeeze/applications/amarok/debian/control index 9805dce74..0f2456165 100644 --- a/debian/squeeze/applications/amarok/debian/control +++ b/debian/squeeze/applications/amarok/debian/control @@ -8,7 +8,7 @@ Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, bzip2, tdelibs4-trinity-dev, libxine-dev, libdbus-tqt-1-dev, libtag1-dev, libsqlite3-dev, - libmysqlclient15-dev | libmysqlclient16-dev, libpq-dev, + libmysqlclient15-dev | libmysqlclient16-dev | libmysqlclient18-dev, libpq-dev, libvisual-0.4-dev, libsdl1.2-dev, libifp-dev, libusb-dev, libgpod-nogtk-dev (>= 0.4.2), libnjb-dev, libmtp-dev, ruby, ruby1.8-dev, diff --git a/debian/squeeze/applications/kchmviewer/debian/control b/debian/squeeze/applications/kchmviewer/debian/control index dfb229d24..7e5b19c42 100644 --- a/debian/squeeze/applications/kchmviewer/debian/control +++ b/debian/squeeze/applications/kchmviewer/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net> -Build-Depends: debhelper (>= 5.0.0), tdelibs4-trinity-dev, libchm-dev, dpatch, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5.0.0), quilt, tdelibs4-trinity-dev, libchm-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://www.kchmviewer.net/ diff --git a/debian/squeeze/applications/kchmviewer/debian/rules b/debian/squeeze/applications/kchmviewer/debian/rules index 72c3fd5bb..a496effa9 100755 --- a/debian/squeeze/applications/kchmviewer/debian/rules +++ b/debian/squeeze/applications/kchmviewer/debian/rules @@ -42,11 +42,10 @@ endif -include debian/debiandirs -build: patch debian/build-kde +build: debian/build-kde -patch: patch-stamp -patch-stamp: - dpatch apply-all +debian/build-kde: + dh_testdir ! [ -f /usr/share/libtool/ltmain.sh ] || \ cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ @@ -54,15 +53,6 @@ patch-stamp: cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in make -f admin/Makefile.common cvs - touch debian/stamp-bootstrap - touch patch-stamp - -unpatch: - dpatch deapply-all - $(RM) -rf patch-stamp debian/patched - -debian/build-kde: - dh_testdir # automake # autoconf test -e config.sub -a -L config.sub || \ @@ -74,7 +64,7 @@ debian/build-kde: $(MAKE) -C build-kde touch debian/build-kde -clean: unpatch +clean: dh_testdir dh_testroot $(RM) -f build-stamp diff --git a/debian/squeeze/applications/knights/debian/control b/debian/squeeze/applications/knights/debian/control index 0e64bc23f..8c281d27e 100644 --- a/debian/squeeze/applications/knights/debian/control +++ b/debian/squeeze/applications/knights/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Jose Carlos Medeiros <debian@psabs.com.br> Uploaders: Ola Lundqvist <opal@debian.org> -Build-Depends: debhelper (>= 5.0.0), tdelibs4-trinity-dev, poxml, dpatch, imagemagick, libx11-dev, libxext-dev, libxinerama-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, libasound2-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5.0.0), quilt, tdelibs4-trinity-dev, poxml, imagemagick, libx11-dev, libxext-dev, libxinerama-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, libasound2-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://knights.sourceforge.net/ diff --git a/debian/squeeze/applications/knights/debian/rules b/debian/squeeze/applications/knights/debian/rules index fc447c09a..7bbbd796f 100755 --- a/debian/squeeze/applications/knights/debian/rules +++ b/debian/squeeze/applications/knights/debian/rules @@ -18,7 +18,6 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -include /usr/share/dpatch/dpatch.make CFLAGS = -Wall -g @@ -37,7 +36,7 @@ debian/knights.xpm: media/hi32-app-knights.png convert $< $@ -config.status: configure patch +config.status: configure dh_testdir ! [ -f /usr/share/libtool/ltmain.sh ] || \ @@ -61,9 +60,7 @@ build-stamp: config.status debian/knights.xpm $(MAKE) touch build-stamp -clean: clean-patched unpatch - -clean-patched: +clean: dh_testdir dh_testroot rm -f po/de.gmo diff --git a/debian/squeeze/applications/koffice/debian/control b/debian/squeeze/applications/koffice/debian/control index b48e508be..d6984e7eb 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), binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, tdelibs4-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff4-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev | libpqxx3-dev, libmysqlclient15-dev | libmysqlclient16-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, tdelibs4-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff4-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev | libpqxx3-dev, libmysqlclient15-dev | libmysqlclient16-dev | libmysqlclient18-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev-la, 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/ksquirrel/debian/control b/debian/squeeze/applications/ksquirrel/debian/control index d2c01e591..2c9b9b633 100644 --- a/debian/squeeze/applications/ksquirrel/debian/control +++ b/debian/squeeze/applications/ksquirrel/debian/control @@ -4,7 +4,7 @@ Priority: extra Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Paul Gevers <paul@climbing.nl> Build-Depends: debhelper (>= 5), - dpatch, + quilt, libksquirrel-trinity-dev, libkonq4-trinity-dev, kipi-plugins-trinity, diff --git a/debian/squeeze/applications/ksquirrel/debian/rules b/debian/squeeze/applications/ksquirrel/debian/rules index 8f8161523..797fc4a08 100755 --- a/debian/squeeze/applications/ksquirrel/debian/rules +++ b/debian/squeeze/applications/ksquirrel/debian/rules @@ -22,7 +22,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -config.status: patch configure +config.status: configure dh_testdir # Add here commands to configure the package. ifneq "$(wildcard /usr/share/misc/config.sub)" "" @@ -54,37 +54,17 @@ build-stamp: config.status touch $@ -clean: clean-patched unpatch - -clean-patched: +clean: dh_testdir dh_testroot rm -f build-stamp - ! [ -f /usr/share/libtool/ltmain.sh ] || \ - cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh - ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ - cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh - cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in - - make -f admin/Makefile.common cvs - # Add here commands to clean up after the build process. [ ! -f Makefile ] || $(MAKE) distclean rm -f config.sub config.guess dh_clean -patch: patch-stamp - -patch-stamp: - dpatch apply-all - dpatch cat-all >patch-stamp - -unpatch: - dpatch deapply-all - rm -rf patch-stamp debian/patched - install: build dh_testdir dh_testroot diff --git a/debian/squeeze/applications/ktechlab/debian/control b/debian/squeeze/applications/ktechlab/debian/control index 4b14b24b4..765916f8a 100644 --- a/debian/squeeze/applications/ktechlab/debian/control +++ b/debian/squeeze/applications/ktechlab/debian/control @@ -2,7 +2,7 @@ Source: ktechlab-trinity Section: tde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Build-Depends: debhelper (>= 6.0.0), imagemagick, tdelibs4-trinity-dev, dpatch, gpsim-dev (>= 0.21.11-2), libgtk2.0-dev, libreadline6-dev, libopts25-dev, chrpath, libpopt-dev, tdesdk-scripts-trinity, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 6.0.0), quilt, imagemagick, tdelibs4-trinity-dev, gpsim-dev (>= 0.21.11-2), libgtk2.0-dev, libreadline6-dev, libopts25-dev, chrpath, libpopt-dev, tdesdk-scripts-trinity, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: ktechlab-trinity diff --git a/debian/squeeze/applications/ktechlab/debian/rules b/debian/squeeze/applications/ktechlab/debian/rules index 1e1e53c9c..40b9f2d14 100755 --- a/debian/squeeze/applications/ktechlab/debian/rules +++ b/debian/squeeze/applications/ktechlab/debian/rules @@ -28,7 +28,6 @@ debian/ktechlab.xpm: icons/hi32-app-ktechlab.png config.status: configure.in dh_testdir - dpatch apply-all ! [ -f /usr/share/libtool/ltmain.sh ] || \ cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh @@ -63,8 +62,6 @@ clean: dh_testroot rm -f build-stamp [ ! -f po/Makefile ] || $(MAKE) -C po clean - dpatch deapply-all - rm -rf debian/patched ! [ -f /usr/share/libtool/ltmain.sh ] || \ cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh diff --git a/debian/squeeze/applications/ktorrent/debian/control b/debian/squeeze/applications/ktorrent/debian/control index ea953a555..3918b6093 100644 --- a/debian/squeeze/applications/ktorrent/debian/control +++ b/debian/squeeze/applications/ktorrent/debian/control @@ -2,7 +2,7 @@ Source: ktorrent-trinity Section: tde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Build-Depends: debhelper (>= 5.0), cdbs, docbook2x, tdelibs4-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, libavahi-tqt-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5.0), cdbs, docbook2x, tdelibs4-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, libavahi-tqt-dev, libgeoip-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: ktorrent-trinity diff --git a/debian/squeeze/applications/tde-style-lipstik/debian/control b/debian/squeeze/applications/tde-style-lipstik/debian/control index 540fbebf2..0b5857188 100644 --- a/debian/squeeze/applications/tde-style-lipstik/debian/control +++ b/debian/squeeze/applications/tde-style-lipstik/debian/control @@ -2,7 +2,7 @@ Source: tde-style-lipstik-trinity Section: tde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Build-Depends: debhelper (>= 4.0.0), tdelibs4-trinity-dev (>= 4:3.2), dpatch, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 4.0.0), quilt, tdelibs4-trinity-dev (>= 4:3.2), automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: tde-style-lipstik-trinity diff --git a/debian/squeeze/applications/tde-style-lipstik/debian/rules b/debian/squeeze/applications/tde-style-lipstik/debian/rules index b20ff9228..f24b21716 100755 --- a/debian/squeeze/applications/tde-style-lipstik/debian/rules +++ b/debian/squeeze/applications/tde-style-lipstik/debian/rules @@ -51,8 +51,7 @@ build-stamp: config.status touch build-stamp -clean: clean-patched unpatch -clean-patched: +clean: dh_testdir dh_testroot rm -f build-stamp @@ -70,10 +69,7 @@ endif dh_clean -patch: patch-stamp -patch-stamp: - dpatch apply-all - #dpatch call-all -a=pkg-info > patch-stamp +patch: ! [ -f /usr/share/libtool/ltmain.sh ] || \ cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ @@ -83,10 +79,6 @@ patch-stamp: make -f admin/Makefile.common cvs touch debian/stamp-bootstrap -unpatch: - dpatch deapply-all - rm -rf patch-stamp debian/patched - install: build dh_testdir dh_testroot diff --git a/debian/squeeze/libraries/libksquirrel/debian/control b/debian/squeeze/libraries/libksquirrel/debian/control index 1d03926a0..08c37d8ed 100644 --- a/debian/squeeze/libraries/libksquirrel/debian/control +++ b/debian/squeeze/libraries/libksquirrel/debian/control @@ -6,7 +6,7 @@ XSBC-Original-Maintainer: Harald Sitter <apachelogger@ubuntu.com> Build-Depends: debhelper (>= 5), cdbs, pkg-config, libmng-dev,librsvg2-bin, medcon, libjasper-dev, libungif4-dev, libwmf-dev, libopenexr-dev, djvulibre-bin, transfig, x11proto-core-dev, netpbm, libtiff4-dev, - libkonq4-trinity-dev, kipi-plugins-trinity, libkipi0-trinity-dev, dpatch, build-essential, + libkonq4-trinity-dev, kipi-plugins-trinity, libkipi0-trinity-dev, quilt, build-essential, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homagepage: http://ksquirrel.sourceforge.net diff --git a/debian/squeeze/libraries/libksquirrel/debian/rules b/debian/squeeze/libraries/libksquirrel/debian/rules index fa07f7f8c..37e6b3f83 100755 --- a/debian/squeeze/libraries/libksquirrel/debian/rules +++ b/debian/squeeze/libraries/libksquirrel/debian/rules @@ -22,7 +22,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -config.status: patch configure +config.status: configure dh_testdir ! [ -f /usr/share/libtool/ltmain.sh ] || \ @@ -56,38 +56,6 @@ build-stamp: config.status touch $@ -clean: clean-patched unpatch - -clean-patched: - dh_testdir - dh_testroot - rm -f build-stamp - - ! [ -f /usr/share/libtool/ltmain.sh ] || \ - cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh - ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ - cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh - cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in - - make -f admin/Makefile.common cvs - touch debian/stamp-bootstrap - - # Add here commands to clean up after the build process. - [ ! -f Makefile ] || $(MAKE) distclean - rm -f config.sub config.guess - - dh_clean - -patch: patch-stamp - -patch-stamp: - dpatch apply-all - dpatch cat-all >patch-stamp - -unpatch: - dpatch deapply-all - rm -rf patch-stamp debian/patched - install: build dh_testdir dh_testroot diff --git a/debian/squeeze/tdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff b/debian/squeeze/tdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff index 6e443209c..f93aa0706 100644 --- a/debian/squeeze/tdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff +++ b/debian/squeeze/tdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff @@ -1,6 +1,6 @@ diff -urN kscreensaver/krootbacking/Makefile.am kscreensaver/krootbacking/Makefile.am ---- kscreensaver/krootbacking/Makefile.am -+++ kscreensaver/krootbacking/Makefile.am +--- a/kscreensaver/krootbacking/Makefile.am ++++ b/kscreensaver/krootbacking/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = $(all_includes) diff --git a/debian/squeeze/tdebase/debian/control b/debian/squeeze/tdebase/debian/control index 596ead4a0..22cf86b64 100644 --- a/debian/squeeze/tdebase/debian/control +++ b/debian/squeeze/tdebase/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>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com> -Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs4c2a-trinity, libogg-dev, libogg-dev-la, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libdbus-1-tqt-dev, libart-2.0-dev (>= 2.3.17), libtool, libltdl-dev, cmake +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs4c2a-trinity, libogg-dev, libogg-dev-la, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libdbus-1-tqt-dev, libart-2.0-dev (>= 2.3.17), libtool, libltdl-dev, cmake Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc Build-Conflicts: nvidia-glx (<< 1.0.8774-6) Standards-Version: 3.8.4 diff --git a/debian/squeeze/tdemultimedia/debian/kmix-trinity.install b/debian/squeeze/tdemultimedia/debian/kmix-trinity.install index 22044f305..fd8ea15e1 100644 --- a/debian/squeeze/tdemultimedia/debian/kmix-trinity.install +++ b/debian/squeeze/tdemultimedia/debian/kmix-trinity.install @@ -36,6 +36,7 @@ debian/tmp/opt/trinity/share/apps/kmix/pics/mix_unknown.png debian/tmp/opt/trinity/share/apps/kmix/pics/mix_video.png debian/tmp/opt/trinity/share/apps/kmix/pics/mix_volume.png debian/tmp/opt/trinity/share/autostart/restore_kmix_volumes.desktop +debian/tmp/opt/trinity/share/autostart/kmix.desktop debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmix/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmix/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmix/index.docbook diff --git a/debian/squeeze/tdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff b/debian/squeeze/tdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff new file mode 100644 index 000000000..a794f17ff --- /dev/null +++ b/debian/squeeze/tdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff @@ -0,0 +1,35 @@ +diff --git a/klaptopdaemon/acpi.cpp b/klaptopdaemon/acpi.cpp +index 4dfb247..cd8f4b0 100644 +--- a/klaptopdaemon/acpi.cpp ++++ b/klaptopdaemon/acpi.cpp +@@ -178,7 +178,7 @@ void AcpiConfig::setupHelper() + proc << tdesu; + proc << "-u"; + proc << "root"; +- proc << "chown root "+helper+"; chmod +s "+helper; ++ proc << "dpkg-statoverride --update --add root root 6755 "+helper; + proc.start(KProcess::Block); // run it sync so has_acpi below sees the results + } + } else { +diff --git a/klaptopdaemon/apm.cpp b/klaptopdaemon/apm.cpp +index 9de0c85..e348943 100644 +--- a/klaptopdaemon/apm.cpp ++++ b/klaptopdaemon/apm.cpp +@@ -166,7 +166,7 @@ void ApmConfig::setupHelper() + proc << tdesu; + proc << "-u"; + proc << "root"; +- proc << TQString("chown root ")+apm_name+TQString("; chmod +s ")+apm_name; ++ proc << TQString("dpkg-statoverride --update --add root root 6755 ")+apm_name; + proc.start(KProcess::Block); // run it sync so has_apm below sees the results + } + } else { +@@ -200,7 +200,7 @@ void ApmConfig::setupHelper2() // we use the acpi helper to do software suspend + proc << tdesu; + proc << "-u"; + proc << "root"; +- proc << "chown root "+helper+"; chmod +s "+helper; ++ proc << "dpkg-statoverride --update --add root root 6755 "+helper; + proc.start(KProcess::Block); // run it sync so has_acpi below sees the results + } + } else { |