From ff558258db1fb24c64115e6841c97b86edd2396b Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Wed, 20 May 2015 19:54:44 +0200 Subject: [PATCH 01/11] RPM packaging: minor updates --- redhat/applications/koffice/koffice-14.0.0.spec | 2 +- redhat/applications/koffice/koffice-3.5.13.2.spec | 2 +- .../tde-systemsettings/tde-systemsettings-14.0.0.spec | 1 + redhat/applications/wlassistant/wlassistant-14.0.0.spec | 1 - 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice-14.0.0.spec index b9977cd98..cb5e1e954 100644 --- a/redhat/applications/koffice/koffice-14.0.0.spec +++ b/redhat/applications/koffice/koffice-14.0.0.spec @@ -367,7 +367,7 @@ fi Summary: Runtime libraries for %{name} Group: System Environment/Libraries Conflicts: %{name} <= %{version}-%{release} -Requires: trinity-kdelibs +Requires: trinity-tdelibs License: LGPLv2+ %description libs diff --git a/redhat/applications/koffice/koffice-3.5.13.2.spec b/redhat/applications/koffice/koffice-3.5.13.2.spec index 34dfb6606..22cfb1166 100644 --- a/redhat/applications/koffice/koffice-3.5.13.2.spec +++ b/redhat/applications/koffice/koffice-3.5.13.2.spec @@ -328,7 +328,7 @@ fi Summary: Runtime libraries for %{name} Group: System Environment/Libraries Conflicts: %{name} <= %{version}-%{release} -Requires: trinity-kdelibs +Requires: trinity-tdelibs License: LGPLv2+ %description libs diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec index 338795cbe..b4190ad5e 100644 --- a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec +++ b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec @@ -58,6 +58,7 @@ Source1: kde-settings-laptops.directory Patch0: %{tde_pkg}-%{tde_version}.patch + Provides: trinity-kde-systemsettings = %{version}-%{release} Obsoletes: trinity-kde-systemsettings < %{version}-%{release} Provides: trinity-systemsettings = %{version}-%{release} diff --git a/redhat/applications/wlassistant/wlassistant-14.0.0.spec b/redhat/applications/wlassistant/wlassistant-14.0.0.spec index cd981bc4c..2ad812d24 100644 --- a/redhat/applications/wlassistant/wlassistant-14.0.0.spec +++ b/redhat/applications/wlassistant/wlassistant-14.0.0.spec @@ -98,7 +98,6 @@ BuildRequires: libidn-devel %define with_gamin 1 BuildRequires: gamin-devel %endif - # PYTHON support BuildRequires: python From caeb84716e89e1e6e34036927a093e57e6c36a3f Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 25 May 2015 18:56:09 +0900 Subject: [PATCH 02/11] Add Debian Stretch symlink Signed-off-by: Michele Calgaro --- debian/stretch | 1 + 1 file changed, 1 insertion(+) create mode 120000 debian/stretch 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 From 0340431967e9042abf526a557b7204be130b6389 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 29 May 2015 08:39:58 +0900 Subject: [PATCH 03/11] Fixed tdegraphics FTBFS in Debian Stretch. Signed-off-by: Michele Calgaro --- debian/lenny/tdegraphics/debian/control | 2 +- debian/squeeze/tdegraphics/debian/control | 2 +- ubuntu/maverick/tdegraphics/debian/control | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Francesco Pedrini , Josh Metzler , Sune Vuorela -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/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 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Francesco Pedrini , Josh Metzler , Sune Vuorela -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/ubuntu/maverick/tdegraphics/debian/control b/ubuntu/maverick/tdegraphics/debian/control index d0f91bb89..a1af7910e 100644 --- a/ubuntu/maverick/tdegraphics/debian/control +++ b/ubuntu/maverick/tdegraphics/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Francesco Pedrini , Josh Metzler , Sune Vuorela -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 From 3cbaa19daf75c8cba7713e68a46dddf64222def9 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 29 May 2015 11:43:44 +0900 Subject: [PATCH 04/11] Fixed kipi-plugins FTBFS in Debian Stretch. Signed-off-by: Michele Calgaro --- debian/lenny/libraries/kipi-plugins/debian/control | 2 +- debian/squeeze/libraries/kipi-plugins/debian/control | 2 +- ubuntu/maverick/libraries/kipi-plugins/debian/control | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 Uploaders: Mark Purcell , Achim Bohnet , Fathi Boudra 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/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 Uploaders: Mark Purcell , Achim Bohnet , Fathi Boudra 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/ubuntu/maverick/libraries/kipi-plugins/debian/control b/ubuntu/maverick/libraries/kipi-plugins/debian/control index f4a908d4b..b087893b5 100644 --- a/ubuntu/maverick/libraries/kipi-plugins/debian/control +++ b/ubuntu/maverick/libraries/kipi-plugins/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson Uploaders: Mark Purcell , Achim Bohnet , Fathi Boudra 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 From 5959d81dd5358ba41b671692d37bf68293bc3c25 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 29 May 2015 12:27:44 +0900 Subject: [PATCH 05/11] Fixed digikam FTBFS in Debian Stretch. Signed-off-by: Michele Calgaro --- debian/lenny/applications/digikam/debian/control | 2 +- debian/squeeze/applications/digikam/debian/control | 2 +- ubuntu/maverick/applications/digikam/debian/control | 2 +- 3 files changed, 3 insertions(+), 3 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 XSBC-Original-Maintainer: Debian KDE Extras Team Uploaders: Achim Bohnet , Mark Purcell , Fathi Boudra 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/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 XSBC-Original-Maintainer: Debian KDE Extras Team Uploaders: Achim Bohnet , Mark Purcell , Fathi Boudra 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/ubuntu/maverick/applications/digikam/debian/control b/ubuntu/maverick/applications/digikam/debian/control index bc98847c3..d800b26c5 100644 --- a/ubuntu/maverick/applications/digikam/debian/control +++ b/ubuntu/maverick/applications/digikam/debian/control @@ -5,7 +5,7 @@ Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian KDE Extras Team Uploaders: Achim Bohnet , Mark Purcell , Fathi Boudra 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), From 1de3d7dececdc00c8b8762a29e959a646345f114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 31 May 2015 16:05:49 +0200 Subject: [PATCH 06/11] Add Ubuntu Wily symlink MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- ubuntu/wily | 1 + 1 file changed, 1 insertion(+) create mode 120000 ubuntu/wily diff --git a/ubuntu/wily b/ubuntu/wily new file mode 120000 index 000000000..5cb6e6000 --- /dev/null +++ b/ubuntu/wily @@ -0,0 +1 @@ +maverick \ No newline at end of file From be8296e88c46d6ea43c285ccef320c1b7a75b083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 31 May 2015 16:07:55 +0200 Subject: [PATCH 07/11] Fix tdesud manpage symlink on Debian and Ubuntu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- debian/lenny/tdebase/debian/tdebase-trinity-bin.links | 2 +- debian/squeeze/tdebase/debian/tdebase-trinity-bin.links | 2 +- ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.links | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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/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/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.links b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.links index 2c6c3384a..975b98403 100644 --- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.links +++ b/ubuntu/maverick/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 From 9e82e241298bb51e278618a061b383dbc2f3a660 Mon Sep 17 00:00:00 2001 From: Nick Leverton Date: Sun, 31 May 2015 16:10:59 +0200 Subject: [PATCH 08/11] Fix alternatives provision on Debian and Ubuntu This resolves Bug 2452 Signed-off-by: Nick Leverton --- debian/lenny/tdebase/debian/konqueror-trinity.postinst | 3 +++ debian/lenny/tdebase/debian/konqueror-trinity.prerm | 2 +- debian/lenny/tdebase/debian/konsole-trinity.postinst | 2 +- debian/lenny/tdebase/debian/konsole-trinity.prerm | 2 +- debian/lenny/tdebase/debian/ksmserver-trinity.postinst | 4 ++-- debian/lenny/tdebase/debian/ksmserver-trinity.prerm | 2 +- debian/lenny/tdebase/debian/twin-trinity.prerm | 2 +- debian/squeeze/tdebase/debian/konqueror-trinity.postinst | 3 +++ debian/squeeze/tdebase/debian/konqueror-trinity.prerm | 2 +- debian/squeeze/tdebase/debian/konsole-trinity.postinst | 2 +- debian/squeeze/tdebase/debian/konsole-trinity.prerm | 2 +- debian/squeeze/tdebase/debian/ksmserver-trinity.postinst | 4 ++-- debian/squeeze/tdebase/debian/ksmserver-trinity.prerm | 2 +- debian/squeeze/tdebase/debian/twin-trinity.prerm | 2 +- ubuntu/maverick/tdebase/debian/konqueror-trinity.postinst | 3 +++ ubuntu/maverick/tdebase/debian/konqueror-trinity.prerm | 2 +- ubuntu/maverick/tdebase/debian/konsole-trinity.postinst | 2 +- ubuntu/maverick/tdebase/debian/konsole-trinity.prerm | 2 +- ubuntu/maverick/tdebase/debian/ksmserver-trinity.postinst | 4 ++-- ubuntu/maverick/tdebase/debian/ksmserver-trinity.prerm | 2 +- ubuntu/maverick/tdebase/debian/twin-trinity.prerm | 2 +- 21 files changed, 30 insertions(+), 21 deletions(-) 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/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/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/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/ubuntu/maverick/tdebase/debian/konqueror-trinity.postinst b/ubuntu/maverick/tdebase/debian/konqueror-trinity.postinst index ea83963d9..4c62f6bf2 100644 --- a/ubuntu/maverick/tdebase/debian/konqueror-trinity.postinst +++ b/ubuntu/maverick/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/ubuntu/maverick/tdebase/debian/konqueror-trinity.prerm b/ubuntu/maverick/tdebase/debian/konqueror-trinity.prerm index 73baa81cc..57b10d0a5 100644 --- a/ubuntu/maverick/tdebase/debian/konqueror-trinity.prerm +++ b/ubuntu/maverick/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/ubuntu/maverick/tdebase/debian/konsole-trinity.postinst b/ubuntu/maverick/tdebase/debian/konsole-trinity.postinst index d7225354d..d8be0590f 100644 --- a/ubuntu/maverick/tdebase/debian/konsole-trinity.postinst +++ b/ubuntu/maverick/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/ubuntu/maverick/tdebase/debian/konsole-trinity.prerm b/ubuntu/maverick/tdebase/debian/konsole-trinity.prerm index 08074f5f3..041265da8 100644 --- a/ubuntu/maverick/tdebase/debian/konsole-trinity.prerm +++ b/ubuntu/maverick/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/ubuntu/maverick/tdebase/debian/ksmserver-trinity.postinst b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.postinst index eee248305..7983daa09 100644 --- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.postinst +++ b/ubuntu/maverick/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/ubuntu/maverick/tdebase/debian/ksmserver-trinity.prerm b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.prerm index a885c6d4c..87b7dcbfe 100644 --- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.prerm +++ b/ubuntu/maverick/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/ubuntu/maverick/tdebase/debian/twin-trinity.prerm b/ubuntu/maverick/tdebase/debian/twin-trinity.prerm index 67c4b2507..28c98ad19 100644 --- a/ubuntu/maverick/tdebase/debian/twin-trinity.prerm +++ b/ubuntu/maverick/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) From 0fda9ebecf4f4892468aab374e87dc029da5b6e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 14 Jun 2015 03:53:30 +0200 Subject: [PATCH 09/11] Enable WITH_LIBUSB in tdebase on Debian and Ubuntu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- debian/lenny/tdebase/debian/rules | 1 + debian/squeeze/tdebase/debian/rules | 1 + ubuntu/maverick/tdebase/debian/rules | 1 + 3 files changed, 3 insertions(+) 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/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/ubuntu/maverick/tdebase/debian/rules b/ubuntu/maverick/tdebase/debian/rules index 43ab682d0..84da82e43 100755 --- a/ubuntu/maverick/tdebase/debian/rules +++ b/ubuntu/maverick/tdebase/debian/rules @@ -44,6 +44,7 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_SUDO_KONSOLE_SUPER_USER_COMMAND="ON" \ -DWITH_LDAP="ON" \ -DWITH_SAMBA="ON" \ + -DWITH_LIBUSB="ON" \ -DWITH_LIBRAW1394="ON" \ -DWITH_OPENEXR="ON" \ -DWITH_XCOMPOSITE="ON" \ From 2b3d2e3585b9643514cde077538087ed23b72dc9 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 17 Jun 2015 15:34:23 +0900 Subject: [PATCH 10/11] Revert to .kdevelop files with entity name for project files. This resolves bug 2308. Signed-off-by: Michele Calgaro --- .../man/{kdevprj2tdevelop.man => kdevprj2kdevelop.man} | 6 +++--- debian/lenny/tdevelop/debian/tdevelop-trinity.install | 2 +- debian/lenny/tdevelop/debian/tdevelop-trinity.manpages | 2 +- .../man/{kdevprj2tdevelop.man => kdevprj2kdevelop.man} | 6 +++--- debian/squeeze/tdevelop/debian/tdevelop-trinity.install | 2 +- debian/squeeze/tdevelop/debian/tdevelop-trinity.manpages | 2 +- .../man/{kdevprj2tdevelop.man => kdevprj2kdevelop.man} | 6 +++--- ubuntu/maverick/tdevelop/debian/tdevelop-trinity.install | 2 +- ubuntu/maverick/tdevelop/debian/tdevelop-trinity.manpages | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) rename debian/lenny/tdevelop/debian/man/{kdevprj2tdevelop.man => kdevprj2kdevelop.man} (72%) rename debian/squeeze/tdevelop/debian/man/{kdevprj2tdevelop.man => kdevprj2kdevelop.man} (72%) rename ubuntu/maverick/tdevelop/debian/man/{kdevprj2tdevelop.man => kdevprj2kdevelop.man} (72%) diff --git a/debian/lenny/tdevelop/debian/man/kdevprj2tdevelop.man b/debian/lenny/tdevelop/debian/man/kdevprj2kdevelop.man similarity index 72% rename from debian/lenny/tdevelop/debian/man/kdevprj2tdevelop.man rename to 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/tdevelop/debian/man/kdevprj2tdevelop.man b/debian/squeeze/tdevelop/debian/man/kdevprj2kdevelop.man similarity index 72% rename from debian/squeeze/tdevelop/debian/man/kdevprj2tdevelop.man rename to 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/ubuntu/maverick/tdevelop/debian/man/kdevprj2tdevelop.man b/ubuntu/maverick/tdevelop/debian/man/kdevprj2kdevelop.man similarity index 72% rename from ubuntu/maverick/tdevelop/debian/man/kdevprj2tdevelop.man rename to ubuntu/maverick/tdevelop/debian/man/kdevprj2kdevelop.man index 14ff40a64..c3e3950f1 100644 --- a/ubuntu/maverick/tdevelop/debian/man/kdevprj2tdevelop.man +++ b/ubuntu/maverick/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/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.install b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.install index c5d963303..bf349800a 100644 --- a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.install +++ b/ubuntu/maverick/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/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.manpages b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.manpages index e3fa64301..11c38318d 100644 --- a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.manpages +++ b/ubuntu/maverick/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 From 98bfbb131544aa506fb02a1cdf0802014f3cf993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Fri, 26 Jun 2015 13:38:21 +0200 Subject: [PATCH 11/11] Enable jingle support in kopete on Debian and Ubuntu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- debian/lenny/tdenetwork/debian/control | 2 +- debian/lenny/tdenetwork/debian/rules | 2 ++ debian/squeeze/tdenetwork/debian/control | 2 +- debian/squeeze/tdenetwork/debian/rules | 2 ++ ubuntu/maverick/tdenetwork/debian/control | 2 +- ubuntu/maverick/tdenetwork/debian/rules | 2 ++ 6 files changed, 9 insertions(+), 3 deletions(-) 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 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Christopher Martin , Modestas Vainius , Sarah Hobbs , Sune Vuorela -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/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 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Christopher Martin , Modestas Vainius , Sarah Hobbs , Sune Vuorela -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/ubuntu/maverick/tdenetwork/debian/control b/ubuntu/maverick/tdenetwork/debian/control index 1eb90fab0..2179fbe91 100644 --- a/ubuntu/maverick/tdenetwork/debian/control +++ b/ubuntu/maverick/tdenetwork/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Christopher Martin , Modestas Vainius , Sarah Hobbs , Sune Vuorela -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/ubuntu/maverick/tdenetwork/debian/rules b/ubuntu/maverick/tdenetwork/debian/rules index ec0abfcde..b10997d3b 100755 --- a/ubuntu/maverick/tdenetwork/debian/rules +++ b/ubuntu/maverick/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" \