summaryrefslogtreecommitdiffstats
path: root/ubuntu/raring/tdebase
diff options
context:
space:
mode:
Diffstat (limited to 'ubuntu/raring/tdebase')
-rw-r--r--ubuntu/raring/tdebase/debian/changelog2
-rw-r--r--ubuntu/raring/tdebase/debian/control8
-rwxr-xr-xubuntu/raring/tdebase/debian/rules2
3 files changed, 6 insertions, 6 deletions
diff --git a/ubuntu/raring/tdebase/debian/changelog b/ubuntu/raring/tdebase/debian/changelog
index b78c606b3..cdbe4c14a 100644
--- a/ubuntu/raring/tdebase/debian/changelog
+++ b/ubuntu/raring/tdebase/debian/changelog
@@ -2409,7 +2409,7 @@ tdebase (4:3.5.1-0ubuntu12) dapper; urgency=low
[ Anthony Mercatante ]
* Add kubuntu_53_tdewallet_config.diff copy a default
- KWallet config for new users
+ TDEWallet config for new users
* Add kubuntu_54_system_protocol_home_dir.diff make
system:/ use /home/foo not system:/home/foo keep
Kaffeine etc happy
diff --git a/ubuntu/raring/tdebase/debian/control b/ubuntu/raring/tdebase/debian/control
index f4ff3113f..6edd57f1d 100644
--- a/ubuntu/raring/tdebase/debian/control
+++ b/ubuntu/raring/tdebase/debian/control
@@ -4,8 +4,8 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs14-trinity, libogg-dev, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libdbus-1-tqt-dev, libart-2.0-dev (>= 14.0.0), libtool, libltdl-dev, binutils-dev, cmake
-Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs14-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs14-trinity, libogg-dev, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libdbus-1-tqt-dev, libart-2.0-dev (>= 14.0.0), libtool, libltdl-dev, cmake
+Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs14-trinity-doc
Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
Standards-Version: 3.8.4
@@ -140,7 +140,7 @@ Section: devel
Architecture: any
Replaces: kdebase-kde3-dev (<< 4:14.0.0), kdebase-trinity-dev (<< 4:14.0.0)
Breaks: kdebase-kde3-dev (<< 4:14.0.0), kdebase-trinity-dev (<< 4:14.0.0)
-Depends: kate-trinity (= ${Source-Version}), kcontrol-trinity (= ${Source-Version}), tdebase-trinity-bin (= ${Source-Version}), tdeprint-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), khelpcenter-trinity (= ${Source-Version}), kicker-trinity (= ${Source-Version}), klipper-trinity (= ${Source-Version}), kmenuedit-trinity (= ${Source-Version}), konqueror-nsplugins-trinity (= ${Source-Version}), konqueror-trinity (= ${Source-Version}), konsole-trinity (= ${Source-Version}), ksmserver-trinity (= ${Source-Version}), ksplash-trinity (= ${Source-Version}), ksysguard-trinity (= ${Source-Version}), twin-trinity (= ${Source-Version}), tdelibs4-trinity-dev
+Depends: kate-trinity (= ${Source-Version}), kcontrol-trinity (= ${Source-Version}), tdebase-trinity-bin (= ${Source-Version}), tdeprint-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), khelpcenter-trinity (= ${Source-Version}), kicker-trinity (= ${Source-Version}), klipper-trinity (= ${Source-Version}), kmenuedit-trinity (= ${Source-Version}), konqueror-nsplugins-trinity (= ${Source-Version}), konqueror-trinity (= ${Source-Version}), konsole-trinity (= ${Source-Version}), ksmserver-trinity (= ${Source-Version}), ksplash-trinity (= ${Source-Version}), ksysguard-trinity (= ${Source-Version}), twin-trinity (= ${Source-Version}), tdelibs14-trinity-dev
Description: development files for the KDE base module
This package contains headers and other development files needed to
compile software based on the KDE base module.
@@ -579,7 +579,7 @@ Section: libdevel
Architecture: any
Replaces: libkonq4-kde3-dev (<< 4:14.0.0), libkonq4-trinity-dev (<< 4:14.0.0)
Breaks: libkonq4-kde3-dev (<< 4:14.0.0), libkonq4-trinity-dev (<< 4:14.0.0)
-Depends: libkonq4-trinity (= ${Source-Version}), tdelibs4-trinity-dev
+Depends: libkonq4-trinity (= ${Source-Version}), tdelibs14-trinity-dev
Conflicts: libkonq-trinity-dev (<< 4:3.0.0), libkonq3-trinity (<< 4:3.0.0)
Description: development files for Konqueror's core libraries
This package contains headers and other development files for the core
diff --git a/ubuntu/raring/tdebase/debian/rules b/ubuntu/raring/tdebase/debian/rules
index c2be9ec9b..2a697708c 100755
--- a/ubuntu/raring/tdebase/debian/rules
+++ b/ubuntu/raring/tdebase/debian/rules
@@ -20,7 +20,7 @@ DEB_KDE_APIDOX := yes
CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG)
DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -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" \
--DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" -DTDM_PAM_SERVICE="tdm-trinity" -DTDESCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" -DWITH_KDESKTOP_LOCK_BACKTRACE="ON" -DWITH_USBIDS="/usr/share/misc/usb.ids" \
+-DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" -DTDM_PAM_SERVICE="tdm-trinity" -DTDESCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" -DWITH_USBIDS="/usr/share/misc/usb.ids" \
-DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_TDESU_BACKEND="OFF" -DWITH_LDAP="ON" -DWITH_SAMBA="ON" -DWITH_LIBRAW1394="ON" -DWITH_OPENEXR="ON" -DWITH_XCOMPOSITE="ON" -DWITH_XCURSOR="ON" -DWITH_XFIXES="ON" -DWITH_XRANDR="ON" -DWITH_XINERAMA="ON" -DWITH_HAL="OFF" -DWITH_TDEHWLIB="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON" -DWITH_XTEST="ON" -DWITH_XSCREENSAVER="ON" -DWITH_UPOWER="ON" -DWITH_LIBART="ON" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo