diff -Nru ubuntu-restricted-extras-15/debian/changelog ubuntu-restricted-extras-15ubuntu1/debian/changelog
--- ubuntu-restricted-extras-15/debian/changelog	2008-04-17 15:58:51.000000000 +0200
+++ ubuntu-restricted-extras-15ubuntu1/debian/changelog	2008-06-16 12:18:47.000000000 +0200
@@ -1,3 +1,9 @@
+ubuntu-restricted-extras (15ubuntu1) intrepid; urgency=low
+
+  * Replaced icedtea-gcjwebplugin with sun-java6-jre (LP: #219684) 
+
+ -- Askar Andersson <olskar@hotmail.com>  Mon, 16 Jun 2008 12:08:34 +0200
+
 ubuntu-restricted-extras (15) hardy; urgency=low
 
   * Add missing recommends icedtea-gcjwebplugin (was only on some arches)
diff -Nru ubuntu-restricted-extras-15/kubuntu-restricted-extras-amd64 ubuntu-restricted-extras-15ubuntu1/kubuntu-restricted-extras-amd64
--- ubuntu-restricted-extras-15/kubuntu-restricted-extras-amd64	2008-03-23 04:09:45.000000000 +0100
+++ ubuntu-restricted-extras-15ubuntu1/kubuntu-restricted-extras-amd64	2008-06-16 12:18:47.000000000 +0200
@@ -1,5 +1,5 @@
 flashplugin-nonfree
-icedtea-gcjwebplugin
+sun-java6-jre 
 libxine1-ffmpeg
 libdvdread3
 libk3b2-extracodecs
diff -Nru ubuntu-restricted-extras-15/kubuntu-restricted-extras-hppa ubuntu-restricted-extras-15ubuntu1/kubuntu-restricted-extras-hppa
--- ubuntu-restricted-extras-15/kubuntu-restricted-extras-hppa	2008-04-17 15:58:02.000000000 +0200
+++ ubuntu-restricted-extras-15ubuntu1/kubuntu-restricted-extras-hppa	2008-06-16 12:18:47.000000000 +0200
@@ -4,4 +4,5 @@
 liblame0
 unrar
 libtunepimp5-mp3
-icedtea-gcjwebplugin
+sun-java6-jre
+
diff -Nru ubuntu-restricted-extras-15/kubuntu-restricted-extras-i386 ubuntu-restricted-extras-15ubuntu1/kubuntu-restricted-extras-i386
--- ubuntu-restricted-extras-15/kubuntu-restricted-extras-i386	2008-04-17 15:54:29.000000000 +0200
+++ ubuntu-restricted-extras-15ubuntu1/kubuntu-restricted-extras-i386	2008-06-16 12:18:47.000000000 +0200
@@ -5,4 +5,5 @@
 liblame0
 unrar
 libtunepimp5-mp3
-icedtea-gcjwebplugin
+sun-java6-jre
+
diff -Nru ubuntu-restricted-extras-15/kubuntu-restricted-extras-ia64 ubuntu-restricted-extras-15ubuntu1/kubuntu-restricted-extras-ia64
--- ubuntu-restricted-extras-15/kubuntu-restricted-extras-ia64	2008-03-23 04:09:45.000000000 +0100
+++ ubuntu-restricted-extras-15ubuntu1/kubuntu-restricted-extras-ia64	2008-06-16 12:18:47.000000000 +0200
@@ -1,4 +1,4 @@
-icedtea-gcjwebplugin
+sun-java6-jre
 libxine1-ffmpeg
 libdvdread3
 libk3b2-extracodecs
diff -Nru ubuntu-restricted-extras-15/kubuntu-restricted-extras-lpia ubuntu-restricted-extras-15ubuntu1/kubuntu-restricted-extras-lpia
--- ubuntu-restricted-extras-15/kubuntu-restricted-extras-lpia	2008-04-17 15:57:57.000000000 +0200
+++ ubuntu-restricted-extras-15ubuntu1/kubuntu-restricted-extras-lpia	2008-06-16 12:18:47.000000000 +0200
@@ -4,4 +4,4 @@
 liblame0
 unrar
 libtunepimp5-mp3
-icedtea-gcjwebplugin
+sun-java6-jre
diff -Nru ubuntu-restricted-extras-15/kubuntu-restricted-extras-powerpc ubuntu-restricted-extras-15ubuntu1/kubuntu-restricted-extras-powerpc
--- ubuntu-restricted-extras-15/kubuntu-restricted-extras-powerpc	2008-04-17 15:55:50.000000000 +0200
+++ ubuntu-restricted-extras-15ubuntu1/kubuntu-restricted-extras-powerpc	2008-06-16 12:18:47.000000000 +0200
@@ -5,4 +5,5 @@
 liblame0
 unrar
 libtunepimp5-mp3
-icedtea-gcjwebplugin
+sun-java6-jre
+
diff -Nru ubuntu-restricted-extras-15/kubuntu-restricted-extras-sparc ubuntu-restricted-extras-15ubuntu1/kubuntu-restricted-extras-sparc
--- ubuntu-restricted-extras-15/kubuntu-restricted-extras-sparc	2008-03-23 04:09:45.000000000 +0100
+++ ubuntu-restricted-extras-15ubuntu1/kubuntu-restricted-extras-sparc	2008-06-16 12:18:47.000000000 +0200
@@ -1,7 +1,8 @@
-icedtea-gcjwebplugin
 libxine1-ffmpeg
 libdvdread3
 libk3b2-extracodecs
 liblame0
 unrar
 libtunepimp5-mp3
+sun-java6-jre
+
diff -Nru ubuntu-restricted-extras-15/ubuntu-restricted-extras-amd64 ubuntu-restricted-extras-15ubuntu1/ubuntu-restricted-extras-amd64
--- ubuntu-restricted-extras-15/ubuntu-restricted-extras-amd64	2008-03-23 04:09:59.000000000 +0100
+++ ubuntu-restricted-extras-15ubuntu1/ubuntu-restricted-extras-amd64	2008-06-16 12:18:47.000000000 +0200
@@ -2,7 +2,7 @@
 gstreamer0.10-plugins-ugly-multiverse
 msttcorefonts
 flashplugin-nonfree
-icedtea-gcjwebplugin
+sun-java6-jre
 unrar
 gstreamer0.10-plugins-bad
 gstreamer0.10-plugins-bad-multiverse
diff -Nru ubuntu-restricted-extras-15/ubuntu-restricted-extras-hppa ubuntu-restricted-extras-15ubuntu1/ubuntu-restricted-extras-hppa
--- ubuntu-restricted-extras-15/ubuntu-restricted-extras-hppa	2008-04-17 15:58:02.000000000 +0200
+++ ubuntu-restricted-extras-15ubuntu1/ubuntu-restricted-extras-hppa	2008-06-16 12:18:47.000000000 +0200
@@ -7,4 +7,5 @@
 gstreamer0.10-ffmpeg
 liblame0
 libdvdread3
-icedtea-gcjwebplugin
+sun-java6-jre
+
diff -Nru ubuntu-restricted-extras-15/ubuntu-restricted-extras-i386 ubuntu-restricted-extras-15ubuntu1/ubuntu-restricted-extras-i386
--- ubuntu-restricted-extras-15/ubuntu-restricted-extras-i386	2008-04-17 15:54:29.000000000 +0200
+++ ubuntu-restricted-extras-15ubuntu1/ubuntu-restricted-extras-i386	2008-06-16 12:18:47.000000000 +0200
@@ -9,4 +9,5 @@
 gstreamer0.10-pitfdll
 liblame0
 libdvdread3
-icedtea-gcjwebplugin
+sun-java6-jre
+
diff -Nru ubuntu-restricted-extras-15/ubuntu-restricted-extras-ia64 ubuntu-restricted-extras-15ubuntu1/ubuntu-restricted-extras-ia64
--- ubuntu-restricted-extras-15/ubuntu-restricted-extras-ia64	2008-03-23 04:09:45.000000000 +0100
+++ ubuntu-restricted-extras-15ubuntu1/ubuntu-restricted-extras-ia64	2008-06-16 12:18:47.000000000 +0200
@@ -1,7 +1,7 @@
 gstreamer0.10-plugins-ugly
 gstreamer0.10-plugins-ugly-multiverse
 msttcorefonts
-icedtea-gcjwebplugin
+sun-java6-jre
 unrar
 gstreamer0.10-plugins-bad
 gstreamer0.10-plugins-bad-multiverse
diff -Nru ubuntu-restricted-extras-15/ubuntu-restricted-extras-lpia ubuntu-restricted-extras-15ubuntu1/ubuntu-restricted-extras-lpia
--- ubuntu-restricted-extras-15/ubuntu-restricted-extras-lpia	2008-04-17 15:57:58.000000000 +0200
+++ ubuntu-restricted-extras-15ubuntu1/ubuntu-restricted-extras-lpia	2008-06-16 12:18:47.000000000 +0200
@@ -7,4 +7,5 @@
 gstreamer0.10-ffmpeg
 liblame0
 libdvdread3
-icedtea-gcjwebplugin
+sun-java6-jre
+
diff -Nru ubuntu-restricted-extras-15/ubuntu-restricted-extras-powerpc ubuntu-restricted-extras-15ubuntu1/ubuntu-restricted-extras-powerpc
--- ubuntu-restricted-extras-15/ubuntu-restricted-extras-powerpc	2008-04-17 15:55:50.000000000 +0200
+++ ubuntu-restricted-extras-15ubuntu1/ubuntu-restricted-extras-powerpc	2008-06-16 12:18:47.000000000 +0200
@@ -8,4 +8,4 @@
 gstreamer0.10-ffmpeg
 liblame0
 libdvdread3
-icedtea-gcjwebplugin
+sun-java6-jre
diff -Nru ubuntu-restricted-extras-15/ubuntu-restricted-extras-sparc ubuntu-restricted-extras-15ubuntu1/ubuntu-restricted-extras-sparc
--- ubuntu-restricted-extras-15/ubuntu-restricted-extras-sparc	2008-03-23 04:09:45.000000000 +0100
+++ ubuntu-restricted-extras-15ubuntu1/ubuntu-restricted-extras-sparc	2008-06-16 12:18:47.000000000 +0200
@@ -1,7 +1,7 @@
 gstreamer0.10-plugins-ugly
 gstreamer0.10-plugins-ugly-multiverse
 msttcorefonts
-icedtea-gcjwebplugin
+sun-java6-jre
 unrar
 gstreamer0.10-plugins-bad
 gstreamer0.10-plugins-bad-multiverse
diff -Nru ubuntu-restricted-extras-15/xubuntu-restricted-extras-amd64 ubuntu-restricted-extras-15ubuntu1/xubuntu-restricted-extras-amd64
--- ubuntu-restricted-extras-15/xubuntu-restricted-extras-amd64	2008-03-23 04:09:45.000000000 +0100
+++ ubuntu-restricted-extras-15ubuntu1/xubuntu-restricted-extras-amd64	2008-06-16 12:18:47.000000000 +0200
@@ -1,5 +1,5 @@
 flashplugin-nonfree
-icedtea-gcjwebplugin
+sun-java6-jre
 libxine1-ffmpeg
 libdvdread3
 liblame0
diff -Nru ubuntu-restricted-extras-15/xubuntu-restricted-extras-hppa ubuntu-restricted-extras-15ubuntu1/xubuntu-restricted-extras-hppa
--- ubuntu-restricted-extras-15/xubuntu-restricted-extras-hppa	2008-04-17 15:58:02.000000000 +0200
+++ ubuntu-restricted-extras-15ubuntu1/xubuntu-restricted-extras-hppa	2008-06-16 12:18:47.000000000 +0200
@@ -3,4 +3,5 @@
 liblame0
 unrar
 msttcorefonts
-icedtea-gcjwebplugin
+sun-java6-jre
+
diff -Nru ubuntu-restricted-extras-15/xubuntu-restricted-extras-i386 ubuntu-restricted-extras-15ubuntu1/xubuntu-restricted-extras-i386
--- ubuntu-restricted-extras-15/xubuntu-restricted-extras-i386	2008-04-17 15:54:29.000000000 +0200
+++ ubuntu-restricted-extras-15ubuntu1/xubuntu-restricted-extras-i386	2008-06-16 12:18:47.000000000 +0200
@@ -4,4 +4,5 @@
 liblame0
 unrar
 msttcorefonts
-icedtea-gcjwebplugin
+sun-java6-jre
+
diff -Nru ubuntu-restricted-extras-15/xubuntu-restricted-extras-ia64 ubuntu-restricted-extras-15ubuntu1/xubuntu-restricted-extras-ia64
--- ubuntu-restricted-extras-15/xubuntu-restricted-extras-ia64	2008-03-23 04:09:45.000000000 +0100
+++ ubuntu-restricted-extras-15ubuntu1/xubuntu-restricted-extras-ia64	2008-06-16 12:18:47.000000000 +0200
@@ -1,4 +1,4 @@
-icedtea-gcjwebplugin
+sun-java6-jre
 libxine1-ffmpeg
 libdvdread3
 liblame0
diff -Nru ubuntu-restricted-extras-15/xubuntu-restricted-extras-lpia ubuntu-restricted-extras-15ubuntu1/xubuntu-restricted-extras-lpia
--- ubuntu-restricted-extras-15/xubuntu-restricted-extras-lpia	2008-04-17 15:57:58.000000000 +0200
+++ ubuntu-restricted-extras-15ubuntu1/xubuntu-restricted-extras-lpia	2008-06-16 12:18:47.000000000 +0200
@@ -3,4 +3,5 @@
 liblame0
 unrar
 msttcorefonts
-icedtea-gcjwebplugin
+sun-java6-jre
+
diff -Nru ubuntu-restricted-extras-15/xubuntu-restricted-extras-powerpc ubuntu-restricted-extras-15ubuntu1/xubuntu-restricted-extras-powerpc
--- ubuntu-restricted-extras-15/xubuntu-restricted-extras-powerpc	2008-04-17 15:55:50.000000000 +0200
+++ ubuntu-restricted-extras-15ubuntu1/xubuntu-restricted-extras-powerpc	2008-06-16 12:18:47.000000000 +0200
@@ -4,4 +4,5 @@
 liblame0
 unrar
 msttcorefonts
-icedtea-gcjwebplugin
+sun-java6-jre
+
diff -Nru ubuntu-restricted-extras-15/xubuntu-restricted-extras-sparc ubuntu-restricted-extras-15ubuntu1/xubuntu-restricted-extras-sparc
--- ubuntu-restricted-extras-15/xubuntu-restricted-extras-sparc	2008-03-23 04:09:45.000000000 +0100
+++ ubuntu-restricted-extras-15ubuntu1/xubuntu-restricted-extras-sparc	2008-06-16 12:18:47.000000000 +0200
@@ -1,4 +1,4 @@
-icedtea-gcjwebplugin
+sun-java6-jre
 libxine1-ffmpeg
 libdvdread3
 liblame0