Finish rename of kwin to twin on Debian and Ubuntu

5 files changed, 15 insertions, 15 deletions

diff --git a/debian/squeeze/tdeartwork/debian/changelog b/debian/squeeze/tdeartwork/debian/changelog
index f0bfe7054..a3043310e 100644
--- a/debian/squeeze/tdeartwork/debian/changelog
+++ b/debian/squeeze/tdeartwork/debian/changelog
@@ -486,10 +486,10 @@ tdeartwork (4:3.2.3-1) unstable; urgency=low
   * Rebuilt against STL-enabled Qt and corresponding tdelibs (closes: #254021).
   * Patched the autoconf tests for kxsconfig so that xscreensaver
     configuration works again (closes: #238180, #243150).
-  * Suggests (kwin | x-window-manager) for kdewallpapers instead of just
+  * Suggests (twin | x-window-manager) for kdewallpapers instead of just
     x-window-manager.
-  * Removed recommends: kwin from tdeartwork-theme-window since this is
-    already coming in as a depends from the kwin shlibs file.
+  * Removed recommends: twin from tdeartwork-theme-window since this is
+    already coming in as a depends from the twin shlibs file.
 
  -- Ben Burton <[email protected]>  Tue, 15 Jun 2004 08:38:18 +1000
 
diff --git a/debian/squeeze/tdeartwork/debian/control b/debian/squeeze/tdeartwork/debian/control
index 0bda1ed09..a4bb8764b 100644
--- a/debian/squeeze/tdeartwork/debian/control
+++ b/debian/squeeze/tdeartwork/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <[email protected]>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <[email protected]>
 Uploaders: Ana Beatriz Guerrero Lopez <[email protected]>, Christopher Martin <[email protected]>, Sune Vuorela <[email protected]>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-trinity-dev, gawk, gettext, sharutils, tdebase-trinity-dev, kwin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-trinity-dev, gawk, gettext, sharutils, tdebase-trinity-dev, twin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies, automake, autoconf, libtool, libltdl-dev
 Build-Conflicts: autoconf2.13, nvidia-glx
 Standards-Version: 3.8.4
 
@@ -89,7 +89,7 @@ Description: window decoration themes released with Trinity
 Package: kdewallpapers-trinity
 Architecture: all
 Section: kde
-Suggests: kwin-trinity | x-window-manager
+Suggests: twin-trinity | x-window-manager
 Replaces: tdebase-data-trinity (<< 4:3.5)
 Description: wallpapers released with Trinity
  This package contains additional wallpapers for Trinity. Wallpapers can be
@@ -102,7 +102,7 @@ Package: kscreensaver-trinity
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, tdebase-trinity-bin
-Recommends: kwin-trinity, kscreensaver-xsavers-trinity (= ${Source-Version})
+Recommends: twin-trinity, kscreensaver-xsavers-trinity (= ${Source-Version})
 Description: additional screen savers released with Trinity
  This package contains the screen savers for Trinity. They can be tested and
  selected within the Appearance and Themes section of the Trinity Control
@@ -119,7 +119,7 @@ Package: kscreensaver-xsavers-trinity
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, tdebase-trinity-bin, xscreensaver-data
-Recommends: kwin-trinity, kscreensaver-trinity (= ${Source-Version}), xscreensaver-gl
+Recommends: twin-trinity, kscreensaver-trinity (= ${Source-Version}), xscreensaver-gl
 Suggests: kscreensaver-xsavers-webcollage-trinity
 Description: Trinity hooks for standard xscreensavers
  This package allows a smooth integration of the standard xscreensavers
@@ -163,7 +163,7 @@ Package: kscreensaver-xsavers-extra-trinity
 Architecture: all
 Section: kde
 Depends: ${shlibs:Depends}, kscreensaver-xsavers-trinity, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies
-Recommends: kwin-trinity, kscreensaver-trinity (= ${Source-Version})
+Recommends: twin-trinity, kscreensaver-trinity (= ${Source-Version})
 Description: Trinity hooks for standard xscreensavers
  This package allows a smooth integration of the universe xscreensavers
  into Trinity. With this package installed you can select and/or configure
diff --git a/debian/squeeze/tdeartwork/debian/control.in b/debian/squeeze/tdeartwork/debian/control.in
index e2d1102a3..8979d776d 100644
--- a/debian/squeeze/tdeartwork/debian/control.in
+++ b/debian/squeeze/tdeartwork/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <[email protected]>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-dev (>= 4:3.5.7), gawk, gettext, sharutils, tdebase-dev (>= 4:3.5.7), kwin, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-dev (>= 4:3.5.7), gawk, gettext, sharutils, tdebase-dev (>= 4:3.5.7), twin, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl
 Build-Conflicts: autoconf2.13, nvidia-glx
 Standards-Version: 3.7.2
 
@@ -89,7 +89,7 @@ Description: window decoration themes released with KDE
 Package: kdewallpapers
 Architecture: all
 Section: kde
-Suggests: kwin | x-window-manager
+Suggests: twin | x-window-manager
 Replaces: tdebase-data (<< 4:3.5)
 Description: wallpapers released with KDE
  This package contains additional wallpapers for KDE. Wallpapers can be
@@ -102,7 +102,7 @@ Package: kscreensaver
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, tdebase-bin
-Recommends: kwin, kscreensaver-xsavers (= ${Source-Version})
+Recommends: twin, kscreensaver-xsavers (= ${Source-Version})
 Description: additional screen savers released with KDE
  This package contains the screen savers for KDE. They can be tested and
  selected within the Appearance and Themes section of the KDE Control
@@ -119,7 +119,7 @@ Package: kscreensaver-xsavers
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, tdebase-bin, xscreensaver
-Recommends: kwin, kscreensaver (= ${Source-Version}), xscreensaver-gl
+Recommends: twin, kscreensaver (= ${Source-Version}), xscreensaver-gl
 Suggests: kscreensaver-xsavers-webcollage
 Description: KDE hooks for standard xscreensavers
  This package allows a smooth integration of the standard xscreensavers
diff --git a/debian/squeeze/tdeartwork/debian/copyright b/debian/squeeze/tdeartwork/debian/copyright
index f98e0b7f5..dbdd37868 100644
--- a/debian/squeeze/tdeartwork/debian/copyright
+++ b/debian/squeeze/tdeartwork/debian/copyright
@@ -139,7 +139,7 @@ Copyright:
 
   OpenLook window decoration theme:
 
-  'OpenLook' kwin client
+  'OpenLook' twin client
 
   Porting to trinity.2 API
     Copyright 2003 Luciano Montanaro <[email protected]>
diff --git a/debian/squeeze/tdeartwork/debian/tdeartwork-theme-window-trinity.install b/debian/squeeze/tdeartwork/debian/tdeartwork-theme-window-trinity.install
index 7f688e236..b36062a5c 100644
--- a/debian/squeeze/tdeartwork/debian/tdeartwork-theme-window-trinity.install
+++ b/debian/squeeze/tdeartwork/debian/tdeartwork-theme-window-trinity.install
@@ -1,2 +1,2 @@
-debian/tmp/opt/trinity/lib/trinity/kwin*
-debian/tmp/opt/trinity/share/apps/kwin
+debian/tmp/opt/trinity/lib/trinity/twin*
+debian/tmp/opt/trinity/share/apps/twin