Merge lp:~vanvugt/ubuntu/oneiric/compiz-plugins-main/fix-793897 into lp:ubuntu/oneiric/compiz-plugins-main

[Daniel van Vugt]

Fix typos in default animation.xml which caused the intended default animations to never be used (LP: #793897)

Fix typos in default animation.xml which caused the intended default animations to never be used (LP: #793897)

[Didier Roche-Tolomelli (didrocks)]

Thanks for your patch and help to make ubuntu better.

I would prefer that to be directly fixed upstream. Sam can you have a look at it please?

Thanks for fixing this small details, it's clearly what makes the quality difference :)

[Daniel van Vugt (vanvugt)]

From what I can tell, the problems are not upstream. The bug is entirely ubuntu-specific.

[Sam Spilsbury (smspillaz)]

Yes, that's correct, incorrect animation names are used.

On Wed, Jun 8, 2011 at 10:28 AM, Daniel van Vugt <email address hidden> wrote:
> >From what I can tell, the problems are not upstream. The bug is entirely ubuntu-specific.
> --
> https://code.launchpad.net/~vanvugt/ubuntu/oneiric/compiz-plugins-main/fix-793897/+merge/63657
> You are requested to review the proposed merge of lp:~vanvugt/ubuntu/oneiric/compiz-plugins-main/fix-793897 into lp:ubuntu/compiz-plugins-main.
>

--
Sam Spilsbury

[Daniel van Vugt (vanvugt)]

It's made more complicated by the apparent fact that debian/patches/* are not used. And it looks like they have (mostly) been pre-applied and committed that way.

What does that mean for oneiric if and when the team upgrades compiz? Will all ubuntu customizations be lost? I'm suspecting the debian/patches set will need to be dusted off and made to work again.

Since we're talking about the standard out-of-the-box user experience here it is kind of important...

[Sam Spilsbury (smspillaz)]

They're applied when the package is built.

On Wed, Jun 8, 2011 at 12:45 PM, Daniel van Vugt <email address hidden> wrote:
> It's made more complicated by the apparent fact that debian/patches/* are not used. And it looks like they have (mostly) been pre-applied and committed that way.
>
> What does that mean for oneiric if and when the team upgrades compiz? Will all ubuntu customizations be lost? I'm suspecting the debian/patches set will need to be dusted off and made to work again.
>
> Since we're talking about the standard out-of-the-box user experience here it is kind of important...
> --
> https://code.launchpad.net/~vanvugt/ubuntu/oneiric/compiz-plugins-main/fix-793897/+merge/63657
> You are requested to review the proposed merge of lp:~vanvugt/ubuntu/oneiric/compiz-plugins-main/fix-793897 into lp:ubuntu/compiz-plugins-main.
>

--
Sam Spilsbury

[Didier Roche-Tolomelli (didrocks)]

Ok, I was mislead by the fact that the patch was applied when you committed in the upstream branch, sorry for the confusion :)

Thanks a lot for the patch.
However, the real branch for compiz-plugins-main is lp:~compiz/compcomm-plugins-main/ubuntu. It contains a debian/ only branch. (this is the case for most desktop team branches).

To be sure to checkout the right branch, you can use $ debcheckout <source_package_name>

That should (if a bzr-vcs tag is provided), bring you the correct branch. If nothing is available, it's generally lp:ubuntu/<source_package_name>.

No worry, I've checkouted the right branch and commit it under your nam (also filed some debian/changelog info which is what you should do to document your changes). You can find the result there: http://bazaar.launchpad.net/~compiz/compcomm-plugins-main/ubuntu/revision/186

Thanks a lot for your contribution :)

review: Approve

=== modified file 'animation/animation.xml.in'
--- animation/animation.xml.in	2011-03-16 19:21:19 +0000
+++ animation/animation.xml.in	2011-06-07 10:00:58 +0000
@@ -101,7 +101,7 @@
 	    <extensible/>
 	    <sort start="2"/>
 	    <default>
-	      <value>animation:Glide2</value>
+	      <value>animation:Glide 2</value>
 	      <value>animation:Fade</value>
 	      <value>animation:None</value>
 	    </default>
@@ -282,7 +282,7 @@
 	    <extensible/>
 	    <sort start="1"/>
 	    <default>
-	      <value>animation:Fade</value>
+	      <value>animation:Focus Fade</value>
 	    </default>
 	  </option>
 	  <option name="focus_durations" type="list">
 
=== modified file 'debian/patches/01-animation-defaults.patch'
--- debian/patches/01-animation-defaults.patch	2011-02-24 17:34:18 +0000
+++ debian/patches/01-animation-defaults.patch	2011-06-07 10:00:58 +0000
@@ -98,7 +98,7 @@
  	    <sort start="1"/>
  	    <default>
 -	      <value>animation:None</value>
-+	      <value>animation:Fade</value>
++	      <value>animation:Focus Fade</value>
  	    </default>
  	  </option>
  	  <option name="focus_durations" type="list">
 
=== modified file 'debian/patches/03_default_options.patch'
--- debian/patches/03_default_options.patch	2011-04-07 14:21:07 +0000
+++ debian/patches/03_default_options.patch	2011-06-07 10:00:58 +0000
@@ -344,7 +344,7 @@
  	    <sort start="2"/>
  	    <default>
 -	      <value>animation:Fade</value>
-+	      <value>animation:Glide2</value>
++	      <value>animation:Glide 2</value>
  	      <value>animation:Fade</value>
  	      <value>animation:None</value>
  	    </default>