summaryrefslogtreecommitdiffstats
path: root/ubuntu/precise
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-03-17 16:46:37 +0100
committerSlávek Banko <slavek.banko@axis.cz>2013-03-17 16:46:37 +0100
commit6f4e4fffbc2a06567e878ceaecc203eecd94b567 (patch)
tree753d49310c27dc00728c39a3705d41b480f3ee0d /ubuntu/precise
parent7a77865322f3fc62d949d95564b6406094d33957 (diff)
downloadtde-packaging-6f4e4fffbc2a06567e878ceaecc203eecd94b567.tar.gz
tde-packaging-6f4e4fffbc2a06567e878ceaecc203eecd94b567.zip
Fix unintended renames in Replaces and Breaks on Debian and Ubuntu
Diffstat (limited to 'ubuntu/precise')
-rw-r--r--ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/control4
-rw-r--r--ubuntu/precise/applications/knetworkmanager.cmake/debian/control4
-rw-r--r--ubuntu/precise/applications/knetworkmanager9/debian/control2
-rw-r--r--ubuntu/precise/applications/tdeio-apt/debian/control4
-rw-r--r--ubuntu/precise/applications/tdeio-locate/debian/control4
-rw-r--r--ubuntu/precise/applications/tdeio-umountwrapper/debian/control4
-rw-r--r--ubuntu/precise/applications/tderadio/debian/control4
-rw-r--r--ubuntu/precise/applications/tdmtheme/debian/control4
-rw-r--r--ubuntu/precise/tdeartwork/debian/control16
-rw-r--r--ubuntu/precise/tdebase/debian/control4
-rw-r--r--ubuntu/precise/tdemultimedia/debian/control4
-rw-r--r--ubuntu/precise/tdenetwork/debian/control4
-rw-r--r--ubuntu/precise/tdesdk/debian/control12
-rw-r--r--ubuntu/precise/tdeutils/debian/control4
-rw-r--r--ubuntu/precise/tdewebdev/debian/control4
15 files changed, 40 insertions, 38 deletions
diff --git a/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/control b/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/control
index c997d25b7..f895ab798 100644
--- a/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/control
+++ b/ubuntu/precise/applications/compizconfig-backend-tdeconfig/debian/control
@@ -8,8 +8,8 @@ Standards-Version: 3.8.4
Package: compizconfig-backend-tdeconfig-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: compizconfig-backend-tdeconfig-trinity (<< 4:14.0.0)
-Breaks: compizconfig-backend-tdeconfig-trinity (<< 4:14.0.0)
+Replaces: compizconfig-backend-kconfig-trinity (<< 4:14.0.0)
+Breaks: compizconfig-backend-kconfig-trinity (<< 4:14.0.0)
Conflicts: libcompizconfig-backend-tdeconfig-trinity
Description: TDEConfig [Trinity] Settings library for plugins - OpenCompositing Project
The OpenCompositing Project brings 3D desktop visual effects that improve
diff --git a/ubuntu/precise/applications/knetworkmanager.cmake/debian/control b/ubuntu/precise/applications/knetworkmanager.cmake/debian/control
index 6650a2b73..268d37649 100644
--- a/ubuntu/precise/applications/knetworkmanager.cmake/debian/control
+++ b/ubuntu/precise/applications/knetworkmanager.cmake/debian/control
@@ -25,8 +25,8 @@ Homepage: http://opensuse.org/Projects/KNetworkManager
Package: network-manager-tde
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0)
-Replaces: network-manager-kde (<< 4:14.0.0)
-Breaks: network-manager-kde (<< 4:14.0.0)
+Replaces: network-manager-kde-trinity (<< 4:14.0.0)
+Breaks: network-manager-kde-trinity (<< 4:14.0.0)
Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
Provides: knetworkmanager-trinity
Conflicts: network-manager-kde
diff --git a/ubuntu/precise/applications/knetworkmanager9/debian/control b/ubuntu/precise/applications/knetworkmanager9/debian/control
index efd256a36..6bc8c18a8 100644
--- a/ubuntu/precise/applications/knetworkmanager9/debian/control
+++ b/ubuntu/precise/applications/knetworkmanager9/debian/control
@@ -16,6 +16,8 @@ Homepage: http://www.trinitydesktop.org/
Package: network-manager-tde
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: network-manager-kde-trinity (<< 4:14.0.0)
+Breaks: network-manager-kde-trinity (<< 4:14.0.0)
Recommends: tdewalletmanager-trinity
Provides: tdenetworkmanager-trinity
Description: TDE systray applet for controlling networking [Trinity]
diff --git a/ubuntu/precise/applications/tdeio-apt/debian/control b/ubuntu/precise/applications/tdeio-apt/debian/control
index fd85e2362..d838074e9 100644
--- a/ubuntu/precise/applications/tdeio-apt/debian/control
+++ b/ubuntu/precise/applications/tdeio-apt/debian/control
@@ -9,8 +9,8 @@ Standards-Version: 3.8.4
Package: tdeio-apt-trinity
Architecture: any
Depends: ${shlibs:Depends}, apt, adept-batch-trinity
-Replaces: tdeio-apt-trinity (<< 4:14.0.0)
-Breaks: tdeio-apt-trinity (<< 4:14.0.0)
+Replaces: kio-apt-trinity (<< 4:14.0.0)
+Breaks: kio-apt-trinity (<< 4:14.0.0)
Description: an apt-cache ioslave for Trinity
tdeio-apt is an ioslave which provides the apt:/ protocol. It
integrates apt-cache functionalities into Konqueror, making
diff --git a/ubuntu/precise/applications/tdeio-locate/debian/control b/ubuntu/precise/applications/tdeio-locate/debian/control
index 4d7dab38f..d49db68f2 100644
--- a/ubuntu/precise/applications/tdeio-locate/debian/control
+++ b/ubuntu/precise/applications/tdeio-locate/debian/control
@@ -9,8 +9,8 @@ Standards-Version: 3.8.4
Package: tdeio-locate-trinity
Architecture: any
Depends: ${shlibs:Depends}
-Replaces: tdeio-locate-trinity (<< 4:14.0.0)
-Breaks: tdeio-locate-trinity (<< 4:14.0.0)
+Replaces: kio-locate-trinity (<< 4:14.0.0)
+Breaks: kio-locate-trinity (<< 4:14.0.0)
Description: tdeio-slave for the locate command [Trinity]
Adds support for the "locate:" and "locater:"
protocols to Konqueror and other KDE applications.
diff --git a/ubuntu/precise/applications/tdeio-umountwrapper/debian/control b/ubuntu/precise/applications/tdeio-umountwrapper/debian/control
index 8775d3064..6b6b2d3c3 100644
--- a/ubuntu/precise/applications/tdeio-umountwrapper/debian/control
+++ b/ubuntu/precise/applications/tdeio-umountwrapper/debian/control
@@ -8,8 +8,8 @@ Standards-Version: 3.8.4
Package: tdeio-umountwrapper-trinity
Architecture: any
Depends: ${shlibs:Depends}
-Replaces: tdeio-umountwrapper-trinity (<< 4:14.0.0)
-Breaks: tdeio-umountwrapper-trinity (<< 4:14.0.0)
+Replaces: kio-umountwrapper-trinity (<< 4:14.0.0)
+Breaks: kio-umountwrapper-trinity (<< 4:14.0.0)
Description: progress dialog for safely removing devices in Trinity.
Wrapper around tdeio_media_mountwrapper.
Provides a progress dialog for Safely Removing of devices in Trinity.
diff --git a/ubuntu/precise/applications/tderadio/debian/control b/ubuntu/precise/applications/tderadio/debian/control
index 3120926d9..0ee221579 100644
--- a/ubuntu/precise/applications/tderadio/debian/control
+++ b/ubuntu/precise/applications/tderadio/debian/control
@@ -9,8 +9,8 @@ Homepage: http://tderadio.sourceforge.net/
Package: tderadio-trinity
Architecture: any
Depends: ${shlibs:Depends}
-Replaces: tderadio-trinity (<< 4:14.0.0)
-Breaks: tderadio-trinity (<< 4:14.0.0)
+Replaces: kradio-trinity (<< 4:14.0.0)
+Breaks: kradio-trinity (<< 4:14.0.0)
Description: Comfortable Radio Application for KDE [Trinity]
TDERadio is a comfortable radio application for KDE 3.x with support for
V4L and V4L2 radio cards drivers.
diff --git a/ubuntu/precise/applications/tdmtheme/debian/control b/ubuntu/precise/applications/tdmtheme/debian/control
index 79f266f85..036c5c0d9 100644
--- a/ubuntu/precise/applications/tdmtheme/debian/control
+++ b/ubuntu/precise/applications/tdmtheme/debian/control
@@ -12,8 +12,8 @@ Homepage: http://beta.smileaf.org/projects
Package: tdmtheme-trinity
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, tdm-trinity
-Replaces: tdmtheme-trinity (<< 4:14.0.0)
-Breaks: tdmtheme-trinity (<< 4:14.0.0)
+Replaces: kdmtheme-trinity (<< 4:14.0.0)
+Breaks: kdmtheme-trinity (<< 4:14.0.0)
Description: theme manager for TDM [Trinity]
tdmtheme is a theme manager for TDM. It provides a KDE Control Module (KCM)
that allows you to easily install, remove and change your TDM themes.
diff --git a/ubuntu/precise/tdeartwork/debian/control b/ubuntu/precise/tdeartwork/debian/control
index b0100a04c..d01eac73b 100644
--- a/ubuntu/precise/tdeartwork/debian/control
+++ b/ubuntu/precise/tdeartwork/debian/control
@@ -113,8 +113,8 @@ Description: wallpapers released with Trinity
Package: tdescreensaver-trinity
Architecture: any
Section: tde
-Replaces: tdescreensaver-trinity (<< 4:14.0.0)
-Breaks: tdescreensaver-trinity (<< 4:14.0.0)
+Replaces: kscreensaver-trinity (<< 4:14.0.0)
+Breaks: kscreensaver-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdebase-trinity-bin
Recommends: twin-trinity, tdescreensaver-xsavers-trinity (= ${Source-Version})
Description: additional screen savers released with Trinity
@@ -132,8 +132,8 @@ Description: additional screen savers released with Trinity
Package: tdescreensaver-xsavers-trinity
Architecture: any
Section: tde
-Replaces: tdescreensaver-xsavers-trinity (<< 4:14.0.0)
-Breaks: tdescreensaver-xsavers-trinity (<< 4:14.0.0)
+Replaces: kscreensaver-xsavers-trinity (<< 4:14.0.0)
+Breaks: kscreensaver-xsavers-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdebase-trinity-bin, xscreensaver-data
Recommends: twin-trinity, tdescreensaver-trinity (= ${Source-Version}), xscreensaver-gl
Suggests: tdescreensaver-xsavers-webcollage-trinity
@@ -155,8 +155,8 @@ Description: Trinity hooks for standard xscreensavers
Package: tdescreensaver-xsavers-webcollage-trinity
Architecture: all
Section: tde
-Replaces: tdescreensaver-xsavers-webcollage-trinity (<< 4:14.0.0)
-Breaks: tdescreensaver-xsavers-webcollage-trinity (<< 4:14.0.0)
+Replaces: kscreensaver-xsavers-webcollage-trinity (<< 4:14.0.0)
+Breaks: kscreensaver-xsavers-webcollage-trinity (<< 4:14.0.0)
Depends: tdescreensaver-xsavers-extra-trinity, miscfiles | wordlist, netpbm
Description: webcollage screensaver Trinity hook
This package give access to the webcollage screensaver through the Trinity
@@ -180,8 +180,8 @@ Description: webcollage screensaver Trinity hook
Package: tdescreensaver-xsavers-extra-trinity
Architecture: all
Section: tde
-Replaces: tdescreensaver-xsavers-extra-trinity (<< 4:14.0.0)
-Breaks: tdescreensaver-xsavers-extra-trinity (<< 4:14.0.0)
+Replaces: kscreensaver-xsavers-extra-trinity (<< 4:14.0.0)
+Breaks: kscreensaver-xsavers-extra-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdescreensaver-xsavers-trinity, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies
Recommends: twin-trinity, tdescreensaver-trinity (= ${Source-Version})
Description: Trinity hooks for standard xscreensavers
diff --git a/ubuntu/precise/tdebase/debian/control b/ubuntu/precise/tdebase/debian/control
index 8bbd21468..2205e998a 100644
--- a/ubuntu/precise/tdebase/debian/control
+++ b/ubuntu/precise/tdebase/debian/control
@@ -252,8 +252,8 @@ Description: miscellaneous binaries and files for the KDE desktop
Package: tdm-trinity
Section: tde
Architecture: any
-Replaces: tdm-trinity (<< 4:14.0.0)
-Breaks: tdm-trinity (<< 4:14.0.0)
+Replaces: kdm-trinity (<< 4:14.0.0)
+Breaks: kdm-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, tdebase-trinity-bin (= ${Source-Version}), tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3}), debconf (>= 1.2.9) | debconf-2.0, libpam-runtime (>= 0.76-14), xbase-clients
Recommends: logrotate, xserver-xorg
Suggests: khelpcenter-trinity, ksmserver-trinity (= ${Source-Version}), kdepasswd-trinity (= ${Source-Version}), menu
diff --git a/ubuntu/precise/tdemultimedia/debian/control b/ubuntu/precise/tdemultimedia/debian/control
index 2033cd2fa..b8f51bc08 100644
--- a/ubuntu/precise/tdemultimedia/debian/control
+++ b/ubuntu/precise/tdemultimedia/debian/control
@@ -172,8 +172,8 @@ Description: enables the browsing of audio CDs under Konqueror
Package: tdemid-trinity
Section: sound
Architecture: any
-Replaces: tdemid-trinity (<< 4:14.0.0)
-Breaks: tdemid-trinity (<< 4:14.0.0)
+Replaces: kmid-trinity (<< 4:14.0.0)
+Breaks: kmid-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: MIDI/karaoke player for Trinity
diff --git a/ubuntu/precise/tdenetwork/debian/control b/ubuntu/precise/tdenetwork/debian/control
index 0dcc946ec..bd19d5809 100644
--- a/ubuntu/precise/tdenetwork/debian/control
+++ b/ubuntu/precise/tdenetwork/debian/control
@@ -334,8 +334,8 @@ Description: LAN information server for Trinity
Package: tdednssd-trinity
Section: net
Architecture: any
-Replaces: tdednssd-trinity (<< 4:14.0.0)
-Breaks: tdednssd-trinity (<< 4:14.0.0)
+Replaces: kdnssd-trinity (<< 4:14.0.0)
+Breaks: kdnssd-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Recommends: avahi-daemon
Suggests: avahi-autoipd | zeroconf
diff --git a/ubuntu/precise/tdesdk/debian/control b/ubuntu/precise/tdesdk/debian/control
index 1fceae9d8..6d1b73e1a 100644
--- a/ubuntu/precise/tdesdk/debian/control
+++ b/ubuntu/precise/tdesdk/debian/control
@@ -148,8 +148,8 @@ Description: a front end for the Trinity bug tracking system
Package: tdecachegrind-trinity
Architecture: any
Section: devel
-Replaces: tdecachegrind-trinity (<< 4:14.0.0)
-Breaks: tdecachegrind-trinity (<< 4:14.0.0)
+Replaces: kcachegrind-trinity (<< 4:14.0.0)
+Breaks: kcachegrind-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Conflicts: tdecachegrind
Recommends: valgrind-callgrind-trinity | valgrind-calltree-trinity, graphviz
@@ -169,8 +169,8 @@ Description: visualisation tool for valgrind profiling output
Package: tdecachegrind-converters-trinity
Architecture: all
Section: devel
-Replaces: tdecachegrind-converters-trinity (<< 4:14.0.0)
-Breaks: tdecachegrind-converters-trinity (<< 4:14.0.0)
+Replaces: kcachegrind-converters-trinity (<< 4:14.0.0)
+Breaks: kcachegrind-converters-trinity (<< 4:14.0.0)
Depends: ${perl:Depends}, php5-cli, python
Conflicts: tdecachegrind-converters
Recommends: tdecachegrind-trinity
@@ -410,8 +410,8 @@ Description: subversion ioslave for Trinity
Package: tdeunittest-trinity
Architecture: any
Section: devel
-Replaces: tdeunittest-trinity (<< 4:14.0.0)
-Breaks: tdeunittest-trinity (<< 4:14.0.0)
+Replaces: kunittest-trinity (<< 4:14.0.0)
+Breaks: kunittest-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Conflicts: tdeunittest
Suggests: tdelibs4-trinity-doc
diff --git a/ubuntu/precise/tdeutils/debian/control b/ubuntu/precise/tdeutils/debian/control
index 956b68ea3..d14bba661 100644
--- a/ubuntu/precise/tdeutils/debian/control
+++ b/ubuntu/precise/tdeutils/debian/control
@@ -346,8 +346,8 @@ Description: timer utility for Trinity
Package: tdewalletmanager-trinity
Section: utils
Architecture: any
-Replaces: tdewalletmanager-trinity (<< 4:14.0.0)
-Breaks: tdewalletmanager-trinity (<< 4:14.0.0)
+Replaces: kwalletmanager-trinity (<< 4:14.0.0)
+Breaks: kwalletmanager-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: khelpcenter-trinity
Description: wallet manager for Trinity
diff --git a/ubuntu/precise/tdewebdev/debian/control b/ubuntu/precise/tdewebdev/debian/control
index 1ba182c43..ab04ebdd0 100644
--- a/ubuntu/precise/tdewebdev/debian/control
+++ b/ubuntu/precise/tdewebdev/debian/control
@@ -88,8 +88,8 @@ Description: data files for Quanta Plus web development environment [Trinity]
Package: tdefilereplace-trinity
Architecture: any
Section: tde
-Replaces: tdefilereplace-trinity (<< 4:14.0.0)
-Breaks: tdefilereplace-trinity (<< 4:14.0.0)
+Replaces: kfilereplace-trinity (<< 4:14.0.0)
+Breaks: kfilereplace-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}
Suggests: quanta-trinity
Description: batch search-and-replace component for KDE [Trinity]