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

18 files changed, 64 insertions, 15 deletions

diff --git a/debian/squeeze/libraries/kipi-plugins/debian/control b/debian/squeeze/libraries/kipi-plugins/debian/control
index fd3f5bf67..7f9285239 100755..100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/control
+++ b/debian/squeeze/libraries/kipi-plugins/debian/control
@@ -12,9 +12,10 @@ Standards-Version: 3.8.4
 Homepage: http://www.kipi-plugins.org/
 
 Package: kipi-plugins-trinity
-Replaces: digikamplugins-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
+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
@@ -66,6 +67,8 @@ Description: image manipulation/handling plugins for KIPI aware programs [Trinit
 Package: kipi-plugins-trinity-doc
 Architecture: all
 Section: doc
+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/debian/squeeze/libraries/libkdcraw/debian/control b/debian/squeeze/libraries/libkdcraw/debian/control
index e203a0c28..aa86aa433 100644
--- a/debian/squeeze/libraries/libkdcraw/debian/control
+++ b/debian/squeeze/libraries/libkdcraw/debian/control
@@ -13,6 +13,8 @@ Homepage: http://www.kipi-plugins.org/
 Package: libkdcraw3-trinity-dev
 Section: libdevel
 Architecture: any
+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]
@@ -25,6 +27,8 @@ Description: RAW picture decoding C++ library (development) [Trinity]
 Package: libkdcraw3-trinity
 Section: libs
 Architecture: any
+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/debian/squeeze/libraries/libkexiv2/debian/control b/debian/squeeze/libraries/libkexiv2/debian/control
index 59490c655..6edfde91d 100644
--- a/debian/squeeze/libraries/libkexiv2/debian/control
+++ b/debian/squeeze/libraries/libkexiv2/debian/control
@@ -11,6 +11,8 @@ Homepage: http://www.kipi-plugins.org/
 Package: libkexiv2-3-trinity-dev
 Section: libdevel
 Architecture: any
+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
@@ -21,6 +23,8 @@ Description: Qt like interface for the libexiv2 library (development) [Trinity]
 Package: libkexiv2-3-trinity
 Section: libs
 Architecture: any
+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/debian/squeeze/libraries/libkipi/debian/control b/debian/squeeze/libraries/libkipi/debian/control
index 9824298b4..ffc736fab 100644
--- a/debian/squeeze/libraries/libkipi/debian/control
+++ b/debian/squeeze/libraries/libkipi/debian/control
@@ -9,6 +9,8 @@ Standards-Version: 3.8.4
 Package: libkipi0-trinity-dev
 Provides: libkipi-trinity-dev
 Conflicts: libkipi-trinity-dev
+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
@@ -26,6 +28,8 @@ Description: library for apps that want to use kipi-plugins (development version
 Package: libkipi0-trinity
 Conflicts: libkipi0c2-trinity
 Section: libs
+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/debian/squeeze/libraries/libksquirrel/debian/control b/debian/squeeze/libraries/libksquirrel/debian/control
index 8fc0ef737..1d03926a0 100644
--- a/debian/squeeze/libraries/libksquirrel/debian/control
+++ b/debian/squeeze/libraries/libksquirrel/debian/control
@@ -14,12 +14,16 @@ Homagepage: http://ksquirrel.sourceforge.net
 Package: libksquirrel0-trinity
 Architecture: any
 Depends: ${shlibs:Depends}
+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-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.
@@ -27,5 +31,7 @@ Description: Trinity image viewer
 Package: libksquirrel-tools-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, libksquirrel0-trinity (= ${binary:Version})
+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/debian/squeeze/libraries/libtqt-perl/debian/changelog b/debian/squeeze/libraries/libtqt-perl/debian/changelog
index 78d64b05a..c5a93479e 100644
--- a/debian/squeeze/libraries/libtqt-perl/debian/changelog
+++ b/debian/squeeze/libraries/libtqt-perl/debian/changelog
@@ -46,7 +46,7 @@ libqt-perl (3.008-3) unstable; urgency=low
   * debian/compat, debian/control, debian/examples, debian/manpages,
     debian/rules: Repackaged using dh-make and cdbs.  Closes: #463089.
   * debian/control, debian/rules: Using chrpath to remove rpath.
-  * config.h.in, PerlQt/bin/pqtapi, PerlQt/bin/pqtsh: Removed previously
+  * config.h.in, PerlTQt/bin/pqtapi, PerlTQt/bin/pqtsh: Removed previously
     automatically added changes.
   * debian/watch: Added.
 
diff --git a/debian/squeeze/libraries/libtqt-perl/debian/control b/debian/squeeze/libraries/libtqt-perl/debian/control
index 3277f09e6..3bef4f1d3 100644
--- a/debian/squeeze/libraries/libtqt-perl/debian/control
+++ b/debian/squeeze/libraries/libtqt-perl/debian/control
@@ -3,13 +3,15 @@ Section: perl
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Bart Martens <bartm@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libtqtinterface-dev, perl (>= 5.8.0), automake, autoconf, kdelibs4-trinity-dev, libsmokeqt-trinity-dev, chrpath, libtool (>= 1.5.2)
+Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libtqtinterface-dev, perl (>= 5.8.0), automake, autoconf, tdelibs4-trinity-dev, libsmokeqt-trinity-dev, chrpath, libtool (>= 1.5.2)
 Build-Conflicts: libtqt-perl
 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/debian/squeeze/libraries/libtqt-perl/debian/docs b/debian/squeeze/libraries/libtqt-perl/debian/docs
index 83bf44358..60566c90c 100644
--- a/debian/squeeze/libraries/libtqt-perl/debian/docs
+++ b/debian/squeeze/libraries/libtqt-perl/debian/docs
@@ -1,3 +1,3 @@
 README
 TODO
-PerlQt/tutorials
+PerlTQt/tutorials
diff --git a/debian/squeeze/libraries/libtqt-perl/debian/examples b/debian/squeeze/libraries/libtqt-perl/debian/examples
index f60bcd7e0..50594b81e 100644
--- a/debian/squeeze/libraries/libtqt-perl/debian/examples
+++ b/debian/squeeze/libraries/libtqt-perl/debian/examples
@@ -1 +1 @@
-PerlQt/examples/*
+PerlTQt/examples/*
diff --git a/debian/squeeze/libraries/libtqt-perl/debian/pqtapi.1 b/debian/squeeze/libraries/libtqt-perl/debian/pqtapi.1
index 009ac1643..f6005623a 100644
--- a/debian/squeeze/libraries/libtqt-perl/debian/pqtapi.1
+++ b/debian/squeeze/libraries/libtqt-perl/debian/pqtapi.1
@@ -1,6 +1,6 @@
 .TH PERLQT 1 "July 31, 2002"
 .SH NAME
-pqtapi \- PerlQt introspection tool
+pqtapi \- PerlTQt introspection tool
 .SH SYNOPSIS
 .B pqtapi
 .RI " [ " -r " " <re> " ]  [ " <class> " ]
@@ -10,14 +10,14 @@ This manual page documents briefly the
 .B pqtapi
 command.
 .PP
-\fBpqtapi\fP is a PerlQt Introspection tool.
+\fBpqtapi\fP is a PerlTQt Introspection tool.
 
 For example:
 $ pqtapi -ir 'setpoint.* int'
   void QCanvasLine::setPoints(int, int, int, int)
   void QPointArray::setPoint(uint, int, int)
 
-For more information, please see the documentation on the PerlQt website
+For more information, please see the documentation on the PerlTQt website
 http://perlqt.sourceforge.net/
 
 .SH OPTIONS
diff --git a/debian/squeeze/libraries/libtqt-perl/debian/pqtsh.1 b/debian/squeeze/libraries/libtqt-perl/debian/pqtsh.1
index 402884ba5..19c7a93a0 100644
--- a/debian/squeeze/libraries/libtqt-perl/debian/pqtsh.1
+++ b/debian/squeeze/libraries/libtqt-perl/debian/pqtsh.1
@@ -1,6 +1,6 @@
 .TH PERLQT 1 "July 31, 2002"
 .SH NAME
-pqtsh \- PerlQt Graphical shell
+pqtsh \- PerlTQt Graphical shell
 .SH SYNOPSIS
 .B pqtsh
 
@@ -10,10 +10,10 @@ This manual page documents briefly the
 command.
 .PP
 \fBpqtsh\fP is a graphical shell that can be used to test and experiment
-with the PerlQt api interactively. It is fairly self-explanatory and includes
+with the PerlTQt api interactively. It is fairly self-explanatory and includes
 an interactive example (Help -> Example).
 
-For more information, please see the documentation on the PerlQt website
+For more information, please see the documentation on the PerlTQt website
 http://perlqt.sourceforge.net/
 
 .SH AUTHOR
diff --git a/debian/squeeze/libraries/libtqt-perl/debian/puic.1 b/debian/squeeze/libraries/libtqt-perl/debian/puic.1
index b83219b02..671bd97fd 100644
--- a/debian/squeeze/libraries/libtqt-perl/debian/puic.1
+++ b/debian/squeeze/libraries/libtqt-perl/debian/puic.1
@@ -32,7 +32,7 @@ command.
 file created with the Qt Designer package. This will generate the package
 defined in  the UI file and a basic main package for testing purposes.
 
-For more information, please see the documentation on the PerlQt website
+For more information, please see the documentation on the PerlTQt website
 http://perlqt.sourceforge.net/
 
 .SH OPTIONS
diff --git a/debian/squeeze/libraries/libtqt-perl/debian/rules b/debian/squeeze/libraries/libtqt-perl/debian/rules
index 6a7885e21..7bf57d40b 100755
--- a/debian/squeeze/libraries/libtqt-perl/debian/rules
+++ b/debian/squeeze/libraries/libtqt-perl/debian/rules
@@ -16,7 +16,7 @@ SAVERESTORE=\
 	puic/Makefile.in \
 	smoke/Makefile.in \
 	smoke/qt/Makefile.in \
-	PerlQt/bin \
+	PerlTQt/bin \
 
 DEB_AUTO_UPDATE_AUTOCONF := 2.61
 
@@ -47,7 +47,7 @@ build/libtqt-perl::
 	chrpath -d puic/puic
 
 clean::
-	rm -f PerlQt/bin/.exists
+	rm -f PerlTQt/bin/.exists
 	for f in $(SAVERESTORE) ; do [ ! -e $$f.d-r-orig ] || ( rm -rf $$f && mv $$f.d-r-orig $$f ) ; done
 	rm -f pre-build-stamp
 
diff --git a/debian/squeeze/libraries/libtqt-perl/debian/watch b/debian/squeeze/libraries/libtqt-perl/debian/watch
index 2dfa7626d..18c470968 100644
--- a/debian/squeeze/libraries/libtqt-perl/debian/watch
+++ b/debian/squeeze/libraries/libtqt-perl/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://sf.net/perlqt/PerlQt-([^b]+)\.tar\.gz
+http://sf.net/perlqt/PerlTQt-([^b]+)\.tar\.gz
diff --git a/debian/squeeze/libraries/mlt++/debian/control b/debian/squeeze/libraries/mlt++/debian/control
index 3ded7ab8a..6d9df2be3 100644
--- a/debian/squeeze/libraries/mlt++/debian/control
+++ b/debian/squeeze/libraries/mlt++/debian/control
@@ -10,6 +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-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
@@ -27,6 +29,8 @@ Description: An open source multimedia framework (C++ wrapper) [Trinity]
 Package: libmlt++-trinity-dev
 Section: libdevel
 Architecture: any
+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/debian/squeeze/libraries/mlt/debian/control b/debian/squeeze/libraries/mlt/debian/control
index b905822f7..09621eccf 100644
--- a/debian/squeeze/libraries/mlt/debian/control
+++ b/debian/squeeze/libraries/mlt/debian/control
@@ -15,6 +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-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
@@ -30,6 +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-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
@@ -43,6 +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-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
@@ -57,6 +63,8 @@ Description: An open source multimedia framework - Core files [Trinity]
 Package: libmlt-trinity-dev
 Section: libdevel
 Architecture: any
+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/debian/squeeze/libraries/pytdeextensions/debian/control b/debian/squeeze/libraries/pytdeextensions/debian/control
index 0ec05cc9d..139709f0d 100644
--- a/debian/squeeze/libraries/pytdeextensions/debian/control
+++ b/debian/squeeze/libraries/pytdeextensions/debian/control
@@ -11,6 +11,8 @@ Standards-Version: 3.8.4
 Package: pytdeextensions-trinity
 Architecture: all
 Depends: ${python:Depends}
+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]
@@ -22,6 +24,8 @@ Description: Python packages to support KDE applications (scripts) [Trinity]
 Package: libpythonize0-trinity-dev
 Architecture: any
 Section: libdevel
+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
@@ -34,6 +38,8 @@ Description: Python packages to support KDE applications (development) [Trinity]
 Package: libpythonize0-trinity
 Architecture: any
 Section: libs
+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/debian/squeeze/libraries/python-trinity/debian/control b/debian/squeeze/libraries/python-trinity/debian/control
index c1f13e757..afacf68ee 100644
--- a/debian/squeeze/libraries/python-trinity/debian/control
+++ b/debian/squeeze/libraries/python-trinity/debian/control
@@ -12,6 +12,8 @@ XS-Python-Version: all
 Package: python-trinity-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt
+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
@@ -23,6 +25,8 @@ Description: Trinity bindings for Python [Trinity]
 Package: python-trinity-trinity-dbg
 Priority: extra
 Architecture: any
+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]
@@ -35,6 +39,8 @@ Description: Trinity bindings for Python (debug extensions) [Trinity]
 Package: python-trinity-trinity-dev
 Section: python
 Architecture: all
+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]
@@ -47,6 +53,8 @@ Description: Trinity bindings for Python - Development files and scripts [Trinit
 Package: python-trinity-trinity-doc
 Section: doc
 Architecture: all
+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.