diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-11-14 13:33:47 -0600 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-11-14 23:05:30 +0100 |
| commit | ae53bea11a5561b6a71541911e3dcf0ee1e7ffc2 (patch) | |
| tree | 34418a85f9a4d79f566fee55d63de517d5815280 /ubuntu | |
| parent | a78fd27fa92ccf926bc35d9f18768783960f31ec (diff) | |
| download | tde-packaging-ae53bea11a5561b6a71541911e3dcf0ee1e7ffc2.tar.gz tde-packaging-ae53bea11a5561b6a71541911e3dcf0ee1e7ffc2.zip | |
Remove obsolete launchpad-integration requirement from tdelibs packaging
(cherry picked from commit 9701c2bc1ac693fcfe1aa2ad6010b52c2a4dce62)
Diffstat (limited to 'ubuntu')
4 files changed, 3 insertions, 17 deletions
diff --git a/ubuntu/maverick/kdebase/debian/control.in b/ubuntu/maverick/kdebase/debian/control.in index ea9ff3fa6..c9262c520 100644 --- a/ubuntu/maverick/kdebase/debian/control.in +++ b/ubuntu/maverick/kdebase/debian/control.in @@ -7,8 +7,7 @@ Uploaders: @@@UPLOADERS@@@ Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.8), libdbus-qt-1-dev (>= 0.60), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, kdelibs4-doc Build-Conflicts: nvidia-glx (<< 1.0.8774-6) -Standards-Version: 3.7.3 -XS-Vcs-Bzr: http://bazaar.launchpad.net/~kubuntu-members/kdebase/debian +Standards-Version: 3.8.4 Package: kdebase Section: kde diff --git a/ubuntu/maverick/kdelibs/debian/control b/ubuntu/maverick/kdelibs/debian/control index 9e3fd10c6..fea368c03 100644 --- a/ubuntu/maverick/kdelibs/debian/control +++ b/ubuntu/maverick/kdelibs/debian/control @@ -61,8 +61,7 @@ Architecture: any Replaces: kdelibs4c2a-kde3 (<< 4:3.5.13) Breaks: kdelibs4c2a-kde3 (<< 4:3.5.13) Depends: ${shlibs:Depends}, kdelibs-data-trinity, - kdelibs-data-trinity, perl, xbase-clients, - launchpad-integration, sudo + kdelibs-data-trinity, perl, xbase-clients, sudo Recommends: xdg-user-dirs Suggests: fam, perl-suid Description: core libraries and binaries for all TDE applications diff --git a/ubuntu/maverick/kdelibs/debian/control.in b/ubuntu/maverick/kdelibs/debian/control.in index 498a97bd4..6115e85df 100644 --- a/ubuntu/maverick/kdelibs/debian/control.in +++ b/ubuntu/maverick/kdelibs/debian/control.in @@ -56,8 +56,7 @@ Package: kdelibs4c2a Section: libs Architecture: any Depends: ${shlibs:Depends}, kdelibs-data (>> ${KDE-Version3}), - kdelibs-data (<< ${KDE-Next-Version3}), perl, xbase-clients, - launchpad-integration, sudo + kdelibs-data (<< ${KDE-Next-Version3}), perl, xbase-clients, sudo Suggests: fam, perl-suid Conflicts: kdelibs4, kdelibs4c2, kdelibs-bin (<< 4:3.3.3), kdelibs4-dev (<< 4:3.5.7.dfsg.1-6) Replaces: kdelibs4, kdelibs4c2, kdeartwork-style (<< 4:3.4.0), diff --git a/ubuntu/maverick/kdelibs/debian/patches/kubuntu_64_rosetta_translation.diff b/ubuntu/maverick/kdelibs/debian/patches/kubuntu_64_rosetta_translation.diff deleted file mode 100644 index ca532e2a1..000000000 --- a/ubuntu/maverick/kdelibs/debian/patches/kubuntu_64_rosetta_translation.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- kdelibs/kdecore/kaboutdata.cpp 2006-03-17 10:19:05.000000000 +0000 -+++ kdelibs/kdecore/kaboutdata.cpp 2006-12-05 19:46:12.000000000 +0000 -@@ -389,7 +389,7 @@ - "of the translation teams all over the world.</p>" - "<p>For more information on KDE internationalization " - "visit <a href=\"http://l10n.kde.org\">http://l10n.kde.org</a></p>" -- ); -+ ) + i18n("<p>Debian includes additions and alterations to the TDE translation from <a href=\"https://translations.launchpad.net/\">Launchpad</a>.</p>"); - } - - TQString |