summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/lenny/applications/digikam/debian/control2
-rw-r--r--debian/lenny/libraries/kipi-plugins/debian/control2
-rw-r--r--debian/lenny/tdebase/debian/konqueror-trinity.postinst3
-rw-r--r--debian/lenny/tdebase/debian/konqueror-trinity.prerm2
-rw-r--r--debian/lenny/tdebase/debian/konsole-trinity.postinst2
-rw-r--r--debian/lenny/tdebase/debian/konsole-trinity.prerm2
-rw-r--r--debian/lenny/tdebase/debian/ksmserver-trinity.postinst4
-rw-r--r--debian/lenny/tdebase/debian/ksmserver-trinity.prerm2
-rwxr-xr-xdebian/lenny/tdebase/debian/rules1
-rw-r--r--debian/lenny/tdebase/debian/tdebase-trinity-bin.links2
-rw-r--r--debian/lenny/tdebase/debian/twin-trinity.prerm2
-rw-r--r--debian/lenny/tdegraphics/debian/control2
-rw-r--r--debian/lenny/tdenetwork/debian/control2
-rwxr-xr-xdebian/lenny/tdenetwork/debian/rules2
-rw-r--r--debian/lenny/tdevelop/debian/man/kdevprj2kdevelop.man (renamed from debian/lenny/tdevelop/debian/man/kdevprj2tdevelop.man)6
-rw-r--r--debian/lenny/tdevelop/debian/tdevelop-trinity.install2
-rw-r--r--debian/lenny/tdevelop/debian/tdevelop-trinity.manpages2
-rw-r--r--debian/squeeze/applications/digikam/debian/control2
-rw-r--r--debian/squeeze/libraries/kipi-plugins/debian/control2
-rw-r--r--debian/squeeze/tdebase/debian/konqueror-trinity.postinst3
-rw-r--r--debian/squeeze/tdebase/debian/konqueror-trinity.prerm2
-rw-r--r--debian/squeeze/tdebase/debian/konsole-trinity.postinst2
-rw-r--r--debian/squeeze/tdebase/debian/konsole-trinity.prerm2
-rw-r--r--debian/squeeze/tdebase/debian/ksmserver-trinity.postinst4
-rw-r--r--debian/squeeze/tdebase/debian/ksmserver-trinity.prerm2
-rwxr-xr-xdebian/squeeze/tdebase/debian/rules1
-rw-r--r--debian/squeeze/tdebase/debian/tdebase-trinity-bin.links2
-rw-r--r--debian/squeeze/tdebase/debian/twin-trinity.prerm2
-rw-r--r--debian/squeeze/tdegraphics/debian/control2
-rw-r--r--debian/squeeze/tdenetwork/debian/control2
-rwxr-xr-xdebian/squeeze/tdenetwork/debian/rules2
-rw-r--r--debian/squeeze/tdevelop/debian/man/kdevprj2kdevelop.man (renamed from debian/squeeze/tdevelop/debian/man/kdevprj2tdevelop.man)6
-rw-r--r--debian/squeeze/tdevelop/debian/tdevelop-trinity.install2
-rw-r--r--debian/squeeze/tdevelop/debian/tdevelop-trinity.manpages2
l---------debian/stretch1
35 files changed, 47 insertions, 34 deletions
diff --git a/debian/lenny/applications/digikam/debian/control b/debian/lenny/applications/digikam/debian/control
index 826b9d164..e4ac538dc 100644
--- a/debian/lenny/applications/digikam/debian/control
+++ b/debian/lenny/applications/digikam/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>, Fathi Boudra <fabo@debian.org>
Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev,
- libtiff-dev, libgphoto2-6-dev | libgphoto2-2-dev, libkipi0-trinity-dev,
+ libtiff-dev, libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev, libkipi0-trinity-dev,
libsqlite3-dev, liblcms1-dev, libkexiv2-3-trinity-dev (>= 0.1.6),
libjasper-dev, libpng12-dev | libpng-dev, libexiv2-dev,
libkdcraw3-trinity-dev (>= 0.1.4),
diff --git a/debian/lenny/libraries/kipi-plugins/debian/control b/debian/lenny/libraries/kipi-plugins/debian/control
index 497ddb612..94ed13bbf 100644
--- a/debian/lenny/libraries/kipi-plugins/debian/control
+++ b/debian/lenny/libraries/kipi-plugins/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Uploaders: Mark Purcell <msp@debian.org>, Achim Bohnet <ach@mpe.mpg.de>, Fathi Boudra <fabo@debian.org>
Build-Depends: cdbs, debhelper (>= 5), quilt, pkg-config, tdelibs14-trinity-dev,
- libexiv2-dev, libgphoto2-6-dev | libgphoto2-2-dev, libgpod-nogtk-dev,
+ libexiv2-dev, libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev, libgpod-nogtk-dev,
libtdepim1-trinity-dev, libkdcraw3-trinity-dev, libkexiv2-3-trinity-dev,
libkipi0-trinity-dev, libtiff-dev, libxslt1-dev, tdepim-trinity-dev,
automake, autoconf, libtool, libltdl-dev
diff --git a/debian/lenny/tdebase/debian/konqueror-trinity.postinst b/debian/lenny/tdebase/debian/konqueror-trinity.postinst
index ea83963d9..4c62f6bf2 100644
--- a/debian/lenny/tdebase/debian/konqueror-trinity.postinst
+++ b/debian/lenny/tdebase/debian/konqueror-trinity.postinst
@@ -24,6 +24,9 @@ case "$1" in
divert_remove /usr/share/icons/hicolor/48x48/apps/konqueror.png
divert_remove /usr/share/icons/hicolor/64x64/apps/konqueror.png
divert_remove /usr/share/icons/hicolor/scalable/apps/konqueror.svgz
+
+ update-alternatives --install /usr/bin/x-www-browser x-www-browser /opt/trinity/bin/konqueror 100 \
+ --slave /usr/share/man/man1/x-www-browser.1.gz x-www-browser.1.gz /usr/share/man/man1/konqueror-trinity.1.gz
;;
install)
diff --git a/debian/lenny/tdebase/debian/konqueror-trinity.prerm b/debian/lenny/tdebase/debian/konqueror-trinity.prerm
index 73baa81cc..57b10d0a5 100644
--- a/debian/lenny/tdebase/debian/konqueror-trinity.prerm
+++ b/debian/lenny/tdebase/debian/konqueror-trinity.prerm
@@ -2,7 +2,7 @@
case "$1" in
remove)
- /usr/sbin/update-alternatives --remove x-www-browser /usr/trinity/bin/konqueror
+ /usr/sbin/update-alternatives --remove x-www-browser /opt/trinity/bin/konqueror
;;
upgrade|deconfigure)
diff --git a/debian/lenny/tdebase/debian/konsole-trinity.postinst b/debian/lenny/tdebase/debian/konsole-trinity.postinst
index d7225354d..d8be0590f 100644
--- a/debian/lenny/tdebase/debian/konsole-trinity.postinst
+++ b/debian/lenny/tdebase/debian/konsole-trinity.postinst
@@ -20,7 +20,7 @@ set -e
case "$1" in
configure)
update-alternatives --install /usr/bin/x-terminal-emulator x-terminal-emulator /opt/trinity/bin/konsole 35 \
- --slave /opt/trinity/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz /opt/trinity/share/man/man1/konsole-trinity.1.gz
+ --slave /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz /usr/share/man/man1/konsole-trinity.1.gz
# force ldconfig due to tdeinit library
ldconfig
diff --git a/debian/lenny/tdebase/debian/konsole-trinity.prerm b/debian/lenny/tdebase/debian/konsole-trinity.prerm
index 08074f5f3..041265da8 100644
--- a/debian/lenny/tdebase/debian/konsole-trinity.prerm
+++ b/debian/lenny/tdebase/debian/konsole-trinity.prerm
@@ -19,7 +19,7 @@ set -e
case "$1" in
remove)
- /usr/sbin/update-alternatives --remove x-terminal-emulator /usr/trinity/bin/konsole
+ /usr/sbin/update-alternatives --remove x-terminal-emulator /opt/trinity/bin/konsole
;;
upgrade|deconfigure)
diff --git a/debian/lenny/tdebase/debian/ksmserver-trinity.postinst b/debian/lenny/tdebase/debian/ksmserver-trinity.postinst
index eee248305..7983daa09 100644
--- a/debian/lenny/tdebase/debian/ksmserver-trinity.postinst
+++ b/debian/lenny/tdebase/debian/ksmserver-trinity.postinst
@@ -21,8 +21,8 @@ case "$1" in
configure)
update-alternatives --install /usr/bin/x-session-manager \
x-session-manager /opt/trinity/bin/starttde 40 \
- --slave /opt/trinity/share/man/man1/x-session-manager.1.gz \
- x-session-manager.1.gz "/opt/trinity/share/man/man1/starttde-trinity.1.gz"
+ --slave /usr/share/man/man1/x-session-manager.1.gz \
+ x-session-manager.1.gz "/usr/share/man/man1/starttde-trinity.1.gz"
# force ldconfig due to tdeinit library
ldconfig
diff --git a/debian/lenny/tdebase/debian/ksmserver-trinity.prerm b/debian/lenny/tdebase/debian/ksmserver-trinity.prerm
index a885c6d4c..87b7dcbfe 100644
--- a/debian/lenny/tdebase/debian/ksmserver-trinity.prerm
+++ b/debian/lenny/tdebase/debian/ksmserver-trinity.prerm
@@ -19,7 +19,7 @@ set -e
case "$1" in
remove)
- /usr/sbin/update-alternatives --remove x-session-manager /usr/trinity/bin/starttde
+ /usr/sbin/update-alternatives --remove x-session-manager /opt/trinity/bin/starttde
;;
upgrade|deconfigure)
diff --git a/debian/lenny/tdebase/debian/rules b/debian/lenny/tdebase/debian/rules
index 6d9265977..31b76c528 100755
--- a/debian/lenny/tdebase/debian/rules
+++ b/debian/lenny/tdebase/debian/rules
@@ -44,6 +44,7 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DWITH_SUDO_KONSOLE_SUPER_USER_COMMAND="OFF" \
-DWITH_LDAP="ON" \
-DWITH_SAMBA="ON" \
+ -DWITH_LIBUSB="ON" \
-DWITH_LIBRAW1394="ON" \
-DWITH_OPENEXR="ON" \
-DWITH_XCOMPOSITE="ON" \
diff --git a/debian/lenny/tdebase/debian/tdebase-trinity-bin.links b/debian/lenny/tdebase/debian/tdebase-trinity-bin.links
index 2c6c3384a..975b98403 100644
--- a/debian/lenny/tdebase/debian/tdebase-trinity-bin.links
+++ b/debian/lenny/tdebase/debian/tdebase-trinity-bin.links
@@ -1 +1 @@
-opt/trinity/share/man/man1/tdesu.1.gz opt/trinity/share/man/man1/tdesud.1.gz
+usr/share/man/man1/tdesu-trinity.1.gz usr/share/man/man1/tdesud-trinity.1.gz
diff --git a/debian/lenny/tdebase/debian/twin-trinity.prerm b/debian/lenny/tdebase/debian/twin-trinity.prerm
index 67c4b2507..28c98ad19 100644
--- a/debian/lenny/tdebase/debian/twin-trinity.prerm
+++ b/debian/lenny/tdebase/debian/twin-trinity.prerm
@@ -19,7 +19,7 @@ set -e
case "$1" in
remove)
- /usr/sbin/update-alternatives --remove x-window-manager /usr/trinity/bin/twin
+ /usr/sbin/update-alternatives --remove x-window-manager /opt/trinity/bin/twin
;;
upgrade|deconfigure)
diff --git a/debian/lenny/tdegraphics/debian/control b/debian/lenny/tdegraphics/debian/control
index 3571e618f..ef7765b04 100644
--- a/debian/lenny/tdegraphics/debian/control
+++ b/debian/lenny/tdegraphics/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>, Francesco Pedrini <francesco.pedrini@gmail.com>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: imlib11-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, tdelibs14-trinity-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-6-dev | libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-private-dev | libpoppler-dev (<< 0.18.4-3), libpoppler-dev, libsane-dev (>> 1.0.15), libtiff-dev, libtiff-tools, liblcms2-dev | liblcms1-dev, libusb-dev, sharutils, libxxf86vm-dev, chrpath [powerpc], cmake, libtool, libltdl-dev
+Build-Depends: imlib11-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, tdelibs14-trinity-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-private-dev | libpoppler-dev (<< 0.18.4-3), libpoppler-dev, libsane-dev (>> 1.0.15), libtiff-dev, libtiff-tools, liblcms2-dev | liblcms1-dev, libusb-dev, sharutils, libxxf86vm-dev, chrpath [powerpc], cmake, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: tdegraphics-trinity
diff --git a/debian/lenny/tdenetwork/debian/control b/debian/lenny/tdenetwork/debian/control
index b9bc2caef..29be3b5b1 100644
--- a/debian/lenny/tdenetwork/debian/control
+++ b/debian/lenny/tdenetwork/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>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>, Sarah Hobbs <hobbsee@ubuntu.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs14-trinity-dev, libgnutls-dev | libgadu-dev (>> 1:1.12.0-3), libgcrypt-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel !mips !mipsel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs14-trinity-dev, libgnutls-dev | libgadu-dev (>> 1:1.12.0-3), libgcrypt-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libspeex-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel !mips !mipsel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: tdenetwork-trinity
diff --git a/debian/lenny/tdenetwork/debian/rules b/debian/lenny/tdenetwork/debian/rules
index 5be156f6f..602afa020 100755
--- a/debian/lenny/tdenetwork/debian/rules
+++ b/debian/lenny/tdenetwork/debian/rules
@@ -36,6 +36,8 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_VERBOSE_MAKEFILE="ON" \
-DCMAKE_SKIP_RPATH="OFF" \
-DBUILD_ALL="ON" \
+ -DWITH_JINGLE="ON" \
+ -DWITH_SPEEX="ON" \
-DWITH_ARTS="ON" \
-DWITH_SLP="ON" \
-DBUILD_KOPETE_PROTOCOL_ALL="ON" \
diff --git a/debian/lenny/tdevelop/debian/man/kdevprj2tdevelop.man b/debian/lenny/tdevelop/debian/man/kdevprj2kdevelop.man
index 14ff40a64..c3e3950f1 100644
--- a/debian/lenny/tdevelop/debian/man/kdevprj2tdevelop.man
+++ b/debian/lenny/tdevelop/debian/man/kdevprj2kdevelop.man
@@ -1,11 +1,11 @@
.TH KDEVPRJ2KDEVELOP 1
.SH NAME
-kdevprj2tdevelop \- KDevelop 2.x project converter
+kdevprj2kdevelop \- KDevelop 2.x project converter
.SH SYNOPSIS
-.B kdevprj2tdevelop
+.B kdevprj2kdevelop
.I file
.SH DESCRIPTION
-.B kdevprj2tdevelop
+.B kdevprj2kdevelop
is a tool for converting KDevelop 2.x projects (*.kdevprj) to the
format used by TDevelop 3.x (*.tdevelop).
.SH PROGRAM OPTIONS
diff --git a/debian/lenny/tdevelop/debian/tdevelop-trinity.install b/debian/lenny/tdevelop/debian/tdevelop-trinity.install
index c5d963303..bf349800a 100644
--- a/debian/lenny/tdevelop/debian/tdevelop-trinity.install
+++ b/debian/lenny/tdevelop/debian/tdevelop-trinity.install
@@ -3,7 +3,7 @@ debian/tmp/etc/trinity/tdeveloprc
debian/tmp/opt/trinity/bin/tdevelop-htdig
debian/tmp/opt/trinity/bin/kdevprofileeditor
debian/tmp/opt/trinity/bin/kdevassistant
-debian/tmp/opt/trinity/bin/kdevprj2tdevelop
+debian/tmp/opt/trinity/bin/kdevprj2kdevelop
debian/tmp/opt/trinity/bin/tdevelop
debian/tmp/opt/trinity/lib/tdeconf_update_bin/kdev-gen-settings-tdeconf_update
debian/tmp/opt/trinity/share/services
diff --git a/debian/lenny/tdevelop/debian/tdevelop-trinity.manpages b/debian/lenny/tdevelop/debian/tdevelop-trinity.manpages
index e3fa64301..11c38318d 100644
--- a/debian/lenny/tdevelop/debian/tdevelop-trinity.manpages
+++ b/debian/lenny/tdevelop/debian/tdevelop-trinity.manpages
@@ -1,5 +1,5 @@
debian/man/out/tdevelop.1
debian/man/out/kdevassistant.1
-debian/man/out/kdevprj2tdevelop.1
+debian/man/out/kdevprj2kdevelop.1
debian/man/out/kdevprofileeditor.1
debian/man/out/tdevelop-htdig.1
diff --git a/debian/squeeze/applications/digikam/debian/control b/debian/squeeze/applications/digikam/debian/control
index 826b9d164..e4ac538dc 100644
--- a/debian/squeeze/applications/digikam/debian/control
+++ b/debian/squeeze/applications/digikam/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>, Fathi Boudra <fabo@debian.org>
Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev,
- libtiff-dev, libgphoto2-6-dev | libgphoto2-2-dev, libkipi0-trinity-dev,
+ libtiff-dev, libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev, libkipi0-trinity-dev,
libsqlite3-dev, liblcms1-dev, libkexiv2-3-trinity-dev (>= 0.1.6),
libjasper-dev, libpng12-dev | libpng-dev, libexiv2-dev,
libkdcraw3-trinity-dev (>= 0.1.4),
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/control b/debian/squeeze/libraries/kipi-plugins/debian/control
index 497ddb612..94ed13bbf 100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/control
+++ b/debian/squeeze/libraries/kipi-plugins/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Uploaders: Mark Purcell <msp@debian.org>, Achim Bohnet <ach@mpe.mpg.de>, Fathi Boudra <fabo@debian.org>
Build-Depends: cdbs, debhelper (>= 5), quilt, pkg-config, tdelibs14-trinity-dev,
- libexiv2-dev, libgphoto2-6-dev | libgphoto2-2-dev, libgpod-nogtk-dev,
+ libexiv2-dev, libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev, libgpod-nogtk-dev,
libtdepim1-trinity-dev, libkdcraw3-trinity-dev, libkexiv2-3-trinity-dev,
libkipi0-trinity-dev, libtiff-dev, libxslt1-dev, tdepim-trinity-dev,
automake, autoconf, libtool, libltdl-dev
diff --git a/debian/squeeze/tdebase/debian/konqueror-trinity.postinst b/debian/squeeze/tdebase/debian/konqueror-trinity.postinst
index ea83963d9..4c62f6bf2 100644
--- a/debian/squeeze/tdebase/debian/konqueror-trinity.postinst
+++ b/debian/squeeze/tdebase/debian/konqueror-trinity.postinst
@@ -24,6 +24,9 @@ case "$1" in
divert_remove /usr/share/icons/hicolor/48x48/apps/konqueror.png
divert_remove /usr/share/icons/hicolor/64x64/apps/konqueror.png
divert_remove /usr/share/icons/hicolor/scalable/apps/konqueror.svgz
+
+ update-alternatives --install /usr/bin/x-www-browser x-www-browser /opt/trinity/bin/konqueror 100 \
+ --slave /usr/share/man/man1/x-www-browser.1.gz x-www-browser.1.gz /usr/share/man/man1/konqueror-trinity.1.gz
;;
install)
diff --git a/debian/squeeze/tdebase/debian/konqueror-trinity.prerm b/debian/squeeze/tdebase/debian/konqueror-trinity.prerm
index 73baa81cc..57b10d0a5 100644
--- a/debian/squeeze/tdebase/debian/konqueror-trinity.prerm
+++ b/debian/squeeze/tdebase/debian/konqueror-trinity.prerm
@@ -2,7 +2,7 @@
case "$1" in
remove)
- /usr/sbin/update-alternatives --remove x-www-browser /usr/trinity/bin/konqueror
+ /usr/sbin/update-alternatives --remove x-www-browser /opt/trinity/bin/konqueror
;;
upgrade|deconfigure)
diff --git a/debian/squeeze/tdebase/debian/konsole-trinity.postinst b/debian/squeeze/tdebase/debian/konsole-trinity.postinst
index d7225354d..d8be0590f 100644
--- a/debian/squeeze/tdebase/debian/konsole-trinity.postinst
+++ b/debian/squeeze/tdebase/debian/konsole-trinity.postinst
@@ -20,7 +20,7 @@ set -e
case "$1" in
configure)
update-alternatives --install /usr/bin/x-terminal-emulator x-terminal-emulator /opt/trinity/bin/konsole 35 \
- --slave /opt/trinity/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz /opt/trinity/share/man/man1/konsole-trinity.1.gz
+ --slave /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz /usr/share/man/man1/konsole-trinity.1.gz
# force ldconfig due to tdeinit library
ldconfig
diff --git a/debian/squeeze/tdebase/debian/konsole-trinity.prerm b/debian/squeeze/tdebase/debian/konsole-trinity.prerm
index 08074f5f3..041265da8 100644
--- a/debian/squeeze/tdebase/debian/konsole-trinity.prerm
+++ b/debian/squeeze/tdebase/debian/konsole-trinity.prerm
@@ -19,7 +19,7 @@ set -e
case "$1" in
remove)
- /usr/sbin/update-alternatives --remove x-terminal-emulator /usr/trinity/bin/konsole
+ /usr/sbin/update-alternatives --remove x-terminal-emulator /opt/trinity/bin/konsole
;;
upgrade|deconfigure)
diff --git a/debian/squeeze/tdebase/debian/ksmserver-trinity.postinst b/debian/squeeze/tdebase/debian/ksmserver-trinity.postinst
index eee248305..7983daa09 100644
--- a/debian/squeeze/tdebase/debian/ksmserver-trinity.postinst
+++ b/debian/squeeze/tdebase/debian/ksmserver-trinity.postinst
@@ -21,8 +21,8 @@ case "$1" in
configure)
update-alternatives --install /usr/bin/x-session-manager \
x-session-manager /opt/trinity/bin/starttde 40 \
- --slave /opt/trinity/share/man/man1/x-session-manager.1.gz \
- x-session-manager.1.gz "/opt/trinity/share/man/man1/starttde-trinity.1.gz"
+ --slave /usr/share/man/man1/x-session-manager.1.gz \
+ x-session-manager.1.gz "/usr/share/man/man1/starttde-trinity.1.gz"
# force ldconfig due to tdeinit library
ldconfig
diff --git a/debian/squeeze/tdebase/debian/ksmserver-trinity.prerm b/debian/squeeze/tdebase/debian/ksmserver-trinity.prerm
index a885c6d4c..87b7dcbfe 100644
--- a/debian/squeeze/tdebase/debian/ksmserver-trinity.prerm
+++ b/debian/squeeze/tdebase/debian/ksmserver-trinity.prerm
@@ -19,7 +19,7 @@ set -e
case "$1" in
remove)
- /usr/sbin/update-alternatives --remove x-session-manager /usr/trinity/bin/starttde
+ /usr/sbin/update-alternatives --remove x-session-manager /opt/trinity/bin/starttde
;;
upgrade|deconfigure)
diff --git a/debian/squeeze/tdebase/debian/rules b/debian/squeeze/tdebase/debian/rules
index 8d6c84f8e..e8502d281 100755
--- a/debian/squeeze/tdebase/debian/rules
+++ b/debian/squeeze/tdebase/debian/rules
@@ -44,6 +44,7 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DWITH_SUDO_KONSOLE_SUPER_USER_COMMAND="OFF" \
-DWITH_LDAP="ON" \
-DWITH_SAMBA="ON" \
+ -DWITH_LIBUSB="ON" \
-DWITH_LIBRAW1394="ON" \
-DWITH_OPENEXR="ON" \
-DWITH_XCOMPOSITE="ON" \
diff --git a/debian/squeeze/tdebase/debian/tdebase-trinity-bin.links b/debian/squeeze/tdebase/debian/tdebase-trinity-bin.links
index 2c6c3384a..975b98403 100644
--- a/debian/squeeze/tdebase/debian/tdebase-trinity-bin.links
+++ b/debian/squeeze/tdebase/debian/tdebase-trinity-bin.links
@@ -1 +1 @@
-opt/trinity/share/man/man1/tdesu.1.gz opt/trinity/share/man/man1/tdesud.1.gz
+usr/share/man/man1/tdesu-trinity.1.gz usr/share/man/man1/tdesud-trinity.1.gz
diff --git a/debian/squeeze/tdebase/debian/twin-trinity.prerm b/debian/squeeze/tdebase/debian/twin-trinity.prerm
index 67c4b2507..28c98ad19 100644
--- a/debian/squeeze/tdebase/debian/twin-trinity.prerm
+++ b/debian/squeeze/tdebase/debian/twin-trinity.prerm
@@ -19,7 +19,7 @@ set -e
case "$1" in
remove)
- /usr/sbin/update-alternatives --remove x-window-manager /usr/trinity/bin/twin
+ /usr/sbin/update-alternatives --remove x-window-manager /opt/trinity/bin/twin
;;
upgrade|deconfigure)
diff --git a/debian/squeeze/tdegraphics/debian/control b/debian/squeeze/tdegraphics/debian/control
index 3571e618f..ef7765b04 100644
--- a/debian/squeeze/tdegraphics/debian/control
+++ b/debian/squeeze/tdegraphics/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>, Francesco Pedrini <francesco.pedrini@gmail.com>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: imlib11-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, tdelibs14-trinity-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-6-dev | libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-private-dev | libpoppler-dev (<< 0.18.4-3), libpoppler-dev, libsane-dev (>> 1.0.15), libtiff-dev, libtiff-tools, liblcms2-dev | liblcms1-dev, libusb-dev, sharutils, libxxf86vm-dev, chrpath [powerpc], cmake, libtool, libltdl-dev
+Build-Depends: imlib11-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, tdelibs14-trinity-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-private-dev | libpoppler-dev (<< 0.18.4-3), libpoppler-dev, libsane-dev (>> 1.0.15), libtiff-dev, libtiff-tools, liblcms2-dev | liblcms1-dev, libusb-dev, sharutils, libxxf86vm-dev, chrpath [powerpc], cmake, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: tdegraphics-trinity
diff --git a/debian/squeeze/tdenetwork/debian/control b/debian/squeeze/tdenetwork/debian/control
index b9bc2caef..29be3b5b1 100644
--- a/debian/squeeze/tdenetwork/debian/control
+++ b/debian/squeeze/tdenetwork/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>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>, Sarah Hobbs <hobbsee@ubuntu.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs14-trinity-dev, libgnutls-dev | libgadu-dev (>> 1:1.12.0-3), libgcrypt-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel !mips !mipsel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs14-trinity-dev, libgnutls-dev | libgadu-dev (>> 1:1.12.0-3), libgcrypt-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libspeex-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel !mips !mipsel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: tdenetwork-trinity
diff --git a/debian/squeeze/tdenetwork/debian/rules b/debian/squeeze/tdenetwork/debian/rules
index ec0abfcde..b10997d3b 100755
--- a/debian/squeeze/tdenetwork/debian/rules
+++ b/debian/squeeze/tdenetwork/debian/rules
@@ -36,6 +36,8 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_VERBOSE_MAKEFILE="ON" \
-DCMAKE_SKIP_RPATH="OFF" \
-DBUILD_ALL="ON" \
+ -DWITH_JINGLE="ON" \
+ -DWITH_SPEEX="ON" \
-DWITH_ARTS="ON" \
-DWITH_SLP="ON" \
-DBUILD_KOPETE_PROTOCOL_ALL="ON" \
diff --git a/debian/squeeze/tdevelop/debian/man/kdevprj2tdevelop.man b/debian/squeeze/tdevelop/debian/man/kdevprj2kdevelop.man
index 14ff40a64..c3e3950f1 100644
--- a/debian/squeeze/tdevelop/debian/man/kdevprj2tdevelop.man
+++ b/debian/squeeze/tdevelop/debian/man/kdevprj2kdevelop.man
@@ -1,11 +1,11 @@
.TH KDEVPRJ2KDEVELOP 1
.SH NAME
-kdevprj2tdevelop \- KDevelop 2.x project converter
+kdevprj2kdevelop \- KDevelop 2.x project converter
.SH SYNOPSIS
-.B kdevprj2tdevelop
+.B kdevprj2kdevelop
.I file
.SH DESCRIPTION
-.B kdevprj2tdevelop
+.B kdevprj2kdevelop
is a tool for converting KDevelop 2.x projects (*.kdevprj) to the
format used by TDevelop 3.x (*.tdevelop).
.SH PROGRAM OPTIONS
diff --git a/debian/squeeze/tdevelop/debian/tdevelop-trinity.install b/debian/squeeze/tdevelop/debian/tdevelop-trinity.install
index c5d963303..bf349800a 100644
--- a/debian/squeeze/tdevelop/debian/tdevelop-trinity.install
+++ b/debian/squeeze/tdevelop/debian/tdevelop-trinity.install
@@ -3,7 +3,7 @@ debian/tmp/etc/trinity/tdeveloprc
debian/tmp/opt/trinity/bin/tdevelop-htdig
debian/tmp/opt/trinity/bin/kdevprofileeditor
debian/tmp/opt/trinity/bin/kdevassistant
-debian/tmp/opt/trinity/bin/kdevprj2tdevelop
+debian/tmp/opt/trinity/bin/kdevprj2kdevelop
debian/tmp/opt/trinity/bin/tdevelop
debian/tmp/opt/trinity/lib/tdeconf_update_bin/kdev-gen-settings-tdeconf_update
debian/tmp/opt/trinity/share/services
diff --git a/debian/squeeze/tdevelop/debian/tdevelop-trinity.manpages b/debian/squeeze/tdevelop/debian/tdevelop-trinity.manpages
index e3fa64301..11c38318d 100644
--- a/debian/squeeze/tdevelop/debian/tdevelop-trinity.manpages
+++ b/debian/squeeze/tdevelop/debian/tdevelop-trinity.manpages
@@ -1,5 +1,5 @@
debian/man/out/tdevelop.1
debian/man/out/kdevassistant.1
-debian/man/out/kdevprj2tdevelop.1
+debian/man/out/kdevprj2kdevelop.1
debian/man/out/kdevprofileeditor.1
debian/man/out/tdevelop-htdig.1
diff --git a/debian/stretch b/debian/stretch
new file mode 120000
index 000000000..20f08b4f4
--- /dev/null
+++ b/debian/stretch
@@ -0,0 +1 @@
+squeeze \ No newline at end of file