From 928546d1e77f804ad63ec61bcd7ab7a99f149c5a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 3 Sep 2012 01:57:31 -0500 Subject: Enable network-manager backend --- debian/lenny/tdelibs/debian/control | 2 +- debian/lenny/tdelibs/debian/control.orig | 126 ------------------------------- debian/lenny/tdelibs/debian/rules | 2 +- 3 files changed, 2 insertions(+), 128 deletions(-) delete mode 100644 debian/lenny/tdelibs/debian/control.orig (limited to 'debian/lenny/tdelibs') diff --git a/debian/lenny/tdelibs/debian/control b/debian/lenny/tdelibs/debian/control index b81a9614a..b357ea259 100644 --- a/debian/lenny/tdelibs/debian/control +++ b/debian/lenny/tdelibs/debian/control @@ -11,7 +11,7 @@ Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), autotools-dev, aspell, libaspell-dev, hspell, libbz2-dev, libcupsys2-dev, libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev, libldap2-dev, liblualib50-dev, libopenexr-dev (>= 1.2.2-4.1), libpcre3-dev, - libsasl2-dev, libssl-dev, libxcomposite-dev, + libsasl2-dev, libssl-dev, libxcomposite-dev, libdbus-1-tqt-dev, libtiff4-dev (>= 3.7.3-1), libavahi-client-dev (>= 0.4), libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-tqt-dev, sharutils, texinfo, libogg-dev-la, libtqtinterface-dev, diff --git a/debian/lenny/tdelibs/debian/control.orig b/debian/lenny/tdelibs/debian/control.orig deleted file mode 100644 index 2df74b790..000000000 --- a/debian/lenny/tdelibs/debian/control.orig +++ /dev/null @@ -1,126 +0,0 @@ -Source: tdelibs-trinity -Section: libs -Priority: optional -Maintainer: Timothy Pearson -XSBC-Original-Maintainer: Debian Qt/KDE Maintainers -Uploaders: Adeodato Simó , Ana Beatriz Guerrero Lopez , Daniel Schepler , Fathi Boudra , Sune Vuorela -Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), autotools-dev, - binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext, - libart-2.0-dev (>= 2.3.17), libarts1-trinity-dev (>= 1.5.0), libacl1-dev, - libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], - libaspell-dev, hspell, libbz2-dev, libcupsys2-dev, - libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev, libldap2-dev, - liblualib50-dev, libopenexr-dev (>= 1.2.2-4.1), libpcre3-dev, - libsasl2-dev, libssl-dev, - libtiff4-dev (>= 3.7.3-1), libavahi-client-dev (>= 0.4), - libxml2-dev, libxml2-utils, libxslt1-dev, - sharutils, texinfo, libogg-dev-la, libtqtinterface-dev, - gettext-kde, lsb-release, base-files, sudo, - cmake, libltdl-dev -Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11 -Standards-Version: 3.8.3 - -Package: tdelibs-trinity -Section: libs -Architecture: all -Provides: tdelibs -Conflicts: tdelibs -Depends: tdelibs4c2a-trinity (>= ${Source-Version}), - tdelibs-data-trinity (>= ${Source-Version}) -Description: core libraries from the official Trinity release - TDE (the Trinity Desktop Environment) is a powerful Open Source graphical - desktop environment for Unix workstations. It combines ease of use, - contemporary functionality, and outstanding graphical design with the - technological superiority of the Unix operating system. - . - This metapackage includes the core TDE libraries, binaries, and data, - needed by virtually all TDE applications. It does not include - development files. - -Package: tdelibs-data-trinity -Section: libs -Architecture: all -Depends: hicolor-icon-theme -Provides: tdelibs-data -Conflicts: tdelibs-data -Replaces: tdeartwork-style-trinity (<< 7:3.4.0), konq-plugins-trinity (<< 7:3.4.0), - ksvg-trinity (<< 7:3.4.0), kpackage-trinity (<< 4:3.4.2), kicker-trinity (<< 4:3.5-rc1), - kttsd-trinity (<< 4:3.5-rc1), tdevelop3-data-trinity (<< 4:3.3.0), libdjvulibre1, - libdjvulibre15 (<< 3.5.16-2), krita (= 1:1.4.90.1-1), digikam-trinity (<< 0.8.1-3), - kaffeine-trinity (<< 0.8.1-3) -Description: core shared data for all TDE applications - This package contains all the architecture independent data files - commonly used by TDE applications. You need these data files to run - TDE applications. - . - This package is part of TDE, and a component of the TDE libraries module. - See the 'kde-trinity' and 'tdelibs-trinity' packages for more information. - -Package: tdelibs4c2a-trinity -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, tdelibs-data-trinity, - tdelibs-data-trinity, perl, xbase-clients, - launchpad-integration, sudo -Recommends: xdg-user-dirs -Suggests: fam, perl-suid -Conflicts: tdelibs4-trinity, tdelibs4c2-trinity (>> 4:1.0.0), tdelibs-bin-trinity (<< 4:3.3.3), tdelibs4-trinity-dev (<< 4:3.5.7.dfsg.1-6) -Replaces: tdelibs4-trinity, tdeartwork-style-trinity, - kcontrol-trinity, tdelibs-bin-trinity (<< 4:3.5.3-1), - tdelibs4-trinity-dev (= 4:3.5.7.dfsg.1-5) -Description: core libraries and binaries for all TDE applications - This package contains all the shared libraries and common core binaries - used by all TDE applications. You need these libraries and binaries to - run TDE applications. - . - Several scripts included in tdebase-bin, related to the handling of SMB - and NFS shares, require the perl-suid package to work properly. - . - This package is part of TDE, and a component of the TDE libraries module. - See the 'kde-trinity' and 'tdelibs-trinity' packages for more information. - -Package: tdelibs4-trinity-dev -Section: libdevel -Architecture: any -Depends: tdelibs4c2a-trinity (= ${Source-Version}), libart-2.0-dev (>= 2.3.17), - libarts1-trinity-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev, - libaspell-dev, hspell, libbz2-dev, libcupsys2-dev, - libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev, - libopenexr-dev (>= 1.2.2-3), libpcre3-dev, liblualib50-dev, - libsasl2-dev, libssl-dev, - libtiff4-dev (>= 3.7.3-1), libxml2-dev, libxml2-utils, libxslt1-dev, - libavahi-client-dev (>= 0.4), libtqtinterface-dev, - gettext-kde -Provides: tdelibs-trinity-dev -Replaces: tdebase-trinity-dev (<< 7:3.4.0), tdelibs4c2a-trinity (<< 4:3.5.8-3ubuntu2) -Description: development files for the TDE core libraries - This package contains all the headers and other related files needed - to compile TDE applications, or develop applications which use the - core TDE libraries. - . - This package is part of TDE, and a component of the TDE libraries module. - See the 'kde-trinity' and 'tdelibs-trinity' packages for more information. - -Package: tdelibs4-trinity-doc -Section: doc -Architecture: all -Provides: tdelibs-trinity-doc -Description: developer documentation for the TDE core libraries - This package contains documentation for the core TDE libraries, of - use more for developers creating applications which use the core - TDE libraries, than regular users. - . - This package is part of TDE, and a component of the TDE libraries module. - See the 'kde-trinity' and 'tdelibs-trinity' packages for more information. - -Package: tdelibs-trinity-dbg -Section: libdevel -Architecture: any -Priority: extra -Conflicts: tdelibs4-trinity-dbg, tdelibs4c2-trinity-dbg, tdelibs4c2a-trinity-dbg -Replaces: tdelibs4-trinity-dbg, tdelibs4c2-trinity-dbg, tdelibs4c2a-trinity-dbg -Depends: tdelibs4c2a-trinity (= ${Source-Version}), libtqtinterface-dbg, libc6-dbg [amd64] -Description: debugging symbols for tdelibs - This package contains the debugging symbols associated with tdelibs. - They will automatically be used by gdb for debugging tdelibs-related - issues. diff --git a/debian/lenny/tdelibs/debian/rules b/debian/lenny/tdelibs/debian/rules index c1dbec10b..4ae9ccf52 100755 --- a/debian/lenny/tdelibs/debian/rules +++ b/debian/lenny/tdelibs/debian/rules @@ -21,7 +21,7 @@ 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_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_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_NETWORK_MANAGER_BACKEND="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to -- cgit v1.2.1