summaryrefslogtreecommitdiffstats
path: root/ubuntu/precise
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-11-14 13:33:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-11-14 13:33:47 -0600
commit9701c2bc1ac693fcfe1aa2ad6010b52c2a4dce62 (patch)
treed0e05451a7a1e4cc3c9c3a7608bdd0e11795b982 /ubuntu/precise
parentaa81bdb85ec4d62b998e126feada5e0cb013a10a (diff)
downloadtde-packaging-9701c2bc1ac693fcfe1aa2ad6010b52c2a4dce62.tar.gz
tde-packaging-9701c2bc1ac693fcfe1aa2ad6010b52c2a4dce62.zip
Remove obsolete launchpad-integration requirement from tdelibs packaging
Diffstat (limited to 'ubuntu/precise')
-rw-r--r--ubuntu/precise/tdebase/debian/control.in3
-rw-r--r--ubuntu/precise/tdelibs/debian/control3
-rw-r--r--ubuntu/precise/tdelibs/debian/control.in3
-rw-r--r--ubuntu/precise/tdelibs/debian/patches/kubuntu_64_rosetta_translation.diff11
4 files changed, 3 insertions, 17 deletions
diff --git a/ubuntu/precise/tdebase/debian/control.in b/ubuntu/precise/tdebase/debian/control.in
index 7a229ecba..8194486c3 100644
--- a/ubuntu/precise/tdebase/debian/control.in
+++ b/ubuntu/precise/tdebase/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, tdelibs4-dev, 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, tdelibs4-doc
Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
-Standards-Version: 3.7.3
-XS-Vcs-Bzr: http://bazaar.launchpad.net/~kubuntu-members/tdebase/debian
+Standards-Version: 3.8.4
Package: tdebase
Section: tde
diff --git a/ubuntu/precise/tdelibs/debian/control b/ubuntu/precise/tdelibs/debian/control
index 76d5fa428..64c331358 100644
--- a/ubuntu/precise/tdelibs/debian/control
+++ b/ubuntu/precise/tdelibs/debian/control
@@ -61,8 +61,7 @@ Architecture: any
Replaces: kdelibs4c2a-trinity (<< 4:14.0.0)
Breaks: kdelibs4c2a-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdelibs-data-trinity,
- tdelibs-data-trinity, perl, xbase-clients,
- launchpad-integration, sudo
+ tdelibs-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/precise/tdelibs/debian/control.in b/ubuntu/precise/tdelibs/debian/control.in
index 2762ac62e..b2a8fce1c 100644
--- a/ubuntu/precise/tdelibs/debian/control.in
+++ b/ubuntu/precise/tdelibs/debian/control.in
@@ -56,8 +56,7 @@ Package: tdelibs4c2a
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, tdelibs-data (>> ${KDE-Version3}),
- tdelibs-data (<< ${KDE-Next-Version3}), perl, xbase-clients,
- launchpad-integration, sudo
+ tdelibs-data (<< ${KDE-Next-Version3}), perl, xbase-clients, sudo
Suggests: fam, perl-suid
Conflicts: tdelibs4, tdelibs4c2, tdelibs-bin (<< 4:3.3.3), tdelibs4-dev (<< 4:3.5.7.dfsg.1-6)
Replaces: tdelibs4, tdelibs4c2, tdeartwork-style (<< 4:3.4.0),
diff --git a/ubuntu/precise/tdelibs/debian/patches/kubuntu_64_rosetta_translation.diff b/ubuntu/precise/tdelibs/debian/patches/kubuntu_64_rosetta_translation.diff
deleted file mode 100644
index b224a4d11..000000000
--- a/ubuntu/precise/tdelibs/debian/patches/kubuntu_64_rosetta_translation.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- tdelibs/tdecore/kaboutdata.cpp 2006-03-17 10:19:05.000000000 +0000
-+++ tdelibs/tdecore/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