Merge lp:~vorlon/compiz/main into lp:~compiz/compiz/ubuntu

[Steve Langasek]

[Steve Langasek (vorlon)]

already uploaded to fix desktop uninstallability, so merging is advised. :-)

=== modified file 'debian/changelog'
--- debian/changelog	2009-03-09 19:56:48 +0000
+++ debian/changelog	2009-03-09 23:43:55 +0000
@@ -1,3 +1,11 @@
+compiz (1:0.8.2-0ubuntu2) jaunty; urgency=low
+
+  * Depend still on compiz-fusion-plugins-{main,extra} instead of on
+    compiz-plugins-{main,extra}, as the package names have not changed in
+    0.8.2.
+
+ -- Steve Langasek <[e-mail]>  Mon, 09 Mar 2009 16:43:50 -0700
+
 compiz (1:0.8.2-0ubuntu1) jaunty; urgency=low
 
   * new upstream release 0.8.2

=== modified file 'debian/control'
--- debian/control	2009-03-09 19:56:48 +0000
+++ debian/control	2009-03-09 23:40:13 +0000
@@ -10,7 +10,7 @@
 
 Package: compiz
 Architecture: all
-Depends: compiz-core (>= 1:0.8.2), compiz-plugins, compiz-gnome, compiz-plugins-main (>= 0.8.2-0), compiz-plugins-extra (>= 0.8.2), libcompizconfig0 (>= 0.8.2)
+Depends: compiz-core (>= 1:0.8.2), compiz-plugins, compiz-gnome, compiz-fusion-plugins-main (>= 0.8.2-0), compiz-fusion-plugins-extra (>= 0.8.2), libcompizconfig0 (>= 0.8.2)
 Description: OpenGL window and compositing manager
  Compiz brings to life a variety of visual effects that make the Linux desktop
  easier to use, more powerful and intuitive, and more accessible for users