Compiz

Merge lp://qastaging/~mc-return/compiz/compiz.merge-minor-fixes into lp://qastaging/compiz/0.9.8

compiz.merge-minor-fixes
Merge into 0.9.8

Proposed by MC Return on 2012-09-01

Status:	Superseded
Proposed branch:	lp://qastaging/~mc-return/compiz/compiz.merge-minor-fixes
Merge into:	lp://qastaging/compiz/0.9.8
Diff against target:	651 lines (+64/-111) 65 files modified compizconfig/ccsm/CMakeLists.txt (+7/-9) compizconfig/ccsm/VERSION (+0/-1) compizconfig/ccsm/setup.py (+20/-7) compizconfig/compizconfig-python/CMakeLists.txt (+13/-14) compizconfig/compizconfig-python/VERSION (+0/-1) compizconfig/compizconfig-python/compizconfig-python.pc.in (+1/-1) compizconfig/compizconfig-python/setup.py (+18/-10) compizconfig/gconf/VERSION (+0/-1) compizconfig/gsettings/VERSION (+0/-1) compizconfig/libcompizconfig/CMakeLists.txt (+4/-11) compizconfig/libcompizconfig/VERSION (+0/-1) plugins/addhelper/VERSION (+0/-1) plugins/animation/VERSION (+0/-1) plugins/animationaddon/VERSION (+0/-1) plugins/bench/VERSION (+0/-1) plugins/bicubic/VERSION (+0/-1) plugins/colorfilter/VERSION (+0/-1) plugins/crashhandler/VERSION (+0/-1) plugins/cubeaddon/VERSION (+0/-1) plugins/expo/VERSION (+0/-1) plugins/extrawm/VERSION (+0/-1) plugins/ezoom/VERSION (+0/-1) plugins/fadedesktop/VERSION (+0/-1) plugins/firepaint/VERSION (+0/-1) plugins/gears/VERSION (+0/-1) plugins/grid/VERSION (+0/-1) plugins/group/VERSION (+0/-1) plugins/imgjpeg/VERSION (+0/-1) plugins/kdecompat/VERSION (+0/-1) plugins/loginout/VERSION (+0/-1) plugins/mag/VERSION (+0/-1) plugins/maximumize/VERSION (+0/-1) plugins/mblur/VERSION (+0/-1) plugins/mousepoll/VERSION (+0/-1) plugins/neg/VERSION (+0/-1) plugins/opacify/VERSION (+0/-1) plugins/place/src/place.cpp (+1/-1) plugins/put/VERSION (+0/-1) plugins/reflex/VERSION (+0/-1) plugins/resizeinfo/VERSION (+0/-1) plugins/ring/VERSION (+0/-1) plugins/scaleaddon/VERSION (+0/-1) plugins/scalefilter/VERSION (+0/-1) plugins/session/VERSION (+0/-1) plugins/shelf/VERSION (+0/-1) plugins/shift/VERSION (+0/-1) plugins/showdesktop/VERSION (+0/-1) plugins/showmouse/VERSION (+0/-1) plugins/showrepaint/VERSION (+0/-1) plugins/snap/VERSION (+0/-1) plugins/splash/VERSION (+0/-1) plugins/stackswitch/VERSION (+0/-1) plugins/staticswitcher/VERSION (+0/-1) plugins/td/VERSION (+0/-1) plugins/text/VERSION (+0/-1) plugins/thumbnail/VERSION (+0/-1) plugins/titleinfo/VERSION (+0/-1) plugins/trailfocus/VERSION (+0/-1) plugins/trip/VERSION (+0/-1) plugins/vpswitch/VERSION (+0/-1) plugins/wall/VERSION (+0/-1) plugins/wallpaper/VERSION (+0/-1) plugins/widget/VERSION (+0/-1) plugins/winrules/VERSION (+0/-1) plugins/workarounds/VERSION (+0/-1)
To merge this branch:	bzr merge lp://qastaging/~mc-return/compiz/compiz.merge-minor-fixes
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Daniel van Vugt		Needs Fixing on 2012-09-05
Sam Spilsbury	2012-09-01	Approve on 2012-09-04
MC Return		Needs Information on 2012-09-03
Łukasz Zemczak	2012-09-04	Pending
Review via email: mp+122398@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2012-09-06.

Commit message

Handle the version info from the VERSION file correctly and use just one VERSION file from the root of the source-tree to extract this info in all of the CMakeLists.txt.

Removed redundant and outdated VERSION files.

Fixed a typo in a comment.

Description of the change

Handle the version info from the VERSION file correctly and use just one VERSION file from the root of the source-tree to extract this info in all of the CMakeLists.txt.

Removes redundant and outdated VERSION files.

Fixes a typo in a comment.

Revision history for this message

Sam Spilsbury (smspillaz) wrote on 2012-09-02:

Looking good:

You probably meant to get rid of these:

1 === added file 'compizconfig/ccsm/VERSION'
2 --- compizconfig/ccsm/VERSION 1970-01-01 00:00:00 +0000
3 +++ compizconfig/ccsm/VERSION 2012-09-02 07:52:18 +0000
4 @@ -0,0 +1,1 @@
5 +0.9.5.94

After the other VERSION files are deleted (some of them were accidentally re-added), I'm happy to merge this, though try to keep unrelated changes in different proposals in future.

Revision history for this message

MC Return (mc-return) wrote on 2012-09-02:

> Looking good:
>
> You probably meant to get rid of these:
>
> 1 === added file 'compizconfig/ccsm/VERSION'
> 2 --- compizconfig/ccsm/VERSION 1970-01-01 00:00:00 +0000
> 3 +++ compizconfig/ccsm/VERSION 2012-09-02 07:52:18 +0000
> 4 @@ -0,0 +1,1 @@
> 5 +0.9.5.94
>
> After the other VERSION files are deleted (some of them were accidentally re-
> added), I'm happy to merge this,

I readded those VERSION files, because they are still used in the CMakeLists, but probably it would be best if we would just keep one VERSION file in the main directory (currently 0.9.8.1) and change the paths for the ccsm, compizconfig-python and libcompizconfig VERSION files in their CMakeLists to our main VERSION file in the root directory of Compiz ?

> though try to keep unrelated changes in
> different proposals in future.

Ack.

Revision history for this message

Sam Spilsbury (smspillaz) wrote on 2012-09-02:

On Sun, 2 Sep 2012, MC Return wrote:

>> Looking good:
>>
>> You probably meant to get rid of these:
>>
>> 1 === added file 'compizconfig/ccsm/VERSION'
>> 2 --- compizconfig/ccsm/VERSION 1970-01-01 00:00:00 +0000
>> 3 +++ compizconfig/ccsm/VERSION 2012-09-02 07:52:18 +0000
>> 4 @@ -0,0 +1,1 @@
>> 5 +0.9.5.94
>>
>> After the other VERSION files are deleted (some of them were accidentally re-
>> added), I'm happy to merge this,
>
> I readded those VERSION files, because they are still used in the CMakeLists, but probably it would be best if we would just keep one VERSION file in the main directory (currently 0.9.8.1) and change the paths for the ccsm, compizconfig-python and libcompizconfig VERSION files in their CMakeLists to our main VERSION file in the root directory of Compiz ?
>

Yep totally agree. Could you just require a VERSION file in the toplevel
of the source tree?

Cheers

>> though try to keep unrelated changes in
>> different proposals in future.
>
> Ack.
> --
> https://code.launchpad.net/~mc-return/compiz/compiz.merge-minor-fixes/+merge/122398
> Your team Compiz Maintainers is requested to review the proposed merge of lp:~mc-return/compiz/compiz.merge-minor-fixes into lp:compiz.
>

Revision history for this message

MC Return (mc-return) wrote on 2012-09-02:

> Yep totally agree. Could you just require a VERSION file in the toplevel
> of the source tree?
>
> Cheers
>
Done. No need for multiple VERSION files anymore :)

Revision history for this message

Sam Spilsbury (smspillaz) wrote on 2012-09-03:

Hmm, probably even

29 +# We read the VERSION file from the root directory.
30 +file (READ ${CMAKE_CURRENT_SOURCE_DIR}/../../VERSION COMPIZ_RELEASE_VERSION LIMIT 12 OFFSET 0)
31 string (STRIP ${COMPIZ_RELEASE_VERSION} COMPIZ_RELEASE_VERSION)
32
33 set (VERSION ${COMPIZ_RELEASE_VERSION})

in both ccsm/ and compizconfig-python aren't even necessary anymore too.

Revision history for this message

MC Return (mc-return) wrote on 2012-09-03:

> Hmm, probably even
>
> 29 +# We read the VERSION file from the root directory.
> 30 +file (READ ${CMAKE_CURRENT_SOURCE_DIR}/../../VERSION
> COMPIZ_RELEASE_VERSION LIMIT 12 OFFSET 0)
> 31 string (STRIP ${COMPIZ_RELEASE_VERSION} COMPIZ_RELEASE_VERSION)
> 32
> 33 set (VERSION ${COMPIZ_RELEASE_VERSION})
>
> in both ccsm/ and compizconfig-python aren't even necessary anymore too.

Removed (still there for libcompizconfig).

Revision history for this message

Sam Spilsbury (smspillaz) wrote on 2012-09-03:

> > Hmm, probably even
> >
> > 29 +# We read the VERSION file from the root directory.
> > 30 +file (READ ${CMAKE_CURRENT_SOURCE_DIR}/../../VERSION
> > COMPIZ_RELEASE_VERSION LIMIT 12 OFFSET 0)
> > 31 string (STRIP ${COMPIZ_RELEASE_VERSION} COMPIZ_RELEASE_VERSION)
> > 32
> > 33 set (VERSION ${COMPIZ_RELEASE_VERSION})
> >
> > in both ccsm/ and compizconfig-python aren't even necessary anymore too.
>
> Removed (still there for libcompizconfig).

Right, it should be removed in libcompizconfig too, or anything that's not the toplevel source tree (sorry about that ...)

Revision history for this message

MC Return (mc-return) wrote on 2012-09-03:

> Right, it should be removed in libcompizconfig too, or anything that's not the
> toplevel source tree (sorry about that ...)

Hmm, here the situation is quite different, because in CMakeLists.txt of libcompizconfig you can also find this:
set (_libcompizconfig_package_string "LibCompizConfig ${VERSION}")

Should this also be removed or changed ?

This also sounds strange:
set (_libcompizconfig_package "LibCompizCompiz")

review: Needs Information

Revision history for this message

Sam Spilsbury (smspillaz) wrote on 2012-09-03:

Right, that can all be removed.

I had a look at what depends on _libcompizconfig_package_string (PACKAGE, and PACKAGE_STRING in config.h in compizconfig/src) and this can also be removed.

Thanks :)

Revision history for this message

MC Return (mc-return) wrote on 2012-09-03:

> Right, that can all be removed.
>
> I had a look at what depends on _libcompizconfig_package_string (PACKAGE, and
> PACKAGE_STRING in config.h in compizconfig/src) and this can also be removed.
>
> Thanks :)

Should be done now :), but compilation fails. Investigating.

Revision history for this message

Sam Spilsbury (smspillaz) wrote on 2012-09-04:

Hey, so I had a look at how we're supposed to be using the version info and it was a little nontrivial. I put it here.

lp:~compiz-team/compiz/compiz.ccs-build-fixes

Feel free to merge that into this branch if that's okay.

Revision history for this message

MC Return (mc-return) wrote on 2012-09-04:

> Hey, so I had a look at how we're supposed to be using the version info and it
> was a little nontrivial. I put it here.
>
> lp:~compiz-team/compiz/compiz.ccs-build-fixes
>
> Feel free to merge that into this branch if that's okay.

Done.
Looks good and compiles without any problems.

Revision history for this message

Sam Spilsbury (smspillaz) wrote on 2012-09-04:

LGTM

review: Approve

Revision history for this message

Sam Spilsbury (smspillaz) wrote on 2012-09-04:

I have subscribed Lukasz as I'm pretty sure that this will require a packaging change (compizconfig-python.pc needs to be in debian/compizconfig-python.install)