Moved TDEFileReplace to tdeutils. This resolves bug 767.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

13 files changed, 51 insertions, 52 deletions

diff --git a/ubuntu/maverick/tdeutils/debian/control b/ubuntu/maverick/tdeutils/debian/control
index 0e14974b4..126a20ee9 100644
--- a/ubuntu/maverick/tdeutils/debian/control
+++ b/ubuntu/maverick/tdeutils/debian/control
@@ -13,7 +13,7 @@ Section: tde
 Architecture: all
 Replaces: kdeutils-kde3 (<< 4:14.0.0~), kdeutils-trinity (<< 4:14.0.0~)
 Breaks: kdeutils-kde3 (<< 4:14.0.0~), kdeutils-trinity (<< 4:14.0.0~)
-Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), tdelirc-trinity (>= ${Source-Version}), tdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}), kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version})
+Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), tdelirc-trinity (>= ${Source-Version}), tdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}), kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version}), tdefilereplace-trinity (>= ${source:Version})
 Suggests: tdeutils-trinity-doc-html (>= ${Source-Version})
 Recommends: tdepowersave-trinity
 Description: general purpose utilities from the official Trinity release
@@ -394,3 +394,21 @@ Description: debugging symbols for tdeutils-trinity
  This package contains the debugging symbols associated with tdeutils-trinity.
  They will automatically be used by gdb for debugging tdeutils-related
  issues.
+
+Package: tdefilereplace-trinity
+Architecture: any
+Section: tde
+Replaces: kfilereplace-kde3 (<< 4:14.0.0~), kfilereplace-trinity (<< 4:14.0.0~)
+Breaks: kfilereplace-kde3 (<< 4:14.0.0~), kfilereplace-trinity (<< 4:14.0.0~)
+Depends: ${shlibs:Depends}
+Suggests: quanta-trinity
+Description: batch search-and-replace component for TDE [Trinity]
+ TDEFileReplace is an embedded component for TDE that acts as a batch
+ search-and-replace tool. It allows you to replace one expression with
+ another in many files at once.
+ .
+ Note that at the moment TDEFileReplace does not come as a standalone
+ application.
+ .
+ This package is part of Trinity, as a component of the TDE utilities module.
+ See the 'tde-trinity' and 'tdeutils-trinity' packages for more information.
diff --git a/ubuntu/maverick/tdeutils/debian/control.in b/ubuntu/maverick/tdeutils/debian/control.in
index 01a6a0559..24274f96b 100644
--- a/ubuntu/maverick/tdeutils/debian/control.in
+++ b/ubuntu/maverick/tdeutils/debian/control.in
@@ -11,7 +11,7 @@ Standards-Version: 3.7.2
 Package: tdeutils
 Section: tde
 Architecture: all
-Depends: ark (>= ${Source-Version}), kcalc (>= ${Source-Version}), kcharselect (>= ${Source-Version}), tdelirc (>= ${Source-Version}), tdessh (>= ${Source-Version}), kdf (>= ${Source-Version}), kedit (>= ${Source-Version}), kfloppy (>= ${Source-Version}), kgpg (>= ${Source-Version}), khexedit (>= ${Source-Version}), kjots (>= ${Source-Version}), klaptopdaemon (>= ${Source-Version}) | kpowersave, kmilo (>= ${Source-Version}), kregexpeditor (>= ${Source-Version}), ksim (>= ${Source-Version}), ktimer (>= ${Source-Version}), tdewalletmanager (>= ${Source-Version}), superkaramba (>= ${Source-Version})
+Depends: ark (>= ${Source-Version}), kcalc (>= ${Source-Version}), kcharselect (>= ${Source-Version}), tdelirc (>= ${Source-Version}), tdessh (>= ${Source-Version}), kdf (>= ${Source-Version}), kedit (>= ${Source-Version}), kfloppy (>= ${Source-Version}), kgpg (>= ${Source-Version}), khexedit (>= ${Source-Version}), kjots (>= ${Source-Version}), klaptopdaemon (>= ${Source-Version}) | kpowersave, kmilo (>= ${Source-Version}), kregexpeditor (>= ${Source-Version}), ksim (>= ${Source-Version}), ktimer (>= ${Source-Version}), tdewalletmanager (>= ${Source-Version}), superkaramba (>= ${Source-Version}), tdefilereplace (>= ${Source-Version})
 Suggests: tdeutils-doc-html (>= ${Source-Version})
 Description: general purpose utilities from the official TDE release
  TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
@@ -331,3 +331,19 @@ Description: debugging symbols for tdeutils
  This package contains the debugging symbols associated with tdeutils.
  They will automatically be used by gdb for debugging tdeutils-related
  issues.
+
+Package: tdefilereplace
+Architecture: any
+Section: tde
+Depends: ${shlibs:Depends}
+Suggests: quanta (= ${Source-Version})
+Description: batch search-and-replace component for TDE
+ TDEFileReplace is an embedded component for TDE that acts as a batch
+ search-and-replace tool. It allows you to replace one expression with
+ another in many files at once.
+ .
+ Note that at the moment TDEFileReplace does not come as a standalone
+ application.
+ .
+ This package is part of Trinity, as a component of the TDE utilities module.
+ See the 'tde' and 'tdeutils' packages for more information.
diff --git a/ubuntu/maverick/tdeutils/debian/copyright b/ubuntu/maverick/tdeutils/debian/copyright
index dfe16e1c5..4203a570c 100644
--- a/ubuntu/maverick/tdeutils/debian/copyright
+++ b/ubuntu/maverick/tdeutils/debian/copyright
@@ -4,6 +4,8 @@ Tue, 16 Apr 2002 22:00:00 -0500.
 It was downloaded from: http://www.kde.org/download
 
 Upstream Authors: Matthias Elter <elter@kde.org> and many others.
+  TDEFileReplace: François Dupoux <fdupoux@dupoux.com> and
+      Andras Mantia <amantia@kde.org>
 
 
 License:
diff --git a/ubuntu/maverick/tdewebdev/debian/man/tdefilereplace-trinity.1 b/ubuntu/maverick/tdeutils/debian/man/tdefilereplace-trinity.1
index 63557c928..63557c928 100644
--- a/ubuntu/maverick/tdewebdev/debian/man/tdefilereplace-trinity.1
+++ b/ubuntu/maverick/tdeutils/debian/man/tdefilereplace-trinity.1
diff --git a/ubuntu/maverick/tdeutils/debian/rules b/ubuntu/maverick/tdeutils/debian/rules
index 9617d1359..4f86b2859 100755
--- a/ubuntu/maverick/tdeutils/debian/rules
+++ b/ubuntu/maverick/tdeutils/debian/rules
@@ -15,6 +15,8 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 
 DEB_KDE_APIDOX := yes
 
+DEB_INSTALL_CHANGELOGS_tdefilereplace-trinity    := tdefilereplace/ChangeLog
+
 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
 
 DEB_CMAKE_EXTRA_FLAGS := \
diff --git a/ubuntu/maverick/tdewebdev/debian/tdefilereplace-trinity.README.Debian b/ubuntu/maverick/tdeutils/debian/tdefilereplace-trinity.README.Debian
index b2f7ce2da..fa8e31afa 100644
--- a/ubuntu/maverick/tdewebdev/debian/tdefilereplace-trinity.README.Debian
+++ b/ubuntu/maverick/tdeutils/debian/tdefilereplace-trinity.README.Debian
@@ -1,10 +1,10 @@
-KFileReplace for Debian
+TDEFileReplace for Debian
 -----------------------
 
-KFileReplace is currently not available as a standalone application.
+TDEFileReplace is currently not available as a standalone application.
 Instead it is made available as a KPart (an embedded TDE component).
 
-An example of an application that uses the KFileReplace component is
+An example of an application that uses the TDEFileReplace component is
 Quanta Plus, found in the package quanta.
 
  -- Ben Burton <bab@debian.org>, Sat, 31 Jan 2004 12:08:48 +1100
diff --git a/ubuntu/maverick/tdewebdev/debian/tdefilereplace-trinity.install b/ubuntu/maverick/tdeutils/debian/tdefilereplace-trinity.install
index 515142b40..c4a1a4202 100644
--- a/ubuntu/maverick/tdewebdev/debian/tdefilereplace-trinity.install
+++ b/ubuntu/maverick/tdeutils/debian/tdefilereplace-trinity.install
@@ -4,10 +4,10 @@ debian/tmp/opt/trinity/lib/trinity/libtdefilereplacepart.so
 debian/tmp/opt/trinity/share/applications/tde/tdefilereplace.desktop
 debian/tmp/opt/trinity/share/apps/tdefilereplace/tdefilereplaceui.rc
 debian/tmp/opt/trinity/share/apps/tdefilereplacepart
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdefilereplace/*.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdefilereplace/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdefilereplace/*.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdefilereplace/*.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/TDEFileReplace/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/TDEFileReplace/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/TDEFileReplace/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/TDEFileReplace/*.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/tdefilereplace.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdefilereplace.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdefilereplace.png
diff --git a/ubuntu/maverick/tdewebdev/debian/tdefilereplace-trinity.manpages b/ubuntu/maverick/tdeutils/debian/tdefilereplace-trinity.manpages
index 694a538a0..694a538a0 100644
--- a/ubuntu/maverick/tdewebdev/debian/tdefilereplace-trinity.manpages
+++ b/ubuntu/maverick/tdeutils/debian/tdefilereplace-trinity.manpages
diff --git a/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.tdefilereplace b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.tdefilereplace
index 54489def9..71d695c74 100644
--- a/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.tdefilereplace
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.tdefilereplace
@@ -1,7 +1,7 @@
 Document: tdefilereplace
-Title: KFileReplace Handbook
+Title: TDEFileReplace Handbook
 Author: Emiliano Gulmini <emi_barbarossa@yahoo.it>
-Abstract: KFileReplace is an utility to search and replace strings.
+Abstract: TDEFileReplace is an utility to search and replace strings.
 Section: Apps/Net
 
 Format: HTML
diff --git a/ubuntu/maverick/tdewebdev/debian/control b/ubuntu/maverick/tdewebdev/debian/control
index 731964c93..888fe26d6 100644
--- a/ubuntu/maverick/tdewebdev/debian/control
+++ b/ubuntu/maverick/tdewebdev/debian/control
@@ -13,7 +13,7 @@ Architecture: all
 Section: tde
 Replaces: kdewebdev-kde3 (<< 4:14.0.0~), kdewebdev-trinity (<< 4:14.0.0~)
 Breaks: kdewebdev-kde3 (<< 4:14.0.0~), kdewebdev-trinity (<< 4:14.0.0~)
-Depends: quanta-trinity (>= ${source:Version}), tdefilereplace-trinity (>= ${source:Version}), kimagemapeditor-trinity (>= ${source:Version}), klinkstatus-trinity (>= ${source:Version}), kommander-trinity (>= ${source:Version}), kxsldbg-trinity (>= ${source:Version})
+Depends: quanta-trinity (>= ${source:Version}), kimagemapeditor-trinity (>= ${source:Version}), klinkstatus-trinity (>= ${source:Version}), kommander-trinity (>= ${source:Version}), kxsldbg-trinity (>= ${source:Version})
 Suggests: kommander-trinity-dev (>= ${source:Version}), tdewebdev-trinity-doc-html (>= ${source:Version})
 Description: web development apps from the official TDE release [Trinity]
  TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
@@ -85,25 +85,6 @@ Description: data files for Quanta Plus web development environment [Trinity]
  This package is part of TDE, as a component of the TDE web development module.
  See the 'tde-trinity' and 'tdewebdev-trinity' packages for more information.
 
-Package: tdefilereplace-trinity
-Architecture: any
-Section: tde
-Replaces: kfilereplace-kde3 (<< 4:14.0.0~), kfilereplace-trinity (<< 4:14.0.0~)
-Breaks: kfilereplace-kde3 (<< 4:14.0.0~), kfilereplace-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}
-Suggests: quanta-trinity
-Description: batch search-and-replace component for TDE [Trinity]
- KFileReplace is an embedded component for TDE that acts as a batch
- search-and-replace tool. It allows you to replace one expression with
- another in many files at once.
- .
- Note that at the moment KFileReplace does not come as a standalone
- application. An example of an application that uses the KFileReplace
- component is Quanta Plus (found in the package quanta).
- .
- This package is part of TDE, as a component of the TDE web development module.
- See the 'tde-trinity' and 'tdewebdev-trinity' packages for more information.
-
 Package: kimagemapeditor-trinity
 Architecture: any
 Section: editors
diff --git a/ubuntu/maverick/tdewebdev/debian/control.in b/ubuntu/maverick/tdewebdev/debian/control.in
index cede6c9b5..032b447cd 100644
--- a/ubuntu/maverick/tdewebdev/debian/control.in
+++ b/ubuntu/maverick/tdewebdev/debian/control.in
@@ -10,7 +10,7 @@ Standards-Version: 3.7.2
 Package: tdewebdev
 Architecture: all
 Section: tde
-Depends: quanta (>= ${Source-Version}), tdefilereplace (>= ${Source-Version}), kimagemapeditor (>= ${Source-Version}), klinkstatus (>= ${Source-Version}), kommander (>= ${Source-Version}), kxsldbg (>= ${Source-Version})
+Depends: quanta (>= ${Source-Version}), kimagemapeditor (>= ${Source-Version}), klinkstatus (>= ${Source-Version}), kommander (>= ${Source-Version}), kxsldbg (>= ${Source-Version})
 Suggests: kommander-dev (>= ${Source-Version}), tdewebdev-doc-html (>= ${Source-Version})
 Description: web development apps from the official TDE release
  TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
@@ -80,23 +80,6 @@ Description: data files for Quanta Plus web development environment
  This package is part of TDE, as a component of the TDE web development module.
  See the 'tde' and 'tdewebdev' packages for more information.
 
-Package: tdefilereplace
-Architecture: any
-Section: tde
-Depends: ${shlibs:Depends}
-Suggests: quanta (= ${Source-Version})
-Description: batch search-and-replace component for TDE
- KFileReplace is an embedded component for TDE that acts as a batch
- search-and-replace tool. It allows you to replace one expression with
- another in many files at once.
- .
- Note that at the moment KFileReplace does not come as a standalone
- application. An example of an application that uses the KFileReplace
- component is Quanta Plus (found in the package quanta).
- .
- This package is part of TDE, as a component of the TDE web development module.
- See the 'tde' and 'tdewebdev' packages for more information.
-
 Package: kimagemapeditor
 Architecture: any
 Section: editors
diff --git a/ubuntu/maverick/tdewebdev/debian/copyright b/ubuntu/maverick/tdewebdev/debian/copyright
index 8ae0e05d3..9afb5f663 100644
--- a/ubuntu/maverick/tdewebdev/debian/copyright
+++ b/ubuntu/maverick/tdewebdev/debian/copyright
@@ -12,8 +12,6 @@ Upstream Authors:
   Quanta Plus: Eric Laffoon <sequitur@kde.org> and
       Andras Mantia <amantia@kde.org>, with inactive authors
       Dmitry Poplavsky <dima@kde.org> and Alexander Yakovlev <yshurik@kde.org>
-  KFileReplace: François Dupoux <fdupoux@dupoux.com> and
-      Andras Mantia <amantia@kde.org>
   KImageMapEditor: Jan Schäfer <janschaefer@users.sourceforge.net>
   KLinkStatus: Paulo Moura Guedes <moura@tdewebdev.org>
   Kommander: Marc Britton <consume@optusnet.com.au>,
diff --git a/ubuntu/maverick/tdewebdev/debian/rules b/ubuntu/maverick/tdewebdev/debian/rules
index 60c404811..b76b1fe75 100755
--- a/ubuntu/maverick/tdewebdev/debian/rules
+++ b/ubuntu/maverick/tdewebdev/debian/rules
@@ -14,7 +14,6 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 
 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
 
-DEB_INSTALL_CHANGELOGS_tdefilereplace-trinity    := tdefilereplace/ChangeLog
 DEB_INSTALL_CHANGELOGS_kimagemapeditor-trinity := kimagemapeditor/ChangeLog
 DEB_INSTALL_CHANGELOGS_klinkstatus-trinity     := klinkstatus/ChangeLog
 DEB_INSTALL_CHANGELOGS_kommander-trinity       := kommander/ChangeLog