Compiz

Merge lp://qastaging/~smspillaz/compiz/compiz.simple-animations-returns-v3 into lp://qastaging/compiz/0.9.13

  1. compiz.simple-animations-returns-v3
  2. Merge into 0.9.13
Proposed by Sam Spilsbury
Status: Superseded
Proposed branch: lp://qastaging/~smspillaz/compiz/compiz.simple-animations-returns-v3
Merge into: lp://qastaging/compiz/0.9.13
Prerequisite: lp://qastaging/~smspillaz/compiz/compiz.animationsjc-returns-v2
Diff against target: 1835 lines (+1724/-1)
16 files modified
debian/compiz-plugins.install (+2/-0)
debian/compiz-plugins.install.armel (+2/-0)
debian/compiz-plugins.install.armhf (+2/-0)
plugins/opengl/src/vertexbuffer.cpp (+2/-1)
plugins/simple-animations/CMakeLists.txt (+4/-0)
plugins/simple-animations/animationsim.xml.in (+235/-0)
plugins/simple-animations/src/animationsim.cpp (+164/-0)
plugins/simple-animations/src/animationsim.h (+405/-0)
plugins/simple-animations/src/bounce.cpp (+76/-0)
plugins/simple-animations/src/expand-piecewise.cpp (+90/-0)
plugins/simple-animations/src/expand.cpp (+70/-0)
plugins/simple-animations/src/fan.cpp (+51/-0)
plugins/simple-animations/src/flyin.cpp (+86/-0)
plugins/simple-animations/src/pulse.cpp (+50/-0)
plugins/simple-animations/src/rotatein.cpp (+210/-0)
plugins/simple-animations/src/sheet.cpp (+275/-0)
To merge this branch: bzr merge lp://qastaging/~smspillaz/compiz/compiz.simple-animations-returns-v3
Reviewer Review Type Date Requested Status
Compiz Maintainers Pending
PS Jenkins bot continuous-integration Pending
Review via email: mp+300100@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2016-07-10.

This proposal has been superseded by a proposal from 2016-07-25.

Commit message

Add back simple-animations plugin

Description of the change

Add back simple-animations plugin

(Thanks to MC Return for preserving it for all these years)

To post a comment you must log in.
Revision history for this message
Sam Spilsbury (smspillaz) wrote : Posted in a previous version of this proposal

Hmmm. Okay, I'm not sure why the diff is showing up as being zero-lines. I suspect it may be something to do with the fact that I accidentally merged this branch into the pre-requisite and then unmerged it.

That said, the logs indicate that the other plugin was successfully merged in, so I suspect this is launchpad not liking something.

Marco do you have any ideas on how to handle this problem? Ideally, I'd like to fix it without having to re-create the entire pipeline.

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Something wrong with debian files again

dh_install --fail-missing
dh_install: Cannot find (any matches for) "debian/tmp/usr/lib/*/pkgconfig/compiz-animationjc.pc" (tried in "." and "debian/tmp")
dh_install: compiz-dev missing files: debian/tmp/usr/lib/*/pkgconfig/compiz-animationjc.pc
dh_install: Cannot find (any matches for) "usr/lib/*/compiz/*animationjc.*" (tried in "." and "debian/tmp")
dh_install: compiz-plugins missing files: usr/lib/*/compiz/*animationjc.*
dh_install: Cannot find (any matches for) "usr/share/compiz/*animationjc.*" (tried in "." and "debian/tmp")
dh_install: compiz-plugins missing files: usr/share/compiz/*animationjc.*
dh_install: Cannot find (any matches for) "usr/lib/*/compiz/*animationsim.*" (tried in "." and "debian/tmp")
dh_install: compiz-plugins missing files: usr/lib/*/compiz/*animationsim.*
dh_install: Cannot find (any matches for) "usr/share/compiz/*animationsim.*" (tried in "." and "debian/tmp")
dh_install: compiz-plugins missing files: usr/share/compiz/*animationsim.*

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

(only for armhf)

Revision history for this message
Sam Spilsbury (smspillaz) wrote :

That's odd. I wonder if the plugin is being disabled by default on
armhf. Let me check.

On Wed, Jul 20, 2016 at 8:14 AM, Marco Trevisan (Treviño)
<mail@3v1n0.net> wrote:
> (only for armhf)
> --
> https://code.launchpad.net/~smspillaz/compiz/compiz.simple-animations-returns-v3/+merge/300100
> You are the owner of lp:~smspillaz/compiz/compiz.simple-animations-returns-v3.

--
Sam Spilsbury

lp://qastaging/~smspillaz/compiz/compiz.simple-animations-returns-v3 updated
4074. By Sam Spilsbury <email address hidden>

Merge lp:~smspillaz/compiz/compiz.animationsjc-returns-v2

4075. By Sam Spilsbury <email address hidden>

simple-animations: No need for libGLU

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches