Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

10 files changed, 50 insertions, 48 deletions

diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/control b/ubuntu/maverick/libraries/kipi-plugins/debian/control
index b80e27503..7f9285239 100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/control
+++ b/ubuntu/maverick/libraries/kipi-plugins/debian/control
@@ -14,8 +14,8 @@ Homepage: http://www.kipi-plugins.org/
 Package: kipi-plugins-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: kipi-plugins-kde3 (<< 4:3.5.13)
-Breaks: kipi-plugins-kde3 (<< 4:3.5.13)
+Replaces: kipi-plugins-trinity (<< 4:14.0.0)
+Breaks: kipi-plugins-trinity (<< 4:14.0.0)
 Recommends: k3b-trinity, graphicsmagick-imagemagick-compat (>=1.1.7) | imagemagick (>=5.4.8), kmail-trinity, tdeprint-trinity, sane-utils, kooka-trinity, konqueror-trinity, mpg123
 Suggests: gimp, gallery, kipi-plugins-trinity-doc
 Enhances: digikam-trinity, kphotoalbum-trinity, showimg, gwenview-trinity
@@ -67,8 +67,8 @@ Description: image manipulation/handling plugins for KIPI aware programs [Trinit
 Package: kipi-plugins-trinity-doc
 Architecture: all
 Section: doc
-Replaces: kipi-plugins-kde3-doc (<< 4:3.5.13)
-Breaks: kipi-plugins-kde3-doc (<< 4:3.5.13)
+Replaces: kipi-plugins-trinity-doc (<< 4:14.0.0)
+Breaks: kipi-plugins-trinity-doc (<< 4:14.0.0)
 Depends: khelpcenter-trinity
 Suggests: kipi-plugins-trinity
 Description: kipi-plugins documentation [Trinity]
diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/control b/ubuntu/maverick/libraries/libkdcraw/debian/control
index 906728ee0..aa86aa433 100644
--- a/ubuntu/maverick/libraries/libkdcraw/debian/control
+++ b/ubuntu/maverick/libraries/libkdcraw/debian/control
@@ -13,8 +13,8 @@ Homepage: http://www.kipi-plugins.org/
 Package: libkdcraw3-trinity-dev
 Section: libdevel
 Architecture: any
-Replaces: libkdcraw3-kde3-dev (<< 4:3.5.13)
-Breaks: libkdcraw3-kde3-dev (<< 4:3.5.13)
+Replaces: libkdcraw3-trinity-dev (<< 4:14.0.0)
+Breaks: libkdcraw3-trinity-dev (<< 4:14.0.0)
 Depends: libkdcraw3-trinity (= ${binary:Version}), pkg-config
 Conflicts: libkdcraw-dev
 Description: RAW picture decoding C++ library (development) [Trinity]
@@ -27,8 +27,8 @@ Description: RAW picture decoding C++ library (development) [Trinity]
 Package: libkdcraw3-trinity
 Section: libs
 Architecture: any
-Replaces: libkdcraw3-kde3 (<< 4:3.5.13)
-Breaks: libkdcraw3-kde3 (<< 4:3.5.13)
+Replaces: libkdcraw3-trinity (<< 4:14.0.0)
+Breaks: libkdcraw3-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Description: Raw picture decoding C++ library (runtime) [Trinity]
  C++ interface around dcraw binary program used to decode RAW
diff --git a/ubuntu/maverick/libraries/libkexiv2/debian/control b/ubuntu/maverick/libraries/libkexiv2/debian/control
index 6ebaea475..6edfde91d 100644
--- a/ubuntu/maverick/libraries/libkexiv2/debian/control
+++ b/ubuntu/maverick/libraries/libkexiv2/debian/control
@@ -11,8 +11,8 @@ Homepage: http://www.kipi-plugins.org/
 Package: libkexiv2-3-trinity-dev
 Section: libdevel
 Architecture: any
-Replaces: libkexiv2-3-kde3-dev (<< 4:3.5.13)
-Breaks: libkexiv2-3-kde3-dev (<< 4:3.5.13)
+Replaces: libkexiv2-3-trinity-dev (<< 4:14.0.0)
+Breaks: libkexiv2-3-trinity-dev (<< 4:14.0.0)
 Depends: libkexiv2-3-trinity (= ${binary:Version}), pkg-config
 Description: Qt like interface for the libexiv2 library (development) [Trinity]
  libkexif2-dev contains development files and documentation for libkexiv2
@@ -23,8 +23,8 @@ Description: Qt like interface for the libexiv2 library (development) [Trinity]
 Package: libkexiv2-3-trinity
 Section: libs
 Architecture: any
-Replaces: libkexiv2-3-kde3 (<< 4:3.5.13)
-Breaks: libkexiv2-3-kde3 (<< 4:3.5.13)
+Replaces: libkexiv2-3-trinity (<< 4:14.0.0)
+Breaks: libkexiv2-3-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Description: Qt like interface for the libexiv2 library (runtime) [Trinity]
  libkexif2 contains the library of libkexiv2.
diff --git a/ubuntu/maverick/libraries/libkipi/debian/control b/ubuntu/maverick/libraries/libkipi/debian/control
index e33e73d15..ffc736fab 100644
--- a/ubuntu/maverick/libraries/libkipi/debian/control
+++ b/ubuntu/maverick/libraries/libkipi/debian/control
@@ -9,8 +9,8 @@ Standards-Version: 3.8.4
 Package: libkipi0-trinity-dev
 Provides: libkipi-trinity-dev
 Conflicts: libkipi-trinity-dev
-Replaces: libkipi0-kde3-dev (<< 4:3.5.13)
-Breaks: libkipi0-kde3-dev (<< 4:3.5.13)
+Replaces: libkipi0-trinity-dev (<< 4:14.0.0)
+Breaks: libkipi0-trinity-dev (<< 4:14.0.0)
 Section: libdevel
 Architecture: any
 Depends: libkipi0-trinity (= ${Source-Version}), pkg-config
@@ -28,8 +28,8 @@ Description: library for apps that want to use kipi-plugins (development version
 Package: libkipi0-trinity
 Conflicts: libkipi0c2-trinity
 Section: libs
-Replaces: libkipi0-kde3 (<< 4:3.5.13)
-Breaks: libkipi0-kde3 (<< 4:3.5.13)
+Replaces: libkipi0-trinity (<< 4:14.0.0)
+Breaks: libkipi0-trinity (<< 4:14.0.0)
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: library for apps that want to use kipi-plugins (runtime version) [Trinity]
diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/control b/ubuntu/maverick/libraries/libksquirrel/debian/control
index 6d64fdda7..1d03926a0 100644
--- a/ubuntu/maverick/libraries/libksquirrel/debian/control
+++ b/ubuntu/maverick/libraries/libksquirrel/debian/control
@@ -14,16 +14,16 @@ Homagepage: http://ksquirrel.sourceforge.net
 Package: libksquirrel0-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: libksquirrel0-kde3 (<< 4:3.5.13)
-Breaks: libksquirrel0-kde3 (<< 4:3.5.13)
+Replaces: libksquirrel0-trinity (<< 4:14.0.0)
+Breaks: libksquirrel0-trinity (<< 4:14.0.0)
 Description: Trinity image viewer
  Runtime libraries for KSquirrel.
 
 Package: libksquirrel-trinity-dev
 Section: libdevel
 Architecture: any
-Replaces: libksquirrel-kde3-dev (<< 4:3.5.13)
-Breaks: libksquirrel-kde3-dev (<< 4:3.5.13)
+Replaces: libksquirrel-trinity-dev (<< 4:14.0.0)
+Breaks: libksquirrel-trinity-dev (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, libksquirrel0-trinity (= ${binary:Version})
 Description: Trinity image viewer
  Development libraries for KSquirrel.
@@ -31,7 +31,7 @@ Description: Trinity image viewer
 Package: libksquirrel-tools-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, libksquirrel0-trinity (= ${binary:Version})
-Replaces: libksquirrel-tools-kde3 (<< 4:3.5.13)
-Breaks: libksquirrel-tools-kde3 (<< 4:3.5.13)
+Replaces: libksquirrel-tools-trinity (<< 4:14.0.0)
+Breaks: libksquirrel-tools-trinity (<< 4:14.0.0)
 Description: Trinity image viewer
  Tools for KSquirrel.
diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/control b/ubuntu/maverick/libraries/libtqt-perl/debian/control
index 3277f09e6..e0823f07a 100644
--- a/ubuntu/maverick/libraries/libtqt-perl/debian/control
+++ b/ubuntu/maverick/libraries/libtqt-perl/debian/control
@@ -10,6 +10,8 @@ Standards-Version: 3.8.4
 Package: libtqt-perl
 Architecture: any
 Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
+Replaces: libtqt-perl (<< 4:14.0.0)
+Breaks: libtqt-perl (<< 4:14.0.0)
 Description: Perl bindings for the TQt library
  This module lets you use the TQt library from Perl.
  It provides an object-oriented interface and is easy to use.
diff --git a/ubuntu/maverick/libraries/mlt++/debian/control b/ubuntu/maverick/libraries/mlt++/debian/control
index fca254cd0..6d9df2be3 100644
--- a/ubuntu/maverick/libraries/mlt++/debian/control
+++ b/ubuntu/maverick/libraries/mlt++/debian/control
@@ -10,8 +10,8 @@ Build-Depends: debhelper (>= 5), libmlt-trinity-dev (>= 0.2.4.svn20071228), auto
 Package: libmlt++0.2.5-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: libmlt++0.2.5-kde3 (<< 4:3.5.13)
-Breaks: libmlt++0.2.5-kde3 (<< 4:3.5.13)
+Replaces: libmlt++0.2.5-trinity (<< 4:14.0.0)
+Breaks: libmlt++0.2.5-trinity (<< 4:14.0.0)
 Provides: libmlt++-trinity
 Description: An open source multimedia framework (C++ wrapper) [Trinity]
  MLT is an open source multimedia framework, designed and developed for
@@ -29,8 +29,8 @@ Description: An open source multimedia framework (C++ wrapper) [Trinity]
 Package: libmlt++-trinity-dev
 Section: libdevel
 Architecture: any
-Replaces: libmlt++-kde3-dev (<< 4:3.5.13)
-Breaks: libmlt++-kde3-dev (<< 4:3.5.13)
+Replaces: libmlt++-trinity-dev (<< 4:14.0.0)
+Breaks: libmlt++-trinity-dev (<< 4:14.0.0)
 Depends: libmlt++0.2.5-trinity (= ${binary:Version}), libmlt-trinity-dev (>= 0.2.4.svn20071228)
 Description: An open source multimedia framework (C++ wrapper) [Trinity]
  MLT is an open source multimedia framework, designed and developed for
diff --git a/ubuntu/maverick/libraries/mlt/debian/control b/ubuntu/maverick/libraries/mlt/debian/control
index 64fc2a37d..09621eccf 100644
--- a/ubuntu/maverick/libraries/mlt/debian/control
+++ b/ubuntu/maverick/libraries/mlt/debian/control
@@ -15,8 +15,8 @@ Build-Depends: debhelper (>= 5), libdv4-dev, libquicktime-dev (>= 2:1.0.0),
 Package: libmlt0.2.5-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, libmlt-data
-Replaces: libmlt0.2.5-kde3 (<< 4:3.5.13)
-Breaks: libmlt0.2.5-kde3 (<< 4:3.5.13)
+Replaces: libmlt0.2.5-trinity (<< 4:14.0.0)
+Breaks: libmlt0.2.5-trinity (<< 4:14.0.0)
 Provides: libmlt-trinity
 Description: An open source multimedia framework - Core files [Trinity]
  MLT is an open source multimedia framework, designed and developed for
@@ -32,8 +32,8 @@ Description: An open source multimedia framework - Core files [Trinity]
 Package: libmiracle0.2.5-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, libmlt0.2.5-trinity (= ${binary:Version}), libvalerie0.2.5-trinity (= ${binary:Version})
-Replaces: libmiracle0.2.5-kde3 (<< 4:3.5.13)
-Breaks: libmiracle0.2.5-kde3 (<< 4:3.5.13)
+Replaces: libmiracle0.2.5-trinity (<< 4:14.0.0)
+Breaks: libmiracle0.2.5-trinity (<< 4:14.0.0)
 Description: An open source multimedia framework - Core files [Trinity]
  MLT is an open source multimedia framework, designed and developed for
  television broadcasting. It provides a toolkit for broadcasters, video
@@ -47,8 +47,8 @@ Description: An open source multimedia framework - Core files [Trinity]
 Package: libvalerie0.2.5-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, libmlt0.2.5-trinity (= ${binary:Version}), libmiracle0.2.5-trinity (= ${binary:Version})
-Replaces: libvalerie0.2.5-kde3 (<< 4:3.5.13)
-Breaks: libvalerie0.2.5-kde3 (<< 4:3.5.13)
+Replaces: libvalerie0.2.5-trinity (<< 4:14.0.0)
+Breaks: libvalerie0.2.5-trinity (<< 4:14.0.0)
 Description: An open source multimedia framework - Core files [Trinity]
  MLT is an open source multimedia framework, designed and developed for
  television broadcasting. It provides a toolkit for broadcasters, video
@@ -63,8 +63,8 @@ Description: An open source multimedia framework - Core files [Trinity]
 Package: libmlt-trinity-dev
 Section: libdevel
 Architecture: any
-Replaces: libmlt-kde3-dev (<< 4:3.5.13)
-Breaks: libmlt-kde3-dev (<< 4:3.5.13)
+Replaces: libmlt-trinity-dev (<< 4:14.0.0)
+Breaks: libmlt-trinity-dev (<< 4:14.0.0)
 Depends: libmlt0.2.5-trinity (= ${binary:Version}), libmiracle0.2.5-trinity (= ${binary:Version}), libvalerie0.2.5-trinity (= ${binary:Version})
 Provides: libmiracle-trinity-dev, libvalerie-trinity-dev
 Description: An open source multimedia framework - Development files [Trinity]
diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/control b/ubuntu/maverick/libraries/pytdeextensions/debian/control
index 9a9301d42..ff229461d 100644
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/control
+++ b/ubuntu/maverick/libraries/pytdeextensions/debian/control
@@ -11,8 +11,8 @@ Standards-Version: 3.8.4
 Package: pytdeextensions-trinity
 Architecture: all
 Depends: ${python:Depends}
-Replaces: pytdeextensions-kde3 (<< 4:3.5.13)
-Breaks: pytdeextensions-kde3 (<< 4:3.5.13)
+Replaces: pykdeextensions-trinity (<< 4:14.0.0)
+Breaks: pykdeextensions-trinity (<< 4:14.0.0)
 Conflicts: pytdeextensions
 Provides: ${python:Provides}
 Description: Python packages to support KDE applications (scripts) [Trinity]
@@ -24,8 +24,8 @@ Description: Python packages to support KDE applications (scripts) [Trinity]
 Package: libpythonize0-trinity-dev
 Architecture: any
 Section: libdevel
-Replaces: libpythonize0-kde3-dev (<< 4:3.5.13)
-Breaks: libpythonize0-kde3-dev (<< 4:3.5.13)
+Replaces: libpythonize0-trinity-dev (<< 4:14.0.0)
+Breaks: libpythonize0-trinity-dev (<< 4:14.0.0)
 Depends: libpythonize0-trinity (= ${binary:Version}), python-dev
 Description: Python packages to support KDE applications (development) [Trinity]
  PyKDE Extensions is a collection of software and Python packages
@@ -38,8 +38,8 @@ Description: Python packages to support KDE applications (development) [Trinity]
 Package: libpythonize0-trinity
 Architecture: any
 Section: libs
-Replaces: libpythonize0-kde3 (<< 4:3.5.13)
-Breaks: libpythonize0-kde3 (<< 4:3.5.13)
+Replaces: libpythonize0-trinity (<< 4:14.0.0)
+Breaks: libpythonize0-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libpythonize0
 Description: Python packages to support KDE applications (library) [Trinity]
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/control b/ubuntu/maverick/libraries/python-trinity/debian/control
index f52038d27..afacf68ee 100644
--- a/ubuntu/maverick/libraries/python-trinity/debian/control
+++ b/ubuntu/maverick/libraries/python-trinity/debian/control
@@ -12,8 +12,8 @@ XS-Python-Version: all
 Package: python-trinity-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt
-Replaces: python-kde3-kde3 (<< 4:3.5.13)
-Breaks: python-kde3-kde3 (<< 4:3.5.13)
+Replaces: python-trinity-trinity (<< 4:14.0.0)
+Breaks: python-trinity-trinity (<< 4:14.0.0)
 XB-Python-Version: ${python:Versions}
 Provides: ${python:Provides}
 Conflicts: python-trinity-trinity
@@ -25,8 +25,8 @@ Description: Trinity bindings for Python [Trinity]
 Package: python-trinity-trinity-dbg
 Priority: extra
 Architecture: any
-Replaces: python-kde3-kde3-dbg (<< 4:3.5.13)
-Breaks: python-kde3-kde3-dbg (<< 4:3.5.13)
+Replaces: python-trinity-trinity-dbg (<< 4:14.0.0)
+Breaks: python-trinity-trinity-dbg (<< 4:14.0.0)
 Depends: python-trinity-trinity (= ${binary:Version}), python-dbg, python-tqt-dbg, ${shlibs:Depends}
 XB-Python-Version: ${python:Versions}
 Description: Trinity bindings for Python (debug extensions) [Trinity]
@@ -39,8 +39,8 @@ Description: Trinity bindings for Python (debug extensions) [Trinity]
 Package: python-trinity-trinity-dev
 Section: python
 Architecture: all
-Replaces: python-kde3-kde3-dev (<< 4:3.5.13)
-Breaks: python-kde3-kde3-dev (<< 4:3.5.13)
+Replaces: python-trinity-trinity-dev (<< 4:14.0.0)
+Breaks: python-trinity-trinity-dev (<< 4:14.0.0)
 Depends: pytqt-tools, ${python:Depends}
 XB-Python-Version: ${python:Versions}
 Description: Trinity bindings for Python - Development files and scripts [Trinity]
@@ -53,8 +53,8 @@ Description: Trinity bindings for Python - Development files and scripts [Trinit
 Package: python-trinity-trinity-doc
 Section: doc
 Architecture: all
-Replaces: python-kde3-kde3-doc (<< 4:3.5.13)
-Breaks: python-kde3-kde3-doc (<< 4:3.5.13)
+Replaces: python-trinity-trinity-doc (<< 4:14.0.0)
+Breaks: python-trinity-trinity-doc (<< 4:14.0.0)
 Description: Documentation and examples for PyKDE [Trinity]
  General documentation and examples for PyKDE providing programming
  tips and working code you can use to learn from.