From ae53bea11a5561b6a71541911e3dcf0ee1e7ffc2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 14 Nov 2012 13:33:47 -0600 Subject: [PATCH] Remove obsolete launchpad-integration requirement from tdelibs packaging (cherry picked from commit 9701c2bc1ac693fcfe1aa2ad6010b52c2a4dce62) --- debian/lenny/kdebase/debian/control.in | 3 +-- debian/lenny/kdelibs/debian/control | 3 +-- debian/lenny/kdelibs/debian/control.in | 3 +-- debian/squeeze/kdebase/debian/control.in | 3 +-- debian/squeeze/kdelibs/debian/control | 3 +-- debian/squeeze/kdelibs/debian/control.in | 3 +-- ubuntu/maverick/kdebase/debian/control.in | 3 +-- ubuntu/maverick/kdelibs/debian/control | 3 +-- ubuntu/maverick/kdelibs/debian/control.in | 3 +-- .../patches/kubuntu_64_rosetta_translation.diff | 11 ----------- 10 files changed, 9 insertions(+), 29 deletions(-) delete mode 100644 ubuntu/maverick/kdelibs/debian/patches/kubuntu_64_rosetta_translation.diff diff --git a/debian/lenny/kdebase/debian/control.in b/debian/lenny/kdebase/debian/control.in index ea9ff3fa6..c9262c520 100644 --- a/debian/lenny/kdebase/debian/control.in +++ b/debian/lenny/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/debian/lenny/kdelibs/debian/control b/debian/lenny/kdelibs/debian/control index 6220c14e8..f3003aae0 100644 --- a/debian/lenny/kdelibs/debian/control +++ b/debian/lenny/kdelibs/debian/control @@ -58,8 +58,7 @@ Package: kdelibs4c2a-trinity Section: libs Architecture: any 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 Conflicts: kdelibs4-trinity, kdelibs4c2-trinity (>> 4:1.0.0), kdelibs-bin-trinity (<< 4:3.3.3), kdelibs4-trinity-dev (<< 4:3.5.7.dfsg.1-6) diff --git a/debian/lenny/kdelibs/debian/control.in b/debian/lenny/kdelibs/debian/control.in index 498a97bd4..6115e85df 100644 --- a/debian/lenny/kdelibs/debian/control.in +++ b/debian/lenny/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/debian/squeeze/kdebase/debian/control.in b/debian/squeeze/kdebase/debian/control.in index ea9ff3fa6..c9262c520 100644 --- a/debian/squeeze/kdebase/debian/control.in +++ b/debian/squeeze/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/debian/squeeze/kdelibs/debian/control b/debian/squeeze/kdelibs/debian/control index db7040438..3fda9df1e 100644 --- a/debian/squeeze/kdelibs/debian/control +++ b/debian/squeeze/kdelibs/debian/control @@ -58,8 +58,7 @@ Package: kdelibs4c2a-trinity Section: libs Architecture: any 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 Conflicts: kdelibs4-trinity, kdelibs4c2-trinity (>> 4:1.0.0), kdelibs-bin-trinity (<< 4:3.3.3), kdelibs4-trinity-dev (<< 4:3.5.7.dfsg.1-6) diff --git a/debian/squeeze/kdelibs/debian/control.in b/debian/squeeze/kdelibs/debian/control.in index 498a97bd4..6115e85df 100644 --- a/debian/squeeze/kdelibs/debian/control.in +++ b/debian/squeeze/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/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.

" - "

For more information on KDE internationalization " - "visit http://l10n.kde.org

" -- ); -+ ) + i18n("

Debian includes additions and alterations to the TDE translation from Launchpad.

"); - } - - TQString