5 files changed, 36 insertions, 29 deletions
diff --git a/ubuntu/maverick/tdetoys/debian/changelog b/ubuntu/maverick/tdetoys/debian/changelog
index 8db640fcb..5406c86c9 100644
--- a/ubuntu/maverick/tdetoys/debian/changelog
+++ b/ubuntu/maverick/tdetoys/debian/changelog
@@ -511,7 +511,7 @@ tdetoys (4:3.1.4-3) unstable; urgency=low
 tdetoys (4:3.1.4-2) unstable; urgency=low
 
   * Updated amor description and man page to note that it works with window
-    managers other than kwin (closes: #213488).
+    managers other than twin (closes: #213488).
 
  -- Ben Burton <bab@debian.org>  Mon, 13 Oct 2003 00:55:42 +1000
 
diff --git a/ubuntu/maverick/tdetoys/debian/control b/ubuntu/maverick/tdetoys/debian/control
index 7255a132c..7388f1dbd 100644
--- a/ubuntu/maverick/tdetoys/debian/control
+++ b/ubuntu/maverick/tdetoys/debian/control
@@ -10,8 +10,8 @@ Standards-Version: 3.8.4
 Package: tdetoys-trinity
 Architecture: all
 Section: kde
-Replaces: tdetoys-kde3 (<< 4:3.5.13)
-Breaks: tdetoys-kde3 (<< 4:3.5.13)
+Replaces: kdetoys-trinity (<< 4:14.0.0)
+Breaks: kdetoys-trinity (<< 4:14.0.0)
 Depends: amor-trinity (>= ${Source-Version}), eyesapplet-trinity (>= ${Source-Version}), fifteenapplet-trinity (>= ${Source-Version}), kmoon-trinity (>= ${Source-Version}), kodo-trinity (>= ${Source-Version}), kteatime-trinity (>= ${Source-Version}), ktux-trinity (>= ${Source-Version}), kweather-trinity (>= ${Source-Version}), kworldclock-trinity (>= ${Source-Version})
 Suggests: tdetoys-trinity-doc-html (>= ${Source-Version})
 Description: toys from the official Trinity release
@@ -26,8 +26,8 @@ Description: toys from the official Trinity release
 Package: tdetoys-trinity-doc-html
 Architecture: all
 Section: doc
-Replaces: tdetoys-kde3-doc-html (<< 4:3.5.13)
-Breaks: tdetoys-kde3-doc-html (<< 4:3.5.13)
+Replaces: kdetoys-trinity-doc-html (<< 4:14.0.0)
+Breaks: kdetoys-trinity-doc-html (<< 4:14.0.0)
 Suggests: konqueror-trinity | www-browser, tdetoys-trinity
 Description: Trinity toys documentation in HTML format
  By default the modules provided by KDE only provide their documentation
@@ -46,10 +46,10 @@ Description: Trinity toys documentation in HTML format
 Package: amor-trinity
 Architecture: any
 Section: games
-Replaces: amor-kde3 (<< 4:3.5.13)
-Breaks: amor-kde3 (<< 4:3.5.13)
+Replaces: amor-trinity (<< 4:14.0.0)
+Breaks: amor-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
-Recommends: kwin-trinity
+Recommends: twin-trinity
 Suggests: khelpcenter-trinity
 Conflicts: task-tdetoys-trinity
 Description: a Trinity creature for your desktop
@@ -65,8 +65,8 @@ Description: a Trinity creature for your desktop
 Package: eyesapplet-trinity
 Architecture: any
 Section: kde
-Replaces: eyesapplet-kde3 (<< 4:3.5.13)
-Breaks: eyesapplet-kde3 (<< 4:3.5.13)
+Replaces: eyesapplet-trinity (<< 4:14.0.0)
+Breaks: eyesapplet-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Recommends: kicker-trinity
 Conflicts: task-tdetoys-trinity
@@ -80,8 +80,8 @@ Description: eyes applet for Trinity
 Package: fifteenapplet-trinity
 Architecture: any
 Section: kde
-Replaces: fifteenapplet-kde3 (<< 4:3.5.13)
-Breaks: fifteenapplet-kde3 (<< 4:3.5.13)
+Replaces: fifteenapplet-trinity (<< 4:14.0.0)
+Breaks: fifteenapplet-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Recommends: kicker-trinity
 Description: fifteen pieces puzzle for Trinity
@@ -95,8 +95,8 @@ Description: fifteen pieces puzzle for Trinity
 Package: kmoon-trinity
 Architecture: any
 Section: kde
-Replaces: kmoon-kde3 (<< 4:3.5.13)
-Breaks: kmoon-kde3 (<< 4:3.5.13)
+Replaces: kmoon-trinity (<< 4:14.0.0)
+Breaks: kmoon-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Recommends: kicker-trinity
 Suggests: khelpcenter-trinity
@@ -110,8 +110,8 @@ Description: moon phase indicator for Trinity
 Package: kodo-trinity
 Architecture: any
 Section: games
-Replaces: kodo-kde3 (<< 4:3.5.13)
-Breaks: kodo-kde3 (<< 4:3.5.13)
+Replaces: kodo-trinity (<< 4:14.0.0)
+Breaks: kodo-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
 Conflicts: task-tdetoys-trinity
@@ -126,8 +126,8 @@ Description: mouse odometer for Trinity
 Package: kteatime-trinity
 Architecture: any
 Section: kde
-Replaces: kteatime-kde3 (<< 4:3.5.13)
-Breaks: kteatime-kde3 (<< 4:3.5.13)
+Replaces: kteatime-trinity (<< 4:14.0.0)
+Breaks: kteatime-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, kicker-trinity
 Suggests: khelpcenter-trinity
 Conflicts: task-tdetoys-trinity
@@ -149,10 +149,10 @@ Description: Trinity utility for making a fine cup of tea
 Package: ktux-trinity
 Architecture: any
 Section: kde
-Replaces: ktux-kde3 (<< 4:3.5.13)
-Breaks: ktux-kde3 (<< 4:3.5.13)
+Replaces: ktux-trinity (<< 4:14.0.0)
+Breaks: ktux-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
-Suggests: kwin-trinity
+Suggests: twin-trinity
 Conflicts: task-tdetoys-trinity
 Description: Tux screensaver for Trinity
  A neat Tux-in-a-spaceship screensaver for the K Desktop Environment (KDE).
@@ -163,8 +163,8 @@ Description: Tux screensaver for Trinity
 Package: kweather-trinity
 Architecture: any
 Section: kde
-Replaces: kweather-kde3 (<< 4:3.5.13)
-Breaks: kweather-kde3 (<< 4:3.5.13)
+Replaces: kweather-trinity (<< 4:14.0.0)
+Breaks: kweather-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Recommends: kicker-trinity
 Suggests: khelpcenter-trinity
@@ -183,8 +183,8 @@ Description: weather display applet for Trinity
 Package: kworldclock-trinity
 Architecture: any
 Section: games
-Replaces: kworldclock-kde3 (<< 4:3.5.13)
-Breaks: kworldclock-kde3 (<< 4:3.5.13)
+Replaces: kworldclock-trinity (<< 4:14.0.0)
+Breaks: kworldclock-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}
 Suggests: tdeartwork-misc-trinity, kicker-trinity, kdesktop-trinity, khelpcenter-trinity
 Conflicts: task-tdetoys-trinity, kworldwatch-trinity (<= 4:2.2-beta1-1)
@@ -203,8 +203,8 @@ Description: earth watcher for Trinity
 Package: tdetoys-trinity-dbg
 Section: libdevel
 Architecture: any
-Replaces: tdetoys-kde3-dbg (<< 4:3.5.13)
-Breaks: tdetoys-kde3-dbg (<< 4:3.5.13)
+Replaces: kdetoys-trinity-dbg (<< 4:14.0.0)
+Breaks: kdetoys-trinity-dbg (<< 4:14.0.0)
 Depends: tdelibs-trinity-dbg
 Priority: extra
 Description: debugging symbols for tdetoys-trinity
diff --git a/ubuntu/maverick/tdetoys/debian/control.in b/ubuntu/maverick/tdetoys/debian/control.in
index 0540c794a..df8f74d5d 100644
--- a/ubuntu/maverick/tdetoys/debian/control.in
+++ b/ubuntu/maverick/tdetoys/debian/control.in
@@ -44,7 +44,7 @@ Package: amor
 Architecture: any
 Section: games
 Depends: ${shlibs:Depends}
-Recommends: kwin
+Recommends: twin
 Suggests: khelpcenter
 Conflicts: task-tdetoys
 Replaces: tdetoys (<< 4:3.0.1-0), task-tdetoys
@@ -140,7 +140,7 @@ Package: ktux
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}
-Suggests: kwin
+Suggests: twin
 Conflicts: task-tdetoys
 Replaces: tdetoys (<< 4:3.0.1-0), task-tdetoys
 Description: Tux screensaver for KDE
diff --git a/ubuntu/maverick/tdetoys/debian/source/format b/ubuntu/maverick/tdetoys/debian/source/format
new file mode 100644
index 000000000..89ae9db8f
--- /dev/null
+++ b/ubuntu/maverick/tdetoys/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/ubuntu/maverick/tdetoys/debian/source/options b/ubuntu/maverick/tdetoys/debian/source/options
new file mode 100644
index 000000000..9d7c8e036
--- /dev/null
+++ b/ubuntu/maverick/tdetoys/debian/source/options
@@ -0,0 +1,6 @@
+# Use bzip2 instead of gzip
+compression = "bzip2"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*