diff options
43 files changed, 300 insertions, 204 deletions
diff --git a/debian/lenny/applications/filelight-l10n/debian/control b/debian/lenny/applications/filelight-l10n/debian/control index 4b3dc34e3..404650732 100644 --- a/debian/lenny/applications/filelight-l10n/debian/control +++ b/debian/lenny/applications/filelight-l10n/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.8.4 Homepage: http://www.methylblue.com/filelight/ Package: filelight-l10n-trinity -Architecture: any +Architecture: all Depends: ${shlibs:Depends} , filelight-trinity Replaces: filelight-l10n-trinity (<< 4:14.0.0~) Breaks: filelight-l10n-trinity (<< 4:14.0.0~) @@ -17,5 +17,5 @@ Description: Localization (l10n) for Filelight, disk space usage tool [Trinity] Filelight, Filelight allows you to understand your disk usage by graphically representing your filesystem as a set of concentric, segmented rings. . - See the 'filelight' package description for more information. + See the 'filelight-trinity' package description for more information. diff --git a/debian/lenny/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/debian/lenny/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff index 826d4e236..0729793b7 100644 --- a/debian/lenny/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff +++ b/debian/lenny/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff @@ -14,16 +14,16 @@ index 7c45fcf..b933832 100644 } else { --// if (getenv("USER") != "root") +-// if (getenv("USER") != TQString("root")) -// { -// KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); -// exit(0); -// } -+ if (getenv("USER") != "root") -+ { -+ KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); -+ exit(0); -+ } ++ if (getenv("USER") != TQString("root")) ++ { ++ KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); ++ exit(0); ++ } TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/debian/lenny/applications/kvpnc/debian/patches/series b/debian/lenny/applications/kvpnc/debian/patches/series index 09040ada9..d29c3ca91 100644 --- a/debian/lenny/applications/kvpnc/debian/patches/series +++ b/debian/lenny/applications/kvpnc/debian/patches/series @@ -1,2 +1,2 @@ -10_su-to-root_usage.diff +# 10_su-to-root_usage.diff 13_add_kuser_issuperuser.diff diff --git a/debian/lenny/tdelibs/debian/rules b/debian/lenny/tdelibs/debian/rules index 5ea30a3cc..1337de8b5 100755 --- a/debian/lenny/tdelibs/debian/rules +++ b/debian/lenny/tdelibs/debian/rules @@ -20,9 +20,38 @@ DEB_KDE_APIDOX := yes version=Debian Package $(DEB_VERSION) DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) -DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" -DWITH_LIBBFD="ON" \ --DWITH_LIBART="ON" -DWITH_LIBIDN="ON" -DWITH_TIFF="ON" -DWITH_JASPER="ON" -DWITH_OPENEXR="ON" -DWITH_AVAHI="ON" -DWITH_ASPELL="ON" -DWITH_HSPELL="ON" -DWITH_ELFICON="ON" -DWITH_TDEHWLIB_DAEMONS="ON" -DWITH_UPOWER="ON" -DWITH_UDISKS="ON" -DWITH_UDISKS2="ON" -DWITH_CONSOLEKIT="ON" -DWITH_NETWORK_MANAGER_BACKEND="ON" -DWITH_LZMA="ON" \ --DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_CMAKE_EXTRA_FLAGS := \ + -DLIB_SUFFIX="" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \ + -DCMAKE_INCLUDE_PATH="/opt/trinity/include" \ + -DAUTODETECT_QT_DIRS="ON" \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DBUILD_ALL="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DWITH_GCC_VISIBILITY="ON" \ + -DWITH_LIBBFD="ON" \ + -DWITH_LIBART="ON" \ + -DWITH_LIBIDN="ON" \ + -DWITH_TIFF="ON" \ + -DWITH_JASPER="ON" \ + -DWITH_OPENEXR="ON" \ + -DWITH_AVAHI="ON" \ + -DWITH_ASPELL="ON" \ + -DWITH_HSPELL="ON" \ + -DWITH_ELFICON="ON" \ + -DWITH_TDEHWLIB_DAEMONS="ON" \ + -DWITH_UPOWER="ON" \ + -DWITH_UDISKS="ON" \ + -DWITH_UDISKS2="ON" \ + -DWITH_CONSOLEKIT="ON" \ + -DWITH_NETWORK_MANAGER_BACKEND="ON" \ + -DWITH_LZMA="ON" \ + -DWITH_XRANDR="ON" \ + -DWITH_XCOMPOSITE="ON" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. diff --git a/debian/lenny/tdelibs/debian/tdecmshell b/debian/lenny/tdelibs/debian/tdecmshell index 4e24cd356..64dea7e87 100755 --- a/debian/lenny/tdelibs/debian/tdecmshell +++ b/debian/lenny/tdelibs/debian/tdecmshell @@ -1,4 +1,6 @@ #!/bin/sh -export TDEDIRS=/usr/:/opt/trinity/ -/opt/trinity/bin/tdecmshell.real $1 $2 $3 $4 $5 $6 $7 $8 +export XDG_CONFIG_DIRS=/opt/trinity/etc/xdg:/etc/xdg +export XDG_DATA_DIRS=/opt/trinity/share:/usr/share + +${0}.real "$@" diff --git a/debian/squeeze/applications/filelight-l10n/debian/control b/debian/squeeze/applications/filelight-l10n/debian/control index 4b3dc34e3..404650732 100644 --- a/debian/squeeze/applications/filelight-l10n/debian/control +++ b/debian/squeeze/applications/filelight-l10n/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.8.4 Homepage: http://www.methylblue.com/filelight/ Package: filelight-l10n-trinity -Architecture: any +Architecture: all Depends: ${shlibs:Depends} , filelight-trinity Replaces: filelight-l10n-trinity (<< 4:14.0.0~) Breaks: filelight-l10n-trinity (<< 4:14.0.0~) @@ -17,5 +17,5 @@ Description: Localization (l10n) for Filelight, disk space usage tool [Trinity] Filelight, Filelight allows you to understand your disk usage by graphically representing your filesystem as a set of concentric, segmented rings. . - See the 'filelight' package description for more information. + See the 'filelight-trinity' package description for more information. diff --git a/debian/squeeze/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/debian/squeeze/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff index 826d4e236..0729793b7 100644 --- a/debian/squeeze/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff +++ b/debian/squeeze/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff @@ -14,16 +14,16 @@ index 7c45fcf..b933832 100644 } else { --// if (getenv("USER") != "root") +-// if (getenv("USER") != TQString("root")) -// { -// KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); -// exit(0); -// } -+ if (getenv("USER") != "root") -+ { -+ KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); -+ exit(0); -+ } ++ if (getenv("USER") != TQString("root")) ++ { ++ KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); ++ exit(0); ++ } TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/debian/squeeze/applications/kvpnc/debian/patches/series b/debian/squeeze/applications/kvpnc/debian/patches/series index 09040ada9..d29c3ca91 100644 --- a/debian/squeeze/applications/kvpnc/debian/patches/series +++ b/debian/squeeze/applications/kvpnc/debian/patches/series @@ -1,2 +1,2 @@ -10_su-to-root_usage.diff +# 10_su-to-root_usage.diff 13_add_kuser_issuperuser.diff diff --git a/debian/squeeze/tdelibs/debian/rules b/debian/squeeze/tdelibs/debian/rules index 5ea30a3cc..1337de8b5 100755 --- a/debian/squeeze/tdelibs/debian/rules +++ b/debian/squeeze/tdelibs/debian/rules @@ -20,9 +20,38 @@ DEB_KDE_APIDOX := yes version=Debian Package $(DEB_VERSION) DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) -DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" -DWITH_LIBBFD="ON" \ --DWITH_LIBART="ON" -DWITH_LIBIDN="ON" -DWITH_TIFF="ON" -DWITH_JASPER="ON" -DWITH_OPENEXR="ON" -DWITH_AVAHI="ON" -DWITH_ASPELL="ON" -DWITH_HSPELL="ON" -DWITH_ELFICON="ON" -DWITH_TDEHWLIB_DAEMONS="ON" -DWITH_UPOWER="ON" -DWITH_UDISKS="ON" -DWITH_UDISKS2="ON" -DWITH_CONSOLEKIT="ON" -DWITH_NETWORK_MANAGER_BACKEND="ON" -DWITH_LZMA="ON" \ --DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_CMAKE_EXTRA_FLAGS := \ + -DLIB_SUFFIX="" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \ + -DCMAKE_INCLUDE_PATH="/opt/trinity/include" \ + -DAUTODETECT_QT_DIRS="ON" \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DBUILD_ALL="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DWITH_GCC_VISIBILITY="ON" \ + -DWITH_LIBBFD="ON" \ + -DWITH_LIBART="ON" \ + -DWITH_LIBIDN="ON" \ + -DWITH_TIFF="ON" \ + -DWITH_JASPER="ON" \ + -DWITH_OPENEXR="ON" \ + -DWITH_AVAHI="ON" \ + -DWITH_ASPELL="ON" \ + -DWITH_HSPELL="ON" \ + -DWITH_ELFICON="ON" \ + -DWITH_TDEHWLIB_DAEMONS="ON" \ + -DWITH_UPOWER="ON" \ + -DWITH_UDISKS="ON" \ + -DWITH_UDISKS2="ON" \ + -DWITH_CONSOLEKIT="ON" \ + -DWITH_NETWORK_MANAGER_BACKEND="ON" \ + -DWITH_LZMA="ON" \ + -DWITH_XRANDR="ON" \ + -DWITH_XCOMPOSITE="ON" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. diff --git a/debian/squeeze/tdelibs/debian/tdecmshell b/debian/squeeze/tdelibs/debian/tdecmshell index 4e24cd356..64dea7e87 100755 --- a/debian/squeeze/tdelibs/debian/tdecmshell +++ b/debian/squeeze/tdelibs/debian/tdecmshell @@ -1,4 +1,6 @@ #!/bin/sh -export TDEDIRS=/usr/:/opt/trinity/ -/opt/trinity/bin/tdecmshell.real $1 $2 $3 $4 $5 $6 $7 $8 +export XDG_CONFIG_DIRS=/opt/trinity/etc/xdg:/etc/xdg +export XDG_DATA_DIRS=/opt/trinity/share:/usr/share + +${0}.real "$@" diff --git a/debian/wheezy/applications/filelight-l10n/debian/control b/debian/wheezy/applications/filelight-l10n/debian/control index 4b3dc34e3..404650732 100644 --- a/debian/wheezy/applications/filelight-l10n/debian/control +++ b/debian/wheezy/applications/filelight-l10n/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.8.4 Homepage: http://www.methylblue.com/filelight/ Package: filelight-l10n-trinity -Architecture: any +Architecture: all Depends: ${shlibs:Depends} , filelight-trinity Replaces: filelight-l10n-trinity (<< 4:14.0.0~) Breaks: filelight-l10n-trinity (<< 4:14.0.0~) @@ -17,5 +17,5 @@ Description: Localization (l10n) for Filelight, disk space usage tool [Trinity] Filelight, Filelight allows you to understand your disk usage by graphically representing your filesystem as a set of concentric, segmented rings. . - See the 'filelight' package description for more information. + See the 'filelight-trinity' package description for more information. diff --git a/debian/wheezy/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/debian/wheezy/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff index 826d4e236..0729793b7 100644 --- a/debian/wheezy/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff +++ b/debian/wheezy/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff @@ -14,16 +14,16 @@ index 7c45fcf..b933832 100644 } else { --// if (getenv("USER") != "root") +-// if (getenv("USER") != TQString("root")) -// { -// KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); -// exit(0); -// } -+ if (getenv("USER") != "root") -+ { -+ KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); -+ exit(0); -+ } ++ if (getenv("USER") != TQString("root")) ++ { ++ KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); ++ exit(0); ++ } TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/debian/wheezy/applications/kvpnc/debian/patches/series b/debian/wheezy/applications/kvpnc/debian/patches/series index 09040ada9..d29c3ca91 100644 --- a/debian/wheezy/applications/kvpnc/debian/patches/series +++ b/debian/wheezy/applications/kvpnc/debian/patches/series @@ -1,2 +1,2 @@ -10_su-to-root_usage.diff +# 10_su-to-root_usage.diff 13_add_kuser_issuperuser.diff diff --git a/debian/wheezy/tdelibs/debian/rules b/debian/wheezy/tdelibs/debian/rules index 5ea30a3cc..1337de8b5 100755 --- a/debian/wheezy/tdelibs/debian/rules +++ b/debian/wheezy/tdelibs/debian/rules @@ -20,9 +20,38 @@ DEB_KDE_APIDOX := yes version=Debian Package $(DEB_VERSION) DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) -DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" -DWITH_LIBBFD="ON" \ --DWITH_LIBART="ON" -DWITH_LIBIDN="ON" -DWITH_TIFF="ON" -DWITH_JASPER="ON" -DWITH_OPENEXR="ON" -DWITH_AVAHI="ON" -DWITH_ASPELL="ON" -DWITH_HSPELL="ON" -DWITH_ELFICON="ON" -DWITH_TDEHWLIB_DAEMONS="ON" -DWITH_UPOWER="ON" -DWITH_UDISKS="ON" -DWITH_UDISKS2="ON" -DWITH_CONSOLEKIT="ON" -DWITH_NETWORK_MANAGER_BACKEND="ON" -DWITH_LZMA="ON" \ --DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_CMAKE_EXTRA_FLAGS := \ + -DLIB_SUFFIX="" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \ + -DCMAKE_INCLUDE_PATH="/opt/trinity/include" \ + -DAUTODETECT_QT_DIRS="ON" \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DBUILD_ALL="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DWITH_GCC_VISIBILITY="ON" \ + -DWITH_LIBBFD="ON" \ + -DWITH_LIBART="ON" \ + -DWITH_LIBIDN="ON" \ + -DWITH_TIFF="ON" \ + -DWITH_JASPER="ON" \ + -DWITH_OPENEXR="ON" \ + -DWITH_AVAHI="ON" \ + -DWITH_ASPELL="ON" \ + -DWITH_HSPELL="ON" \ + -DWITH_ELFICON="ON" \ + -DWITH_TDEHWLIB_DAEMONS="ON" \ + -DWITH_UPOWER="ON" \ + -DWITH_UDISKS="ON" \ + -DWITH_UDISKS2="ON" \ + -DWITH_CONSOLEKIT="ON" \ + -DWITH_NETWORK_MANAGER_BACKEND="ON" \ + -DWITH_LZMA="ON" \ + -DWITH_XRANDR="ON" \ + -DWITH_XCOMPOSITE="ON" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. diff --git a/debian/wheezy/tdelibs/debian/tdecmshell b/debian/wheezy/tdelibs/debian/tdecmshell index 4e24cd356..64dea7e87 100755 --- a/debian/wheezy/tdelibs/debian/tdecmshell +++ b/debian/wheezy/tdelibs/debian/tdecmshell @@ -1,4 +1,6 @@ #!/bin/sh -export TDEDIRS=/usr/:/opt/trinity/ -/opt/trinity/bin/tdecmshell.real $1 $2 $3 $4 $5 $6 $7 $8 +export XDG_CONFIG_DIRS=/opt/trinity/etc/xdg:/etc/xdg +export XDG_DATA_DIRS=/opt/trinity/share:/usr/share + +${0}.real "$@" diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0-fix_gtk3_segv.patch b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0-fix_gtk3_segv.patch deleted file mode 100644 index f3e37218e..000000000 --- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0-fix_gtk3_segv.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- gtk-qt-engine/kcm_gtk/kcmgtk.cpp.ORI 2013-07-23 23:35:16.614406882 +0200 -+++ gtk-qt-engine/kcm_gtk/kcmgtk.cpp 2013-07-23 23:56:39.121594541 +0200 -@@ -261,13 +261,22 @@ - } - } - -+ bool gtk3installed = false; - widget->styleBox3->clear(); - TQStringList otherGtk3Styles = gtk3Themes.keys(); -- otherGtk3Styles.remove(otherGtk3Styles.find("tdegtk")); -- widget->styleBox3->insertStringList(otherGtk3Styles); -- -- bool gtk3installed = (gtk3Themes.find("tdegtk") != gtk3Themes.end()); -+ if(!otherGtk3Styles.empty()) { -+ otherGtk3Styles.remove(otherGtk3Styles.find("tdegtk")); -+ if(!otherGtk3Styles.empty()) { -+ gtk3installed = (gtk3Themes.find("tdegtk") != gtk3Themes.end()); -+ } -+ } -+ if(gtk3installed) { -+ widget->styleBox3->insertStringList(otherGtk3Styles); -+ } -+ otherGtk3Styles.clear(); - widget->styleKde3->setEnabled(gtk3installed); -+ widget->styleBox3->setEnabled(gtk3installed); -+ widget->styleOther3->setEnabled(gtk3installed); - widget->warning4->setHidden(gtk3installed); - widget->warning5->setHidden(gtk3installed); - widget->warning6->setHidden(gtk3installed); diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec index 2bbcf8c43..79c275e09 100644 --- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec +++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec @@ -45,7 +45,6 @@ Source2: gtkrc-2.0-kde4 Source3: gtkrc-2.0-kde-kde4 Patch0: gtk-qt-engine-14.0.0-debug.patch -Patch1: gtk-qt-engine-14.0.0-fix_gtk3_segv.patch BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= 1:1.5.10 @@ -74,7 +73,6 @@ a way to configure it from within KControl. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %patch0 -p1 -b .debug -#patch1 -p1 -b .segv %build diff --git a/redhat/applications/kbfx/kbfx-14.0.0.spec b/redhat/applications/kbfx/kbfx-14.0.0.spec index b8be0817c..8661e7e81 100644 --- a/redhat/applications/kbfx/kbfx-14.0.0.spec +++ b/redhat/applications/kbfx/kbfx-14.0.0.spec @@ -105,13 +105,13 @@ cd build -DDATA_INSTALL_DIR=%{tde_datadir}/apps \ -DMIME_INSTALL_DIR=%{tde_datadir}/mimelnk \ -DXDG_APPS_INSTALL_DIR=%{tde_tdeappdir} \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}"\ -DDOC_INSTALL_DIR=%{tde_tdedocdir} \ -DLIB_INSTALL_DIR=%{tde_libdir} \ \ -DUSE_STRIGI=OFF \ -DUSE_MENUDRAKE=OFF \ - -DBUILD_DOC=ON \ - -DBUILD_ALL=OFF \ + -DBUILD_ALL=ON \ .. # Not SMP safe ! @@ -166,12 +166,14 @@ update-desktop-database %{tde_appdir} &> /dev/null %{tde_datadir}/apps/kicker/applets/kbfxspinx.desktop %{tde_datadir}/apps/konqueror/servicemenus/kbfx_install_theme.desktop %{tde_datadir}/apps/konqueror/servicemenus/kbfx_prepare_theme.desktop -#%{tde_tdedocdir}/HTML/en/common/kbfx-*.jpg -#%{tde_tdedocdir}/HTML/en/kbfxconfigapp/ -%{tde_tdedocdir}/kbfx/ +%{tde_tdedocdir}/HTML/en/kbfxconfigapp/ +%{tde_docdir}/kbfx/ %{tde_datadir}/icons/hicolor/*/apps/kbfx.png %{tde_datadir}/icons/hicolor/*/apps/kbfxconfigapp.png -#%{tde_datadir}/locale/*/LC_MESSAGES/kbfxconfigapp.mo +%lang(bg) %{tde_datadir}/locale/bg/LC_MESSAGES/kbfxconfigapp.mo +%lang(hu) %{tde_datadir}/locale/hu/LC_MESSAGES/kbfxconfigapp.mo +%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/kbfxconfigapp.mo +%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/kbfxconfigapp.mo %{tde_datadir}/mimelnk/application/x-kbfxtheme.desktop diff --git a/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec b/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec index 971e26a8c..14c2f88d8 100644 --- a/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec +++ b/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec @@ -111,9 +111,7 @@ export PATH="%{tde_bindir}:${PATH}" --enable-new-ldflags \ --enable-closure \ --enable-rpath \ - --enable-gcc-hidden-visibility \ - \ - --with-extra-includes=/usr/include/cdda + --enable-gcc-hidden-visibility %__make %{?_smp_mflags} diff --git a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec index 1cd956ab3..65838ef05 100644 --- a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec +++ b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec @@ -46,7 +46,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch1: tde-guidance-14.0.0-tqt3.patch +#Patch1: tde-guidance-14.0.0-tqt3.patch BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= 1:1.5.10 @@ -146,7 +146,9 @@ or can be run as standalone applications. %exclude %{tde_datadir}/apps/guidance/MonitorsDB # Files from powermanager +%if 0%{?with_powermanager} %exclude %{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png +%endif %exclude %{tde_datadir}/apps/guidance/pics/ac-adapter.png %exclude %{tde_datadir}/apps/guidance/pics/battery*.png %exclude %{tde_datadir}/apps/guidance/pics/processor.png @@ -259,7 +261,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .tqt3 +#patch1 -p1 -b .tqt3 %if 0%{?rhel} || 0%{?mgaversion} || 0%{?mdkversion} %__sed -i "userconfig/unixauthdb.py" \ diff --git a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec index c1d23ec3a..121915ed9 100644 --- a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec +++ b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec @@ -41,8 +41,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch3: tdepowersave-14.0.0-test.patch - BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} @@ -89,7 +87,6 @@ settings for: %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -#patch3 -p1 -b .test %build diff --git a/redhat/buildall-r14.sh b/redhat/buildall-r14.sh index 4b78f646f..8e77efba1 100755 --- a/redhat/buildall-r14.sh +++ b/redhat/buildall-r14.sh @@ -273,7 +273,6 @@ grpiui applications/klcddimmer if [ "${DIST}" != ".el4" ]; then grpiui applications/kmplayer fi - grpiui applications/kmyfirewall grpiui applications/kmymoney grpiui applications/knemo diff --git a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec index 67b2d884c..904985358 100644 --- a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec +++ b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec @@ -27,7 +27,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch1: libcaldav-14.0.0-older_libcurl.patch +#Patch1: libcaldav-14.0.0-older_libcurl.patch BuildRequires: libtool %if 0%{?rhel} == 4 @@ -75,7 +75,7 @@ Provides: libcaldav-devel = %{version}-%{release} %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .libcurl +#patch1 -p1 -b .libcurl ./autogen.sh diff --git a/redhat/dependencies/python-tqt/python-tqt-14.0.0-ftbfs.patch b/redhat/dependencies/python-tqt/python-tqt-14.0.0-ftbfs.patch deleted file mode 100644 index 069111d3e..000000000 --- a/redhat/dependencies/python-tqt/python-tqt-14.0.0-ftbfs.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- trinity-python-tqt-14.0.0~pre36+d3f27c3e/sip/qt/qobject.sip.ORI 2013-07-03 20:23:06.054830311 +0200 -+++ trinity-python-tqt-14.0.0~pre36+d3f27c3e/sip/qt/qobject.sip 2013-07-03 20:23:14.833911835 +0200 -@@ -2196,7 +2196,7 @@ - // See if it is a TQt signal. - if (*sig == '2') - { -- pyqt3TQtSignal *tab; -+ pyqt3QtSignal *tab; - - // Search the table. - for (tab = ((pyqt3ClassTypeDef *)((sipWrapperType *)(self->ob_type))->type)->qt3_emit; tab->st_name != NULL; ++tab) ---- trinity-python-tqt-14.0.0~pre36+d3f27c3e/configure.py.ORI 2013-07-23 18:00:47.017942165 +0200 -+++ trinity-python-tqt-14.0.0~pre36+d3f27c3e/configure.py 2013-07-23 18:01:40.757575552 +0200 -@@ -321,6 +321,9 @@ - makefile.extra_include_dirs.append(qt_dir + "/src/3rdparty/zlib") - makefile.extra_include_dirs.append(os.path.join(src_dir, "pyuic3")) - -+ if not os.access("pyuic3", os.F_OK): -+ os.mkdir("pyuic3") -+ - makefile.generate() - tool_dirs.append("pyuic3") - -@@ -350,6 +353,9 @@ - - makefile.extra_include_dirs.append(os.path.join(src_dir, "pylupdate3")) - -+ if not os.access("pylupdate3", os.F_OK): -+ os.mkdir("pylupdate3") -+ - makefile.generate() - tool_dirs.append("pylupdate3") - elif qt_version >= 0x020000: diff --git a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec index f516327d7..9a564dc75 100644 --- a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec +++ b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec @@ -14,6 +14,7 @@ License: GPL Summary: TQt bindings for Python Group: System Environment/Libraries +Obsoletes: PyQt Obsoletes: trinity-PyQt Obsoletes: trinity-python-qt3 @@ -24,10 +25,9 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch0: python-tqt-14.0.0-ftbfs.patch BuildRequires: gcc-c++ -BuildRequires: trinity-tqtinterface-devel >= %{version} +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-tqscintilla-devel %if 0%{?rhel} || 0%{?fedora} @@ -140,7 +140,6 @@ packages based on them, like PyTDE. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch0 -p1 %build diff --git a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec index e8e46792e..f45e193a5 100644 --- a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec +++ b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec @@ -93,7 +93,6 @@ Requires: trinity-digikam Requires: trinity-dolphin Requires: trinity-filelight Requires: trinity-gwenview -Requires: trinity-gwenview-i18n Requires: trinity-k3b Requires: trinity-k9copy Requires: trinity-kaffeine @@ -205,6 +204,7 @@ Obsoletes: trinity-tde-guidance-powermanager # Debian/Ubuntu specific ... #Requires: trinity-adept +#Requires: trinity-gwenview-i18n # Beagle does not exist anymore, so Kerry is now useless. #Requires: trinity-kerry @@ -310,7 +310,7 @@ Summary: Default wallpaper for Trinity %__sed %{SOURCE0} \ -e 's/\$releasever/%{fedora}/g' \ -e 's/-fedora/-f%{fedora}/g' \ - >"%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13.repo" + >"%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity.repo" %endif # RHEL configuration for YUM @@ -318,10 +318,11 @@ Summary: Default wallpaper for Trinity %if 0%{?rhel} %__sed %{SOURCE1} \ -e 's/\$releasever/%{rhel}/g' \ - >"%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13.repo" + >"%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity.repo" %endif %if 0%{?fedora} || 0%{?rhel} +%__sed -i %{?buildroot}%{_sysconfdir}/yum.repos.d/*.repo -e "s|3.5.13|r14|g" %__chmod 644 %{?buildroot}%{_sysconfdir}/yum.repos.d/*.repo %endif @@ -337,26 +338,5 @@ Summary: Default wallpaper for Trinity %endif %changelog -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 -- Update to version 3.5.13.2 -- Add GPG signing key - -* Mon Oct 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1 -- Update to version 3.5.13.1 - -* Mon Aug 06 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6 -- Add 'applications' subpackage - -* Wed Aug 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5 -- Updates to reflect new packages names -- Add Mageia 2 support -- Removes 'extras' packages - -* Wed Jun 06 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4 -- Enable mirrorlist - -* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3 -- Fix repo files name and content - -* Sat Nov 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2 -- Add 'repo' package +* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 +- Initial build for TDE R14 diff --git a/redhat/tdeaddons/tdeaddons-14.0.0.spec b/redhat/tdeaddons/tdeaddons-14.0.0.spec index 5fe73356f..222d41f73 100644 --- a/redhat/tdeaddons/tdeaddons-14.0.0.spec +++ b/redhat/tdeaddons/tdeaddons-14.0.0.spec @@ -244,8 +244,8 @@ a tab bar, a Python browser and even more. Summary: Trinity file dialog plugins for text files and folders Group: Applications/Utilities -Obsoletes: trinity-kfile-plugins < %{version}-%{release} -Provides: trinity-kfile-plugins = %{version}-%{release} +Obsoletes: trinity-tdeaddons-kfile-plugins < %{version}-%{release} +Provides: trinity-tdeaddons-kfile-plugins = %{version}-%{release} %description tdefile-plugins This is a collection of plugins for the TDE file dialog. These plugins diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec index ca65457af..c5deaff0e 100644 --- a/redhat/tdebase/tdebase-14.0.0.spec +++ b/redhat/tdebase/tdebase-14.0.0.spec @@ -389,6 +389,7 @@ BuildRequires: gnome-screensaver BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel %endif %if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} >= 1220 +BuildRequires: xscreensaver BuildRequires: libXScrnSaver-devel %endif %if 0%{?suse_version} == 1140 @@ -3364,7 +3365,7 @@ cd build -DWITH_TDEHWLIB=ON \ -DWITH_UPOWER=ON \ -DWITH_GCC_VISIBILITY=ON \ - -DWITH_KDESKTOP_LOCK_BACKTRACE=OFF \ + \ -DBUILD_ALL=ON \ %if 0%{?suse_version} -DKCHECKPASS_PAM_SERVICE="xdm" \ @@ -3396,10 +3397,6 @@ cd build %__install -D -m 644 \ "%{?buildroot}%{tde_datadir}/apps/tdm/sessions/tde.desktop" \ "%{?buildroot}%{_datadir}/xsessions/tde.desktop" - -# Force session name to be 'TDE' -%__sed -i "%{?buildroot}%{_datadir}/xsessions/tde.desktop" \ - -e "s,^Name=.*,Name=TDE," %endif # Mageia/Mandriva/PCLinuxOS stores its session file in different folder than RHEL/Fedora @@ -3435,7 +3432,7 @@ EOF # TDM configuration %__sed -i "%{?buildroot}%{_sysconfdir}/trinity/tdm/tdmrc" \ -%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1220 +%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 -e "s/^#*MinShowUID=.*/MinShowUID=1000/" %else -e "s/^#*MinShowUID=.*/MinShowUID=500/" @@ -3455,9 +3452,9 @@ EOF %__mkdir_p "%{?buildroot}%{_sysconfdir}/alternatives" %__ln_s "%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase" "%{?buildroot}%{_sysconfdir}/alternatives/media_safelyremove.desktop_tdebase" -# SUSE: creates DM config file, used by '/etc/init.d/xdm' +# SUSE >= 12 : creates DM config file, used by '/etc/init.d/xdm' # You must set 'DISPLAYMANAGER=tdm' in '/etc/sysconfig/displaymanager' -%if 0%{?suse_version} +%if 0%{?suse_version} >= 1210 %__install -D -m 644 "%{SOURCE6}" "%{?buildroot}/usr/lib/X11/displaymanagers/tdm" %__sed -i "%{?buildroot}/usr/lib/X11/displaymanagers/tdm" -e "s|/opt/trinity/bin|%{tde_bindir}|g" %endif diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/control b/ubuntu/maverick/applications/filelight-l10n/debian/control index 5c70581c8..2a83b443e 100644 --- a/ubuntu/maverick/applications/filelight-l10n/debian/control +++ b/ubuntu/maverick/applications/filelight-l10n/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.8.4 Homepage: http://www.methylblue.com/filelight/ Package: filelight-l10n-trinity -Architecture: any +Architecture: all Depends: ${shlibs:Depends} , filelight-trinity Replaces: filelight-l10n-kde3 (<< 4:14.0.0~), filelight-l10n-trinity (<< 4:14.0.0~) Breaks: filelight-l10n-kde3 (<< 4:14.0.0~), filelight-l10n-trinity (<< 4:14.0.0~) @@ -17,5 +17,5 @@ Description: Localization (l10n) for Filelight, disk space usage tool [Trinity] Filelight, Filelight allows you to understand your disk usage by graphically representing your filesystem as a set of concentric, segmented rings. . - See the 'filelight' package description for more information. + See the 'filelight-trinity' package description for more information. diff --git a/ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff index 826d4e236..0729793b7 100644 --- a/ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff +++ b/ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff @@ -14,16 +14,16 @@ index 7c45fcf..b933832 100644 } else { --// if (getenv("USER") != "root") +-// if (getenv("USER") != TQString("root")) -// { -// KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); -// exit(0); -// } -+ if (getenv("USER") != "root") -+ { -+ KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); -+ exit(0); -+ } ++ if (getenv("USER") != TQString("root")) ++ { ++ KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); ++ exit(0); ++ } TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/ubuntu/maverick/applications/kvpnc/debian/patches/series b/ubuntu/maverick/applications/kvpnc/debian/patches/series index 09040ada9..d29c3ca91 100644 --- a/ubuntu/maverick/applications/kvpnc/debian/patches/series +++ b/ubuntu/maverick/applications/kvpnc/debian/patches/series @@ -1,2 +1,2 @@ -10_su-to-root_usage.diff +# 10_su-to-root_usage.diff 13_add_kuser_issuperuser.diff diff --git a/ubuntu/maverick/tdelibs/debian/rules b/ubuntu/maverick/tdelibs/debian/rules index d64786b7d..6889b4098 100755 --- a/ubuntu/maverick/tdelibs/debian/rules +++ b/ubuntu/maverick/tdelibs/debian/rules @@ -20,9 +20,38 @@ DEB_KDE_APIDOX := yes version=Debian Package $(DEB_VERSION) DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) -DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" -DWITH_LIBBFD="ON" \ --DWITH_LIBART="ON" -DWITH_LIBIDN="ON" -DWITH_TIFF="ON" -DWITH_JASPER="ON" -DWITH_OPENEXR="ON" -DWITH_AVAHI="ON" -DWITH_ASPELL="ON" -DWITH_HSPELL="ON" -DWITH_ELFICON="ON" -DWITH_TDEHWLIB_DAEMONS="ON" -DWITH_UPOWER="ON" -DWITH_UDISKS="ON" -DWITH_UDISKS2="ON" -DWITH_CONSOLEKIT="ON" -DWITH_NETWORK_MANAGER_BACKEND="ON" -DWITH_LZMA="ON" \ --DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_CMAKE_EXTRA_FLAGS := \ + -DLIB_SUFFIX="" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \ + -DCMAKE_INCLUDE_PATH="/opt/trinity/include" \ + -DAUTODETECT_QT_DIRS="ON" \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DBUILD_ALL="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DWITH_GCC_VISIBILITY="ON" \ + -DWITH_LIBBFD="ON" \ + -DWITH_LIBART="ON" \ + -DWITH_LIBIDN="ON" \ + -DWITH_TIFF="ON" \ + -DWITH_JASPER="ON" \ + -DWITH_OPENEXR="ON" \ + -DWITH_AVAHI="ON" \ + -DWITH_ASPELL="ON" \ + -DWITH_HSPELL="ON" \ + -DWITH_ELFICON="ON" \ + -DWITH_TDEHWLIB_DAEMONS="ON" \ + -DWITH_UPOWER="ON" \ + -DWITH_UDISKS="ON" \ + -DWITH_UDISKS2="ON" \ + -DWITH_CONSOLEKIT="ON" \ + -DWITH_NETWORK_MANAGER_BACKEND="ON" \ + -DWITH_LZMA="ON" \ + -DWITH_XRANDR="ON" \ + -DWITH_XCOMPOSITE="ON" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. diff --git a/ubuntu/maverick/tdelibs/debian/tdecmshell b/ubuntu/maverick/tdelibs/debian/tdecmshell index 4e24cd356..64dea7e87 100755 --- a/ubuntu/maverick/tdelibs/debian/tdecmshell +++ b/ubuntu/maverick/tdelibs/debian/tdecmshell @@ -1,4 +1,6 @@ #!/bin/sh -export TDEDIRS=/usr/:/opt/trinity/ -/opt/trinity/bin/tdecmshell.real $1 $2 $3 $4 $5 $6 $7 $8 +export XDG_CONFIG_DIRS=/opt/trinity/etc/xdg:/etc/xdg +export XDG_DATA_DIRS=/opt/trinity/share:/usr/share + +${0}.real "$@" diff --git a/ubuntu/precise/applications/filelight-l10n/debian/control b/ubuntu/precise/applications/filelight-l10n/debian/control index 5c70581c8..2a83b443e 100644 --- a/ubuntu/precise/applications/filelight-l10n/debian/control +++ b/ubuntu/precise/applications/filelight-l10n/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.8.4 Homepage: http://www.methylblue.com/filelight/ Package: filelight-l10n-trinity -Architecture: any +Architecture: all Depends: ${shlibs:Depends} , filelight-trinity Replaces: filelight-l10n-kde3 (<< 4:14.0.0~), filelight-l10n-trinity (<< 4:14.0.0~) Breaks: filelight-l10n-kde3 (<< 4:14.0.0~), filelight-l10n-trinity (<< 4:14.0.0~) @@ -17,5 +17,5 @@ Description: Localization (l10n) for Filelight, disk space usage tool [Trinity] Filelight, Filelight allows you to understand your disk usage by graphically representing your filesystem as a set of concentric, segmented rings. . - See the 'filelight' package description for more information. + See the 'filelight-trinity' package description for more information. diff --git a/ubuntu/precise/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/ubuntu/precise/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff index 826d4e236..0729793b7 100644 --- a/ubuntu/precise/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff +++ b/ubuntu/precise/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff @@ -14,16 +14,16 @@ index 7c45fcf..b933832 100644 } else { --// if (getenv("USER") != "root") +-// if (getenv("USER") != TQString("root")) -// { -// KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); -// exit(0); -// } -+ if (getenv("USER") != "root") -+ { -+ KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); -+ exit(0); -+ } ++ if (getenv("USER") != TQString("root")) ++ { ++ KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); ++ exit(0); ++ } TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/ubuntu/precise/applications/kvpnc/debian/patches/series b/ubuntu/precise/applications/kvpnc/debian/patches/series index 09040ada9..d29c3ca91 100644 --- a/ubuntu/precise/applications/kvpnc/debian/patches/series +++ b/ubuntu/precise/applications/kvpnc/debian/patches/series @@ -1,2 +1,2 @@ -10_su-to-root_usage.diff +# 10_su-to-root_usage.diff 13_add_kuser_issuperuser.diff diff --git a/ubuntu/precise/tdelibs/debian/rules b/ubuntu/precise/tdelibs/debian/rules index d64786b7d..6889b4098 100755 --- a/ubuntu/precise/tdelibs/debian/rules +++ b/ubuntu/precise/tdelibs/debian/rules @@ -20,9 +20,38 @@ DEB_KDE_APIDOX := yes version=Debian Package $(DEB_VERSION) DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) -DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" -DWITH_LIBBFD="ON" \ --DWITH_LIBART="ON" -DWITH_LIBIDN="ON" -DWITH_TIFF="ON" -DWITH_JASPER="ON" -DWITH_OPENEXR="ON" -DWITH_AVAHI="ON" -DWITH_ASPELL="ON" -DWITH_HSPELL="ON" -DWITH_ELFICON="ON" -DWITH_TDEHWLIB_DAEMONS="ON" -DWITH_UPOWER="ON" -DWITH_UDISKS="ON" -DWITH_UDISKS2="ON" -DWITH_CONSOLEKIT="ON" -DWITH_NETWORK_MANAGER_BACKEND="ON" -DWITH_LZMA="ON" \ --DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_CMAKE_EXTRA_FLAGS := \ + -DLIB_SUFFIX="" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \ + -DCMAKE_INCLUDE_PATH="/opt/trinity/include" \ + -DAUTODETECT_QT_DIRS="ON" \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DBUILD_ALL="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DWITH_GCC_VISIBILITY="ON" \ + -DWITH_LIBBFD="ON" \ + -DWITH_LIBART="ON" \ + -DWITH_LIBIDN="ON" \ + -DWITH_TIFF="ON" \ + -DWITH_JASPER="ON" \ + -DWITH_OPENEXR="ON" \ + -DWITH_AVAHI="ON" \ + -DWITH_ASPELL="ON" \ + -DWITH_HSPELL="ON" \ + -DWITH_ELFICON="ON" \ + -DWITH_TDEHWLIB_DAEMONS="ON" \ + -DWITH_UPOWER="ON" \ + -DWITH_UDISKS="ON" \ + -DWITH_UDISKS2="ON" \ + -DWITH_CONSOLEKIT="ON" \ + -DWITH_NETWORK_MANAGER_BACKEND="ON" \ + -DWITH_LZMA="ON" \ + -DWITH_XRANDR="ON" \ + -DWITH_XCOMPOSITE="ON" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. diff --git a/ubuntu/precise/tdelibs/debian/tdecmshell b/ubuntu/precise/tdelibs/debian/tdecmshell index 4e24cd356..64dea7e87 100755 --- a/ubuntu/precise/tdelibs/debian/tdecmshell +++ b/ubuntu/precise/tdelibs/debian/tdecmshell @@ -1,4 +1,6 @@ #!/bin/sh -export TDEDIRS=/usr/:/opt/trinity/ -/opt/trinity/bin/tdecmshell.real $1 $2 $3 $4 $5 $6 $7 $8 +export XDG_CONFIG_DIRS=/opt/trinity/etc/xdg:/etc/xdg +export XDG_DATA_DIRS=/opt/trinity/share:/usr/share + +${0}.real "$@" diff --git a/ubuntu/raring/applications/filelight-l10n/debian/control b/ubuntu/raring/applications/filelight-l10n/debian/control index 5c70581c8..2a83b443e 100644 --- a/ubuntu/raring/applications/filelight-l10n/debian/control +++ b/ubuntu/raring/applications/filelight-l10n/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.8.4 Homepage: http://www.methylblue.com/filelight/ Package: filelight-l10n-trinity -Architecture: any +Architecture: all Depends: ${shlibs:Depends} , filelight-trinity Replaces: filelight-l10n-kde3 (<< 4:14.0.0~), filelight-l10n-trinity (<< 4:14.0.0~) Breaks: filelight-l10n-kde3 (<< 4:14.0.0~), filelight-l10n-trinity (<< 4:14.0.0~) @@ -17,5 +17,5 @@ Description: Localization (l10n) for Filelight, disk space usage tool [Trinity] Filelight, Filelight allows you to understand your disk usage by graphically representing your filesystem as a set of concentric, segmented rings. . - See the 'filelight' package description for more information. + See the 'filelight-trinity' package description for more information. diff --git a/ubuntu/raring/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/ubuntu/raring/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff index 826d4e236..0729793b7 100644 --- a/ubuntu/raring/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff +++ b/ubuntu/raring/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff @@ -14,16 +14,16 @@ index 7c45fcf..b933832 100644 } else { --// if (getenv("USER") != "root") +-// if (getenv("USER") != TQString("root")) -// { -// KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); -// exit(0); -// } -+ if (getenv("USER") != "root") -+ { -+ KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); -+ exit(0); -+ } ++ if (getenv("USER") != TQString("root")) ++ { ++ KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) ); ++ exit(0); ++ } TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/ubuntu/raring/applications/kvpnc/debian/patches/series b/ubuntu/raring/applications/kvpnc/debian/patches/series index 09040ada9..d29c3ca91 100644 --- a/ubuntu/raring/applications/kvpnc/debian/patches/series +++ b/ubuntu/raring/applications/kvpnc/debian/patches/series @@ -1,2 +1,2 @@ -10_su-to-root_usage.diff +# 10_su-to-root_usage.diff 13_add_kuser_issuperuser.diff diff --git a/ubuntu/raring/tdelibs/debian/rules b/ubuntu/raring/tdelibs/debian/rules index d64786b7d..6889b4098 100755 --- a/ubuntu/raring/tdelibs/debian/rules +++ b/ubuntu/raring/tdelibs/debian/rules @@ -20,9 +20,38 @@ DEB_KDE_APIDOX := yes version=Debian Package $(DEB_VERSION) DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) -DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" -DWITH_LIBBFD="ON" \ --DWITH_LIBART="ON" -DWITH_LIBIDN="ON" -DWITH_TIFF="ON" -DWITH_JASPER="ON" -DWITH_OPENEXR="ON" -DWITH_AVAHI="ON" -DWITH_ASPELL="ON" -DWITH_HSPELL="ON" -DWITH_ELFICON="ON" -DWITH_TDEHWLIB_DAEMONS="ON" -DWITH_UPOWER="ON" -DWITH_UDISKS="ON" -DWITH_UDISKS2="ON" -DWITH_CONSOLEKIT="ON" -DWITH_NETWORK_MANAGER_BACKEND="ON" -DWITH_LZMA="ON" \ --DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_CMAKE_EXTRA_FLAGS := \ + -DLIB_SUFFIX="" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \ + -DCMAKE_INCLUDE_PATH="/opt/trinity/include" \ + -DAUTODETECT_QT_DIRS="ON" \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DBUILD_ALL="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DWITH_GCC_VISIBILITY="ON" \ + -DWITH_LIBBFD="ON" \ + -DWITH_LIBART="ON" \ + -DWITH_LIBIDN="ON" \ + -DWITH_TIFF="ON" \ + -DWITH_JASPER="ON" \ + -DWITH_OPENEXR="ON" \ + -DWITH_AVAHI="ON" \ + -DWITH_ASPELL="ON" \ + -DWITH_HSPELL="ON" \ + -DWITH_ELFICON="ON" \ + -DWITH_TDEHWLIB_DAEMONS="ON" \ + -DWITH_UPOWER="ON" \ + -DWITH_UDISKS="ON" \ + -DWITH_UDISKS2="ON" \ + -DWITH_CONSOLEKIT="ON" \ + -DWITH_NETWORK_MANAGER_BACKEND="ON" \ + -DWITH_LZMA="ON" \ + -DWITH_XRANDR="ON" \ + -DWITH_XCOMPOSITE="ON" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. diff --git a/ubuntu/raring/tdelibs/debian/tdecmshell b/ubuntu/raring/tdelibs/debian/tdecmshell index 4e24cd356..64dea7e87 100755 --- a/ubuntu/raring/tdelibs/debian/tdecmshell +++ b/ubuntu/raring/tdelibs/debian/tdecmshell @@ -1,4 +1,6 @@ #!/bin/sh -export TDEDIRS=/usr/:/opt/trinity/ -/opt/trinity/bin/tdecmshell.real $1 $2 $3 $4 $5 $6 $7 $8 +export XDG_CONFIG_DIRS=/opt/trinity/etc/xdg:/etc/xdg +export XDG_DATA_DIRS=/opt/trinity/share:/usr/share + +${0}.real "$@" |