compiz: Changes to 'upstream-wheezy'

[Sean Finney]

New branch 'upstream-wheezy' available with the following commits:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1rimho-0008vm...@vasks.debian.org

compiz: Changes to 'debian-wheezy'

[Sean Finney]

New branch 'debian-wheezy' available with the following commits:
commit 865d1109284c3b9f67274a69a128b630c58910e7
Author: Sean Finney sean...@debian.org
Date:   Tue Oct 25 20:52:14 2011 +0200

Prepare compiz-0.8.4-5

commit 4376e6f6807297bee681411dce386053ed3694e1
Author: Sean Finney sean...@debian.org
Date:   Tue Oct 25 20:49:09 2011 +0200

Add dependency on libcompizconfig0 to compiz metapackage

Closes: #631129
Thanks: Patricio Rojo s...@wasabi.das.uchile.cl

commit 17480c1d714b23d86b987b598e6756793048fd9c
Author: Michael Biebl bi...@debian.org
Date:   Tue Oct 25 20:34:46 2011 +0200

Link against all necessary libraries

Closes: #639681, #554114
Thanks: Michael Biebl bi...@debian.org
Thanks: Loïc Minier loic.min...@ubuntu.com
Signed-off-by: Sean Finney sean...@debian.org

commit 1a467931296ac6921ce71e9805f7526fe8e6b6f4
Author: Sean Finney sean...@debian.org
Date:   Tue Oct 25 20:24:27 2011 +0200

Update gbp.conf for new debian-wheezy branch


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1rimho-0008va...@vasks.debian.org

Bug#576427: versioning mix-up

[sean finney]

Hi,

On Fri, May 20, 2011 at 11:46:14AM -0400, Andres Cimmarusti wrote:
 Compiz-stable is very outdated in Debian. Upstream released version

Help is always welcome.  Personally I haven't been spending a great
deal of time/effort on compiz because the manner in which the upstream
author manages the project is *really* burdensome and it's really easy
for me to lose energy/time/motivation.

 0.8.8 last month 04/2011 (http://releases.compiz.org/0.8.8/)
 Compiz-stable is suitable to be packaged for unstable and then
 eventually makes its way to stable.

I think the original plan was to move to the 0.9.x version, and we
started that with uploads to experimental a couple months back.  however,
the software proved to be less than super stable (crashy, leaking memory,
etc), so it hasn't been transitioned into unstable.

unfortunately i made the mistake of doing the experimental-targeted work
in the unstable branch, thinking it'd be a quick transition, and now we're
stuck in a kind of in-between state unsure of what the next upload to unstable
will be.

 Even compiz-unstable (0.9.x) is already outdated. Version 0.9.4 is
 already available (http://releases.compiz.org/0.9.4/)
 This one is suitable for experimental.

and it's already there.  the versions are all messed up because
the upstream author never took the time to push out the proper tags,
but I believe everything is approximately 0.9.4.

if you'd like to help with updating the compiz packages, you're more than
welcome to join up :)


sean

-- 



-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20110522192501.ga14...@cobija.connexer.com

Bug#625521: glibc: causes segfault in Xorg

[sean finney]

Hi,

On Wed, May 04, 2011 at 10:56:27PM -0500, Steve M. Robbins wrote:
  And furthermore, even if Debian chooses to fix this, upstreams will
  be forced to eventually cater to the default glibc behavior for every
  other libc distro out there that does not have their own fix (and
  non-libc OS's where this behavior already exists), 
 
 That's fine: let others be the guinea pigs, then introduce the
 optimized memcpy later when the rest of the world has adapted.

I hope the glibc maintainer does not share this view, then.  If we were in
the midst of preparing a release, I'd agree and argue that such a change
shouldn't happen, because of the risk of regression, but otherwise the
whole point of testing/unstable is to find these types of things and
get them fixed before the next release.

  so gains would be potentially limited.
 
 For me, having a working system would be a great gain!

As would be with getting the buggy applications fixed.  My guess is
that the glibc upstream would side for the latter of these two, and I
don't think it's unreasonable that the debian maintainer might decide
to follow suit, since the buggy applications will be (eventually)
caught and fixed.

  That said, regressions do suck, especially when they take the form of
  heisenbugs.  But one could easily hack something LD_PRELOAD'able check
  for stuff like this without forcing a global change.
 
 Sounds interesting.  What do you have in mind?

The same types of hacks used to find other nonstandard or undefined
behavior (à la valgrind).  Simply override the problematic function
with your own via an LD_PRELOAD'd shared library.  Proof of concept:

me@host:~/debug-memcpy$ ./test_memcpy 
before: hhh
after:  hhh
me@host:~/debug-memcpy$ env LD_PRELOAD=./memcpy.so ./test_memcpy 
before: hhh
Error: memcpy used on overlapping regions
Aborted
me@host:~/debug-memcpy$ env MEMCPY=warn LD_PRELOAD=./memcpy.so ./test_memcpy 
before: hhh
Warning: memcpy used on overlapping regions
after:  hhh
me@host:~/debug-memcpy$ env MEMCPY=safe LD_PRELOAD=./memcpy.so ./test_memcpy 
before: hhh
after:  hhh

The first case above illustrates the undefined behavior which might crash,
the remaining two show using an LD_PRELOADED version of memcpy with the
checks to override the behavior.

I put a tarball up on http://seanius.net/tmp/debug-memcpy.tgz if you want to
check it out, it's maybe a dozen lines of actual code.  Note that I haven't
tested the bounds checking corner cases for 100% accuracy.

If you were running something super critical on testing, like a mars rover
or a robot that does brain surgery, you could install this system-wide and
hack the default action, and then you get your stability back.  Otherwise,
I'd think taking the default glibc behavior and using something like this
as one of several debugging tools when the heisenbugs pop up would be
pretty reasonable.  Maybe valgrind already does checks like this, but
if not, I imagine that it wouldn't be too hard to add the same check there.


sean



-- 



--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20110505075603.ga6...@cobija.connexer.com

Bug#625521: glibc: causes segfault in Xorg

[sean finney]

On Wed, May 04, 2011 at 12:29:50PM +0200, Julien BLACHE wrote:
 Steve M. Robbins st...@sumost.ca wrote:
 
 Hi,
 
  I'm with Linus on this: let's just revert to the old behaviour.  A
  tiny amount of clock cycles saved isn't worth the instability.
 
 Tiny amount?! The optimized memcpy() variants that break shitty code
 bring a 4 to 5x speedup on the processors they've been written for!

And furthermore, even if Debian chooses to fix this, upstreams will
be forced to eventually cater to the default glibc behavior for every
other libc distro out there that does not have their own fix (and
non-libc OS's where this behavior already exists), so gains would be
potentially limited.

That said, regressions do suck, especially when they take the form of
heisenbugs.  But one could easily hack something LD_PRELOAD'able check
for stuff like this without forcing a global change.

my 0.02 $LC_MONETARY anyway,

sean



-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20110504113415.gb2...@cobija.connexer.com

Bug#617763: compiz updates!

[Sean Finney]

Hi Dave/Daniel,

On Fri, 2011-03-11 at 19:01 -0500, Dave Witbrodt wrote:
  (http://www.seanius.net/blog/2011/03/compiz-updates) and later tonight
  or tomorrow I'm going to give your packages in experimental a try.
 
 OK, I'm having to bail out on my experiments.  Running 'compiz 
 --replace' succeeded in displacing my window manager with compiz, but I 
 could not get gtk-window-decorator to work.  There's an open bug on it 
 already:
 
 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=617763

In this bug (included as cc), you have a mixture of 0.8.x versions of
compiz with the 0.9.x versions from experimental.  please try (assuming
you still have experimental in your sources.list) doing an apt-get -t
experimental install compiz, and see if you're still having problems
after that.

 I made a quick attempt to grab the latest 'emerald' source code from 
 Ubuntu, but it would not compile.  I admit being tempted to grab the 
 entire source set of compiz + emerald from Ubuntu, but I have too many 
 other pressing matters needing attention, so I'll have to try again in a 
 month or two.

To my knowledge emerald doesn't work with 0.9.x, though I haven't tried.
Your best chance would be to install all of the compiz development
related packages (libdecoration0-dev, compiz-dev, etc), and then grab
the emerald sources from git.compiz.org.



sean



signature.asc
Description: This is a digitally signed message part

compiz: Changes to 'debian-unstable'

[Sean Finney]

 debian/changelog |6 ++
 debian/control   |5 -
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 4274770e62f70d0c879351da1f356a025ebc688a
Author: Sean Finney sean...@debian.org
Date:   Mon Mar 7 19:50:54 2011 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index d557d7f..df57645 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+compiz (0.9.2.1+git20110226.f059fae9-3) experimental; urgency=low
+
+  * Add Conflicts/Replaces to reflect some shifting of files from 0.8.x
+
+ -- Sean Finney sean...@debian.org  Mon, 07 Mar 2011 19:50:37 +0100
+
 compiz (0.9.2.1+git20110226.f059fae9-2) experimental; urgency=low
 
   * Add a Depends on libglibmm-2.4-dev to compiz-dev

commit 43f818d3dcde593ee19b2c1b29cec07c945e4657
Author: Sean Finney sean...@debian.org
Date:   Mon Mar 7 19:49:50 2011 +0100

Add Conflicts/Replaces to reflect some shifting of files from 0.8.x

diff --git a/debian/control b/debian/control
index 2474fe2..c8d2206 100644
--- a/debian/control
+++ b/debian/control
@@ -49,6 +49,8 @@ Breaks: libcompizconfig0 ( 0.9),
  compiz-fusion-plugins-main ( 0.9),
  compiz-fusion-plugins-extra ( 0.9),
  compiz-gtk ( 0.9)
+Conflicts: compiz-gtk (= 0.8.4-4)
+Replaces: compiz-gtk (= 0.8.4-4)
 Recommends: compiz-plugins (= ${binary:Version})
 Suggests: nvidia-glx (= 1.0.9625-1)
 Provides: compiz-core-abiversion-${coreabiversion}
@@ -78,7 +80,8 @@ Description: OpenGL window and compositing manager - 
development files
 Package: compiz-gtk
 Architecture: any
 Depends: compiz-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Replaces: compiz-plugins ( 0.7.6-2)
+Replaces: compiz-plugins (= 0.8.4-4)
+Conflicts: compiz-plugins (= 0.8.4-4)
 Suggests: gnome-themes
 Description: OpenGL window and compositing manager - Gtk window decorator
  Compiz brings to life a variety of visual effects that make the Linux desktop


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pwg23-0002gu...@alioth.debian.org

compiz: Changes to 'refs/tags/compiz-0.9.2.1+git20110226.f059fae9-3'

[Sean Finney]

Tag 'compiz-0.9.2.1+git20110226.f059fae9-3' created by Sean Finney 
sean...@debian.org at 2011-03-07 19:21 +

Debian release 0.9.2.1+git20110226.f059fae9-3

Changes since compiz-0.9.2.1+git20110226.f059fae9-2:
Sean Finney (2):
  Add Conflicts/Replaces to reflect some shifting of files from 0.8.x
  Prepare changelog for upload

---
 debian/changelog |6 ++
 debian/control   |5 -
 2 files changed, 10 insertions(+), 1 deletion(-)
---


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pwg2i-0002po...@alioth.debian.org

compizconfig-backend-gconf: Changes to 'debian-unstable'

[Sean Finney]

 debian/changelog |6 ++
 debian/control   |3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 0ba268ebf19601f54d74cc58c9ed826568d70022
Author: Sean Finney sean...@debian.org
Date:   Mon Mar 7 21:30:15 2011 +0100

Prepare for upload

diff --git a/debian/changelog b/debian/changelog
index ef1283e..378a617 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+compizconfig-backend-gconf (0.9.2.1+git20110226.g861a1d4-2) experimental; 
urgency=low
+
+  * Add a Depends compiz-core-abiversion-${coreabiversion}
+
+ -- Sean Finney sean...@debian.org  Mon, 07 Mar 2011 21:29:43 +0100
+
 compizconfig-backend-gconf (0.9.2.1+git20110226.g861a1d4-1) experimental; 
urgency=low
 
   * Incorporate Janos Guljas' compiz packaging work, thanks!

commit d08945d2367c88a11ee270756357cc3d58aaa532
Author: Sean Finney sean...@debian.org
Date:   Mon Mar 7 21:29:04 2011 +0100

Add a Depends compiz-core-abiversion-${coreabiversion}

diff --git a/debian/control b/debian/control
index edd14eb..0e4159a 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,8 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/bling/compizconfig-backend-gconf.
 
 Package: compizconfig-backend-gconf
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: compiz-core-abiversion-${coreabiversion},
+ ${shlibs:Depends}, ${misc:Depends}
 Description: Compiz Fusion configuration system - gconf backend
  Compiz Fusion is the result of the re-unification of the Beryl-project
  and the community around the Compiz Window Manager. It seeks to provide


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pwh7t-0007zr...@alioth.debian.org

compizconfig-backend-gconf: Changes to 'refs/tags/compizconfig-backend-gconf-0.9.2.1+git20110226.g861a1d4-2'

[Sean Finney]

Tag 'compizconfig-backend-gconf-0.9.2.1+git20110226.g861a1d4-2' created by Sean 
Finney sean...@debian.org at 2011-03-07 20:33 +

Debian release 0.9.2.1+git20110226.g861a1d4-2

Changes since compizconfig-backend-gconf-0.9.2.1+git20110226.g861a1d4-1:
Sean Finney (2):
  Add a Depends compiz-core-abiversion-${coreabiversion}
  Prepare for upload

---
 debian/changelog |6 ++
 debian/control   |3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)
---


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pwh7y-00080x...@alioth.debian.org

compizconfig-backend-kconfig4: Changes to 'debian-unstable'

[Sean Finney]

 debian/changelog |7 +++
 debian/control   |4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit a218f9161ba822a5e9527345a82b0855618b75ae
Author: Sean Finney sean...@debian.org
Date:   Mon Mar 7 21:38:01 2011 +0100

Prepare changelog

diff --git a/debian/changelog b/debian/changelog
index f24de17..ae1ea9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+compizconfig-backend-kconfig (0.9.2.1+git20110227.770eb464-2) experimental; 
urgency=low
+
+  * Add a Depends compiz-core-abiversion-${coreabiversion}
+  * This package was conflicting with... itself?  Fixed.
+
+ -- Sean Finney sean...@debian.org  Mon, 07 Mar 2011 21:37:38 +0100
+
 compizconfig-backend-kconfig (0.9.2.1+git20110227.770eb464-1) experimental; 
urgency=low
 
   * /o\ Brown paper bag upload.

commit 9863e811639902a6f5cc747f76a61f8666a5f040
Author: Sean Finney sean...@debian.org
Date:   Mon Mar 7 21:37:04 2011 +0100

This package was conflicting with... itself?  Fixed.

diff --git a/debian/control b/debian/control
index a1f39bc..046a91b 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,6 @@ Package: compizconfig-backend-kconfig
 Architecture: any
 Depends: compiz-core-abiversion-${coreabiversion},
  ${shlibs:Depends}, ${misc:Depends}
-Conflicts: compizconfig-backend-kconfig
 Description: Compiz Fusion configuration system - kconfig backend
  Compiz Fusion is the result of the re-unification of the Beryl-project
  and the community around the Compiz Window Manager. It seeks to provide

commit 168d5eefa44d3a7bf97a22a7c6a32c6f8e416e8a
Author: Sean Finney sean...@debian.org
Date:   Mon Mar 7 21:36:27 2011 +0100

Add a Depends compiz-core-abiversion-${coreabiversion}

diff --git a/debian/control b/debian/control
index b1a7075..a1f39bc 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,8 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/bling/compizconfig-backend-kconfi
 
 Package: compizconfig-backend-kconfig
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: compiz-core-abiversion-${coreabiversion},
+ ${shlibs:Depends}, ${misc:Depends}
 Conflicts: compizconfig-backend-kconfig
 Description: Compiz Fusion configuration system - kconfig backend
  Compiz Fusion is the result of the re-unification of the Beryl-project


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pwhfb-mx...@alioth.debian.org

compizconfig-backend-kconfig4: Changes to 'refs/tags/compizconfig-backend-kconfig-0.9.2.1+git20110227.770eb464-1'

[Sean Finney]

Tag 'compizconfig-backend-kconfig-0.9.2.1+git20110227.770eb464-1' created by 
Sean Finney sean...@debian.org at 2011-02-27 16:33 +

Debian release 0.9.2.1+git20110227.770eb464-1

Changes since compizconfig-backend-kconfig-0.9.2.1+git20110226.770eb464-1:
Sean Finney (4):
  Fix package names in debian/control
  Fix references to -kconfig4 in debian/changelog
  Revert Update lintian/overrides
  Prepare for next upload

---
 debian/changelog |   12 ++--
 debian/control   |4 ++--
 debian/lintian-overrides |2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)
---


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pwhff-nr...@alioth.debian.org

compizconfig-backend-kconfig4: Changes to 'refs/tags/compizconfig-backend-kconfig-0.9.2.1+git20110227.770eb464-2'

[Sean Finney]

Tag 'compizconfig-backend-kconfig-0.9.2.1+git20110227.770eb464-2' created by 
Sean Finney sean...@debian.org at 2011-03-07 20:41 +

Debian release 0.9.2.1+git20110227.770eb464-2

Changes since compizconfig-backend-kconfig-0.9.2.1+git20110227.770eb464-1:
Sean Finney (3):
  Add a Depends compiz-core-abiversion-${coreabiversion}
  This package was conflicting with... itself?  Fixed.
  Prepare changelog

---
 debian/changelog |7 +++
 debian/control   |4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)
---


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pwhff-ns...@alioth.debian.org

compiz: Changes to 'debian-unstable'

[Sean Finney]

 debian/changelog |6 ++
 debian/control   |4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit bb069ebb0a086389445ac05323273444e1973e6b
Author: Sean Finney sean...@debian.org
Date:   Mon Mar 7 20:46:04 2011 +

Prepare upload

diff --git a/debian/changelog b/debian/changelog
index df57645..fbe3e00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+compiz (0.9.2.1+git20110226.f059fae9-4) experimental; urgency=low
+
+  * compiz-plugins needs a Depends libdecoration0 (= 0.9.0)
+
+ -- Sean Finney sean...@debian.org  Mon, 07 Mar 2011 20:45:51 +
+
 compiz (0.9.2.1+git20110226.f059fae9-3) experimental; urgency=low
 
   * Add Conflicts/Replaces to reflect some shifting of files from 0.8.x

commit 107c1b0060f24175ef5daafb0b5e1f001c3d89d2
Author: Sean Finney sean...@debian.org
Date:   Mon Mar 7 21:12:11 2011 +0100

compiz-plugins needs a Depends libdecoration0 (= 0.9.0)

diff --git a/debian/control b/debian/control
index c8d2206..e461fc4 100644
--- a/debian/control
+++ b/debian/control
@@ -117,7 +117,9 @@ Description: OpenGL window and compositing manager - GNOME 
window decorator
 
 Package: compiz-plugins
 Architecture: any
-Depends: compiz-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: compiz-core (= ${binary:Version}), 
+ libdecoration0 (= 0.9.0),
+ ${shlibs:Depends}, ${misc:Depends}
 Description: OpenGL window and compositing manager - plugins
  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


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pwhgu-00080u...@alioth.debian.org

compiz: Changes to 'refs/tags/compiz-0.9.2.1+git20110226.f059fae9-4'

[Sean Finney]

Tag 'compiz-0.9.2.1+git20110226.f059fae9-4' created by Sean Finney 
sean...@debian.org at 2011-03-07 20:57 +

Debian release 0.9.2.1+git20110226.f059fae9-4

Changes since compiz-0.9.2.1+git20110226.f059fae9-3:
Sean Finney (2):
  compiz-plugins needs a Depends libdecoration0 (= 0.9.0)
  Prepare upload

---
 debian/changelog |6 ++
 debian/control   |4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)
---


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pwhgh-00087c...@alioth.debian.org

compiz: Changes to 'debian-unstable'

[Sean Finney]

 debian/changelog |6 ++
 debian/control   |2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit c99bc540594015164b0c419e464e9984852de606
Author: Sean Finney sean...@debian.org
Date:   Sun Mar 6 13:53:49 2011 +

Prepare new upload

diff --git a/debian/changelog b/debian/changelog
index e57eb08..d557d7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+compiz (0.9.2.1+git20110226.f059fae9-2) experimental; urgency=low
+
+  * Add a Depends on libglibmm-2.4-dev to compiz-dev
+
+ -- Sean Finney sean...@debian.org  Sun, 06 Mar 2011 13:53:30 +
+
 compiz (0.9.2.1+git20110226.f059fae9-1) experimental; urgency=low
 
   [ Sean Finney ]

commit 2ff078c8f4285d11e7620d4b4c566607da9f283a
Author: Sean Finney sean...@debian.org
Date:   Sun Mar 6 13:52:57 2011 +

Add a Depends on libglibmm-2.4-dev to compiz-dev

diff --git a/debian/control b/debian/control
index 9c6002e..2474fe2 100644
--- a/debian/control
+++ b/debian/control
@@ -66,7 +66,7 @@ Description: OpenGL window and compositing manager
 
 Package: compiz-dev
 Architecture: any
-Depends: compiz-core (= ${binary:Version}), ${misc:Depends}, libgl1-mesa-dev | 
libgl-dev, libpng-dev, libxcomposite-dev (= 1:0.3-2), libxfixes-dev 
(=1:4.0.1), libxdamage-dev (= 1:1.0.3), libxinerama-dev, libxrandr-dev 
(=2:1.1.0.2), libxcursor-dev, libice-dev (= 1:1.0.1), libsm-dev (= 1:1.0.1), 
libstartup-notification0-dev (= 0.7), libxslt1-dev, libxml2-dev, 
libx11-xcb-dev, libglib2.0-dev, compiz-plugins (= ${binary:Version})
+Depends: compiz-core (= ${binary:Version}), ${misc:Depends}, libgl1-mesa-dev | 
libgl-dev, libpng-dev, libxcomposite-dev (= 1:0.3-2), libxfixes-dev 
(=1:4.0.1), libxdamage-dev (= 1:1.0.3), libxinerama-dev, libxrandr-dev 
(=2:1.1.0.2), libxcursor-dev, libice-dev (= 1:1.0.1), libsm-dev (= 1:1.0.1), 
libstartup-notification0-dev (= 0.7), libxslt1-dev, libxml2-dev, 
libx11-xcb-dev, libglib2.0-dev, libglibmm-2.4-dev, compiz-plugins (= 
${binary:Version})
 Description: OpenGL window and compositing manager - development files
  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


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pwepz-0006rh...@alioth.debian.org

compiz: Changes to 'refs/tags/compiz-0.9.2.1+git20110226.f059fae9-2'

[Sean Finney]

Tag 'compiz-0.9.2.1+git20110226.f059fae9-2' created by Sean Finney 
sean...@debian.org at 2011-03-06 14:35 +

Debian release 0.9.2.1+git20110226.f059fae9-2

Changes since compiz-0.9.2.1+git20110226.f059fae9-1:
Sean Finney (2):
  Add a Depends on libglibmm-2.4-dev to compiz-dev
  Prepare new upload

---
 debian/changelog |6 ++
 debian/control   |2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)
---


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pwf3q-0004go...@alioth.debian.org

compiz-fusion-plugins-extra: Changes to 'debian-unstable'

[Sean Finney]

 debian/changelog |6 ++
 debian/control   |1 +
 2 files changed, 7 insertions(+)

New commits:
commit 9fa28ef1a21073eb31d387ad7d0b0daa5aad34ed
Author: Sean Finney sean...@debian.org
Date:   Sat Mar 5 10:54:40 2011 +0100

prepare changelog

diff --git a/debian/changelog b/debian/changelog
index 70e500f..759f12d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+compiz-fusion-plugins-extra (0.9.2.1+git20110224.e621355c-2) experimental; 
urgency=low
+
+  * Fix an FTBFS by adding a Build-Dep on libglibmm-2.4-dev
+
+ -- Sean Finney sean...@debian.org  Sat, 05 Mar 2011 10:54:09 +0100
+
 compiz-fusion-plugins-extra (0.9.2.1+git20110224.e621355c-1) experimental; 
urgency=low
 
   [ Janos Guljas ]

commit 0be62af5e627a46f60425d33c7f55c22fedc2ef2
Author: Sean Finney sean...@debian.org
Date:   Sat Mar 5 10:53:45 2011 +0100

Fix an FTBFS by adding a Build-Dep on libglibmm-2.4-dev

diff --git a/debian/control b/debian/control
index a340399..d43ef41 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Sean Finney sean...@debian.org
 Build-Depends: debhelper (= 7.0.50~), cmake, pkg-config, xsltproc,
  compiz-dev (= 0.9), libdecoration0-dev (= 0.9), compiz-fusion-plugins-main 
(= 0.9),
+ libglibmm-2.4-dev,
  librsvg2-dev, libcairo2-dev, libsm-dev, libdbus-1-dev, libjpeg62-dev,
  libxslt1-dev, libglu1-mesa-dev, libnotify-dev,
  libboost1.42-dev, libboost-serialization1.42-dev


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pvohk-0007wm...@alioth.debian.org

compiz-fusion-plugins-extra: Changes to 'refs/tags/compiz-fusion-plugins-extra-0.9.2.1+git20110224.e621355c-2'

[Sean Finney]

Tag 'compiz-fusion-plugins-extra-0.9.2.1+git20110224.e621355c-2' created by 
Sean Finney sean...@debian.org at 2011-03-05 09:59 +

Debian release 0.9.2.1+git20110224.e621355c-2

Changes since compiz-fusion-plugins-extra-0.9.2.1+git20110224.e621355c-1:
Sean Finney (2):
  Fix an FTBFS by adding a Build-Dep on libglibmm-2.4-dev
  prepare changelog

---
 debian/changelog |6 ++
 debian/control   |1 +
 2 files changed, 7 insertions(+)
---


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pvoi4-00086a...@alioth.debian.org

compiz-fusion-plugins-unsupported: Changes to '07merge'

[Sean Finney]

New branch '07merge' available with the following commits:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pvowl-000851...@alioth.debian.org

compiz-fusion-plugins-unsupported: Changes to 'upstream-unstable'

[Sean Finney]

Rebased ref, commits from common ancestor:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pvowl-00084b...@alioth.debian.org

compiz-fusion-plugins-unsupported: Changes to 'debian-squeeze'

[Sean Finney]

New branch 'debian-squeeze' available with the following commits:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pvowl-00085q...@alioth.debian.org

compiz-fusion-plugins-unsupported: Changes to 'debian-unstable'

[Sean Finney]

 .gitmodules|   15 
 AUTHORS|8 
 CMakeLists.txt |   36 
 INSTALL|  236 -
 Makefile.am|9 
 NEWS   |8 
 VERSION|1 
 atlantis   |1 
 autogen.sh |   16 
 cmake/CompizFusion.cmake   |  680 ---
 cmake/addons.cmake |  171 
 compiz-elements.pc.in  |   12 
 configure.ac   |  167 
 cubemodel  |1 
 dev/null   |binary
 elements   |1 
 fakeargb   |1 
 images/Makefile.am |   25 
 images/fireflies1.svg  |   75 
 images/fireflies2.svg  |   75 
 include/Makefile.am|4 
 include/compiz-elements.h  |  148 
 metadata/Makefile.am   |   38 
 metadata/atlantis.xml.in   |  371 --
 metadata/cubemodel.xml.in  |  196 -
 metadata/elements.xml.in   |  320 -
 metadata/fakeargb.xml.in   |   18 
 metadata/mswitch.xml.in|   18 
 metadata/snow.xml.in   |  130 
 metadata/tile.xml.in   |  134 
 po/ChangeLog   |   12 
 po/LINGUAS |   30 
 po/Makefile.in.in  |  218 -
 po/Makevars|   43 
 po/POTFILES.in |7 
 po/ar.po   | 5718 -
 po/as.po   | 3941 --
 po/be.po   | 4561 --
 po/bn.po   | 5678 
 po/ca.po   | 6032 --
 po/cs.po   | 6009 --
 po/da.po   | 3941 --
 po/de.po   | 6328 
 po/el.po   | 6221 
 po/en_GB.po| 6028 --
 po/es.po   | 6345 
 po/eu.po   | 5877 --
 po/fa.po   | 5487 ---
 po/fi.po   | 5857 -
 po/fr.po   | 6168 ---
 po/gl.po   | 5243 --
 po/gu.po   | 6090 ---
 po/he.po   | 5864 -
 po/hi.po   | 6078 ---
 po/hr.po   | 3941 --
 po/hu.po   | 5978 --
 po/it.po   | 6308 
 po/ja.po   | 5212 --
 po/ko.po   | 5821 -
 po/ml_IN.po| 5457 ---
 po/nb.po   | 6108 ---
 po/nl.po   | 6203 ---
 po/or.po   | 4206 
 po/pl.po   | 6153 ---
 po/pt.po   | 4915 
 po/pt_BR.po| 6281 
 po/ru.po   | 6389 -
 po/sv.po   | 6061 ---
 po/tr.po   | 5922 --
 po/zh_CN.po| 5826 -
 po/zh_HK.po| 4206 
 src/Makefile.am|2 
 src/atlantis/CMakeLists.txt|3 
 src/atlantis/Makefile.am   |   61 
 src/atlantis/atlantis-internal.h   |  530 ---
 src/atlantis/atlantis.c| 1203 --
 src/atlantis/bfish.c   |  226 -
 src/atlantis/bfish.h   |  536 ---
 src/atlantis/bubble.c  |   74 
 src/atlantis/chromis.c |  200 -
 src/atlantis/chromis.h |  293 -
 src/atlantis/coral.c   |   75 
 src/atlantis/coral.h   | 4559 --
 src/atlantis/coral2.c  |   75 
 src/atlantis/coral2.h  | 5305 --
 

compiz-fusion-plugins-unsupported: Changes to 'upstream-squeeze'

[Sean Finney]

New branch 'upstream-squeeze' available with the following commits:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pvowq-000869...@alioth.debian.org

compiz-fusion-plugins-unsupported: Changes to 'debian-unstable'

[Sean Finney]

 debian/changelog|   17 +
 debian/compat   |2 
 debian/control  |   13 +
 debian/copyright|  191 
 debian/docs |1 
 debian/install  |6 
 debian/patches/series   |1 
 debian/patches/upstream_git_set-include-order.patch |  146 ---
 debian/rules|   96 --
 debian/source/format|1 
 debian/source/local-options |2 
 debian/watch|4 
 12 files changed, 233 insertions(+), 247 deletions(-)

New commits:
commit c70a43fd2f49849582a557c53539da0d144afc86
Author: Sean Finney sean...@debian.org
Date:   Sat Mar 5 11:48:03 2011 +

Okay no, really prepare it this time.

diff --git a/debian/changelog b/debian/changelog
index 1be4062..2f84405 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,9 @@ compiz-fusion-plugins-unsupported 
(0.9.2.1+git20110224.4d704607-1) experimental;
   [ Sean Finney ]
   * Add common 3.0 format local-options
   * Add Build-Dep on libglibmm-2.4-dev
+  * Update copyright information
 
- -- Sean Finney sean...@debian.org  Sat, 05 Mar 2011 10:30:08 +
+ -- Sean Finney sean...@debian.org  Sat, 05 Mar 2011 11:47:28 +
 
 compiz-fusion-plugins-unsupported (0.8.4-4) UNRELEASED; urgency=low
 

commit df7781e81db3a54bf9062d3667bcc86bf2846c33
Author: Sean Finney sean...@debian.org
Date:   Sat Mar 5 11:47:00 2011 +

Update copyright information

diff --git a/debian/copyright b/debian/copyright
index 7e8a439..49786dc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -17,3 +17,194 @@ License:
 
 The Debian packaging is (C) 2007, sean finney sean...@debian.org and
 is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+
+Copyright:
+
+./atlantis/models/ObjToC.config: * Copyright : (C) 2007 by Dennis Kasprzyk
+./atlantis/models/ObjToC.config: * Copyright : (C) 2007-2008 by David Mikos
+./atlantis/models/ObjToC.java: * Copyright : (C) 2007-2008 by David Mikos
+./atlantis/src/atlantis.cpp: * (c) Copyright 1993, 1994, Silicon Graphics, Inc.
+./atlantis/src/atlantis.cpp: * Copyright : (C) 2007 by Dennis Kasprzyk
+./atlantis/src/atlantis.cpp: * Copyright : (C) 2007-2008 by David Mikos
+./atlantis/src/atlantis.cpp:/* Copyright (c) E. Lassauge, 1998. */
+./atlantis/src/atlantis.h: * (c) Copyright 1993, 1994, Silicon Graphics, Inc.
+./atlantis/src/atlantis.h: * Copyright : (C) 2007 by Dennis Kasprzyk
+./atlantis/src/atlantis.h: * Copyright : (C) 2007-2008 by David Mikos
+./atlantis/src/atlantis.h:/* Copyright (c) E. Lassauge, 1998. */
+./atlantis/src/bfish.cpp: * Copyright : (C) 2007 by Dennis Kasprzyk
+./atlantis/src/bfish.cpp: * Copyright : (C) 2007-2008 by David Mikos
+./atlantis/src/bubble.cpp: * Copyright : (C) 2007 by Dennis Kasprzyk
+./atlantis/src/bubble.cpp: * Copyright : (C) 2007-2008 by David Mikos
+./atlantis/src/chromis.cpp: * Copyright : (C) 2007 by Dennis Kasprzyk
+./atlantis/src/chromis.cpp: * Copyright : (C) 2007-2008 by David Mikos
+./atlantis/src/coral.cpp: * Copyright : (C) 2007 by Dennis Kasprzyk
+./atlantis/src/coral.cpp: * Copyright : (C) 2007-2008 by David Mikos
+./atlantis/src/coral2.cpp: * Copyright : (C) 2007 by Dennis Kasprzyk
+./atlantis/src/coral2.cpp: * Copyright : (C) 2007-2008 by David Mikos
+./atlantis/src/crab.cpp: * Copyright : (C) 2007 by Dennis Kasprzyk
+./atlantis/src/crab.cpp: * Copyright : (C) 2007-2008 by David Mikos
+./atlantis/src/dolphin.cpp: * (c) Copyright 1993, 1994, Silicon Graphics, Inc.
+./atlantis/src/dolphin.cpp: * Copyright : (C) 2007 by Dennis Kasprzyk
+./atlantis/src/dolphin.cpp: * Copyright : (C) 2007-2008 by David Mikos
+./atlantis/src/dolphin.cpp:/* Copyright (c) E. Lassauge, 1998. */
+./atlantis/src/fish.cpp: * Copyright : (C) 2007 by Dennis Kasprzyk
+./atlantis/src/fish.cpp: * Copyright : (C) 2007-2008 by David Mikos
+./atlantis/src/fish2.cpp: * Copyright : (C) 2007 by Dennis Kasprzyk
+./atlantis/src/fish2.cpp: * Copyright : (C) 2007-2008 by David Mikos
+./atlantis/src/float.cpp: * Copyright : (C) 2007 by Dennis Kasprzyk
+./atlantis/src/float.cpp: * Copyright : (C) 2007-2008 by David Mikos
+./atlantis/src/scuttle.cpp: * Copyright : (C) 2007 by Dennis Kasprzyk
+./atlantis/src/scuttle.cpp: * Copyright : (C) 2007-2008 by David Mikos
+./atlantis/src/shark.cpp: * (c) Copyright 1993, 1994, Silicon Graphics, Inc.
+./atlantis/src/shark.cpp: * Copyright : (C) 2007 by Dennis Kasprzyk
+./atlantis/src/shark.cpp: * Copyright : (C) 2007-2008 by David Mikos
+./atlantis/src/shark.cpp:/* Copyright (c) E. Lassauge, 1998. */
+./atlantis/src/swim.cpp: * (c) Copyright 1993, 1994, Silicon Graphics, Inc.
+./atlantis/src/swim.cpp: * Copyright : (C) 2007 by Dennis Kasprzyk
+./atlantis/src

compiz-fusion-plugins-unsupported: Changes to 'refs/tags/0.9.0'

[Sean Finney]

Tag '0.9.0' created by Guillaume Seguin guilla...@segu.in at 2010-07-04 08:42 
+

Compiz 0.9.0 release
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEABECAAYFAkwwSX0ACgkQFGCg8MK49G55CQCgppbIoBfP9KZO1hh3qF7JaALD
MscAnjHE5InyzQSGTroABevML46zJ9+e
=4dd8
-END PGP SIGNATURE-

Changes since the dawn of time:
Guillaume Seguin (2):
  Initial import
  Add atlantis and cubemodel

Repos Merger (24):
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update

Sam Spilsbury (1):
  Add git-dist target


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pvznb-0007v0...@alioth.debian.org

compiz-fusion-plugins-unsupported: Changes to 'refs/tags/compiz-fusion-plugins-unsupported-0.9.2.1+git20110224.4d704607-1'

[Sean Finney]

Tag 'compiz-fusion-plugins-unsupported-0.9.2.1+git20110224.4d704607-1' created 
by Sean Finney sean...@debian.org at 2011-03-05 11:51 +

Debian release 0.9.2.1+git20110224.4d704607-1

Changes since 0.9.0:
C-F Language team (16):
  translation updates
  translation update
  emerald translation updates
  translation updates
  translation updates
  translation updates
  new translations and updates
  new translations and updates
  l10n updates
  l10n updates
  l10n updates
  l10n updates
  l10n updates
  l10n updates
  l10n updates
  l10n updates

C-F language team (1):
  translation updates

Compiz Fusion l10n team (1):
  Translations update

Cyril Brulebois (4):
  Add Vcs-* fields.
  Tighten dependencies on compiz-core.
  Upload to unstable.
  Add Homepage field.

Danny Baumann (86):
  Also damage screen on the last animation step.
  Solve some animation weirdnesses.
  Fix tiling animation multihead issues by using the fullscreen output.
  printf - compLogMessage
  Remove unneeded hint.
  Dummy commit.
  Dummy commit.
  Indention fixes.
  Update file list.
  Update file list.
  Update to include -main plugin translatable strings.
  More German translation updates.
  Even more German translations.
  Fix typo.
  Fixed a few typos and added some more translations.
  Slight optimization.
  Remove superflous file.
  Update file list.
  Update template.
  Updated German translation for gotovp.
  Translation update by Forlong.
  Update file list.
  Indention fix.
  Compiz indention style.
  Fix typo.
  Update with intltool-update
  Added translations for scalefilter.
  Some updates to German translation.
  Some more minor German translation updates.
  Update file list.
  More German translation updates.
  Update file list.
  Fix indention.
  Load snow after image loaders.
  Update file list.
  Update template.
  Compiz indention style and some smaller cleanup.
  Added default snowflake image.
  Added images to build system.
  po/Makefile.in.in is autogenerated.
  Set DATADIR define to $DATADIR/compiz.
  Update file list.
  Some German translation updates.
  Update file list.
  Only include present XML files.
  Added mswitch to build system.
  Remove gotovp metadata.
  Update German translation to reflect vpswitch changes.
  Some German translation updates.
  Tile vertically and horizontally are keys, too.
  Track core changes.
  Track core changes.
  Track core changes.
  Track core changes.
  Track core changes.
  Track core changes.
  Remove unneeded includes.
  Remove useless includes.
  Remove useless includes.
  Dummy commit.
  Dummy commit.
  xml - xml.in
  Added build system for 3D and atlantis.
  Simplify window size calculations.
  Properly terminate 3D usage after ending cube rotation.
  Fix typo.
  Fix typo.
  Compiz indention style.
  Use core matrix functions.
  Use CompVector.
  Track checkOrientation API changes.
  Fix whitespace.
  Don't define VERSION twice.
  Remove useless check.
  Fix another typo.
  Fix division-by-zero when snow speed is 100.
  Remove 3D from build system.
  Send out sync request when changing window size.
  Combine bring_to_front and highlight_selected options into one option, 
making them mutually exclusive.
  Track core changes.
  Add hu to LINGUAS file.
  Also add ko to LINGUAS file.
  Added CMake build file.
  Added build system for elements  cubemodel, update atlantis file list.
  Added missing Makefile.
  Dummy commit

David Mikos (7):
  Neaten up getline usage and split code into separate file.
  Faster loading by custom tokenizer instead of getLine.
  Fix broken loading animations so that frames checked right to left.
  Additional fix so that correct number of zeros in animation are found.
  Document ObjToC.java and make it easier to use.
  Fix stretching on rescale for multiple monitors.
  Fix stretching on rescaling for multiple monitors.

Dennis Kasprzyk (39):
  Makefile update
  Makefile update
  Makefile update
  Makefile update
  build system
  build without showdesktop
  don't install showdesktop.xml
  Applied lastest core changes
  Applied lastest core changes
  Rename to Compiz fusion
  xml-xml.in
  dummy commit
  xml-xml.in
  xml-xml.in
  Added translation support.
  Added translation support.
  Remove obsolete deps/features from vtable
  Remove obsolete deps/features from vtable
  Remove obsolete deps/features from vtable
  Added polish translation.
  Fix schema build.
  Require right bcop version.
  New

compizconfig-python: Changes to 'debian-squeeze'

[Sean Finney]

New branch 'debian-squeeze' available with the following commits:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pw0vu-0005nt...@alioth.debian.org

compizconfig-python: Changes to 'upstream-squeeze'

[Sean Finney]

New branch 'upstream-squeeze' available with the following commits:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pw0vu-0005om...@alioth.debian.org

compizconfig-python: Changes to 'debian-unstable'

[Sean Finney]

 INSTALL   |   38 +++
 MANIFEST.in   |2 
 Makefile  |   11 ++
 Makefile.am   |8 -
 NEWS  |   15 +++
 VERSION   |2 
 acinclude.m4  |  141 
 autogen.sh|   16 ---
 configure.ac  |   46 -
 debian/changelog  |   17 +++
 debian/compat |2 
 debian/control|   18 ++-
 debian/install|1 
 debian/patches/01-fix-extension-dir.patch |   18 +++
 debian/patches/series |1 
 debian/pyversions |1 
 debian/rules  |  110 +-
 debian/source/format  |1 
 debian/source/local-options   |2 
 debian/watch  |4 
 setup.py  |  149 ++
 src/Makefile.am   |   17 ---
 src/compizconfig.pyx  |  120 ++--
 23 files changed, 306 insertions(+), 434 deletions(-)

New commits:
commit 4e63c660658060df65f41710755e2c3ce8b3b7ca
Author: Sean Finney sean...@debian.org
Date:   Sat Mar 5 23:24:04 2011 +

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index ef264a8..c138ec2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-compizconfig-python (0.9.2.1-1.1) unstable; urgency=low
+compizconfig-python (0.9.2.1+git20110224.5ccb653e-1) experimental; urgency=low
 
   [ Janos Guljas ]
   * New upstream release.
@@ -10,7 +10,10 @@ compizconfig-python (0.9.2.1-1.1) unstable; urgency=low
 * 01-fix-extension-dir.patch
   - Remove Makefile so dh_python2 can install extension in a right place
 
- -- Janos Guljas ja...@resenje.org  Mon, 15 Nov 2010 17:41:49 +0100
+  [ Sean Finney ]
+  * Add common 3.0 local options
+
+ -- Sean Finney sean...@debian.org  Sat, 05 Mar 2011 23:22:44 +
 
 compizconfig-python (0.8.4-2) unstable; urgency=low
 

commit f8d8b7725d1ff88d6fe489e318b7d846a511c27e
Author: Sean Finney sean...@debian.org
Date:   Sun Mar 6 00:16:12 2011 +0100

Add common 3.0 local options

diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 000..9cdfca9
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1,2 @@
+unapply-patches
+abort-on-upstream-changes

commit 70610c30c68babf680c9468b8fc113d5f8a4a86e
Author: Sean Finney sean...@debian.org
Date:   Sun Mar 6 00:15:38 2011 +0100

Add Janos' packaging work

diff --git a/debian/changelog b/debian/changelog
index 979063d..ef264a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+compizconfig-python (0.9.2.1-1.1) unstable; urgency=low
+
+  [ Janos Guljas ]
+  * New upstream release.
+  * Bump standards to 3.9.1.
+  * Switch to dpkg format 3.0 (quilt)
+  * Rewrite debian/rules to use debhelper 7.
+  * Add debian/watch file.
+  * Add patch
+* 01-fix-extension-dir.patch
+  - Remove Makefile so dh_python2 can install extension in a right place
+
+ -- Janos Guljas ja...@resenje.org  Mon, 15 Nov 2010 17:41:49 +0100
+
 compizconfig-python (0.8.4-2) unstable; urgency=low
 
   * Update Build-Depends against compiz-dev to = 0.8.4 for ABI bump.
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 61ec250..f0cf281 100644
--- a/debian/control
+++ b/debian/control
@@ -2,21 +2,25 @@ Source: compizconfig-python
 Priority: extra
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Sean Finney sean...@debian.org
-Build-Depends: autoconf, automake1.9, autotools-dev, compiz-dev (= 0.8.4), 
debhelper (= 5), libcompizconfig-dev (= 0.8.4), libglib2.0-dev, libtool, 
libxml2-dev, libxslt1-dev, python-all-dev, python-pyrex, python-support
-Standards-Version: 3.7.2
-Section: x11
+Build-Depends: debhelper (= 7.0.50~), libtool, compiz-dev (= 0.9.0),
+ libglib2.0-dev, libxml2-dev, libxslt1-dev, libcompizconfig-dev (= 0.9.0),
+ python-all-dev, python-pyrex, cython
+Standards-Version: 3.9.1
+XS-Python-Version: = 2.6
+Section: python
+Homepage: http://www.compiz.org/
 Vcs-Git: git://git.debian.org/git/pkg-xorg/bling/compizconfig-python.git
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/bling/compizconfig-python.git
-Homepage: http://www.compiz-fusion.org
 
 Package: python-compizconfig
 Architecture: any
 Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
-Description: Compizconfig bindings for python
+XB-Python-Version: ${python:Versions}
+Description: Compizconfig bindings for Python
  Compiz Fusion

compizconfig-python: Changes to '07merge'

[Sean Finney]

New branch '07merge' available with the following commits:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pw0vu-0005nv...@alioth.debian.org

compizconfig-python: Changes to 'upstream-unstable'

[Sean Finney]

Rebased ref, commits from common ancestor:
commit 5ccb653eb22428318c25b355b5143e695d33f0c7
Author: Guillaume Seguin guilla...@segu.in
Date:   Fri Feb 18 15:29:33 2011 +0800

Don't drop the stderr since it might give a message to the user
that could actually be quite useful (eg, adjust PKG_CONFIG_PATH)

diff --git a/setup.py b/setup.py
index 1002067..a364eed 100644
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,7 @@ def pkgconfig(*packages, **kw):
 flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries', 
'-R': 'runtime_library_dirs'}
 cmd = ['pkg-config', '--libs', '--cflags']
 
-tokens = subprocess.Popen (cmd + list(packages), stdout=subprocess.PIPE, 
stderr=open(os.devnull, 'w')).communicate()[0].split ()
+tokens = subprocess.Popen (cmd + list(packages), 
stdout=subprocess.PIPE).communicate()[0].split ()
 
 for t in tokens:
 if '-L' in t[:2]:

commit c6019ee880d3e9e1ea9f0d4d01d7e9172e2ed520
Author: Sam Spilsbury sam.spilsb...@canonical.com
Date:   Fri Feb 18 15:26:38 2011 +0800

Add packges and list directly

diff --git a/setup.py b/setup.py
index 26af394..1002067 100644
--- a/setup.py
+++ b/setup.py
@@ -25,10 +25,7 @@ def pkgconfig(*packages, **kw):
 flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries', 
'-R': 'runtime_library_dirs'}
 cmd = ['pkg-config', '--libs', '--cflags']
 
-for i in packages:
-cmd.append (i)
-
-tokens = subprocess.Popen (cmd, stdout=subprocess.PIPE, 
stderr=open(os.devnull, 'w')).communicate()[0].split ()
+tokens = subprocess.Popen (cmd + list(packages), stdout=subprocess.PIPE, 
stderr=open(os.devnull, 'w')).communicate()[0].split ()
 
 for t in tokens:
 if '-L' in t[:2]:

commit 65a2c0115b1e784b2639dc7b12de4396f1be5d3d
Author: Sam Spilsbury sam.spilsb...@canonical.com
Date:   Fri Feb 18 15:10:10 2011 +0800

Adjust for subprocess syntax

diff --git a/setup.py b/setup.py
index 85f64eb..26af394 100644
--- a/setup.py
+++ b/setup.py
@@ -23,9 +23,13 @@ if = in version:
 
 def pkgconfig(*packages, **kw):
 flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries', 
'-R': 'runtime_library_dirs'}
+cmd = ['pkg-config', '--libs', '--cflags']
+
+for i in packages:
+cmd.append (i)
+
+tokens = subprocess.Popen (cmd, stdout=subprocess.PIPE, 
stderr=open(os.devnull, 'w')).communicate()[0].split ()
 
-tokens = subprocess.Popen (['pkg-config', '--libs', '--cflags %s' % ' 
'.join (packages)], stdout=subprocess.PIPE, stderr=open(os.devnull, 
'w')).communicate()[0].split ()
-
 for t in tokens:
 if '-L' in t[:2]:
 kw.setdefault (flag_map.get (-L), []).append (t[2:])

commit 28c6874942fb19da27d7a8aa2148956a13380902
Author: Sam Spilsbury sam.spilsb...@canonical.com
Date:   Sat Feb 12 23:13:55 2011 +0800

Use subprocess instead of commands and print () instead of print
because they are deprecated in Python 3.0

diff --git a/setup.py b/setup.py
index 9cfb05f..85f64eb 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,6 @@ from distutils.command.sdist import sdist as _sdist
 from distutils.extension import Extension
 import os
 import subprocess
-import commands
 
 # If src/compizconfig.pyx exists, build using Cython
 if os.path.exists (src/compizconfig.pyx):
@@ -25,7 +24,7 @@ if = in version:
 def pkgconfig(*packages, **kw):
 flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries', 
'-R': 'runtime_library_dirs'}
 
-tokens = commands.getoutput(pkg-config --libs --cflags %s % ' 
'.join(packages)).split()
+tokens = subprocess.Popen (['pkg-config', '--libs', '--cflags %s' % ' 
'.join (packages)], stdout=subprocess.PIPE, stderr=open(os.devnull, 
'w')).communicate()[0].split ()
 
 for t in tokens:
 if '-L' in t[:2]:
@@ -44,8 +43,8 @@ VERSION_FILE = os.path.join (os.path.dirname (__file__), 
VERSION)
 pkgconfig_libs = subprocess.Popen ([pkg-config, --libs, 
libcompizconfig], stdout=subprocess.PIPE, stderr=open(os.devnull, 
'w')).communicate ()[0]
 
 if len (pkgconfig_libs) is 0:
-  print CompizConfig Python [ERROR]: No libcompizconfig.pc found in the 
pkg-config search path
-  print Ensure that libcompizonfig is installed or libcompizconfig.pc is in 
your $PKG_CONFIG_PATH
+  print (CompizConfig Python [ERROR]: No libcompizconfig.pc found in the 
pkg-config search path)
+  print (Ensure that libcompizonfig is installed or libcompizconfig.pc is in 
your $PKG_CONFIG_PATH)
   exit (1);
 libs = pkgconfig_libs[2:].split ( )[0]
 
@@ -105,7 +104,7 @@ class uninstall (_install):
 for counter in xrange (len (files)):
 files[counter] = prepend + files[counter].rstrip ()
 for file in files:
-print Uninstalling %s % file
+print (Uninstalling %s % file)
 try:
 os.unlink (file)
 except:

commit 53d5da274e4d6327b75ed233d3e6f74c8b123296
Author: Sam Spilsbury sam.spilsb...@canonical.com
Date:   

compizconfig-python: Changes to 'refs/tags/0.9.0'

[Sean Finney]

Tag '0.9.0' created by Guillaume Seguin guilla...@segu.in at 2010-07-04 08:37 
+

Compiz 0.9.0 release
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEABECAAYFAkwwSFYACgkQFGCg8MK49G6bZgCgrtzd4q8Ig/QyCQm+yxVy7OY2
v6AAoJJbHF7o5dsR36A9KuVWj7eaqDFd
=gs+q
-END PGP SIGNATURE-

Changes since 0.8.2:
Dominique Leuenberger (1):
  No RPATH to a relative path. In fact, we link to libcompizconfig.so.0, 
which typically is in %libdir

Erkin Bahceci (3):
  Remove display-related stuff from extensions.
  Revert Remove display-related stuff from extensions.
  Remove display and multi-screen stuff.

Guillaume Seguin (6):
  * Bump version to 0.8.3
  Add distutils based installer (setup.py) using Cython
  Fix python3 incompatibility
  Add MANIFEST.in
  Distribute C file
  Whitespace fix

Marien Zwart (1):
  Use the pyrexc detected by configure

Sam Spilsbury (19):
  Added merged autotools / CMake buildsystem.
  Merge branch 'master' of 
git://git.compiz.org/compiz/compizconfig/compizconfig-python into compiz++
  Dummy commit
  Remove dummy
  Remove debug message
  Remove autotools buildsystem
  Just use distutils
  Parse libcompizconfig pkg-config file and set linker path and runtime 
library path
  Add more meaningful install instructions
  Pick up bits of the ccsm buildsystem, particularly uninstall support
  Added new method to get pkgconfig bits and also added 
COMPIZ_DISABLE_RPATH env variable
  Add a better rpath on/off switch
  Bump version
  Better version reading and update package info
  Add MANIFEST.in to get correct files for sdist and simple Makefile
  Merge branch 'master' of 
git+ssh://git.compiz.org/git/compiz/compizconfig/compizconfig-python
  Add maintainer and maintainer email fields
  Update NEWS for 0.9.0 release
  Merge branch 'master' of 
git+ssh://git.compiz.org/git/compiz/compizconfig/compizconfig-python

---
 INSTALL  |   38 +
 MANIFEST.in  |2 
 Makefile |   11 +++
 Makefile.am  |8 --
 NEWS |7 ++
 VERSION  |2 
 acinclude.m4 |  141 
 autogen.sh   |   16 -
 configure.ac |   46 ---
 setup.py |  149 +++
 src/Makefile.am  |   17 -
 src/compizconfig.pyx |  114 +--
 12 files changed, 235 insertions(+), 316 deletions(-)
---


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pw0vd-0005r9...@alioth.debian.org

compizconfig-python: Changes to 'refs/tags/compizconfig-python-0.9.2.1+git20110224.5ccb653e-1'

[Sean Finney]

Tag 'compizconfig-python-0.9.2.1+git20110224.5ccb653e-1' created by Sean Finney 
sean...@debian.org at 2011-03-05 23:29 +

Debian release 0.9.2.1+git20110224.5ccb653e-1

Changes since 0.9.0:
Dennis Kasprzyk (1):
  Fix profile resetting.

Guillaume Seguin (6):
  * Fix  update configure.ac
  * Bump VERSION to 0.6.1
  * Include VERSION in distfile
  * Set version to 0.6.0.1
  * Bump version to 0.8.4
  Don't drop the stderr since it might give a message to the user

Jigish Gohil (1):
  bump version to 0.6.0

Loïc Minier (2):
  Depend on compiz-core and -abiversion-2009xxyy
  Revert Depend on compiz-core and -abiversion-2009xxyy

Sam Spilsbury (8):
  Update NEWS for 0.9.2 release
  Update to 0.9.2.1
  Update NEWS for 0.9.2.1 Release
  Don't use tabs/spaces in the pkgconfig block
  Use __cinit__ instead of __new__ since its removed in Cython 0.14
  Use subprocess instead of commands and print () instead of print
  Adjust for subprocess syntax
  Add packges and list directly

Sean Finney (28):
  run autogen.sh
  remove autofoo cruft
  initial debianization
  fixes to various build files for backporting and add a few
  Merge branch 'upstream-unstable' of 
git+ssh://git.debian.org/git/pkg-xorg/bling/compizconfig-python into 07merge
  Merge branch 'upstream-unstable' into debian-unstable
  new upstream release
  update build deps
  Merge commit '0.7.6' into upstream-unstable
  Merge branch 'upstream-unstable' into debian-unstable
  new upstream release
  Merge commit '0.8.2' into upstream-unstable
  Merge branch 'upstream-unstable' into debian-unstable
  add gbp.conf for use with git-buildpackage
  bump compiz-related build-deps to 0.8.2
  prepare changelog
  update debian/install for python = 2.6
  prepare changelog
  Merge commit '0.8.4' into upstream-unstable
  Merge branch 'upstream-unstable' into debian-unstable
  Use python-support for managing python extensions
  Prepare changelog for 0.8.4-1
  Update Build-Depends against compiz-dev to = 0.8.4 for ABI bump.
  prepare 0.8.4-2
  Merge branch 'upstream-unstable' into debian-unstable
  Add Janos' packaging work
  Add common 3.0 local options
  Prepare changelog for upload

---
 NEWS  |1 
 VERSION   |2 
 debian/changelog  |   76 ++
 debian/compat |1 
 debian/control|   26 ++
 debian/copyright  |   27 ++
 debian/gbp.conf   |8 +++
 debian/patches/01-fix-extension-dir.patch |   18 +++
 debian/patches/series |1 
 debian/rules  |8 +++
 debian/source/format  |1 
 debian/source/local-options   |2 
 debian/watch  |4 +
 setup.py  |   28 +--
 src/compizconfig.pyx  |   12 ++--
 15 files changed, 193 insertions(+), 22 deletions(-)
---


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pw0vd-0005ry...@alioth.debian.org

ccsm: Changes to '07merge'

[Sean Finney]

New branch '07merge' available with the following commits:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pw23d-0008is...@alioth.debian.org

ccsm: Changes to 'debian-unstable'

[Sean Finney]

 +++
 images/scalable/apps/plugin-switcher.svg | 1114 +
 images/scalable/apps/plugin-td.svg   |  546 ++
 images/scalable/apps/plugin-text.svg |  711 ---
 images/scalable/apps/plugin-thumbnail.svg|  814 ++-
 images/scalable/apps/plugin-tile.svg |  644 +-
 images/scalable/apps/plugin-titleinfo.svg|  155 
 images/scalable/apps/plugin-toggledeco.svg   |  341 +
 images/scalable/apps/plugin-trailfocus.svg   |  936 ++--
 images/scalable/apps/plugin-trip.svg |  274 +
 images/scalable/apps/plugin-unknown.svg  |  588 +-
 images/scalable/apps/plugin-vidcap.svg   |  497 ++
 images/scalable/apps/plugin-video.svg|  743 +--
 images/scalable/apps/plugin-vpswitch.svg | 2330 ++
 images/scalable/apps/plugin-wall.svg |  197 
 images/scalable/apps/plugin-wallpaper.svg| 1106 -
 images/scalable/apps/plugin-water.svg|   65 
 images/scalable/apps/plugin-widget.svg   |  549 +-
 images/scalable/apps/plugin-winreflect.svg   |  189 
 images/scalable/apps/plugin-winrules.svg |  802 +--
 images/scalable/apps/plugin-wizard.svg   |  297 +
 images/scalable/apps/plugin-wobbly.svg   |  119 
 images/scalable/apps/plugin-workarounds.svg  | 1226 ++---
 images/scalable/apps/plugin-workspacenames.svg   |  277 +
 images/scalable/apps/plugin-zoom.svg | 1216 -
 images/scalable/categories/plugins-accessibility.svg |  428 -
 images/scalable/categories/plugins-all.svg   | 1119 +
 images/scalable/categories/plugins-desktop.svg   |  865 +--
 images/scalable/categories/plugins-effects.svg   | 1206 ++---
 images/scalable/categories/plugins-extras.svg|  207 
 images/scalable/categories/plugins-general.svg   |  331 -
 images/scalable/categories/plugins-image_loading.svg |  939 +---
 images/scalable/categories/plugins-profiles.svg  |  579 +-
 images/scalable/categories/plugins-search.svg| 1874 ++--
 images/scalable/categories/plugins-uncategorized.svg |   43 
 images/scalable/categories/plugins-utility.svg   |  537 --
 images/scalable/categories/plugins-window_management.svg |  944 +---
 setup.py |2 
 184 files changed, 61856 insertions(+), 40023 deletions(-)

New commits:
commit a3b76ae75c191a07c531ac1e5a9315df7995f9cc
Author: Sean Finney sean...@debian.org
Date:   Sun Mar 6 00:40:20 2011 +

Prepare changelog

diff --git a/debian/changelog b/debian/changelog
index d4e55e8..c68afc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,5 @@
-ccsm (0.9.2.1-1.1) unstable; urgency=low
+ccsm (0.9.2.1+git20110224.cb1268cb-1) experimental; urgency=low
+
 
   [ Janos Guljas ]
   * New upstream release.
@@ -12,7 +13,15 @@ ccsm (0.9.2.1-1.1) unstable; urgency=low
 * 01-fix-extension-dir.patch
   - Remove Makefile so dh_python2 can install extension in a right place
 
- -- Janos Guljas ja...@resenje.org  Mon, 15 Nov 2010 20:42:24 +0100
+  [ Sean Finney ]
+  * Add common 3.0 source format options
+  * Remove local changes snuck into packaging by dpkg-source 3.0
+  * Explicitly remove ccsm.desktop during clean
+  * New patch to remove invalid Compiz category from ccsm.desktop
+  * Fix mis-named md.po - mnk.po
+  * Remove leftover installed_files file during clean
+
+ -- Sean Finney sean...@debian.org  Sun, 06 Mar 2011 00:36:36 +
 
 ccsm (0.8.4-2) unstable; urgency=high
 

commit 2f15e2e0d7974bc020de0df821e28e3e1bd2bed3
Author: Sean Finney sean...@debian.org
Date:   Sun Mar 6 00:35:19 2011 +

Remove leftover installed_files file during clean

diff --git a/debian/rules b/debian/rules
index 937f6c8..85a9b6f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,8 @@ clean:
rm -f ccsm.desktop
# misnamed translation
if [ -f po/mnk.po ]; then mv po/mnk.po po/md.po; fi
+   # other misc junk
+   rm -f installed_files
 
 override_dh_auto_install:
# misnamed translation

commit e366aac0ebdcfe73d2666c243c77e6b9fb74cd44
Author: Sean Finney sean...@debian.org
Date:   Sun Mar 6 00:33:05 2011 +

Fix mis-named md.po - mnk.po

diff --git a/debian/rules b/debian/rules
index 85ddc57..937f6c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,10 @@ clean:
dh $@
# setup.py seems to unconditionally generate this guy, even on clean
rm -f ccsm.desktop
+   # misnamed translation
+   if [ -f po/mnk.po ]; then mv po/mnk.po po/md.po; fi
 
 override_dh_auto_install:
+   # misnamed translation
+   if [ -f po/md.po ]; then mv po/md.po po/mnk.po; fi
python setup.py install 
--root=$(CURDIR)/debian/compizconfig-settings

ccsm: Changes to 'upstream-unstable'

[Sean Finney]

Rebased ref, commits from common ancestor:
commit cb1268cb2a6728d2f0dcc21d417b3b2c13d729e6
Author: Silvia Dobrota silvia.dobrot...@imperial.ac.uk
Date:   Thu Feb 24 12:24:46 2011 +0800

[PATCH] Focus filter entry on return to main page

diff --git a/ccm/Window.py b/ccm/Window.py
index 9478f34..1b57fcf 100644
--- a/ccm/Window.py
+++ b/ccm/Window.py
@@ -96,6 +96,7 @@ class MainWin(gtk.Window):
 
 def BackToMain(self, widget):
 self.SetPage(self.MainPage)
+self.MainPage.filterEntry.grab_focus()
 
 def RefreshPage(self, updatedPlugin):
 currentPage = self.CurrentPage

commit 407bc8674877adf4042691a0408779fe84aad268
Author: Sam Spilsbury sam.spilsb...@canonical.com
Date:   Wed Feb 23 01:18:16 2011 +0800

Explcitly convert list items to str for now

diff --git a/ccm/Settings.py b/ccm/Settings.py
index 787461f..6dfcdb9 100644
--- a/ccm/Settings.py
+++ b/ccm/Settings.py
@@ -755,8 +755,13 @@ class BaseListSetting(Setting):
 
 def _Read(self):
 self.Store.clear()
+   # FIXME: The list types are being defined as all str
+   # in self.Widgets (which goes to self.Store) - this
+   # is a problem since values can be of other types,
+   # however explicitly converting to a string seems to
+   # work here
 for values in zip(*[w.GetForRenderer() for w in self.Widgets]):
-self.Store.append(values)
+self.Store.append([str (x) for x in values])
 
 def OnDestroy(self, widget):
 for w in self.Widgets:
@@ -1452,6 +1457,7 @@ def MakeSetting(setting, List=False):
 t = setting.Type
 
 stype = SettingTypeDict.get(t, None)
+
 if not stype:
 return
 

commit 821087d360e4525a70dce778502fa22034ddaae4
Author: Joe Rusbasan j...@rbasn.us
Date:   Tue Feb 22 01:42:40 2011 -0500

Fix typo

diff --git a/ccm/Pages.py b/ccm/Pages.py
index 2349dfe..0bbf30a 100644
--- a/ccm/Pages.py
+++ b/ccm/Pages.py
@@ -716,7 +716,7 @@ class ProfileBackendPage(object):
 for i, name in enumerate(self.Context.Backends):
 backend = self.Context.Backends[name]
 backendBox.append_text(backend.ShortDesc)
-if name == self.CurrentBackend.Name:
+if name == self.Context.CurrentBackend.Name:
 active = i
 backendBox.set_active(active)
 backendBox.connect(changed, self.BackendChangedAddTimeout)

commit 632c982318d74f9db693ebdcc3154e83f41ce83c
Author: Patrick Niklaus ma...@compiz-fusion.org
Date:   Sat Feb 12 19:24:14 2011 +0100

Replaced libsexy code with gtk entry

diff --git a/ccm/Pages.py b/ccm/Pages.py
index ff7ef54..2349dfe 100644
--- a/ccm/Pages.py
+++ b/ccm/Pages.py
@@ -76,7 +76,7 @@ class PluginPage(GenericPage):
 filterLabel = Label()
 filterLabel.set_markup(HeaderMarkup % (_(Filter)))
 filterLabel.connect(style-set, self.HeaderStyleSet)
-self.FilterEntry = gtk.Entry()
+self.FilterEntry = ClearEntry()
 self.FilterEntry.connect(changed, self.FilterChanged)
 
 self.LeftWidget.pack_start(pluginImg, False, False)
@@ -256,15 +256,10 @@ class FilterPage(GenericPage):
 self.LeftWidget.pack_start(filterLabel, False, False)
 
 # Entry FIXME find a solution with std gtk
-
-self.FilterEntry = sexy.IconEntry()
-self.FilterEntry.add_clear_button()
-keyboardImage = Image(input-keyboard, ImageThemed, 16)
-self.FilterEntry.set_icon(sexy.ICON_ENTRY_PRIMARY, keyboardImage)
-self.FilterEntry.set_icon_highlight(sexy.ICON_ENTRY_PRIMARY, True)
-self.FilterEntry.connect('icon-pressed', self.GrabKey)
-
-self.FilterEntry = gtk.Entry()
+self.FilterEntry = ClearEntry()
+self.FilterEntry.set_icon_from_icon_name(gtk.ENTRY_ICON_PRIMARY, 
input-keyboard)
+self.FilterEntry.set_icon_tooltip_text(gtk.ENTRY_ICON_PRIMARY, _(Grab 
Keys))
+self.FilterEntry.connect('icon-press', self.GrabKey)
 
 self.FilterEntry.set_tooltip_text(_(Enter a filter.\nClick the 
keyboard image to grab a key for which to search.))
 self.FilterEntry.connect(changed, self.FilterChanged)
@@ -434,16 +429,15 @@ class FilterPage(GenericPage):
 self.FilterValueCheck.set_active(True)
 self.FilterEntry.set_text(new)
 
-# FIXME find a way to reuse this function
-
-def GrabKey(self, widget, pos, button):
+def GrabKey(self, widget, pos, event):
+if pos != gtk.ENTRY_ICON_PRIMARY:
+return
 grabber = KeyGrabber(label = _(Grab key combination))
 self.LeftWidget.pack_start(grabber, False, False)
 grabber.hide()
 grabber.set_no_show_all(True)
 grabber.connect('changed', self.GotKey)
 grabber.begin_key_grab(None)
-
 
 def ShowFilterError(self, text):
 
@@ -1191,7 +1185,7 @@ class MainPage(object):
 filterLabel.set_markup(HeaderMarkup % (_(Filter)))
 filterLabel.connect(style-set, 

ccsm: Changes to 'refs/tags/0.9.0'

[Sean Finney]

Tag '0.9.0' created by Guillaume Seguin guilla...@segu.in at 2010-07-04 08:38 
+

Compiz 0.9.0 release
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEABECAAYFAkwwSIUACgkQFGCg8MK49G7M/wCcChPOX0DzYS379jk6zWTS+P8l
I5IAoKw4iwUG1r8IAURga4gxN1Neva5t
=OhD+
-END PGP SIGNATURE-

Changes since 0.8.2:
C-F Language team (1):
  l10n updates

Christopher Williams (1):
  Don't destroy match dialog before reading contents

Dominique Leuenberger (2):
  A shebang is confusing in those files: they are a) installed -x, and as 
such the shebang is useless b) installed in a folder that is out of $PATH c) 
not meant to be started on their own. They are import(ed) by others.
  Force a .profile extension

Erkin Bahceci (4):
  Track compizconfig changes.
  Fix typos.
  Fix opening preferences page.
  Fix missing parameter in ImportProfileAs.

Guillaume Seguin (3):
  * Bump version to 0.8.3
  Update translations
  Fix charsets

Sam Spilsbury (9):
  Fix decoration plugin icon
  Add icons for new plugins in the 0.9.x series
  Merge branch 'master' of 
git+ssh://git.compiz.org/git/compiz/compizconfig/ccsm
  Added 0.9.0's copytex plugin icon
  Merge branch 'master' of 
git+ssh://git.compiz.org/git/compiz/compizconfig/ccsm
  Icon refresh for tango icon set
  Bump version
  Update package info
  Update NEWS for a 0.9.0 release

Scott Moreau (2):
  Increase max buttons to 20.
  Rename icons to reflect plugin changes.

---
 NEWS |5 
 VERSION  |2 
 ccm/Conflicts.py |8 
 ccm/Constants.py.in  |1 
 ccm/Pages.py |   13 
 ccm/Settings.py  |3 
 ccm/Utils.py |   21 
 ccm/Widgets.py   |5 
 ccm/Window.py|1 
 ccsm |3 
 images/22x22/apps/ccsm.png   |binary
 images/22x22/apps/ccsm.svg   |  457 --
 images/22x22/categories/plugins-accessibility.png|binary
 images/22x22/categories/plugins-all.png  |binary
 images/22x22/categories/plugins-desktop.png  |binary
 images/22x22/categories/plugins-effects.png  |binary
 images/22x22/categories/plugins-extras.png   |binary
 images/22x22/categories/plugins-image_loading.png|binary
 images/22x22/categories/plugins-profiles.png |binary
 images/22x22/categories/plugins-search.png   |binary
 images/22x22/categories/plugins-uncategorized.png|binary
 images/22x22/categories/plugins-utility.png  |binary
 images/22x22/categories/plugins-window_management.png|binary
 images/scalable/apps/ccsm.svg|  516 --
 images/scalable/apps/plugin-3d.svg   | 1258 -
 images/scalable/apps/plugin-addhelper.svg|  815 ++-
 images/scalable/apps/plugin-anaglyph.svg | 2693 
 images/scalable/apps/plugin-animation.svg|  149 
 images/scalable/apps/plugin-animationaddon.svg   |  126 
 images/scalable/apps/plugin-animationplus.svg|   95 
 images/scalable/apps/plugin-animationsim.svg |  271 +
 images/scalable/apps/plugin-annotate.svg |  232 -
 images/scalable/apps/plugin-atlantis.svg |  382 -
 images/scalable/apps/plugin-autumn.svg   |  154 
 images/scalable/apps/plugin-bench.svg|  403 -
 images/scalable/apps/plugin-bicubic.svg  |  131 
 images/scalable/apps/plugin-blur.svg |  317 -
 images/scalable/apps/plugin-bubbles.svg  | 1946 
 images/scalable/apps/plugin-clone.svg| 1343 --
 images/scalable/apps/plugin-colorfilter.svg  |  840 ++-
 images/scalable/apps/plugin-commands.svg | 1953 ++--
 images/scalable/apps/plugin-compiztoolbox.svg| 1533 +++
 images/scalable/apps/plugin-composite.svg| 1326 ++
 images/scalable/apps/plugin-copytex.svg  |  952 
 images/scalable/apps/plugin-core.svg |  612 ++
 images/scalable/apps/plugin-crashhandler.svg |  330 +
 images/scalable/apps/plugin-cube.svg |  378 +
 images/scalable/apps/plugin-cubeaddon.svg|  442 --
 images/scalable/apps/plugin-cubemodel.svg|  436 ++
 images/scalable/apps/plugin-dbus.svg |  189 
 images/scalable/apps/plugin-debug.svg|  956 +---
 

ccsm: Changes to 'refs/tags/ccsm-0.9.2.1+git20110224.cb1268cb-1'

[Sean Finney]

Tag 'ccsm-0.9.2.1+git20110224.cb1268cb-1' created by Sean Finney 
sean...@debian.org at 2011-03-06 00:42 +

Debian release 0.9.2.1+git20110224.cb1268cb-1

Changes since ccsm-0.8.4-2:
Christopher Williams (1):
  Don't destroy match dialog before reading contents

Dominique Leuenberger (2):
  A shebang is confusing in those files: they are a) installed -x, and as 
such the shebang is useless b) installed in a folder that is out of $PATH c) 
not meant to be started on their own. They are import(ed) by others.
  Force a .profile extension

Erkin Bahceci (4):
  Track compizconfig changes.
  Fix typos.
  Fix opening preferences page.
  Fix missing parameter in ImportProfileAs.

Guillaume Seguin (2):
  Update translations
  Fix charsets

Joe Rusbasan (1):
  Fix typo

Patrick Niklaus (3):
  Python 3 syntax and minor cleanup
  Removed the libsexy import
  Replaced libsexy code with gtk entry

Sam Spilsbury (15):
  Fix decoration plugin icon
  Add icons for new plugins in the 0.9.x series
  Merge branch 'master' of 
git+ssh://git.compiz.org/git/compiz/compizconfig/ccsm
  Added 0.9.0's copytex plugin icon
  Merge branch 'master' of 
git+ssh://git.compiz.org/git/compiz/compizconfig/ccsm
  Icon refresh for tango icon set
  Bump version
  Update package info
  Update NEWS for a 0.9.0 release
  0.9.2 icons refresh
  Update NEWS for 0.9.2
  Fix date on NEWS
  Update to 0.9.2.1
  Update NEWS for 0.9.2.1 Release
  Explcitly convert list items to str for now

Scott Moreau (2):
  Increase max buttons to 20.
  Rename icons to reflect plugin changes.

Sean Finney (9):
  Merge branch 'upstream-unstable' into debian-unstable
  Import Janos' Packaging work
  Add common 3.0 source format options
  Remove local changes snuck into packaging by dpkg-source 3.0
  Explicitly remove ccsm.desktop since setup.py unconditionally creates it
  New patch to remove invalid Compiz category from ccsm.desktop
  Fix mis-named md.po - mnk.po
  Remove leftover installed_files file during clean
  Prepare changelog

Silvia Dobrota (1):
  Focus filter entry on return to main page

---
 NEWS |   16 
 VERSION  |2 
 ccm/Conflicts.py |   11 
 ccm/Constants.py.in  |9 
 ccm/Pages.py |   81 
 ccm/Settings.py  |   75 
 ccm/Utils.py |   29 
 ccm/Widgets.py   |   44 
 ccm/Window.py|2 
 ccsm |   20 
 debian/changelog |   25 
 debian/compat|2 
 debian/control   |   12 
 debian/docs  |1 
 debian/install   |7 
 debian/patches/01-fix-extension-dir.patch|   18 
 debian/patches/desktop-file-category |9 
 debian/patches/invalid_desktop_category.patch|9 
 debian/patches/pygtk-breakage-workaround.patch   |9 
 debian/patches/remove-python-shebangs|   49 
 debian/patches/series|5 
 debian/pyversions|1 
 debian/rules |   82 
 debian/source/format |1 
 debian/source/local-options  |2 
 debian/watch |4 
 images/22x22/apps/ccsm.png   |binary
 images/22x22/apps/ccsm.svg   |  457 --
 images/22x22/categories/plugins-accessibility.png|binary
 images/22x22/categories/plugins-all.png  |binary
 images/22x22/categories/plugins-desktop.png  |binary
 images/22x22/categories/plugins-effects.png  |binary
 images/22x22/categories/plugins-extras.png   |binary
 images/22x22/categories/plugins-image_loading.png|binary
 images/22x22/categories/plugins-profiles.png |binary
 images/22x22/categories/plugins-search.png   |binary
 images/22x22/categories/plugins-uncategorized.png|binary
 images/22x22/categories/plugins-utility.png  |binary
 images/22x22/categories/plugins-window_management.png|binary
 images/scalable/apps/ccsm.svg|  516 --
 images/scalable/apps/plugin-3d.svg   | 1258 -
 images/scalable/apps/plugin-addhelper.svg

compiz-fusion-plugins-main: Changes to 'upstream-unstable'

[Sean Finney]

Rebased ref, commits from common ancestor:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pvzxf-0001ev...@alioth.debian.org

compiz-fusion-plugins-main: Changes to 'debian-unstable'

[Sean Finney]

/Makefile.am |   30 
 src/expo/expo.c  | 1862 --
 src/ezoom/CMakeLists.txt |3 
 src/ezoom/Makefile.am|   30 
 src/ezoom/ezoom.c| 2519 -
 src/jpeg/CMakeLists.txt  |6 
 src/jpeg/Makefile.am |   33 
 src/jpeg/imgjpeg.c   |  463 -
 src/kdecompat/CMakeLists.txt |3 
 src/kdecompat/Makefile.am|   30 
 src/kdecompat/kdecompat.c|  584 --
 src/mag/CMakeLists.txt   |3 
 src/mag/Makefile.am  |   29 
 src/mag/mag.c| 1306 
 src/mousepoll/CMakeLists.txt |3 
 src/mousepoll/Makefile.am|   18 
 src/mousepoll/mousepoll.c|  495 -
 src/neg/CMakeLists.txt   |3 
 src/neg/Makefile.am  |   30 
 src/neg/neg.c|  834 ---
 src/opacify/CMakeLists.txt   |3 
 src/opacify/Makefile.am  |   30 
 src/opacify/opacify.c|  649 --
 src/put/CMakeLists.txt   |3 
 src/put/Makefile.am  |   30 
 src/put/put.c| 1365 
 src/resizeinfo/CMakeLists.txt|3 
 src/resizeinfo/Makefile.am   |   35 
 src/resizeinfo/resizeinfo.c  |  736 --
 src/ring/CMakeLists.txt  |3 
 src/ring/Makefile.am |   30 
 src/ring/ring.c  | 1822 --
 src/scaleaddon/CMakeLists.txt|3 
 src/scaleaddon/Makefile.am   |   34 
 src/scaleaddon/scaleaddon.c  | 1379 
 src/session/CMakeLists.txt   |3 
 src/session/Makefile.am  |   19 
 src/session/session.c| 1154 
 src/shift/CMakeLists.txt |3 
 src/shift/Makefile.am|   30 
 src/shift/shift.c| 2677 -
 src/snap/CMakeLists.txt  |3 
 src/snap/Makefile.am |   30 
 src/snap/snap.c  | 1174 
 src/staticswitcher/CMakeLists.txt|3 
 src/staticswitcher/Makefile.am   |   30 
 src/staticswitcher/staticswitcher.c  | 2133 ---
 src/text/CMakeLists.txt  |3 
 src/text/Makefile.am |   34 
 src/text/text.c  |  734 --
 src/thumbnail/CMakeLists.txt |3 
 src/thumbnail/Makefile.am|   32 
 src/thumbnail/thumbnail.c| 1302 
 src/thumbnail/thumbnail_tex.h|  313 -
 src/titleinfo/CMakeLists.txt |3 
 src/titleinfo/Makefile.am|   30 
 src/titleinfo/titleinfo.c|  491 -
 src/vpswitch/CMakeLists.txt  |3 
 src/vpswitch/Makefile.am |   30 
 src/vpswitch/vpswitch.c  |  561 --
 src/wall/CMakeLists.txt  |3 
 src/wall/Makefile.am |   34 
 src/wall/wall.c  | 2263 
 src/winrules/CMakeLists.txt  |3 
 src/winrules/Makefile.am |   29 
 src/winrules/winrules.c  |  883 ---
 src/workarounds/CMakeLists.txt   |3 
 src/workarounds/Makefile.am  |   30 
 src/workarounds/workarounds.c|  855 ---
 staticswitcher   |1 
 text |1 
 thumbnail|1 
 titleinfo|1 
 vpswitch |1 
 wall |1 
 winrules |1 
 workarounds  |1 
 236 files changed, 347 insertions(+), 253192 deletions(-)

New commits:
commit b2ffc7e931489cf896d75ccce8f722615426e745
Author: Sean Finney sean...@debian.org
Date:   Fri Mar 4 07:03:01 2011 +

prepare upload

diff --git a/debian/changelog b/debian/changelog
index 665728b..477c208 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-compiz-fusion-plugins-main (0.9.2.1-1.1) unstable; urgency=low
+compiz-fusion-plugins-main

compiz-fusion-plugins-main: Changes to 'refs/tags/0.8.6'

[Sean Finney]

Tag '0.8.6' created by Guillaume Seguin guilla...@segu.in at 2010-04-23 04:58 
+

Compiz Fusion 0.8.6 release
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.14 (GNU/Linux)

iEYEABECAAYFAkvRKQ8ACgkQFGCg8MK49G6C7gCgjRB7J7OXHZWUlIn/TUrYAJfq
VJMAoJcNvbs6n/UsP8iVbdQaI6te6jkf
=rRdn
-END PGP SIGNATURE-

Changes since 0.8.4:
Danny Baumann (6):
  Fix property reading for 64-bit architectures.
  Add support for plasma popup slide effect.
  Add support for 'present window group' effect.
  Correctly reflect that the popup window is managed.
  Use pixmap size instead of the window size for animations.
  Handle windows that have server border set properly.

Erkin Bahceci (2):
  Remove commented out po strings, again.
  Don't animate notify-osd.

Guillaume Seguin (4):
  Update translations
  Update translations
  * Bump version to 0.8.5
  * Bump version to 0.8.6

Repos Merger (1):
  Merge branch 'master' of /git/fusion/plugins-main

Scott Moreau (1):
  General reorganization and cleanup.

---
 VERSION |2 
 metadata/animation.xml.in   |4 
 metadata/kdecompat.xml.in   |   33 +
 po/pt.po|2 
 src/kdecompat/kdecompat.c   |  704 ++--
 src/put/put.c   |   82 ++--
 src/staticswitcher/staticswitcher.c |3 
 7 files changed, 759 insertions(+), 71 deletions(-)
---


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pvzad-0004c0...@alioth.debian.org

compiz-fusion-plugins-main: Changes to 'refs/tags/0.9.0'

[Sean Finney]

Tag '0.9.0' created by Guillaume Seguin guilla...@segu.in at 2010-07-04 08:41 
+

Compiz 0.9.0 release
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEABECAAYFAkwwSS4ACgkQFGCg8MK49G5QOgCdElopwi9MRypRtz7RiGh8Kjtn
mcwAoJgJzvcNpPmV6v5zp+iGqG/2mTpY
=7awZ
-END PGP SIGNATURE-

Changes since the dawn of time:
Guillaume Seguin (2):
  Initial import
  Automatic submodules references update

Repos Merger (106):
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  

compiz-fusion-plugins-main: Changes to 'refs/tags/compiz-fusion-plugins-main-0.9.2.1+git20110224.g4a6783f-1'

[Sean Finney]

Tag 'compiz-fusion-plugins-main-0.9.2.1+git20110224.g4a6783f-1' created by Sean 
Finney sean...@debian.org at 2011-03-04 07:06 +

Debian release 0.9.2.1+git20110224.g4a6783f-1

Changes since 0.9.0:
Adel Gadllah (1):
  * Fix build on PPC64

Andrew (1):
  Fix whitespace.

Andrew Riedi (1):
  Fix whitespace.

C-F Language team (18):
  translation updates
  translation update
  emerald translation updates
  translation updates
  translation updates
  translation updates
  translation updates
  new translations and updates
  new translations and updates
  l10n updates
  l10n updates
  l10n updates
  l10n updates
  l10n updates
  l10n updates
  l10n updates
  l10n updates
  l10n updates

C-F language team (1):
  translation updates

Carlo Palma (1):
  New effect: Airplane

Compiz Fusion l10n team (1):
  Translations update

Cyril Brulebois (5):
  Add Vcs-* headers.
  Tighten dependencies on compiz-core.
  Try to detect ABI detection breakage, ensure COMPIZCORE_DEPENDS is not 
empty.
  Upload to unstable.
  Add Homepage field.

Danny Baumann (610):
  Begin to convert animation to use int descriptions.
  Fix basic metadata for former string options.
  Improve formatting and option description.
  Load resizeinfo after resize.
  Whitespace  formatting improvements.
  Use Compiz' resize notify message to determine the current window size.
  Build fix.
  Crash fix.
  Remove No
  Track the first grabbed window, not the last one.
  Use int options and int descriptions for the animation type options.
  Improve spelling and code formatting.
  Minor cleanup.
  Adjust TODO list and mail address.
  Don't do a fade animation while scale is active.
  Fix indentation.
  Re-sort some options.
  Fix indention.
  Re-sort some options.
  Fix whitespace.
  Added category and grouping.
  Whitespace fixes.
  Typo fix.
  Re-sort options.
  Dummy commit.
  printf - compLogMessage
  Merge branch 'master' of 
git+ssh://man...@git.opencompositing.org/git/compcomm/plugins/animation
  Use hovered window instead of selected window.
  printf - compLogMessage
  printf - compLogMessage
  printf - compLogMessage
  printf - compLogMessage
  Correctly round window highlight rectangle position.
  Don't wait for animation to finish for doing actions.
  Remove command line parameters for wall/resizeinfo/text build and replace 
them by proper package checks.
  Move to utility section.
  Move to utility section.
  Added pkg-config file and adjusted header file name.
  Updated Makefile and use text plugin package.
  Fix include file.
  Fixed include file (should have been done by commit hook...)
  Install text plugin header and pkg-config file.
  Merge branch 'master' of 
git+ssh://man...@git.opencompositing.org/git/compcomm/plugins-main
  Properly adjust maximum size of window title to slot size.
  Fix size calculation for windows without size increment hint.
  Adjust header.
  Properly free window private index.
  Fixed animation not being loadable.
  Fix automerge issues by copying the latest code from plugins/animation.
  Function and variable scope cleanup.
  Fix file list and fix conflicts by copying the latest code from the 
plugin repo.
  Improve description.
  prepareXCoords - transformToScreenSpace
  prepareXCoords - transformToScreenSpace.
  Fix possibly uninitialized return value.
  Remove trailing whitespace.
  Fix possible NULL pointer dereferences.
  Fix some possible NULL pointer dereferences.
  Update file list.
  xml - xml.in
  xml - xml.in
  xml - xml.in
  xml - xml.in
  xml - xml.in
  xml - xml.in
  xml - xml.in
  xml - xml.in
  xml - xml.in
  xml - xml.in
  xml - xml.in
  xml - xml.in
  xml - xml.in
  xml - xml.in
  xml - xml.in
  Update file list.
  Fix typo.
  Update to include -main plugin translatable strings.
  More German translation updates.
  Even more German translations.
  Check return value.
  Added NULL pointer check.
  Fix typo.
  Fixed a few typos and added some more translations.
  Include po directory in Makefile.am.
  Fix missing anim with transparent cube in magic lamp, dream, folds.
  Update file list.
  Update template.
  Updated German translation for gotovp.
  Translation update by Forlong.
  Fix indention.
  Compiz indention style.
  Indention fixes.
  Compiz indention style.
  Update file list.
  Fix incompatibility between unmap fadeout of the fade plugin and 
minimized window icon display.
  Also scale icons according to their position in the ring, not only the 
windows.
  Don't scale icons for minimized

compiz-fusion-plugins-extra: Changes to 'upstream-unstable'

[Sean Finney]

Rebased ref, commits from common ancestor:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pva56-000194...@alioth.debian.org

compiz-fusion-plugins-main: Changes to 'debian-unstable'

[Sean Finney]

 debian/changelog |6 ++
 debian/control   |4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 5c1701043afa8df9d9c7a1253ddcf915f022cc66
Author: Sean Finney sean...@debian.org
Date:   Fri Mar 4 22:35:44 2011 +

prepare changelog for release

diff --git a/debian/changelog b/debian/changelog
index 477c208..61e9d38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+compiz-fusion-plugins-main (0.9.2.1+git20110224.g4a6783f-2) experimental; 
urgency=low
+
+  * Fix FTBFS by adding Build-Dep on libglibmm-2.4-dev
+
+ -- Sean Finney sean...@debian.org  Fri, 04 Mar 2011 22:35:10 +
+
 compiz-fusion-plugins-main (0.9.2.1+git20110224.g4a6783f-1) experimental; 
urgency=low
 
   [ Janos Guljas ]

commit 8397196bbe43654821fa79d8e7b8cd0c2e473860
Author: Sean Finney sean...@debian.org
Date:   Fri Mar 4 22:34:31 2011 +

Fix FTBFS by adding Build-Dep on libglibmm-2.4-dev

diff --git a/debian/control b/debian/control
index 85c95cc..e065eed 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,9 @@ Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Sean Finney sean...@debian.org
 Build-Depends: debhelper (= 7.0.50~), cmake, xsltproc,
  compiz-dev (= 0.9.0), libdecoration0-dev (= 0.9.0), pkg-config,
- libgconf2-dev, libglib2.0-dev, libglu1-mesa-dev, libjpeg62-dev, libxml2-dev,
+ libgconf2-dev, libglib2.0-dev, 
+ libglibmm-2.4-dev,
+ libglu1-mesa-dev, libjpeg62-dev, libxml2-dev,
  libxslt1-dev, libcairo2-dev, libpango1.0-dev, librsvg2-dev, libsm-dev,
  libdbus-1-dev, libboost1.42-dev, libboost-serialization1.42-dev
 Standards-Version: 3.9.1


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pvdlp-0007xj...@alioth.debian.org

compiz-fusion-plugins-main: Changes to 'refs/tags/compiz-fusion-plugins-main-0.9.2.1+git20110224.g4a6783f-2'

[Sean Finney]

Tag 'compiz-fusion-plugins-main-0.9.2.1+git20110224.g4a6783f-2' created by Sean 
Finney sean...@debian.org at 2011-03-04 22:46 +

Debian release 0.9.2.1+git20110224.g4a6783f-2

Changes since compiz-fusion-plugins-main-0.9.2.1+git20110224.g4a6783f-1:
Sean Finney (2):
  Fix FTBFS by adding Build-Dep on libglibmm-2.4-dev
  prepare changelog for release

---
 debian/changelog |6 ++
 debian/control   |4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)
---


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pvdlb-0007av...@alioth.debian.org

compiz-fusion-plugins-extra: Changes to 'debian-unstable'

[Sean Finney]

|3 
 src/wallpaper/Makefile.am   |   30 
 src/wallpaper/wallpaper.c   |  985 -
 src/widget/CMakeLists.txt   |3 
 src/widget/Makefile.am  |   30 
 src/widget/widget.c | 1010 -
 trailfocus  |1 
 wallpaper   |1 
 widget  |1 
 222 files changed, 174 insertions(+), 263944 deletions(-)

New commits:
commit 14eac89a41236a8393a1888104a70aa6a6dad13e
Author: Sean Finney sean...@debian.org
Date:   Fri Mar 4 23:33:52 2011 +

Prepare changelog for update

diff --git a/debian/changelog b/debian/changelog
index 4254a17..70e500f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,7 @@ compiz-fusion-plugins-extra (0.9.2.1+git20110224.e621355c-1) 
experimental; urgen
   * Removed debian/install file.
   * Updated debian/watch file.
 
- -- Janos Guljas ja...@resenje.org  Mon, 15 Nov 2010 23:03:54 +0100
+ -- Sean Finney sean...@debian.org  Fri, 04 Mar 2011 23:33:21 +
 
 compiz-fusion-plugins-extra (0.8.4-3) UNRELEASED; urgency=low
 

commit bb1bca450727608e2227bb350c25d04bdff9cc31
Author: Sean Finney sean...@debian.org
Date:   Fri Mar 4 20:18:04 2011 +0100

Add common format 3.0 local-options

diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 000..9cdfca9
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1,2 @@
+unapply-patches
+abort-on-upstream-changes

commit 3e146cfff6f51208170a9e420a6d164dfac4188f
Author: Sean Finney sean...@debian.org
Date:   Fri Mar 4 20:16:29 2011 +0100

prepare changelog

diff --git a/debian/changelog b/debian/changelog
index 823acdc..4254a17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-compiz-fusion-plugins-extra (0.9.2.1-1.1) unstable; urgency=low
+compiz-fusion-plugins-extra (0.9.2.1+git20110224.e621355c-1) experimental; 
urgency=low
 
   [ Janos Guljas ]
   * New upstream release.

commit 9e2ad9bc99a71b76fdab40a93d5060a98e58edfe
Author: Sean Finney sean...@debian.org
Date:   Fri Mar 4 20:14:11 2011 +0100

Incorporate Janos' packaging work

diff --git a/debian/changelog b/debian/changelog
index 96f3b56..823acdc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+compiz-fusion-plugins-extra (0.9.2.1-1.1) unstable; urgency=low
+
+  [ Janos Guljas ]
+  * New upstream release.
+  * Bump standards to 3.9.1.
+  * Switch to dpkg format 3.0 (quilt)
+  * Rewrite debian/rules to use debhelper 7.
+  * Removed debian/install file.
+  * Updated debian/watch file.
+
+ -- Janos Guljas ja...@resenje.org  Mon, 15 Nov 2010 23:03:54 +0100
+
 compiz-fusion-plugins-extra (0.8.4-3) UNRELEASED; urgency=low
 
   * Add Homepage field.
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index b89c7d0..a340399 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,12 @@ Source: compiz-fusion-plugins-extra
 Priority: extra
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Sean Finney sean...@debian.org
-Build-Depends: automake1.9, autotools-dev, compiz-dev (= 0.8.4), 
compiz-fusion-bcop (= 0.8.4), compiz-fusion-plugins-main (= 0.8.4), debhelper 
(= 5), intltool, libgconf2-dev, libglib2.0-dev, 
- libglu1-mesa-dev,
- libtool, libxml2-dev, libxslt1-dev, pkg-config, xsltproc, librsvg2-dev, 
libcairo2-dev, libsm-dev, libdbus-1-dev, libjpeg62-dev, libdecoration0-dev (= 
0.8.4)
-Standards-Version: 3.7.2
+Build-Depends: debhelper (= 7.0.50~), cmake, pkg-config, xsltproc,
+ compiz-dev (= 0.9), libdecoration0-dev (= 0.9), compiz-fusion-plugins-main 
(= 0.9),
+ librsvg2-dev, libcairo2-dev, libsm-dev, libdbus-1-dev, libjpeg62-dev,
+ libxslt1-dev, libglu1-mesa-dev, libnotify-dev,
+ libboost1.42-dev, libboost-serialization1.42-dev
+Standards-Version: 3.9.1
 Section: x11
 Vcs-Git: 
git://git.debian.org/git/pkg-xorg/bling/compiz-fusion-plugins-extra.git
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/bling/compiz-fusion-plugins-extra.git
@@ -14,12 +16,13 @@ Homepage: http://wiki.compiz.org/PluginsExtra
 Package: compiz-fusion-plugins-extra
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${compizcore:Depends}
+Breaks: compiz-core ( 0.9.0)
 Description: Compiz Fusion plugins - extra collection
  Compiz Fusion is the result of the re-unification of the Beryl-project
  and the community around the Compiz Window Manager. It seeks to provide
  an easy and fun-to-use windowing environment, allowing use of the
  graphics hardware to provide impressive effects, amazing speed and
- unrivalled usefulness
+ unrivalled usefulness.
  .
  This package provides plugins which are not as well tested and supported
  as the main plugins from the compiz-fusion project.
diff --git a/debian/docs b/debian/docs
index a3d08bc..ff9f8cf 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,3 +1,2 @@
 NEWS
 AUTHORS

compiz-fusion-plugins-extra: Changes to 'refs/tags/0.9.0'

[Sean Finney]

Tag '0.9.0' created by Guillaume Seguin guilla...@segu.in at 2010-07-04 08:41 
+

Compiz 0.9.0 release
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEABECAAYFAkwwSU8ACgkQFGCg8MK49G7z3gCgszr34DuqEAgIbfTbdjA0dvoM
A3sAniZq/ATpbyw2TMSFTnpkpm/vvsOe
=kVie
-END PGP SIGNATURE-

Changes since the dawn of time:
Guillaume Seguin (2):
  Initial import
  Automatic submodules references update

Repos Merger (100):
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update
  Automatic submodules references update

Sam Spilsbury (1):
  Add git-dist target


-- 

compiz-fusion-plugins-extra: Changes to 'refs/tags/compiz-fusion-plugins-extra-0.9.2.1+git20110224.e621355c-1'

[Sean Finney]

Tag 'compiz-fusion-plugins-extra-0.9.2.1+git20110224.e621355c-1' created by 
Sean Finney sean...@debian.org at 2011-03-04 23:36 +

Debian release 0.9.2.1+git20110224.e621355c-1

Changes since 0.9.0:
Andrew Wedderburn (1):
  Added cube cap for the up coming 0.5.2 release

C-F Language team (17):
  translation updates
  translation update
  emerald translation updates
  translation updates
  translation updates
  translation updates
  translation updates
  new translations and updates
  new translations and updates
  l10n updates
  l10n updates
  l10n updates
  l10n updates
  l10n updates
  l10n updates
  l10n updates
  l10n updates

C-F language team (1):
  translation updates

Compiz Fusion l10n team (1):
  Translations update

Cyril Brulebois (4):
  Add Vcs-* fields.
  Tighten dependencies on compiz-core.
  Upload to unstable.
  Add Homepage field.

Danny Baumann (451):
  Allow assigning a key binding to the 'Change glow color' action.
  Use the window add notify to apply autotabbing.
  Only bind tab bar layers to texture when they're actually drawn.
  Merge branch 'master' of 
git+ssh://man...@git.opencompositing.org/git/compcomm/plugins/group
  Revert Use
  Remove rotation check.
  Properly use core's screenTexEnvMode function.
  Fix typo.
  Fix maximum value for tab bar spring friction.
  Fix hang after slot DnD caused by massive calls to groupShowDelayTimeout.
  Better fix for the 'hang on slot drop' problem.
  Improve the damage handling for tab bars.
  Fix slot damaging for slots dragged to another viewport.
  Fix crash when dropping slots on another tab bar.
  More damage fixes.
  Fix glow size calculation.
  Finally really fix w-output calculation.
  printf - compLogMessage
  Adjust default value for thumb spacing.
  printf - compLogMessage
  printf - compLogMessage
  Move to utility section.
  Use text plugin package.
  Rename group.h to group-internal.h.
  Fix reflection for single head setups.
  Better fix for single head setups.
  Remove unneeded hints.
  Rename displayPrivateIndex - groupDisplayPrivateIndex to prevent symbol 
conflicts.
  Fix windows losing their tab bar when autotabbing is enabled, 
auto-ungrouping is enabled and a window is dragged of the tab bar so only one 
window is remaining.
  xml - xml.in
  xml - xml.in
  xml - xml.in
  xml - xml.in
  Actually rename xml - xml.in
  xml - xml.in
  xml - xml.in
  xml - xml.in
  xml - xml.in
  xml - xml.in
  xml - xml.in
  xml - xml.in
  xml - xml.in
  xml - xml.in
  Actually rename xml - xml.in
  Update file list.
  Update file list.
  Update to include -main plugin translatable strings.
  More German translation updates.
  Even more German translations.
  Indention fixes.
  Added 'after' dependency for blur which is needed for reflection to be 
visible with blur loaded.
  Fix typo.
  Improve tab bar painting code.
  Optimize window paint routine.
  Furtherly optimize window paint routine and do not reference local 
variables outside their scope.
  Fixed a few typos and added some more translations.
  Cleanups and beautification.
  Fix headers.
  Include po directory in Makefile.am.
  Fix tab bar fading.
  Fix typo.
  Whitespace fixes.
  Add build system for gotovp.
  Fix viewport switching after entering an invalid target number.
  Update file list.
  Update template.
  Updated German translation for gotovp.
  Use less hacky way to prevent moving/resizing of showdesktop'ed windows.
  Set showdesktop'ed windows to unmanaged so they aren't handled by 
updateWindowAttributes and friends.
  Compiz indent style and minor cleanup.
  Translation update by Forlong.
  Dummy commit.
  Keep plugins alphabetically sorted.
  Keep plugins alphabetically sorted.
  Update file list.
  Add build system for scalefilter.
  Merge branch 'master' of 
git+ssh://man...@git.opencompositing.org/git/fusion/plugins-extra
  Fix typo.
  Merge branch 'master' of 
git+ssh://man...@git.opencompositing.org/git/fusion/plugins-extra
  Fix copy'n'paste error.
  Beryl - Compiz
  Beryl - Compiz
  Added basic text input localization support.
  More UTF-8 fixes.
  Fix typo.
  Update with intltool-update
  Added translations for scalefilter.
  Only set the needed locale type, LC_ALL breaks string formatting for 
floating point numbers in pixel shaders ;-)
  Some updates to German translation.
  Some more minor German translation updates.
  Update file list.
  More German translation updates.
  Update file list.
  Added option for case insensitive filtering.
  Drop previously applied filter with Escape

compiz-fusion-plugins-extra: Changes to 'upstream-squeeze'

[Sean Finney]

New branch 'upstream-squeeze' available with the following commits:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pveea-0007io...@alioth.debian.org

compiz-fusion-plugins-extra: Changes to 'debian-squeeze'

[Sean Finney]

New branch 'debian-squeeze' available with the following commits:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pveep-0007k4...@alioth.debian.org

libcompizconfig: Changes to 'upstream-unstable'

[Sean Finney]

Rebased ref, commits from common ancestor:
commit 78a7cc8ca71020dff42dd2731071bfdf548ea2e8
Author: Sam Spilsbury sam.spilsb...@canonical.com
Date:   Thu Nov 25 18:22:33 2010 +0800

Revert Add a COMPIZCONFIG_PROFILE env var so that distributions and

This reverts commit e1438fb552487271ebed9894516c74210eb3de81.

No need for it, we have COMPIZ_CONFIG_PROFILE

diff --git a/cmake/LibCompizConfigCommon.cmake 
b/cmake/LibCompizConfigCommon.cmake
index a5e154e..de27b71 100644
--- a/cmake/LibCompizConfigCommon.cmake
+++ b/cmake/LibCompizConfigCommon.cmake
@@ -5,7 +5,7 @@ include (CompizPackage)
 
 macro (_get_backend_parameters _prefix)
 set (_current_var _foo)
-set (_supported_var PKGDEPS LDFLAGSADD CFLAGSADD LIBRARIES LIBDIRS INCDIRS 
FILESADD)
+set (_supported_var PKGDEPS LDFLAGSADD CFLAGSADD LIBRARIES LIBDIRS INCDIRS)
 foreach (_val ${_supported_var})
set (${_prefix}_${_val})
 endforeach (_val)
@@ -87,8 +87,7 @@ function (compizconfig_backend bname)
 add_library (
${bname} SHARED ${_cpp_files}
${_h_files}
-   ${_c_files}
-   ${compizconfig_${_BACKEND}_FILESADD})
+   ${_c_files})
 
 target_link_libraries (
${bname}
diff --git a/src/main.c b/src/main.c
index e052885..4d861f6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -59,13 +59,7 @@ initGeneralOptions (CCSContext * context)
 else
ccsSetBackend (context, ini);
 
-/* The session might ask for a specific profile */
-
-if ((val = getenv (COMPIZCONFIG_PROFILE)))
-{
-   ccsSetProfile (context, val);
-}
-else if (ccsReadConfig (OptionProfile, val))
+if (ccsReadConfig (OptionProfile, val))
 {
ccsSetProfile (context, val);
free (val);
@@ -566,7 +560,7 @@ openBackend (char *backend)
 
 if (home  strlen (home))
 {
-   asprintf (dlname, %s/.compizconfig/backends/lib%s.so,
+   asprintf (dlname, %s/.compizconfig/backends/lib%s.so, 
  home, backend);
dlerror ();
dlhand = dlopen (dlname, RTLD_NOW | RTLD_NODELETE | RTLD_LOCAL);
@@ -578,7 +572,7 @@ openBackend (char *backend)
 if (dlname) {
free (dlname);
 }
-   asprintf (dlname, %s/compizconfig/backends/lib%s.so,
+   asprintf (dlname, %s/compizconfig/backends/lib%s.so, 
  LIBDIR, backend);
dlhand = dlopen (dlname, RTLD_NOW | RTLD_NODELETE | RTLD_LOCAL);
err = dlerror ();
@@ -1536,7 +1530,7 @@ ccsGetSortedPluginStringList (CCSContext * context)
found = TRUE;
l2 = l2-next;
}
-
+   
if (p  !ccsPluginListFind (plugins[i].after, p)  !found)
plugins[i].after = ccsPluginListAppend (plugins[i].after, p);
 
@@ -1774,9 +1768,9 @@ ccsReadSettings (CCSContext * context)
 {
 if (!context)
return;
-
+
 CONTEXT_PRIV (context);
-
+
 if (!cPrivate-backend)
return;
 
@@ -1842,7 +1836,7 @@ ccsWriteSettings (CCSContext * context)
 {
 if (!context)
return;
-
+
 CONTEXT_PRIV (context);
 
 if (!cPrivate-backend)
@@ -1882,9 +1876,9 @@ ccsWriteChangedSettings (CCSContext * context)
 {
 if (!context)
return;
-
+
 CONTEXT_PRIV (context);
-
+
 if (!cPrivate-backend)
return;
 
@@ -2263,7 +2257,7 @@ ccsCanDisablePlugin (CCSContext * context, CCSPlugin * 
plugin)
}
pluginList = pluginList-next;
}
-
+   
}
if (conflict)
list = ccsPluginConflictListAppend (list, conflict);
@@ -2279,9 +2273,9 @@ ccsGetExistingProfiles (CCSContext * context)
 {
 if (!context)
return NULL;
-
+
 CONTEXT_PRIV (context);
-
+
 if (!cPrivate-backend)
return NULL;
 
@@ -2296,9 +2290,9 @@ ccsDeleteProfile (CCSContext * context, char *name)
 {
 if (!context)
return;
-
+
 CONTEXT_PRIV (context);
-
+
 if (!cPrivate-backend)
return;
 
@@ -2473,7 +2467,7 @@ ccsExportToFile (CCSContext *context,
if (skipDefaults  setting-isDefault)
continue;
 
-   asprintf (keyName, s%d_%s,
+   asprintf (keyName, s%d_%s, 
  context-screenNum, setting-name);
 
switch (setting-type)
@@ -2573,7 +2567,7 @@ ccsImportFromFile (CCSContext *context,
if (!setting-isDefault  !overwriteNonDefault)
continue;
 
-   asprintf (keyName, s%d_%s,
+   asprintf (keyName, s%d_%s, 
  context-screenNum, setting-name);
 
switch (setting-type)

commit f7355bf03c3611e9349661c6cad2865a83d1b134
Author: Sam Spilsbury sam.spilsb...@canonical.com
Date:   Thu Nov 25 18:07:13 2010 +0800

Ensure that we install the config defaults in SYSCONFDIR and also add a 
custom target for it

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 

libcompizconfig: Changes to 'debian-unstable'

[Sean Finney]

 CMakeLists.txt |  197 
 INSTALL|  239 --
 Makefile.am|   25 -
 NEWS   |   18 
 VERSION|2 
 autogen.sh |   16 
 backend/CMakeLists.txt |5 
 backend/Makefile.am|   18 
 backend/ini.c  |  727 ---
 backend/src/ini.c  |  721 +++
 cmake/CMakeLists.txt   |8 
 cmake/FindCompizConfig.cmake   |   86 +++
 cmake/LibCompizConfigCommon.cmake  |  122 +
 config.h.in|5 
 config/CMakeLists.txt  |   10 
 config/Makefile.am |6 
 configure.ac   |  156 --
 debian/changelog   |   16 
 debian/compat  |2 
 debian/control |8 
 debian/libcompizconfig-dev.install |9 
 debian/libcompizconfig0.install|3 
 debian/rules   |   88 ---
 debian/source/format   |1 
 debian/source/local-options|2 
 debian/watch   |4 
 include/CMakeLists.txt |9 
 include/Makefile.am|3 
 include/ccs.h  |   33 -
 libcompizconfig.pc.in  |2 
 metadata/Makefile.am   |5 
 metadata/ccp.xml   |7 
 plugin/CMakeLists.txt  |6 
 plugin/Makefile.am |   15 
 plugin/ccp.c   |  844 -
 plugin/ccp.xml |7 
 plugin/ccp/CMakeLists.txt  |   16 
 plugin/ccp/ccp.xml.in  |7 
 plugin/ccp/src/ccp.cpp |  532 +++
 plugin/ccp/src/ccp.cpp~|  536 +++
 plugin/ccp/src/ccp.h   |   73 +++
 po/POTFILES.in |2 
 src/CMakeLists.txt |   79 +++
 src/Makefile.am|   52 --
 src/compiz.cpp |  159 ++
 src/compizconfig.proto |8 
 src/config.c   |2 
 src/main.c |   74 ---
 48 files changed, 2583 insertions(+), 2382 deletions(-)

New commits:
commit 3475736511c33db57ecc381d15a9fbf2d628d51d
Author: Sean Finney sean...@debian.org
Date:   Sun Feb 27 09:42:11 2011 +

Temp hack for upstream cruft in repo and after build

diff --git a/debian/rules b/debian/rules
index 8b9be96..1ca6489 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,12 @@ CORE_ABIVERSION := $(shell sed -rn 
's/^\#define[[:space:]]+CORE_ABIVERSION[[:spa
 %:
dh $@
 
+
+# temporary hack for a tmp file left in upstream repo
+override_dh_clean:
+   dh_clean -X plugin/ccp/src/ccp.cpp~
+   rm -f src/compizconfig.pb.cc src/compizconfig.pb.h
+
 override_dh_auto_configure:
dh_auto_configure -- -DCOMPIZ_BUILD_WITH_RPATH=FALSE 
-DCOMPIZ_PACKAGING_ENABLED=TRUE -DCOMPIZ_PLUGIN_INSTALL_TYPE=package
 

commit 8820916e88fc0182c4abf2146974e843a6bae51d
Author: Sean Finney sean...@debian.org
Date:   Sun Feb 27 09:40:26 2011 +

Add unapply-patches and abort-on-upstream-changes to local-options

diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 000..8293bbd
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1,2 @@
+apply-patches
+abort-on-upstream-changes

commit fd868d88df9f814a3cea6e6c2c71425ef6a08ef7
Author: Sean Finney sean...@debian.org
Date:   Sun Feb 27 09:38:29 2011 +

Prepare new release

diff --git a/debian/changelog b/debian/changelog
index c0acfc3..73a1623 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libcompizconfig (0.9.2.1+git20110226.78a7cc8c-1) experimental; urgency=low
+
+  * Incorporate Janos Guljas' compiz packaging work, thanks!
+
+ -- Sean Finney sean...@debian.org  Sun, 27 Feb 2011 09:36:37 +
+
 libcompizconfig (0.9.2.1-1.1) unstable; urgency=low
 
   * New upstream release

commit cdcbbe940b4e3f6fc68fbe60a8917ad1a7b722eb
Author: Sean Finney sean...@debian.org
Date:   Sun Feb 27 09:30:31 2011 +

Incorporate Janos Guljas' packaging work

diff --git a/debian/changelog b/debian/changelog
index 10d0191..c0acfc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libcompizconfig (0.9.2.1-1.1) unstable; urgency=low
+
+  * New upstream release
+  * Bump standards to 3.9.1
+  * Switch to dpkg version 3.0 (quilt)
+  * Rewrite debian/rules to use debhelper 7.
+  * Added debian/watch file
+
+ -- Janos Guljas ja...@resenje.org  Sun, 14 Nov 2010 20:13:28 +0100
+
 libcompizconfig (0.8.4-3) UNRELEASED; urgency=low
 
   * Update upstream git repo url in debian/copyright.
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5

libcompizconfig: Changes to '07merge'

[Sean Finney]

New branch '07merge' available with the following commits:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ptdlc-qv...@alioth.debian.org

libcompizconfig: Changes to 'upstream-squeeze'

[Sean Finney]

New branch 'upstream-squeeze' available with the following commits:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ptdli-tu...@alioth.debian.org

libcompizconfig: Changes to 'debian-squeeze'

[Sean Finney]

New branch 'debian-squeeze' available with the following commits:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ptdom-0001b7...@alioth.debian.org

libcompizconfig: Changes to 'refs/tags/0.9.0'

[Sean Finney]

Tag '0.9.0' created by Guillaume Seguin guilla...@segu.in at 2010-07-04 08:36 
+

Compiz 0.9.0 release
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEABECAAYFAkwwSCUACgkQFGCg8MK49G56lQCdEt97go4xcqRLb0zwASkKuZDz
vyIAoJR2ttV+n4FulGIAp+OR33/4Zw12
=1ku1
-END PGP SIGNATURE-

Changes since 0.7.8:
Danny Baumann (6):
  Link against libX11 because we need it for XStringToKeysym.
  Fix memory leak.
  Sanity check input values of ccsFindSetting.
  Mem leak fixes and minor cleanup.
  Revert accidential change.
  Fix precedence order of LC_* environment variables.

Dennis Kasprzyk (2):
  Initial compiz++ changes.
  Track core changes.

Dominique Leuenberger (1):
  Better control of destination folders by introducing the same variables 
as in core

Erkin Bahceci (28):
  Ignore extensions  string restrictions at compiz startup.
  Remove global metadata.
  Speed up metadata parsing via protocol buffers.
  Disable protobuf automatically if not installed.
  Clean up whitespace.
  Add compizconfig.proto to dist. Simplify Makefile.am.
  Merge branch 'master' of 
git+ssh://cornel...@git.opencompositing.org/git/fusion/compizconfig/libcompizconfig
  Add source URL to protobuf warning message.
  Fix circular dependency error (bug 1061).
  Use $XDG_CACHE_HOME/compizconfig/ as protobuf cache directory.
  Disable protobuf if cache dir cannot be created.
  Create protobuf cache dir recursively.
  Merge branch 'master' of 
git+ssh://cornel...@git.opencompositing.org/git/fusion/compizconfig/libcompizconfig
  Don't write .pb for ini, gconf, ccp, kconfig.
  Track core changes.
  Update .pb when an older .xml is used, too.
  Remove display-related stuff.
  Remove more display-related stuff.
  Remove display and multi-screen stuff.
  Compare string find result with npos.
  Fix shadowing issues.
  Fix memory leaks.
  Fix memory leaks.
  Avoid allocating 0-size memory. Fix memory leak.
  Fix encoding of corner followed by adjacent edge case.
  Fix crash when LANG has no value.
  Fix checking of libprotobuf version = 2.1.
  Fix compiler warnings.

Guillaume Seguin (1):
  * Bump version to 0.7.9

Live session user (2):
  Include CompizPackage cmake header too
  Merge branch 'master' of 
git://anongit.compiz.org/compiz/compizconfig/libcompizconfig

Lubos Lunak (1):
  Fix copy'n'paste mistakes in allocation size.

Sam Spilsbury (34):
  Added support for POSIX 2008's definition of scandir ()
  Added merged autoreconf/cmake buildsystem.
  * Fix incorrect pkgconfig installaton
  Remove debug message
  Fix internal build
  Actually fix internal build
  Remove autotools builsystem
  Remove unnecessary debug message
  Use libcompizconfig: label for errors rather than libccs:
  Merge branch 'master' of 
git+ssh://git.compiz.org/git/compiz/compizconfig/libcompizconfig
  Install plugin globally
  Added ALL_LIGUAS support and tidy up buildsystem
  Add git-dist target and uninstall target (a bit of a hack though...)
  Make backend buildsystem more modular and similar to compiz_plugin 
function
  Ensure the package is found before continuing
  Fix ini build
  Adapt for buildsystem changes
  Track core buildsystem changes
  Remove some rpath usage
  Added optional building with rpath
  Merge branch 'master' of 
git+ssh://git.compiz.org/git/compiz/compizconfig/libcompizconfig
  Add COMPIZ_DESTDIR support to libcompizconfig
  Use the COMPIZ_BUILD_WITH_RPATH option to disable setting an rpath on
  Store files in the compiz-1 dir and drop the ++ extension
  Add proper COMPIZ_DESTDIR support to findcompizconfig_install
  Merge branch 'master' of 
git+ssh://git.compiz.org/git/compiz/compizconfig/libcompizconfig
  Fix backends build
  Merge branch 'master' of 
git+ssh://git.compiz.org/git/compiz/compizconfig/libcompizconfig
  Don't install FindCompizConfig.cmake to ${prefix}/share/compiz/cmake
  Add a COMPIZ_PACKAGING_ENABLED option for packagers to tweak libdir, et.
  Save protobuf files in XDG_CACHE_DIR/compizconfig-1 to prevent conflicts 
where 0.8 protobuf files might be loaded into 0.9 and vice versa
  Load files from .compiz-1
  Bump version
  Update NEWS for 0.9.0 release

Travis Watkins (2):
  don't change default backend when it fails to load
  add so versioning to libcompizconfig.so

---
 CMakeLists.txt|  194 ++
 Makefile.am   |   25 
 NEWS  |8 
 VERSION   |2 
 autogen.sh|   16 
 backend/CMakeLists.txt|5 
 backend/Makefile.am   |   18 
 backend/ini.c |  718 
 backend/src/ini.c |  721 
 cmake/CMakeLists.txt 

libcompizconfig: Changes to 'refs/tags/libcompizconfig-0.9.2.1+git20110226.78a7cc8c-1'

[Sean Finney]

Tag 'libcompizconfig-0.9.2.1+git20110226.78a7cc8c-1' created by Sean Finney 
sean...@debian.org at 2011-02-27 09:52 +

Debian release 0.9.2.1+git20110226.78a7cc8c-1

Changes since 0.9.0:
Danny Baumann (5):
  Fix ini file corruption.
  Another attempt at properly fixing file locking.
  Make wobbly provide the feature edgeresistance.
  Prevent binding key combinations with invalid key names.
  Merge branch '0.6.0' of 
git+ssh://man...@git.opencompositing.org/git/fusion/compizconfig/libcompizconfig
 into 0.6.0

Dennis Kasprzyk (2):
  Do not create dir/file during import.
  Allow empty lists.

Didier Roche (1):
  Give a default value to COMPIZ_SYSCONFDIR

Erkin Bahceci (9):
  Update .pb when an older .xml is used, too.
  Compare string find result with npos.
  Fix memory leaks.
  Fix memory leaks.
  Avoid allocating 0-size memory. Fix memory leak.
  Fix encoding of corner followed by adjacent edge case.
  Fix crash when LANG has no value.
  Fix checking of libprotobuf version = 2.1.
  Fix compiler warnings.

Guillaume Seguin (5):
  * Bump VERSION to 0.6.1
  Fix compizconfig.proto dist inclusion
  * Bump version to 0.8.2
  * Bump version to 0.8.3
  * Bump version to 0.8.4

Jigish Gohil (1):
  bump version to 0.6.0

Julien Cristau (4):
  Disable protobuf to work around #572923.
  Link libcompizconfig with -ldl (closes: #558875)
  Prepare changelog for upload
  Update upstream git repo url in debian/copyright.

Loïc Minier (8):
  Bdep on libxcursor-dev; closes: #525240, #524943
  Revert Bdep on libxcursor-dev; closes: #525240, #524943
  Depend on compiz-core and -abiversion-2009xxyy
  Add Vcs-Git-* control headers
  Fix missing -abiversion in virtual dep
  Let libcompizconfig-dev dep on compiz-dev
  Bump compiz-dev bdep and dep to 0.8.2-6 for FTBFS
  Update changelog for 0.8.2-2

Roland Baer (1):
  Sanitised return value(s) of getNodesFromXPath().

Roland Bär (1):
  Plug minor memleak.

Sam Spilsbury (11):
  Fix backends not linking against libraries specified in PKGDEPS
  Update INSTALL file
  Update NEWS for 0.9.2
  Fix warnings when protobuf is disabled
  Add a LIBCOMPIZCONFIG_VERSION_MACRO and update to 0.9.2.1
  Update NEWS for 0.9.2.1 Release
  Update NEWS for 0.9.2.1 Release
  Add a COMPIZCONFIG_PROFILE env var so that distributions and
  Merge branch 'master' of 
git+ssh://git.compiz.org/git/compiz/compizconfig/libcompizconfig
  Ensure that we install the config defaults in SYSCONFDIR and also add a 
custom target for it
  Revert Add a COMPIZCONFIG_PROFILE env var so that distributions and

Sean Finney (41):
  initial autoconfination of code
  initial debianization
  Merge commit 'upstream/0.6.0' into debian-unstable
  re-run autogen.sh
  - update debian packaging for new upstream
  s/libcompizconfig0-dev/libcompizconfig-dev/g
  update/clarify copyright info
  Merge branch 'upstream-unstable' of 
git+ssh://git.debian.org/git/pkg-xorg/bling/libcompizconfig into 07merge
  Merge branch 'upstream-unstable' into debian-unstable
  new upstream release
  catch new xml file shipped in /usr/share/compiz
  delete disappeared upstream files
  catch autocruft
  update build deps
  add autofoo build-deps
  more autofoo build-deps
  Merge commit '0.7.6' into upstream-unstable
  Merge branch 'upstream-unstable' into debian-unstable
  new upstream release
  Merge commit '0.8.2' into upstream-unstable
  Merge branch 'upstream-unstable' into debian-unstable
  add gbp.conf for use with git-buildpackage
  add build-dep on libprotobuf-dev and protobuf-compiler
  update standard-version to 3.8.1
  remove usr/share/compizconfig from libcompizconfig0.install
  prep changelog for upload
  update build-dep version against compiz-dev
  another change to the changelog
  Merge commit '0.8.4' into upstream-unstable
  Merge branch 'upstream-unstable' into debian-unstable
  Prepare 0.8.4-1
  Update Build-Depends against compiz-dev to 0.8.4-1 for ABI bump.
  Update changelog to mention ABI bump.
  Merge commit '0.9.0' into debian-unstable
  Merge commit '0780051028371e006173c5a30ddd1d7930630375' into 
debian-unstable
  Merge commit '0d25d2e9a2aaacacf5a6efe75f995fb1e51bea9c' into 
debian-unstable
  Merge branch 'upstream-unstable' into debian-unstable
  Incorporate Janos Guljas' packaging work
  Prepare new release
  Add unapply-patches and abort-on-upstream-changes to local-options
  Temp hack for upstream cruft in repo and after build

---
 CMakeLists.txt |9 -
 INSTALL|  239 +
 NEWS   |   10 +
 cmake/LibCompizConfigCommon.cmake  |7 -
 config/CMakeLists.txt

compizconfig-backend-gconf: Changes to '07merge'

[Sean Finney]

New branch '07merge' available with the following commits:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pte74-0001uw...@alioth.debian.org

compizconfig-backend-gconf: Changes to 'debian-squeeze'

[Sean Finney]

New branch 'debian-squeeze' available with the following commits:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pte74-0001vd...@alioth.debian.org

compizconfig-backend-gconf: Changes to 'upstream-squeeze'

[Sean Finney]

New branch 'upstream-squeeze' available with the following commits:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pte75-0001vv...@alioth.debian.org

compizconfig-backend-gconf: Changes to 'debian-unstable'

[Sean Finney]

 CMakeLists.txt   |   23 
 Makefile.am  |7 
 NEWS |   15 
 VERSION  |2 
 autogen.sh   |   16 
 configure.ac |   84 -
 debian/changelog |   17 
 debian/compat|2 
 debian/control   |   11 
 debian/copyright |4 
 debian/install   |1 
 debian/rules |   74 -
 debian/source/format |1 
 debian/source/local-options  |2 
 debian/watch |4 
 settings-backend/Makefile.am |   14 
 settings-backend/gconf.c | 2070 --
 src/gconf.c  | 2108 +++
 18 files changed, 2190 insertions(+), 2265 deletions(-)

New commits:
commit db10ac36078a5dcdde0d5f872d5eb033792df4cd
Author: Sean Finney sean...@debian.org
Date:   Sun Feb 27 10:38:53 2011 +

update debian/copyright

diff --git a/debian/copyright b/debian/copyright
index 12db44a..7dbd7ff 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,10 @@ This package was debianized by Sean Finney 
sean...@debian.org.
 
 It was downloaded from 
git://anongit.compiz-fusion.org/fusion/compizconfig/compizconfig-backend-gconf
 
+ * Copyright (c) 2006 Robert Carr rac...@opencompositing.org
+ * Copyright (c) 2007 Danny Baumann man...@opencompositing.org
+ * Copyright (c) 2007 Dennis Kasprzyk onest...@opencompositing.org
+
 Upstream Authors (Lead Developers, see AUTHORS for full list): 
 
Danny Baumann dannybaum...@web.de

commit c7ab6cd52ef8b9467092c755bbc062cb233289dd
Author: Sean Finney sean...@debian.org
Date:   Sun Feb 27 10:31:59 2011 +

add unapply-patches and abort-on-upstream-changes to local-options

diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 000..9cdfca9
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1,2 @@
+unapply-patches
+abort-on-upstream-changes

commit 0a4c862b6feb1941bbaab36eca8cd06430ecbb30
Author: Sean Finney sean...@debian.org
Date:   Sun Feb 27 10:31:35 2011 +

Incorporate Janos' packaging work

diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 46a969d..edd14eb 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,12 @@ Source: compizconfig-backend-gconf
 Priority: extra
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Sean Finney sean...@debian.org
-Build-Depends: debhelper (= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (= 0.8.4), intltool, libcompizconfig-dev (= 0.8.4), 
libglib2.0-dev, libgconf2-dev, libtool, pkg-config, xsltproc
-Standards-Version: 3.8.1
+Build-Depends: debhelper (= 7.0.50~), cmake, intltool, pkg-config, libtool,
+ compiz-dev (= 0.9.0), libcompizconfig-dev (= 0.9.0), libglib2.0-dev,
+ libgconf2-dev, libxslt1-dev, libxml2-dev
+Standards-Version: 3.9.1
 Section: x11
+Homepage: http://www.compiz.org/
 Vcs-Git: git://git.debian.org/git/pkg-xorg/bling/compizconfig-backend-gconf.git
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/bling/compizconfig-backend-gconf.git
 
@@ -16,7 +19,7 @@ Description: Compiz Fusion configuration system - gconf 
backend
  and the community around the Compiz Window Manager. It seeks to provide
  an easy and fun-to-use windowing environment, allowing use of the
  graphics hardware to provide impressive effects, amazing speed and
- unrivalled usefulness
+ unrivalled usefulness.
  .
  This package provides the gconf-based configuration backend for the 
- compiz-fusion plugin system
+ compiz-fusion plugin system.
diff --git a/debian/install b/debian/install
deleted file mode 100644
index b73f6a0..000
--- a/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/compizconfig/backends/*.so
diff --git a/debian/rules b/debian/rules
index 69e92c1..5b62395 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,73 +4,13 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-   CFLAGS += -O0
-else
-   CFLAGS += -O2
-endif
+CORE_ABIVERSION := $(shell sed -rn 
's/^\#define[[:space:]]+CORE_ABIVERSION[[:space:]]+//p' 
/usr/include/compiz/core/core.h )
 
-AUTOFOO_DELETE:=Makefile.in aclocal.m4 config.guess config.sub configure \
-   depcomp install-sh intltool-extract.in intltool-merge.in \
-   intltool-update.in ltmain.sh missing mkinstalldirs \
-   settings-backend/Makefile.in po
+%:
+   dh $@
 
-configure: configure-stamp
-configure-stamp:
-   dh_testdir
-   ./autogen.sh --prefix=/usr --disable-static
-   touch configure-stamp
+override_dh_auto_configure:
+   dh_auto_configure -- -DCOMPIZ_BUILD_WITH_RPATH=FALSE 
-DCOMPIZ_PACKAGING_ENABLED=TRUE -DCOMPIZ_PLUGIN_INSTALL_TYPE=package
 
-build: build-stamp
-build

compizconfig-backend-gconf: Changes to 'upstream-unstable'

[Sean Finney]

Rebased ref, commits from common ancestor:
commit 861a1d44b2041d760226ffc2e7d8f62f4afd4d0d
Author: Sam Spilsbury smspillaz@XPS-UNITY.(none)
Date:   Mon Dec 13 05:09:28 2010 +0800

Fix branch confusion

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 67f4ffa..0ab43d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,157 +4,7 @@ find_package (CompizConfig REQUIRED)
 
 include (LibCompizConfigCommon)
 
-# Generate GConf Schemas for existing installed plugins
-
-set (GENERATE_SCHEMAS_FOR_EXISTING_PLUGINS 1 CACHE BOOL Generate GConf 
schemas for existing plugins)
-
-if (GENERATE_SCHEMAS_FOR_EXISTING_PLUGINS)
-pkg_check_modules (GCONF gconf-2.0)
-
-find_program (GCONFTOOL_EXECUTABLE gconftool-2)
-mark_as_advanced (FORCE GCONFTOOL_EXECUTABLE)
-set (COMPIZ_GCONF_SCHEMAS_XSLT 
${CMAKE_SOURCE_DIR}/xslt/compiz_gconf_schemas.xslt)
-
-if (NOT COMPIZ_INSTALL_GCONF_SCHEMA_DIR)
-set (SCHEMADIR ${CMAKE_INSTALL_PREFIX}/share/gconf/schemas)
-else (NOT COMPIZ_INSTALL_GCONF_SCHEMA_DIR)
-set (SCHEMADIR ${COMPIZ_INSTALL_GCONF_SCHEMA_DIR})
-endif (NOT COMPIZ_INSTALL_GCONF_SCHEMA_DIR)
-
-if (NOT GCONF_FOUND OR NOT GCONFTOOL_EXECUTABLE)
-   set (GENERATE_SCHEMAS_FOR_EXISTING_PLUGINS 0)
-else ()
-   option (
-   COMPIZ_DISABLE_SCHEMAS_INSTALL
-   Disables gconf schema installation with gconftool
-   OFF
-   )
-
-   set (
-   COMPIZ_INSTALL_GCONF_SCHEMA_DIR ${COMPIZ_INSTALL_GCONF_SCHEMA_DIR} 
CACHE PATH
-   Installation path of the gconf schema file
-   )
-
-   function (compiz_install_gconf_schema _src _dst _name)
-   find_program (GCONFTOOL_EXECUTABLE gconftool-2)
-   mark_as_advanced (FORCE GCONFTOOL_EXECUTABLE)
-
-   if (GCONFTOOL_EXECUTABLE AND NOT COMPIZ_DISABLE_SCHEMAS_INSTALL)
-   install (CODE 
-   if (\\$ENV{USER}\ STREQUAL \root\)
-   exec_program (${GCONFTOOL_EXECUTABLE}
-   ARGS \--get-default-source\
-   OUTPUT_VARIABLE ENV{GCONF_CONFIG_SOURCE})
-   exec_program (${GCONFTOOL_EXECUTABLE}
-   ARGS \--makefile-install-rule ${_src}  
/dev/null\)
-   else (\\$ENV{USER}\ STREQUAL \root\)
-   exec_program (${GCONFTOOL_EXECUTABLE}
-   ARGS \--install-schema-file=${_src}  
/dev/null\)
-   endif (\\$ENV{USER}\ STREQUAL \root\)
-   )
-   endif ()
-   install (
-   FILES ${_src}
-   DESTINATION ${COMPIZ_DESTDIR}${_dst}
-   RENAME ${_name}
-   )
-   endfunction ()
-
-   # generate gconf schema
-   function (compiz_gconf_schema _src _dst _inst _name)
-   find_program (XSLTPROC_EXECUTABLE xsltproc)
-   mark_as_advanced (FORCE XSLTPROC_EXECUTABLE)
-
-   if (XSLTPROC_EXECUTABLE)
-   add_custom_command (
-   OUTPUT ${_dst}
-   COMMAND ${XSLTPROC_EXECUTABLE}
-   -o ${_dst}
-   ${COMPIZ_GCONF_SCHEMAS_XSLT}
-   ${_src}
-   DEPENDS ${_src}
-   )
-   compiz_install_gconf_schema (${_dst} ${_inst} ${_name})
-   endif ()
-   endfunction ()
-
-   # generate schemas for existing plugins in compiz prefix
-
-   file (GLOB _compiz_schema_files ${COMPIZ_PREFIX}/share/compiz/*.xml)
-   foreach (_file ${_compiz_schema_files})
-   string (LENGTH ${COMPIZ_PREFIX}/share/compiz/ _dir_len)
-   string (LENGTH ${_file} _path_len)
-
-   math (EXPR _file_len ${_path_len} - ${_dir_len})
-   math (EXPR _plugin_name_len ${_file_len} - 4)
-
-   string (SUBSTRING ${_file} ${_dir_len} ${_file_len} _plugin_name)
-   string (SUBSTRING ${_plugin_name} 0 ${_plugin_name_len} 
_plugin_name)
-   if (NOT COMPIZ_INSTALL_GCONF_SCHEMA_DIR)
-   set (PLUGIN_SCHEMADIR ${COMPIZ_PREFIX}/share/gconf/schemas)
-   else (NOT COMPIZ_INSTALL_GCONF_SCHEMA_DIR)
-   set (PLUGIN_SCHEMADIR ${COMPIZ_INSTALL_GCONF_SCHEMA_DIR})
-   endif (NOT COMPIZ_INSTALL_GCONF_SCHEMA_DIR)
-   compiz_gconf_schema (${_file} 
${CMAKE_BINARY_DIR}/generated/compiz-${_plugin_name}.schemas
-${PLUGIN_SCHEMADIR} 
compiz-${_plugin_name}.schemas)
-   list (APPEND _gconf_files_add 
${CMAKE_BINARY_DIR}/generated/compiz-${_plugin_name}.schemas)
-   endforeach ()
-
-   # generate schemas for existing plugins in package prefix
-
-   file (GLOB _compiz_schema_files ${datadir}/compiz/*.xml)
-   foreach (_file ${_compiz_schema_files})
-   string (LENGTH ${datadir}/compiz/ _dir_len)
-   string (LENGTH ${_file} _path_len)
-
-   math (EXPR _file_len 

compizconfig-backend-gconf: Changes to 'refs/tags/0.9.0'

[Sean Finney]

Tag '0.9.0' created by Guillaume Seguin guilla...@segu.in at 2010-07-04 08:37 
+

Compiz 0.9.0 release
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEABECAAYFAkwwSD0ACgkQFGCg8MK49G4JTACgiruAIyd4Hj0hcCpJeIEUbHoL
1UQAniW+4sYGxV4p8UqZ8TDRDgL9/Z+4
=IZga
-END PGP SIGNATURE-

Changes since 0.8.4:
Danny Baumann (1):
  Merge branch 'master' of 
git+ssh://git.compiz.org/git/fusion/compizconfig/compizconfig-backend-gconf

Guido Iribarren (1):
  Integrate metacity's resize_with_right_button option.

Guillaume Seguin (1):
  * Bump version to 0.8.5

Sam Spilsbury (12):
  Remove multiple-screen support for compiz++
  Dummy commit
  Remove dummy
  Add merged autotools / cmake buildsystem and adjust for compiz++
  Remove autotools builsystem
  Merge branch 'compiz++' of 
git+ssh://smspil...@git.compiz.org/git/fusion/compizconfig/compizconfig-backend-gconf
 into compiz++
  Update for libcompizconfig buildsystem changes
  Add package generation
  Typo
  Set project definition in cmake file
  Bump version
  Update NEWS for 0.9.0 release

---
 CMakeLists.txt   |   22 
 Makefile.am  |7 
 NEWS |7 
 VERSION  |2 
 autogen.sh   |   16 
 configure.ac |   84 -
 settings-backend/Makefile.am |   14 
 settings-backend/gconf.c | 2070 --
 src/gconf.c  | 2113 +++
 9 files changed, 2143 insertions(+), 2192 deletions(-)
---


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pte83-0001qt...@alioth.debian.org

compizconfig-backend-gconf: Changes to 'refs/tags/compizconfig-backend-gconf-0.9.2.1+git20110226.g861a1d4-1'

[Sean Finney]

Tag 'compizconfig-backend-gconf-0.9.2.1+git20110226.g861a1d4-1' created by Sean 
Finney sean...@debian.org at 2011-02-27 10:41 +

Debian release 0.9.2.1+git20110226.g861a1d4-1

Changes since compizconfig-backend-gconf-0.8.4-1:
Danny Baumann (1):
  Merge branch 'master' of 
git+ssh://git.compiz.org/git/fusion/compizconfig/compizconfig-backend-gconf

Didier Roche (1):
  fix schema owner and typo

Guido Iribarren (1):
  Integrate metacity's resize_with_right_button option.

Guillaume Seguin (1):
  * Bump version to 0.8.5

Sam Spilsbury (23):
  Remove multiple-screen support for compiz++
  Dummy commit
  Remove dummy
  Add merged autotools / cmake buildsystem and adjust for compiz++
  Remove autotools builsystem
  Merge branch 'compiz++' of 
git+ssh://smspil...@git.compiz.org/git/fusion/compizconfig/compizconfig-backend-gconf
 into compiz++
  Update for libcompizconfig buildsystem changes
  Add package generation
  Typo
  Set project definition in cmake file
  Bump version
  Update NEWS for 0.9.0 release
  Update NEWS for 0.9.2 release
  Fix date on NEWS
  Update to 0.9.2.1
  Set COMPIZCONFIG_GCONF_VERSION_MACRO and update to 0.9.2.1
  Update NEWS for 0.9.2.1 Release
  Update NEWS for 0.9.2.1 Release
  Change paths so that old and new settings don't conflict
  Fix setting /allscreens, we should set /screen%i (defaults to screen 0)
  Add multiscreen support
  Merge branch 'master' of 
git+ssh://git.compiz.org/git/compiz/compizconfig/compizconfig-backend-gconf
  Fix branch confusion

Sean Finney (6):
  Merge commit '0.9.0' into debian-unstable
  Merge branch 'upstream-unstable' into debian-unstable
  Prepare changelog for next upload
  Incorporate Janos' packaging work
  add unapply-patches and abort-on-upstream-changes to local-options
  update debian/copyright

---
 CMakeLists.txt   |   23 
 Makefile.am  |7 
 NEWS |   15 
 VERSION  |2 
 autogen.sh   |   16 
 configure.ac |   84 -
 debian/changelog |   17 
 debian/compat|2 
 debian/control   |   11 
 debian/copyright |4 
 debian/install   |1 
 debian/rules |   74 -
 debian/source/format |1 
 debian/source/local-options  |2 
 debian/watch |4 
 settings-backend/Makefile.am |   14 
 settings-backend/gconf.c | 2070 --
 src/gconf.c  | 2108 +++
 18 files changed, 2190 insertions(+), 2265 deletions(-)
---


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pte85-0001re...@alioth.debian.org

compizconfig-backend-gconf: Changes to 'refs/tags/compizconfig-backend-gconf-0.9.2.1+git20110226.g861a1d4'

[Sean Finney]

Tag 'compizconfig-backend-gconf-0.9.2.1+git20110226.g861a1d4' created by Sean 
Finney sean...@debian.org at 2011-02-27 10:47 +

Tagging new upstream release
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)

iEYEABECAAYFAk1qK8kACgkQynjLPm522B2dyACfVvLvg3YA2bDlq0lqVabgC5BN
mQUAn1NrsJm4og6ktLG4BXpp5p1lg0gl
=c2BJ
-END PGP SIGNATURE-

Changes since 0.9.0:
Didier Roche (1):
  fix schema owner and typo

Sam Spilsbury (11):
  Update NEWS for 0.9.2 release
  Fix date on NEWS
  Update to 0.9.2.1
  Set COMPIZCONFIG_GCONF_VERSION_MACRO and update to 0.9.2.1
  Update NEWS for 0.9.2.1 Release
  Update NEWS for 0.9.2.1 Release
  Change paths so that old and new settings don't conflict
  Fix setting /allscreens, we should set /screen%i (defaults to screen 0)
  Add multiscreen support
  Merge branch 'master' of 
git+ssh://git.compiz.org/git/compiz/compizconfig/compizconfig-backend-gconf
  Fix branch confusion

---
 CMakeLists.txt |5 +++--
 NEWS   |3 +--
 VERSION|2 +-
 src/gconf.c|   33 ++---
 4 files changed, 19 insertions(+), 24 deletions(-)
---


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pteac-0002qb...@alioth.debian.org

compizconfig-backend-kconfig4: Changes to 'debian-lenny-backports'

[Sean Finney]

New branch 'debian-lenny-backports' available with the following commits:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ptfhe-0005y2...@alioth.debian.org

compizconfig-backend-kconfig4: Changes to 'debian-unstable'

[Sean Finney]

 CMakeLists.txt   |1 
 NEWS |   15 ++
 VERSION  |2 
 cmake/addons.cmake   |4 -
 debian/changelog |   18 +++
 debian/compat|2 
 debian/control   |   21 
 debian/copyright |2 
 debian/install   |2 
 debian/lintian-overrides |2 
 debian/patches/build-system-broken.patch |   18 +++
 debian/patches/series|1 
 debian/rules |   75 ++-
 debian/source/format |1 
 debian/source/local-options  |2 
 debian/watch |4 +
 src/CMakeLists.txt   |   10 +++-
 src/kconfig_backend.cpp  |   39 ++--
 18 files changed, 100 insertions(+), 119 deletions(-)

New commits:
commit 0a2dff25d212f35e833a799d5c2c4f469899b67d
Author: Sean Finney sean...@debian.org
Date:   Sun Feb 27 12:20:01 2011 +

Update lintian/overrides

diff --git a/debian/lintian-overrides b/debian/lintian-overrides
index 331b7d3..24dc892 100644
--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
@@ -1 +1 @@
-compizconfig-backend-kconfig: binary-or-shlib-defines-rpath 
./usr/lib/compizconfig/backends/libkconfig4.so /usr/lib
+compizconfig-backend-kconfig4: binary-or-shlib-defines-rpath 
./usr/lib/compizconfig/backends/libkconfig4.so /usr/lib

commit 5fdd84faf5cbfa76ba11912ee3d8604a8481466f
Author: Sean Finney sean...@debian.org
Date:   Sun Feb 27 12:19:29 2011 +

Update debian/copyright

diff --git a/debian/copyright b/debian/copyright
index 12db44a..dd7e6a4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,8 @@ This package was debianized by Sean Finney sean...@debian.org.
 
 It was downloaded from 
git://anongit.compiz-fusion.org/fusion/compizconfig/compizconfig-backend-gconf
 
+ *  Copyright (c) 2008 Dennis Kasprzyk onest...@compiz-fusion.org
+
 Upstream Authors (Lead Developers, see AUTHORS for full list): 
 
Danny Baumann dannybaum...@web.de

commit 5986ac1779924ae54041c3de5531f5ad3d65fa6f
Author: Sean Finney sean...@debian.org
Date:   Sun Feb 27 12:15:33 2011 +

Add a temporary workaround for broken upstream cmake config

diff --git a/debian/patches/build-system-broken.patch 
b/debian/patches/build-system-broken.patch
new file mode 100644
index 000..3f986cc
--- /dev/null
+++ b/debian/patches/build-system-broken.patch
@@ -0,0 +1,18 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 5612c4a..782afa8 100644
+--- a/src/CMakeLists.txt
 b/src/CMakeLists.txt
+@@ -1,11 +1,11 @@
+ find_package(KDE4 REQUIRED)
++include(KDE4Defaults)
++include(MacroLibrary)
+ find_package (Compiz REQUIRED)
+ 
+ add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+ 
+-include(KDE4Defaults)
+ include(FindPkgConfig)
+-include(MacroLibrary)
+ include(CompizCommon)
+ include(CompizPackage)
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000..c88f5b9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+build-system-broken.patch

commit 7dff41101a5f37e605b744e28777bbabb090e359
Author: Sean Finney sean...@debian.org
Date:   Sun Feb 27 11:24:31 2011 +

Prepare changelog for next upload

diff --git a/debian/changelog b/debian/changelog
index 399153f..334dade 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+compizconfig-backend-kconfig4 (0.9.2.1+git20110226.770eb464-1) experimental; 
urgency=low
+
+  * Incorporate packaging work by Janos. Thanks!
+
+ -- Sean Finney sean...@debian.org  Sun, 27 Feb 2011 11:22:51 +
+
 compizconfig-backend-kconfig4 (0.9.2.1-1.1) unstable; urgency=low
 
   [ Janos Guljas ]

commit 815c73434d252630ef63b137132c9c74d22f
Author: Sean Finney sean...@debian.org
Date:   Sun Feb 27 11:23:32 2011 +

Add local-options used in other compiz packages

diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 000..9cdfca9
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1,2 @@
+unapply-patches
+abort-on-upstream-changes

commit 63fb2622c58da36ccfea245407cc557da1c15bbf
Author: Sean Finney sean...@debian.org
Date:   Sun Feb 27 11:21:42 2011 +

Incorporate Janos' packaging work

diff --git a/debian/changelog b/debian/changelog
index 0ac2420..399153f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+compizconfig-backend-kconfig4 (0.9.2.1-1.1) unstable; urgency=low
+
+  [ Janos Guljas ]
+  * New upstream release.
+  * Rename package to compizconfig-backend-kconfig4.
+  * Bump standards to 3.9.1.
+  * Switch to dpkg format 3.0 (quilt)
+  * Rewrite debian/rules to use debhelper 7.
+  * Add debian/watch file.
+
+ -- Janos Guljas ja...@resenje.org  Mon

compizconfig-backend-kconfig4: Changes to 'master'

[Sean Finney]

New branch 'master' available with the following commits:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ptfhe-0005ym...@alioth.debian.org

compizconfig-backend-kconfig4: Changes to 'upstream-unstable'

[Sean Finney]

 CMakeLists.txt  |1 -
 NEWS|   15 +++
 VERSION |2 +-
 cmake/addons.cmake  |4 ++--
 src/CMakeLists.txt  |   10 +-
 src/kconfig_backend.cpp |   39 +++
 6 files changed, 34 insertions(+), 37 deletions(-)

New commits:
commit 770eb46487b271541fb23a6a74dcb1030797f94e
Author: Sam Spilsbury smspil...@gmail.com
Date:   Sat Nov 6 20:48:58 2010 +0800

Update NEWS for 0.9.2.1 Release

diff --git a/NEWS b/NEWS
index 62f37ce..0e4faa2 100644
--- a/NEWS
+++ b/NEWS
@@ -10,3 +10,6 @@ Release 0.9.2 (2010-10-24 Sam Spilsbury smspil...@gmail.com)
 ==
 Development release.
 
+Release 0.9.2.1 (2010-11-06 Sam Spilsbury sam.spilsb...@canonical.com)
+
+Bugfix release.

commit 0bb0cd3906e56a55a53810a069c3fe004b0b47b1
Author: Sam Spilsbury smspil...@gmail.com
Date:   Sat Nov 6 20:42:34 2010 +0800

Update to 0.9.2.1

diff --git a/VERSION b/VERSION
index f626ec2..5d08606 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.9.0
+VERSION=0.9.2.1

commit 762987fe678873a9af90fa7815b52338f84433c5
Author: Sam Spilsbury smspil...@gmail.com
Date:   Sun Oct 24 22:49:54 2010 +0800

Update NEWS for 0.9.2 release

diff --git a/NEWS b/NEWS
index c0d9009..62f37ce 100644
--- a/NEWS
+++ b/NEWS
@@ -4,4 +4,9 @@ Development release.
 
 Integrate into libcompizconfig buildsystem.
 
-Adjust for libcompizconfig API changes
\ No newline at end of file
+Adjust for libcompizconfig API changes
+
+Release 0.9.2 (2010-10-24 Sam Spilsbury smspil...@gmail.com)
+==
+Development release.
+

commit 73eb88f089bee4043d35b4f4c1793eff18c20561
Author: Sam Spilsbury smspil...@gmail.com
Date:   Sun Jul 4 09:11:00 2010 +0800

Update NEWS for 0.9.0 release

diff --git a/NEWS b/NEWS
new file mode 100644
index 000..c0d9009
--- /dev/null
+++ b/NEWS
@@ -0,0 +1,7 @@
+Release 0.9.0 (2010-07-03 Sam Spilsbury smspil...@gmail.com)
+==
+Development release.
+
+Integrate into libcompizconfig buildsystem.
+
+Adjust for libcompizconfig API changes
\ No newline at end of file

commit ff1d449fd09e70e1ee8accae386614bd87a25cdc
Author: Sam Spilsbury smspil...@gmail.com
Date:   Fri May 21 00:53:59 2010 +0800

Added COMPIZ_DESTDIR support

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6c861b6..7b29852 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,6 +6,11 @@ include(KDE4Defaults)
 include(FindPkgConfig)
 include(MacroLibrary)
 
+set (CMAKE_SKIP_RPATH FALSE)
+
+option (COMPIZ_BUILD_WITH_RPATH Leave as ON unless building packages ON)
+set (COMPIZ_DESTDIR ${COMPIZ_DESTDIR} CACHE STRING Leave blank unless 
building packages)
+
 pkg_check_modules(CCS REQUIRED libcompizconfig)
 
 QT4_ADD_DBUS_INTERFACE( kconfig4_kwin_SRCS org.kde.KWin.xml kwin_interface )
@@ -20,4 +25,4 @@ kde4_add_library(kconfig4 SHARED ${kconfig4_LIB_SRCS})
 
 target_link_libraries(kconfig4 ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} 
${CCS_LIBRARIES} X11)
 
-install(TARGETS kconfig4 DESTINATION ${CCS_LIBDIR}/compizconfig/backends)
+install(TARGETS kconfig4 DESTINATION 
${COMPIZ_DESTDIR}${CCS_LIBDIR}/compizconfig/backends)

commit 1749b0a0a1172963e09b4f4aa667793ee0d763b1
Author: Sam Spilsbury smspil...@gmail.com
Date:   Fri May 14 12:22:32 2010 +

Add dist and uninstall targets

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e3467d..cf8f47c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,4 +21,6 @@ add_subdirectory(src)
 
 cf_print_configure_header ()
 
-cf_add_package_generation (CompizConfig KDE 4 storage backend)
\ No newline at end of file
+compiz_add_uninstall ()
+cf_add_package_generation (CompizConfig KDE 4 storage backend)
+compiz_add_git_dist ()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6c861b6..c72963e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,10 +1,13 @@
 find_package(KDE4 REQUIRED)
+find_package (Compiz REQUIRED)
 
 add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 
 include(KDE4Defaults)
 include(FindPkgConfig)
 include(MacroLibrary)
+include(CompizCommon)
+include(CompizPackage)
 
 pkg_check_modules(CCS REQUIRED libcompizconfig)
 

commit d0cbf24911e20717e200a7f73f65a08feb3e6413
Author: Sam Spilsbury smspil...@gmail.com
Date:   Fri May 7 10:35:21 2010 +0800

Remove dummy

diff --git a/dummy b/dummy
deleted file mode 100644
index e69de29..000

commit df91ed16fff3f3f140bd6d12f1cf27a3c8c5b2b9
Author: Sam Spilsbury smspil...@gmail.com
Date:   Fri May 7 10:35:15 2010 +0800

Dummy commit

diff --git a/dummy b/dummy
new file mode 100644
index 000..e69de29

commit 7f6404839715fc5a35b9ef08bbd46b2229dcb62f
Author: Sam Spilsbury smspil...@gmail.com
Date:   Sun Apr 25 14:28:09 2010 +

Remove dummy

diff --git a/dummy 

compizconfig-backend-kconfig4: Changes to 'debian-squeeze'

[Sean Finney]

New branch 'debian-squeeze' available with the following commits:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ptfhe-0005yx...@alioth.debian.org

compizconfig-backend-kconfig4: Changes to 'upstream-lenny-backports'

[Sean Finney]

New branch 'upstream-lenny-backports' available with the following commits:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ptfhe-0005z1...@alioth.debian.org

compizconfig-backend-kconfig4: Changes to 'upstream-squeeze'

[Sean Finney]

New branch 'upstream-squeeze' available with the following commits:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ptfhe-0005zg...@alioth.debian.org

compizconfig-backend-kconfig4: Changes to 'refs/tags/0.9.0'

[Sean Finney]

Tag '0.9.0' created by Guillaume Seguin guilla...@segu.in at 2010-07-04 08:37 
+

Compiz 0.9.0 release
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEABECAAYFAkwwSEcACgkQFGCg8MK49G6eFwCfRd3POm1xtXyee1zE4BUHUhSH
5NsAoJ1VXcibDX3RkwaVxwwEy0zhcefI
=UM6h
-END PGP SIGNATURE-

Changes since 0.8.4:
Guillaume Seguin (1):
  * Bump version to 0.8.5

Sam Spilsbury (10):
  Allow building with Compiz 0.9.0
  Dummy commit
  Remove dummy
  Dummy commit
  Remove dummy
  Merge branch 'compiz++'
  Add dist and uninstall targets
  Added COMPIZ_DESTDIR support
  Merge branch 'master' of 
git+ssh://smspil...@git.compiz.org/git/compiz/compizconfig/compizconfig-backend-kconfig4
  Update NEWS for 0.9.0 release

---
 CMakeLists.txt  |1 -
 NEWS|7 +++
 VERSION |2 +-
 cmake/addons.cmake  |4 ++--
 src/CMakeLists.txt  |   10 +-
 src/kconfig_backend.cpp |   39 +++
 6 files changed, 26 insertions(+), 37 deletions(-)
---


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ptfpk-eh...@alioth.debian.org

compizconfig-backend-kconfig4: Changes to 'refs/tags/0.9.2.1+git20110226.770eb464'

[Sean Finney]

Tag '0.9.2.1+git20110226.770eb464' created by Sean Finney sean...@debian.org 
at 2011-02-27 12:31 +

Tagging 0.9.2.1+git20110226.770eb464

Changes since 0.9.0:
Sam Spilsbury (3):
  Update NEWS for 0.9.2 release
  Update to 0.9.2.1
  Update NEWS for 0.9.2.1 Release

---
 NEWS|1 -
 VERSION |2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
---


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ptfpx-ho...@alioth.debian.org

compizconfig-backend-kconfig4: Changes to 'refs/tags/compizconfig-backend-kconfig-0.9.2.1+git20110226.770eb464-1'

[Sean Finney]

Tag 'compizconfig-backend-kconfig-0.9.2.1+git20110226.770eb464-1' created by 
Sean Finney sean...@debian.org at 2011-02-27 12:25 +

Debian release 0.9.2.1+git20110226.770eb464-1

Changes since 0.9.2.1+git20110226.770eb464:
Sean Finney (21):
  initial (re-)debianization.
  add build-depends and modify build system to use quilt
  update debian/rules for new upstream (cmake) build system
  new force-link-against-lX11.patch: force linking with -lX11
  prepare changelog
  Merge branch 'upstream-unstable' into debian-unstable
  prepare 0.8.4-1
  Update Build-Depends against compiz-dev to = 0.8.4 for ABI bump.
  Update changelog with ABI bump
  Remove patch force-link-against-lX11.patch, fixed upstream.
  re-prepare 0.8.4-1
  Add lintian override for the private libraries with defined rpath
  prepare changelog for 0.8.4-2
  Merge commit '0.9.0' into debian-unstable
  Merge branch 'upstream-unstable' into debian-unstable
  Incorporate Janos' packaging work
  Add local-options used in other compiz packages
  Prepare changelog for next upload
  Add a temporary workaround for broken upstream cmake config
  Update debian/copyright
  Update lintian/overrides

---
 debian/changelog |   75 +++
 debian/compat|1 
 debian/control   |   25 ++
 debian/copyright |   21 
 debian/gbp.conf  |8 +++
 debian/lintian-overrides |1 
 debian/patches/build-system-broken.patch |   18 +++
 debian/patches/series|1 
 debian/rules |   16 ++
 debian/source/format |1 
 debian/source/local-options  |2 
 debian/watch |4 +
 12 files changed, 173 insertions(+)
---


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ptfq0-iv...@alioth.debian.org

Re: compizconfig-backend-kconfig4_0.9.2.1+git20110226.770eb464-1_i386.changes is NEW

[Sean Finney]

Hi FTP masters,

Can you please remove these files?  I merged someone else's work that
incorrectly changed the package names.

Thanks!
Sean

On Sun, 2011-02-27 at 12:48 +, Debian FTP Masters wrote:
 (new) 
 compizconfig-backend-kconfig4_0.9.2.1+git20110226.770eb464-1.debian.tar.gz 
 extra x11
 (new) compizconfig-backend-kconfig4_0.9.2.1+git20110226.770eb464-1.dsc extra 
 x11
 (new) compizconfig-backend-kconfig4_0.9.2.1+git20110226.770eb464-1_i386.deb 
 extra x11
 Compiz Fusion configuration system - kconfig backend
  Compiz Fusion is the result of the re-unification of the Beryl-project
  and the community around the Compiz Window Manager. It seeks to provide
  an easy and fun-to-use windowing environment, allowing use of the
  graphics hardware to provide impressive effects, amazing speed and
  unrivalled usefulness.
  .
  This package provides the kconfig-based (kde) configuration backend for the
  compiz-fusion plugin system.
 (new) compizconfig-backend-kconfig4_0.9.2.1+git20110226.770eb464.orig.tar.gz 
 extra x11
 Changes: compizconfig-backend-kconfig4 (0.9.2.1+git20110226.770eb464-1) 
 experimental; urgency=low
  .
   * Incorporate packaging work by Janos. Thanks!
 
 
 Override entries for your package:
 
 Announcing to debian-devel-chan...@lists.debian.org
 
 
 Your package contains new components which requires manual editing of
 the override file.  It is ok otherwise, so please be patient.  New
 packages are usually added to the override file about once a week.
 
 You may have gotten the distribution wrong.  You'll get warnings above
 if files already exist in other distributions.
 



signature.asc
Description: This is a digitally signed message part

compizconfig-backend-kconfig4: Changes to 'debian-unstable'

[Sean Finney]

 debian/changelog |   12 ++--
 debian/control   |4 ++--
 debian/lintian-overrides |2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

New commits:
commit e8622e146f7e483abba239dd75524866bb944f5d
Author: Sean Finney sean...@debian.org
Date:   Sun Feb 27 17:01:31 2011 +0100

Prepare for next upload

diff --git a/debian/changelog b/debian/changelog
index 1fe3e4e..f24de17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+compizconfig-backend-kconfig (0.9.2.1+git20110227.770eb464-1) experimental; 
urgency=low
+
+  * /o\ Brown paper bag upload.
+  * Fix package names in debian/control
+  * Fix references to -kconfig4 in debian/changelog
+
+ -- Sean Finney sean...@debian.org  Sun, 27 Feb 2011 16:59:06 +0100
+
 compizconfig-backend-kconfig (0.9.2.1+git20110226.770eb464-1) experimental; 
urgency=low
 
   * Incorporate packaging work by Janos. Thanks!

commit 59c65dc4741ea11a3d69509e7199d048ffee5adc
Author: Sean Finney sean...@debian.org
Date:   Sun Feb 27 16:26:26 2011 +

Revert Update lintian/overrides

This reverts commit 0a2dff25d212f35e833a799d5c2c4f469899b67d.

diff --git a/debian/lintian-overrides b/debian/lintian-overrides
index 24dc892..331b7d3 100644
--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
@@ -1 +1 @@
-compizconfig-backend-kconfig4: binary-or-shlib-defines-rpath 
./usr/lib/compizconfig/backends/libkconfig4.so /usr/lib
+compizconfig-backend-kconfig: binary-or-shlib-defines-rpath 
./usr/lib/compizconfig/backends/libkconfig4.so /usr/lib

commit c6a95bcf3d152d0af83a27a407edb98e0fd967ca
Author: Sean Finney sean...@debian.org
Date:   Sun Feb 27 16:58:36 2011 +0100

Fix references to -kconfig4 in debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 334dade..1fe3e4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-compizconfig-backend-kconfig4 (0.9.2.1+git20110226.770eb464-1) experimental; 
urgency=low
+compizconfig-backend-kconfig (0.9.2.1+git20110226.770eb464-1) experimental; 
urgency=low
 
   * Incorporate packaging work by Janos. Thanks!
 
  -- Sean Finney sean...@debian.org  Sun, 27 Feb 2011 11:22:51 +
 
-compizconfig-backend-kconfig4 (0.9.2.1-1.1) unstable; urgency=low
+compizconfig-backend-kconfig (0.9.2.1-1.1) unstable; urgency=low
 
   [ Janos Guljas ]
   * New upstream release.

commit 4d18d93b8b4a100347790a911660e6b9140acca0
Author: Sean Finney sean...@debian.org
Date:   Sun Feb 27 16:58:05 2011 +0100

Fix package names in debian/control

diff --git a/debian/control b/debian/control
index 4aa6a84..b1a7075 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: compizconfig-backend-kconfig4
+Source: compizconfig-backend-kconfig
 Priority: extra
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Sean Finney sean...@debian.org
@@ -10,7 +10,7 @@ Homepage: http://www.compiz.org/
 Vcs-Git: 
git://git.debian.org/git/pkg-xorg/bling/compizconfig-backend-kconfig4.git
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/bling/compizconfig-backend-kconfig4.git
 
-Package: compizconfig-backend-kconfig4
+Package: compizconfig-backend-kconfig
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: compizconfig-backend-kconfig


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ptjf8-ec...@alioth.debian.org

compiz: Changes to 'upstream-squeeze'

[Sean Finney]

New branch 'upstream-squeeze' available with the following commits:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ptkyr-0006gs...@alioth.debian.org

compiz: Changes to 'upstream-unstable'

[Sean Finney]

Rebased ref, commits from common ancestor:
commit 9849ca3ce14e8398a01e18347c0a69f25e9c15c0
Author: Sam Spilsbury smspil...@gmail.com
Date:   Thu Feb 24 02:11:46 2011 +0800

Nuke warning

diff --git a/gtk/window-decorator/wnck.c b/gtk/window-decorator/wnck.c
index d6ec9a2..2118511 100644
--- a/gtk/window-decorator/wnck.c
+++ b/gtk/window-decorator/wnck.c
@@ -646,7 +646,6 @@ void
 window_closed (WnckScreen *screen,
   WnckWindow *win)
 {
-Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
 decor_t *d = g_object_get_data (G_OBJECT (win), decor);
 
 if (d)

commit 792260c0d31a7bad6d2754bb4c3cd34001039c69
Author: Sam Spilsbury smspil...@gmail.com
Date:   Thu Feb 24 02:10:33 2011 +0800

Preprocessor abuse to handle the Gtk+ 2.24 transition

diff --git a/gtk/window-decorator/events.c b/gtk/window-decorator/events.c
index f6ed81b..f3213e5 100644
--- a/gtk/window-decorator/events.c
+++ b/gtk/window-decorator/events.c
@@ -894,8 +894,7 @@ event_filter_func (GdkXEvent *gdkxevent,
{
if (!wnck_window_get (xevent-xcreatewindow.window))
{
-   GdkWindow *toplevel = gdk_x11_window_foreign_new_for_display 
(gdkdisplay,
- 
xevent-xcreatewindow.window);
+   GdkWindow *toplevel = create_foreign_window 
(xevent-xcreatewindow.window);
 
if (toplevel)
{
diff --git a/gtk/window-decorator/gdk.c b/gtk/window-decorator/gdk.c
index 9e59cbd..7b43ca4 100644
--- a/gtk/window-decorator/gdk.c
+++ b/gtk/window-decorator/gdk.c
@@ -62,8 +62,7 @@ create_gdk_window (Window xframe)
 {
 GdkDisplay  *display = gdk_display_get_default ();
 GdkScreen   *screen  = gdk_display_get_default_screen (display);
-GdkWindow   *window  = gdk_x11_window_foreign_new_for_display (display,
-   xframe);
+GdkWindow   *window  = create_foreign_window (xframe);
 GdkColormap *cmap= gdk_screen_get_rgb_colormap (screen);
 
 gdk_drawable_set_colormap (GDK_DRAWABLE (window), cmap);
diff --git a/gtk/window-decorator/gtk-window-decorator.c 
b/gtk/window-decorator/gtk-window-decorator.c
index 957ea7d..03c558c 100644
--- a/gtk/window-decorator/gtk-window-decorator.c
+++ b/gtk/window-decorator/gtk-window-decorator.c
@@ -370,8 +370,7 @@ main (int argc, char *argv[])
 
 if (!minimal)
 {
-   GdkWindow *root = gdk_x11_window_foreign_new_for_display (gdkdisplay,
- 
gdk_x11_get_default_root_xwindow ());
+   GdkWindow *root = create_foreign_window 
(gdk_x11_get_default_root_xwindow ());
 
gdk_window_add_filter (NULL,
   event_filter_func,
@@ -382,8 +381,7 @@ main (int argc, char *argv[])
 
for (i = 0; i  nchildren; i++)
{
-   GdkWindow *toplevel = gdk_x11_window_foreign_new_for_display 
(gdkdisplay,
- 
children[i]);
+   GdkWindow *toplevel = create_foreign_window  (children[i]);
 
/* Need property notify on all windows */
 
diff --git a/gtk/window-decorator/gtk-window-decorator.h 
b/gtk/window-decorator/gtk-window-decorator.h
index ab90085..6b43a94 100644
--- a/gtk/window-decorator/gtk-window-decorator.h
+++ b/gtk/window-decorator/gtk-window-decorator.h
@@ -37,10 +37,26 @@
 #include X11/extensions/Xrender.h
 #include X11/Xregion.h
 
+#ifdef HAVE_GTK_2_24
+
 #ifndef GDK_DISABLE_DEPRECATED
 #define GDK_DISABLE_DEPRECATED
 #endif
 
+#define create_foreign_window(xid) 
   \
+gdk_x11_window_foreign_new_for_display (gdk_display_get_default (),
   \
+   xid)
+#else
+
+#define create_foreign_window(xid) 
   \
+gdk_window_foreign_new (xid)
+
+#ifdef GDK_DISABLE_DEPRECATED
+#undef GDK_DISABLE_DEPRECATED
+#endif
+
+#endif
+
 #ifndef GTK_DISABLE_DEPRECATED
 #define GTK_DISABLE_DEPRECATED
 #endif

commit 54d17f08447938d53d9ee6348cac1bf9ec220db6
Author: Travis Watkins amara...@ubuntu.com
Date:   Tue Feb 22 11:02:23 2011 -0600

stop using deprecated gdk functions

diff --git a/gtk/window-decorator/events.c b/gtk/window-decorator/events.c
index 73e44ef..f6ed81b 100644
--- a/gtk/window-decorator/events.c
+++ b/gtk/window-decorator/events.c
@@ -894,8 +894,8 @@ event_filter_func (GdkXEvent *gdkxevent,
{
if (!wnck_window_get (xevent-xcreatewindow.window))
{
-   GdkWindow *toplevel = gdk_window_foreign_new_for_display 
(gdkdisplay,
- 
xevent-xcreatewindow.window);
+   GdkWindow *toplevel = gdk_x11_window_foreign_new_for_display 
(gdkdisplay,
+   

compiz: Changes to 'upstream-unstable'

[Sean Finney]

 cmake/FindCompiz.cmake  |   18 +++-
 include/core/core.h |2 -
 include/core/screen.h   |1 
 plugins/cube/src/cube.cpp   |3 +-
 plugins/decor/src/decor.cpp |1 
 plugins/opengl/include/opengl/opengl.h  |2 -
 plugins/opengl/include/opengl/texture.h |3 ++
 plugins/opengl/src/screen.cpp   |3 +-
 plugins/opengl/src/texture.cpp  |3 +-
 plugins/resize/src/resize.cpp   |   47 +---
 src/event.cpp   |   17 ---
 src/screen.cpp  |8 -
 12 files changed, 68 insertions(+), 40 deletions(-)

New commits:
commit f059fae9963dcb69f2a85b5b26cb615565b4c3e1
Author: Sam Spilsbury sam.spilsb...@canonical.com
Date:   Thu Feb 24 15:54:16 2011 +0800

Fix broken build

diff --git a/plugins/decor/src/decor.cpp b/plugins/decor/src/decor.cpp
index 326d2f4..6e975f0 100644
--- a/plugins/decor/src/decor.cpp
+++ b/plugins/decor/src/decor.cpp
@@ -75,7 +75,7 @@ isAncestorTo (CompWindow *window,
  * occlusion detection
  */
 void
-DecorWindow::computeShadowRegion (bool transformedWindows)
+DecorWindow::computeShadowRegion ()
 {
 shadowRegion = CompRegion (window-outputRect ());
 

commit 3f3551f41310da96650024edde76e4d952b8a6ad
Author: Sam Spilsbury sam.spilsb...@canonical.com
Date:   Thu Feb 24 15:52:09 2011 +0800

Specify plugin name when loading images to find the correct
image loading dir for plugins which don't specify absolute
paths to their images

diff --git a/include/core/core.h b/include/core/core.h
index b0b86b3..7543f58 100644
--- a/include/core/core.h
+++ b/include/core/core.h
@@ -27,7 +27,7 @@
 #define _COMPIZ_CORE_H
 
 
-#define CORE_ABIVERSION 20110131
+#define CORE_ABIVERSION 20110224
 
 #include stdio.h
 #include assert.h
diff --git a/include/core/screen.h b/include/core/screen.h
index f9652f1..6f4ef01 100644
--- a/include/core/screen.h
+++ b/include/core/screen.h
@@ -211,6 +211,7 @@ class CompScreen :
 bool   override_redirect = false);
 
bool readImageFromFile (CompString name,
+   CompString pname,
CompSize   size,
void   *data);
 
diff --git a/plugins/cube/src/cube.cpp b/plugins/cube/src/cube.cpp
index 9436fdf..0751388 100644
--- a/plugins/cube/src/cube.cpp
+++ b/plugins/cube/src/cube.cpp
@@ -388,9 +388,10 @@ PrivateCubeScreen::updateSkydomeTexture ()
return;
 
 CompString imgName = optionGetSkydomeImage ();
+CompString pname = cube;
 
 if (optionGetSkydomeImage ().empty () ||
-   (mSky = GLTexture::readImageToTexture (imgName, mSkySize)).empty ())
+   (mSky = GLTexture::readImageToTexture (imgName, pname, mSkySize)).empty 
())
 {
GLfloat aaafTextureData[128][128][3];
GLfloat fRStart = (GLfloat) optionGetSkydomeGradientStartColorRed () / 
0x;
diff --git a/plugins/decor/src/decor.cpp b/plugins/decor/src/decor.cpp
index d2bfadb..326d2f4 100644
--- a/plugins/decor/src/decor.cpp
+++ b/plugins/decor/src/decor.cpp
@@ -61,7 +61,6 @@ isAncestorTo (CompWindow *window,
 return false;
 }
 
-
 /* Make shadows look nice, don't paint shadows on top of
  * things they don't make sense on top of, eg, menus
  * need shadows but they don't need to be painted when
@@ -76,7 +75,7 @@ isAncestorTo (CompWindow *window,
  * occlusion detection
  */
 void
-DecorWindow::computeShadowRegion ()
+DecorWindow::computeShadowRegion (bool transformedWindows)
 {
 shadowRegion = CompRegion (window-outputRect ());
 
diff --git a/plugins/opengl/include/opengl/opengl.h 
b/plugins/opengl/include/opengl/opengl.h
index 5b4045c..a9c74ef 100644
--- a/plugins/opengl/include/opengl/opengl.h
+++ b/plugins/opengl/include/opengl/opengl.h
@@ -35,7 +35,7 @@
 #include opengl/texture.h
 #include opengl/fragment.h
 
-#define COMPIZ_OPENGL_ABI 2
+#define COMPIZ_OPENGL_ABI 3
 
 #include core/pluginclasshandler.h
 
diff --git a/plugins/opengl/include/opengl/texture.h 
b/plugins/opengl/include/opengl/texture.h
index 3d0ddba..2023402 100644
--- a/plugins/opengl/include/opengl/texture.h
+++ b/plugins/opengl/include/opengl/texture.h
@@ -200,9 +200,12 @@ class GLTexture : public CompRect {
 * return a GLTexture::List with its contents
 *
 * @param imageFileName The filename of the image
+* @param pluginNameThe name of the plugin, used to find
+*  the default image path
 * @param size  The size of this new texture
 */
static List readImageToTexture (CompString imageFileName,
+   CompString pluginName,
CompSize   size);
 
friend class PrivateTexture;
diff --git a/plugins/opengl/src/screen.cpp b/plugins/opengl/src/screen.cpp
index 5fe1cc0..253f03b 100644
--- 

Re: compiz plans

[Sean Finney]

And hello again!

I haven't heard anything negative back, so I've started with this plan.
The compiz git repo should now be updated and pushed (i disabled the
post-receive hook temporarily when i realized how much noise it was
going to make).  So you can take a look there if you want to see how i
was planning on moving forward.

basically, i:

 * branch off debian-unstable and upstream-unstable into -squeeze
branches.
 * reset upstream-unstable to compiz.org/master
 * force-pushed upstream-unstable to our repo
 * in debian-unstable -s theirs merge at upstream 0.9.0 release
 * merge upstream-unstable into debian-unstable at upstream 0.9.2 and
0.9.2.1 releases
 * merge upstream-unstable head into debian-unstable
 * remove debian directory and replace it with Janos' packaging
 * set release to experimental for next upload

I haven't yet tried actually *building* the package yet, but figure
whatever is done will be on top of this.

I'm not sure how much more time I will have for this today, but I'll
continue with a process similar to the above for the rest of the compiz
packages, and when i'm done i'll throw them out to experimental for
everyone to play with.  Holler soon and loud if you object :)


sean


signature.asc
Description: This is a digitally signed message part

compiz: Changes to 'debian-unstable'

[Sean Finney]

 debian/changelog |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dac407dfdf8b675e1f1dfdabec9de89371f58438
Author: Sean Finney sean...@debian.org
Date:   Sat Feb 26 15:34:56 2011 +0100

Set next upload - experimental

diff --git a/debian/changelog b/debian/changelog
index af56d75..ecb8ce6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-compiz (0.9.2.1+git20110226-1) unstable; urgency=low
+compiz (0.9.2.1+git20110226-1) experimental; urgency=low
 
   [ Sean Finney ]
   * Incorporate Janos Guljas' compiz packaging work, thanks!


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ptleg-0007xs...@alioth.debian.org

compiz: Changes to 'debian-unstable'

[Sean Finney]

 debian/changelog   |   
 2 
 debian/control |   
 1 
 debian/patches/030_no_fade_in_staticswicher.patch  |   
12 
 debian/patches/056_Preserve-DESTDIR-if-no-override-in-COMPIZ_DESTDIR.patch |   
22 
 debian/patches/060_move_checks_to_compiz.patch |  
196 -
 debian/patches/065_add_bailer_and_detection_plugins.patch  |  
652 
 debian/patches/085_add_grid_plugin.patch   | 
1461 ++
 debian/patches/086_new_grid_defaults.patch |   
49 
 debian/patches/series  |   
 5 
 debian/rules   |   
 9 
 debian/source/local-options|   
 2 
 11 files changed, 2200 insertions(+), 211 deletions(-)

New commits:
commit 784abdee22139d95eb1e7a9cec04d1a8accc7437
Author: Sean Finney sean...@debian.org
Date:   Sat Feb 26 22:43:37 2011 +

Prepare new upload

diff --git a/debian/changelog b/debian/changelog
index ecb8ce6..e57eb08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-compiz (0.9.2.1+git20110226-1) experimental; urgency=low
+compiz (0.9.2.1+git20110226.f059fae9-1) experimental; urgency=low
 
   [ Sean Finney ]
   * Incorporate Janos Guljas' compiz packaging work, thanks!

commit 6e9d7f78e86d9d53aec87b665dfb706c1433fa36
Author: Sean Finney sean...@debian.org
Date:   Sun Feb 27 00:23:46 2011 +

Cleanup leftover .pot file in clean target

diff --git a/debian/rules b/debian/rules
index cd2efcc..b583b80 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,11 @@ DEFAULT_PLUGINS = core bailer detection composite opengl 
decor mousepoll vpswit
 %:
dh $@
 
+clean:
+   dh clean
+   # upstream build leaves this around
+   rm -f po/compiz.pot
+
 override_dh_auto_configure:
# currently, segfault if CMAKE_BUILD_TYPE=Release
dh_auto_configure -- -DCOMPIZ_BUILD_WITH_RPATH=FALSE 
-DCOMPIZ_DEFAULT_PLUGINS=\$(DEFAULT_PLUGINS)\ 
-DCMAKE_BUILD_TYPE=RelWithDebInfo -DCOMPIZ_PACKAGING_ENABLED=TRUE

commit ee1eb7fabb2faa084d1a32ddc383a977d996d1e4
Author: Sean Finney sean...@debian.org
Date:   Sat Feb 26 17:46:43 2011 +

Add unapply-patches and abort-on-upstream-changes to source local-options

This should allow tools like git-buildpackage to remain happy with the
new 3.0 (quilt) format. If you're using git-buildpackage, you might
also want to have

cleaner = debuild clean  rm -rf .pc

in your ~/.gbp.conf until #591858 is fixed.

diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 000..9cdfca9
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1,2 @@
+unapply-patches
+abort-on-upstream-changes

commit f0b2e5bf112a200bdf55f9f807dc21da25dbf1e6
Author: Sean Finney sean...@debian.org
Date:   Sat Feb 26 16:43:19 2011 +

Add missing build dep on libglibmm-2.4-dev

diff --git a/debian/control b/debian/control
index 659747e..9c6002e 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Build-Depends: cmake (= 2.6), debhelper (= 7.0.50~), 
intltool, libtool,
  libdbus-glib-1-dev, libgconf2-dev, 
  libgl1-mesa-dev (= 6.5.1) | libgl-dev, libglib2.0-dev, libgnome-desktop-dev,
  libboost1.42-dev, libboost-serialization1.42-dev,
+ libglibmm-2.4-dev,
  libgnomeui-dev, 
  libgnome-window-settings-dev, libgtk2.0-dev, libice-dev (= 1:1.0.1), 
  libmetacity-dev (= 1:2.30.0), libpango1.0-dev, libpng12-dev | libpng-dev, 
librsvg2-dev,

commit 72dd7ed370a58e90a062450c0a5af8edc7acce5f
Author: Sean Finney sean...@debian.org
Date:   Sat Feb 26 16:16:29 2011 +

Update list of default plugins and cmake configuration options

diff --git a/debian/rules b/debian/rules
index 4308488..cd2efcc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,14 +6,14 @@
 
 CORE_ABIVERSION := $(shell sed -rn 
's/^\#define[[:space:]]+CORE_ABIVERSION[[:space:]]+//p' include/core/core.h )
 
-DEFAULT_PLUGINS = core composite opengl decor mousepoll scale expo move 
compiztoolbox place wall ezoom staticswitcher resize wobbly cube rotate 3d 
cubeaddon
+DEFAULT_PLUGINS = core bailer detection composite opengl decor mousepoll 
vpswitch regex animation snap expo move compiztoolbox place grid gnomecompat 
wall ezoom workarounds staticswitcher resize fade scale session
 
 %:
dh $@
 
 override_dh_auto_configure:
# currently, segfault if CMAKE_BUILD_TYPE=Release
-   dh_auto_configure -- -DCOMPIZ_BUILD_WITH_RPATH=FALSE 
-DCOMPIZ_DEFAULT_PLUGINS=\$(DEFAULT_PLUGINS)\ -DCMAKE_BUILD_TYPE=Debug 
-DCOMPIZ_PACKAGING_ENABLED=TRUE
+   dh_auto_configure -- -DCOMPIZ_BUILD_WITH_RPATH=FALSE 
-DCOMPIZ_DEFAULT_PLUGINS=\$(DEFAULT_PLUGINS)\ 
-DCMAKE_BUILD_TYPE=RelWithDebInfo

compiz: Changes to 'refs/tags/0.9.0'

[Sean Finney]

Tag '0.9.0' created by Guillaume Seguin guilla...@segu.in at 2010-07-04 08:35 
+

Compiz 0.9.0 release
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEABECAAYFAkwwR+0ACgkQFGCg8MK49G5TkQCePGXs+n8ccf8xU+FNBbN+uQM8
gvwAoKEiO+udt6v2QcmRQ0GWTR3HFHED
=aV3Z
-END PGP SIGNATURE-

Changes since compiz-0.7.6:
Adel Gadllah (1):
  Install locale in standard location

C-F Language team (1):
  new translations and updates

Christopher Williams (2):
  Fix compatibility with newer libmetacity-private versions. GtkStyle is 
colormap specific, so we can't use a new colormap each time we create a pixmap.
  When a user tries to resize by clicking on the center, don't pass the 
input down to the window.

Danny Baumann (224):
  Only move placed windows on decoration size changes.
  Merge branch 'master' of 
git+ssh://man...@git.freedesktop.org/git/xorg/app/compiz
  Minor cleanup.
  Fix a number of memory leaks.
  Merge branch 'master' of 
git+ssh://man...@git.freedesktop.org/git/xorg/app/compiz
  Minor cleanup.
  Fix another mem leak.
  Plug some minor memory leaks.
  Warning fix.
  Revert Update default window match to account for panel selection mode.
  Evaluate window match only for non-panel selection mode.
  Store icon geometry in CompWindow struct.
  Bump ABIVERSION.
  Use icon geometry stored in CompWindow struct.
  Fix some minor memory leaks.
  Don't focus default window when rotating due to window activation.
  Merge branch 'master' of 
git+ssh://man...@git.freedesktop.org/git/xorg/app/compiz
  Add missing glib includes.
  Merge branch 'master' of 
git+ssh://man...@git.freedesktop.org/git/xorg/app/compiz
  Revert Don't focus default window when rotating due to window 
activation.
  Improve ABI version check printout.
  Only move focus to window on click if it wasn't focussed before.
  Merge branch 'master' of 
git+ssh://man...@git.freedesktop.org/git/xorg/app/compiz
  Fix typo.
  Initialize option value correctly.
  Merge branch 'master' of 
git+ssh://man...@git.freedesktop.org/git/xorg/app/compiz
  Re-sync to master.
  Re-sync to master.
  Merge branch 'compiz++' of 
git+ssh://man...@git.compiz-fusion.org/private/compiz into compiz++
  C++ implementation of matrix and vector.
  Added missing file.
  Fix return value.
  Shut up compiler.
  Merge branch 'compiz++' of 
git+ssh://man...@git.compiz-fusion.org/private/compiz into compiz++
  Merge branch 'compiz++' of 
git+ssh://man...@git.compiz-fusion.org/private/compiz into compiz++
  Merge branch 'compiz++' of 
git+ssh://man...@git.compiz-fusion.org/private/compiz into compiz++
  Merge branch 'compiz++' of 
git+ssh://man...@git.compiz-fusion.org/private/compiz into compiz++
  Merge branch 'compiz++' of 
git+ssh://man...@git.compiz-fusion.org/private/compiz into compiz++
  Remove getter for w-attrib and use member getters instead.
  Use attrib getters from within CompWindow class.
  Also update d-below variable when we have a grab, so that it has the 
correct value after grab end.
  Try to find the window under the pointer through the server if d-below 
is not valid.
  Added support for _NET_WM_MOVERESIZE_CANCEL.
  On selected window changes, always clear out label first to make sure a 
text-changed signal is emitted to atk.
  Add definitions for EWMH source indication values.
  Pass client type of _NET_MOVERESIZE_WINDOW message sender to validate 
function.
  Replace return to exit loop by break.
  Limit number of damage rects in one screen repaint.
  Allow mouse initiated resize not only in the 4 corners, but in all 
directions.
  Improve focus stealing prevention.
  Fix memory leak.
  There is no real reason to arbitrarily remove shadows on below state 
windows.
  Add support for matching a window's alpha channel availability.
  Make sure  RGBA matching is always present for shadows.
  When the startup ID of a window changes, move it to current viewport 
instead of changing to the viewport of the window.
  Typo  build fixes.
  Call terminate function also for bindings without modifiers.
  Cleanup: pass button and key events directly (instead of generic XEvent) 
into action handlers.
  Only decrement pendingMaps variable when there are actually pending maps.
  Use pendingMaps variable to set w-managed on MapNotify.
  Build fix.
  Use timer to start decorator.
  Fix a number of potential memleaks in XGetWindowProperty return value 
handling.
  Make sure geometry rectangle is kept inside the screen area.
  Make viewportForGeometry not take the current viewport into account.
  Ensure windows fit in the work area when placing them by calling the 
window sizing validation function.
  Ignore _NET_WM_STATE_HIDDEN property changes as suggested by EWMH.
  Change 

compiz: Changes to 'refs/tags/compiz-0.8.6'

[Sean Finney]

Tag 'compiz-0.8.6' created by Danny Baumann dannybaum...@web.de at 2010-03-28 
12:43 +

compiz 0.8.6 release
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEABECAAYFAkuvTvUACgkQ6+ZunlVwJYPGwACgtFJH/b2jEYok6Vq7HE5xou5F
NsgAnRKWMNU3PkI7R23YXi0Z7vTiqpFV
=e/3S
-END PGP SIGNATURE-

Changes since compiz-0.8.4:
Colin Guthrie (1):
  gtk-decorator: Replace deprecated GTK_WIDGET_VISIBLE symbol

Danny Baumann (34):
  Fix crash in multi-screen setups.
  Fix Gnome keybinding list.
  Make short descriptions of bindings a _little_ more verbose.
  Clean up focus functions.
  Fix some focus issues:
  Fix gravity handling.
  Minor consistency fix.
  Only keep windows on-screen that were fully on-screen before.
  Merge branch 'compiz-0.8' of 
git+ssh://man...@git.compiz.org/git/compiz/core into compiz-0.8
  Correctly reflect that the switcher window is managed.
  Fix icon property reading if the icon pixmap has a depth of 1 bit.
  Don't pull in unstable API, it's not needed any longer.
  Revert Don't pull in unstable API, it's not needed any longer.
  Fix crash.
  Minor whitespace fixes and optimizations.
  Fix window region calculation for windows that have border width set.
  Merge branch 'compiz-0.8' of git+ssh://git.compiz.org/git/compiz/core 
into compiz-0.8
  Fix crash on opening windows.
  Merge branch 'compiz-0.8' of git+ssh://git.compiz.org/git/compiz/core 
into compiz-0.8
  Fix handling of windows that have a server border set.
  Also handle windows that have a server border set properly in pointer
  Fix typo.
  Properly send ClientMessage event after aquiring compositing manager
  Merge branch 'compiz-0.8' of git+ssh://git.compiz.org/git/compiz/core 
into compiz-0.8
  Only accept ConfigureRequest / _NET_MOVERESIZE_WINDOW ClientMessage
  Fix window position validation for windows that change size without
  Link all required libraries explicitly.
  Cleanup key binding list from redundant and unneeded keys and add scale
  Also place windows that are marked unmovable.
  Merge branch 'compiz-0.8' of git+ssh://git.compiz.org/git/compiz/core 
into compiz-0.8
  Keep pixmaps of unmapped windows around if they are used for animations.
  Make sure w-width and w-height always reflect the size of the pixmap.
  Add NEWS entry and bump version for 0.8.6 release.
  Fix upload path and tag command.

Dennis Kasprzyk (3):
  Kde 4.4 support.
  Better detection of tooltip windows (KDE backport).
  Fake enlightment desktop property to make qt ignore the composite window 
during frame calculations.

Erkin Bahceci (7):
  Post-release version increment.
  Better resize constraint and snap for combined work area.
  Do the resize output snap only when outside.
  Complete the work area optimization.
  wobbly: Fix y constraint on throwing.
  wobbly: Fix warning.
  wobbly: Constrain throwing at the bottom as well.

Lukasz Kies (1):
  Fix png plugin to work with libpng = 1.4.

---
 Makefile.am   |6 
 NEWS  |   12 +
 configure.ac  |   10 
 gtk/gnome/50-compiz-desktop-key.xml.in|   10 
 gtk/gnome/50-compiz-key.xml.in|   15 -
 gtk/window-decorator/gtk-window-decorator.c   |2 
 include/compiz-core.h |4 
 kde/window-decorator-kde4/Makefile.am |2 
 kde/window-decorator-kde4/decorator.cpp   |4 
 kde/window-decorator-kde4/paintredirector.cpp |3 
 kde/window-decorator-kde4/utils.cpp   |2 
 kde/window-decorator-kde4/utils.h |1 
 kde/window-decorator-kde4/window.cpp  |  118 +-
 kde/window-decorator-kde4/window.h|   24 +-
 metadata/obs.xml.in   |   24 +-
 plugins/obs.c |   32 ++
 plugins/place.c   |   53 ++--
 plugins/png.c |6 
 plugins/resize.c  |  297 ++
 plugins/switcher.c|6 
 plugins/wobbly.c  |   41 ++-
 src/Makefile.am   |2 
 src/display.c |   74 +++---
 src/event.c   |   91 ---
 src/screen.c  |   29 +-
 src/window.c  |   82 +--
 26 files changed, 703 insertions(+), 247 deletions(-)
---


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ptugr-0003gn...@alioth.debian.org

compiz plans

[Sean Finney]

hello hello!

i'd like to propose that we start move towards shipping 0.9 packages in
the near future.  it's not clear that they're 100% stable (relative to
the current level of stability anyway), although they are showing up in
natty now so it's probably not that bad, either.

i see that janos has spent some time on upgrading the packages/packaging
a while back and that the packages are sitting on mentors.d.n.  thanks
for the footwork there :)  because they weren't done in git, i don't
think they should directly be sponsored,  but i'm thnking that we can
use them as a basis for the next version, after we get it rolled into 
git (which will have it's own set of problems due to upstream branch
fun).

oh, on that last parenthetical, i chatted on IRC with KiBi but i want to
make sure that everyone else here is okay with the plans about the git
changes.  since 0.8 and 0.9 diverged like, what, 2 years ago, this will
not work well merging into our upstream branch.  so what i propose is
doing something like what i blogged about earlier today[1]:

git branch -m upstream-unstable upstream-unstable-save
git branch upstream-unstable upstream-remote/master
git merge -s ours upstream-unstable
git diff ref-to-be-merged | git apply -R --index --exclude=debian/*
git commit -F .git/COMMIT_EDITMSG --amend

so basically upstream-unstable will remain fast-forwardable, but to the
new upstream branch (i.e. current checkouts will break), but our
packaging history in the debian branch remains consistant (and will not
break). sound good?

so how about, as time permits over the next week or so, i start doing
the git foo, importing the packages, pushing these guys out towards
experimental?  that way we should get a bit more visibility and can
double check the upgrade paths etc without losing the oppurtunity to
postpone it further if we don't like the resulting situation.


sean

[1] http://www.seanius.net/blog/2011/02/git-merge-s-theirs/


signature.asc
Description: This is a digitally signed message part

Re: Updating X Strike Force Uploaders

[Sean Finney]

Hello back :)

I've been semi-AFK for the past couple months and am slowly getting back
in the swing of things.

With regards to my Uploader: status, I can't make any promises for how
active I will be for the compiz packages, but if you decide to remove me
I won't take it personally as long as I can add myself back if/when I
need to touch them again :)


sean

On Wed, 2011-02-02 at 07:09 +0100, Cyril Brulebois wrote:
 Hello everybody.
 
 I'd like to first thank you for the work you put into XSF packages!
 
 As part of the ongoing clean-up phase on X packages, I think it'd be
 nice to have Maintainer/Uploaders matching who's working on packages
 currently.
 
 Using grep-dctrl on /var/lib/apt/*Sources, I came up with the
 following people listed in Uploaders:
   Andres Salomon dilin...@debian.org
   Branden Robinson bran...@debian.org
   Brice Goglin bgog...@debian.org
   Chris Lamb la...@debian.org
   Cyril Brulebois k...@debian.org
   David Nusinow dnusi...@debian.org
   Drew Parsons dpars...@debian.org
   Fabio M. Di Nitto fabbi...@fabbione.net
   Ian Campbell i...@hellion.org.uk
   Julien Cristau jcris...@debian.org
   Julien Viard de Galbert jul...@vdg.blogsite.org
   Jurij Smakov ju...@debian.org
   Liang Guo bluestonech...@gmail.com
   Matthew Johnson mj...@debian.org
   Mattia Dongili malat...@debian.org
   Mohammed Adnène Trojette adn+...@diwi.org
   Otavio Salvador ota...@debian.org
   Sean Finney sean...@debian.org
   Steve Langasek vor...@debian.org
   Sven Joachim svenj...@gmx.de
 
 As far as I know, we have at least the following people active:
   Cyril Brulebois k...@debian.org (:D)
   Ian Campbell i...@hellion.org.uk
   Julien Viard de Galbert jul...@vdg.blogsite.org
   Jurij Smakov ju...@debian.org
   Liang Guo bluestonech...@gmail.com
   Mattia Dongili malat...@debian.org
   Sven Joachim svenj...@gmx.de
 
 Special cases:
   Otavio Salvador ota...@debian.org
 → xresprobe. It got NMU'd recently, and from our (Julien's and my)
 point of view, it should be orphaned/removed, but debian-edu
 seemed to need it.
   Mohammed Adnène Trojette adn+...@diwi.org
 → xkeyboard-config. Already discussed on IRC.
   Julien Cristau jcris...@debian.org
 → Started to remove himself from all packages.
 
 Now, do others want to keep on being listed as uploaders?
 
 And again, thank you.
 
 KiBi.



signature.asc
Description: This is a digitally signed message part

compiz-fusion-plugins-unsupported: Changes to 'debian-unstable'

[Sean Finney]

 debian/changelog|   10 +
 debian/control  |2 
 debian/install  |1 
 debian/patches/series   |1 
 debian/patches/upstream_git_set-include-order.patch |  146 
 debian/rules|6 
 6 files changed, 163 insertions(+), 3 deletions(-)

New commits:
commit 3f04b0da9e355e95c3456b81b79017cbf120ef9e
Author: Sean Finney sean...@debian.org
Date:   Fri Feb 12 15:00:16 2010 +0100

prepare changelog for 0.8.4-2

diff --git a/debian/changelog b/debian/changelog
index 742d41d..e1d6f81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+compiz-fusion-plugins-unsupported (0.8.4-2) unstable; urgency=low
+
+  * Add extra install rules for new svg files in 0.8.4.
+  * Incorporate quilt into the build system.
+  * New patch upstream_git_set-include-order.patch backported from
+upstream git to fix FTBFS on systems with an older -unsupported
+package installed.
+
+ -- Sean Finney sean...@debian.org  Fri, 12 Feb 2010 16:03:06 +0100
+
 compiz-fusion-plugins-unsupported (0.8.4-1) unstable; urgency=low
 
   * New upstream release.

commit 7c39d21bf62066ada442b881cba87f18905873b1
Author: Sean Finney sean...@debian.org
Date:   Fri Feb 12 15:58:53 2010 +0100

Backport upstream patch to fix include order FTBFS

diff --git a/debian/patches/series b/debian/patches/series
index e69de29..cdc4570 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_git_set-include-order.patch
diff --git a/debian/patches/upstream_git_set-include-order.patch 
b/debian/patches/upstream_git_set-include-order.patch
new file mode 100644
index 000..1519efb
--- /dev/null
+++ b/debian/patches/upstream_git_set-include-order.patch
@@ -0,0 +1,146 @@
+commit cd540468a63676ed7c979ac0eb548b6d1324d075
+Author: Robert Noland rnol...@2hip.net
+Date:   Tue Nov 3 11:52:57 2009 -0600
+
+Order the include directories so that local includes get picked up first.
+
+diff --git a/src/atlantis/Makefile.am b/src/atlantis/Makefile.am
+index e217477..ac2fb4f 100644
+--- a/src/atlantis/Makefile.am
 b/src/atlantis/Makefile.am
+@@ -40,12 +40,12 @@ dist_libatlantis_la_SOURCES = \
+ BUILT_SOURCES = $(nodist_libatlantis_la_SOURCES)
+ 
+ INCLUDES =  \
+-  @COMPIZ_CFLAGS@  \
++  -I$(top_srcdir)/include \
++  @COMPIZ_CFLAGS@ \
+   -DDATADIR='$(compdatadir)'\
+   -DLIBDIR='$(libdir)'  \
+   -DLOCALEDIR=\@datadir@/locale\  \
+-  -DIMAGEDIR='$(imagedir)'  \
+-  -I$(top_srcdir)/include
++  -DIMAGEDIR='$(imagedir)'
+ 
+ moduledir = $(plugindir)
+ 
+diff --git a/src/cubemodel/Makefile.am b/src/cubemodel/Makefile.am
+index c9b1369..866082c 100644
+--- a/src/cubemodel/Makefile.am
 b/src/cubemodel/Makefile.am
+@@ -14,12 +14,12 @@ dist_libcubemodel_la_SOURCES = \
+ BUILT_SOURCES = $(nodist_libcubemodel_la_SOURCES)
+ 
+ INCLUDES =  \
+-  @COMPIZ_CFLAGS@  \
++  -I$(top_srcdir)/include \
++  @COMPIZ_CFLAGS@ \
+   -DDATADIR='$(compdatadir)'\
+   -DLIBDIR='$(libdir)'  \
+   -DLOCALEDIR=\@datadir@/locale\  \
+-  -DIMAGEDIR='$(imagedir)'  \
+-  -I$(top_srcdir)/include
++  -DIMAGEDIR='$(imagedir)'
+ 
+ moduledir = $(plugindir)
+ 
+diff --git a/src/elements/Makefile.am b/src/elements/Makefile.am
+index cfb6a70..b675fec 100644
+--- a/src/elements/Makefile.am
 b/src/elements/Makefile.am
+@@ -17,12 +17,12 @@ dist_libelements_la_SOURCES = \
+ BUILT_SOURCES = $(nodist_libelements_la_SOURCES)
+ 
+ INCLUDES =  \
+-  @COMPIZ_CFLAGS@  \
++  -I$(top_srcdir)/include \
++  @COMPIZ_CFLAGS@ \
+   -DDATADIR='$(compdatadir)'\
+   -DLIBDIR='$(libdir)'  \
+   -DLOCALEDIR=\@datadir@/locale\  \
+-  -DIMAGEDIR='$(imagedir)'  \
+-  -I$(top_srcdir)/include
++  -DIMAGEDIR='$(imagedir)'
+ 
+ moduledir = $(plugindir)
+ 
+diff --git a/src/fakeargb/Makefile.am b/src/fakeargb/Makefile.am
+index 0a4f275..8cbe3ed 100644
+--- a/src/fakeargb/Makefile.am
 b/src/fakeargb/Makefile.am
+@@ -9,12 +9,12 @@ dist_libfakeargb_la_SOURCES = fakeargb.c
+ BUILT_SOURCES = $(nodist_libfakeargb_la_SOURCES)
+ 
+ INCLUDES =  \
+-  @COMPIZ_CFLAGS@  \
++  -I$(top_srcdir)/include \
++  @COMPIZ_CFLAGS@ \
+   -DDATADIR='$(compdatadir)'\
+   -DLIBDIR='$(libdir)'  \
+   -DLOCALEDIR=\@datadir@/locale\  \
+-  -DIMAGEDIR='$(imagedir)'  \
+-  -I$(top_srcdir)/include
++  -DIMAGEDIR='$(imagedir)'
+ 
+ moduledir = $(plugindir

compiz-fusion-plugins-unsupported: Changes to 'refs/tags/compiz-fusion-plugins-unsupported-0.8.4-2'

[Sean Finney]

Tag 'compiz-fusion-plugins-unsupported-0.8.4-2' created by Sean Finney 
sean...@debian.org at 2010-02-12 15:06 +

Tagging upload of compiz-fusion-plugins-unsupported 0.8.4-2 to unstable.
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.10 (GNU/Linux)

iD8DBQBLdW5dynjLPm522B0RAiAwAJ9HXR5ocE6CPBjoJXk5Hu44bFlpJgCfVd2c
24TFvFoakMsEXjGpFY1QpXQ=
=HOIK
-END PGP SIGNATURE-

Changes since compiz-fusion-plugins-unsupported-0.8.4-1:
Sean Finney (4):
  Add extra install rules for new svg files in 0.8.4
  Incorporate quilt into build system.
  Backport upstream patch to fix include order FTBFS
  prepare changelog for 0.8.4-2

---
 debian/changelog|   10 +
 debian/control  |2 
 debian/install  |1 
 debian/patches/series   |1 
 debian/patches/upstream_git_set-include-order.patch |  146 
 debian/rules|6 
 6 files changed, 163 insertions(+), 3 deletions(-)
---


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

compizconfig-backend-kconfig4: Changes to 'debian-unstable'

[Sean Finney]

 debian/changelog |6 ++
 debian/install   |1 +
 debian/lintian-overrides |1 +
 debian/rules |8 +++-
 4 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit c41fdc36736772227f50b28165df63a64db9c6be
Author: Sean Finney sean...@debian.org
Date:   Fri Feb 12 19:29:24 2010 +0100

prepare changelog for 0.8.4-2

diff --git a/debian/changelog b/debian/changelog
index 7241f01..0ac2420 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+compizconfig-backend-kconfig (0.8.4-2) unstable; urgency=low
+
+  * Add lintian override for the private libraries with defined rpath
+
+ -- Sean Finney sean...@debian.org  Fri, 12 Feb 2010 19:29:15 +0100
+
 compizconfig-backend-kconfig (0.8.4-1) unstable; urgency=low
 
   * New upstream release.

commit b84f8e81153073ff563d28d104ff5791845782a7
Author: Sean Finney sean...@debian.org
Date:   Fri Feb 12 19:34:35 2010 +0100

Add lintian override for the private libraries with defined rpath

diff --git a/debian/install b/debian/install
index 5bcc6cf..93451ff 100644
--- a/debian/install
+++ b/debian/install
@@ -1 +1,2 @@
 usr/lib/compizconfig/backends/*.so
+usr/share/lintian/overrides/compizconfig-backend-kconfig
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
new file mode 100644
index 000..331b7d3
--- /dev/null
+++ b/debian/lintian-overrides
@@ -0,0 +1 @@
+compizconfig-backend-kconfig: binary-or-shlib-defines-rpath 
./usr/lib/compizconfig/backends/libkconfig4.so /usr/lib
diff --git a/debian/rules b/debian/rules
index 1fad597..bb1fb62 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,8 @@ else
CFLAGS += -O2
 endif
 
+DEST:=$(CURDIR)/debian/tmp
+
 builddir/CMakeCache.txt: $(QUILT_STAMPFN)
dh_testdir
mkdir -p builddir
@@ -39,7 +41,11 @@ install: build
dh_testroot
dh_clean -k 
dh_installdirs
-   cd builddir  $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+   cd builddir  $(MAKE) DESTDIR=$(DEST) install
+   # copy in needed lintian overrides
+   mkdir -p $(DEST)/usr/share/lintian/overrides
+   cp debian/lintian-overrides \
+  $(DEST)/usr/share/lintian/overrides/compizconfig-backend-kconfig
 
 # Build architecture-independent files here.
 binary-indep: build install


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

compizconfig-backend-kconfig4: Changes to 'refs/tags/compizconfig-backend-kconfig-0.8.4-2'

[Sean Finney]

Tag 'compizconfig-backend-kconfig-0.8.4-2' created by Sean Finney 
sean...@debian.org at 2010-02-12 18:35 +

Debian release 0.8.4-2

Changes since compizconfig-backend-kconfig-0.8.4-1:
Sean Finney (2):
  Add lintian override for the private libraries with defined rpath
  prepare changelog for 0.8.4-2

---
 debian/changelog |6 ++
 debian/install   |1 +
 debian/lintian-overrides |1 +
 debian/rules |8 +++-
 4 files changed, 15 insertions(+), 1 deletion(-)
---


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

compiz: Changes to 'debian-unstable'

[Sean Finney]

 debian/changelog|   63 
++
 debian/compiz-gtk.links |1 
 debian/patches/010-disable-child-window-clipping.patch  |   42 
+
 debian/patches/012_snap-by-default.patch|   14 
 debian/patches/013-add-cursor-theme-support.patch   |  243 
+
 debian/patches/014-fix-gtk-window-decorator-no-argb-crash.patch |   49 
+
 debian/patches/014_fix-no-border-window-shadow.patch|4 
 debian/patches/015_draw_dock_shadows_on_desktop.patch   |   85 
+++
 debian/patches/015_optional-fbo.patch   |5 
 debian/patches/016_call_glxwaitx_before_drawing.patch   |   17 
 debian/patches/017_always_unredirect_screensaver_on_nvidia.patch|   32 
+
 debian/patches/018_use_metacity_settings.patch  |   16 
 debian/patches/020_fix_focus.patch  |   81 
+++
 debian/patches/029_default_options.patch|  143 
+
 debian/patches/030_from_git_crash_fix_multiscreen.patch |   45 
+
 debian/patches/031_from_git_fix_gnome_keybindings.patch |   43 
+
 debian/patches/035_ignore_workspaces.patch  |   19 
 debian/patches/037_fullscreen_stacking_fixes.patch  |   17 
 debian/patches/049-damage-report-non-empty.patch|   83 
+++
 debian/patches/050_stacking.patch   |   16 
 debian/patches/060_move_checks_to_compiz.patch  |  264 
+
 debian/patches/061_KWD_stubs.patch  |   17 
 debian/patches/562027-fix-gconf-ftbfs.patch |9 
 debian/patches/series   |   40 
-
 debian/patches/ubuntu/010-disable-child-window-clipping.patch   |   41 
-
 debian/patches/ubuntu/013-add-cursor-theme-support.patch|  239 
-
 debian/patches/ubuntu/014-fix-gtk-window-decorator-no-argb-crash.patch  |   44 
-
 debian/patches/ubuntu/014_fix-no-border-window-shadow.patch |   21 
 debian/patches/ubuntu/015_draw_dock_shadows_on_desktop.patch|   82 
---
 debian/patches/ubuntu/016_call_glxwaitx_before_drawing.patch|   13 
 debian/patches/ubuntu/017_always_unredirect_screensaver_on_nvidia.patch |   28 
-
 debian/patches/ubuntu/018_use_metacity_settings.patch   |   13 
 debian/patches/ubuntu/020_fix_focus.patch   |   81 
---
 debian/patches/ubuntu/029_default_options   |  133 
-
 debian/patches/ubuntu/030_from_git_crash_fix_multiscreen.patch  |   45 
-
 debian/patches/ubuntu/031_from_git_fix_gnome_keybindings.patch  |   43 
-
 debian/patches/ubuntu/035_ignore_workspaces |   13 
 debian/patches/ubuntu/037_fullscreen_stacking_fixes.patch   |   16 
 debian/patches/ubuntu/049-damage-report-non-empty.patch |   81 
---
 debian/patches/ubuntu/050_stacking.patch|   13 
 debian/patches/ubuntu/060_move_checks_to_compiz.patch   |  265 
--
 debian/patches/ubuntu/061_KWD_stubs.patch   |   13 
 debian/patches/ubuntu/090_profiling |  118 

 debian/patches/ubuntu/099-autogen.patch |   12 
 debian/patches/ubuntu/series|   20 
 45 files changed, 1317 insertions(+), 1365 deletions(-)

New commits:
commit 46f472a364f12e150ba12329b21e6e2c873d4b95
Author: Sean Finney sean...@debian.org
Date:   Wed Feb 3 21:57:45 2010 +0100

Prepare changelog for 0.8.4-1

diff --git a/debian/changelog b/debian/changelog
index 471394a..7f2033a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,66 @@
+compiz (0.8.4-1) unstable; urgency=low
+
+  * New upstream release.
+
+  [ Sean Finney ]
+  * Fix FTBFS: gconf/gconf-client.h: No such file or directory
+- thanks to Sebastian Harl tok...@debian.org (Closes: #562027, #562438) 
+  * Add compiz-decorator symlink for compatibility with ubuntu systems.
+  * Make all patches DEP-3 formatted.
+  * No longer keep the ubuntu patches logically separated from ours
+  * Enable 010-disable-child-window-clipping.patch, as there's an ABI bump.
+Also, massage the patch a little so that it applies cleanly.
+  * Synchronize ubuntu patches from 0.8.4-0ubuntu10
+* 015_draw_dock_shadows_on_desktop.patch:
+  - change decoration plugin to draw dock shadows only on the
+desktop window instead of on top of all other windows
+* 016_call_glxwaitx_before_drawing.patch:
+  - Call glXWaitX before we start

compiz: Changes to 'refs/tags/compiz-0.8.4-1'

[Sean Finney]

Tag 'compiz-0.8.4-1' created by Sean Finney sean...@debian.org at 2010-02-11 
19:25 +

Debian release 0.8.4-1

Changes since compiz-0.8.4:
Brice Goglin (3):
  Restore all ${misc:Depends} in debian/control since they are not useless
  Make compiz dependencies on compiz-* packages versioned
  Make the build-dependency on libfuse-dev require = 2.7.0

Danny Baumann (82):
  Remove trailing whitespace.
  Formatting fixes.
  Fix possible memleaks.
  Fix typos.
  Add comment marking the active plugin check as workaround.
  Never modify w-state outside changeWindowState function.
  Don't save last window state in CompWindow structure.
  Coding style adjustments.
  Only show resize rectangle on the screen the resized window is on.
  Only assign the default shadow to windows which use default decorations.
  Remove frame window property on removing the window frame.
  XineramaQueryScreens is not guaranteed to set the number parameter to 
zero if it returns NULL, so better initialize the parameter properly.
  Use normal mode for maximized windows.
  Check for changes to the override_redirect flag on window map.
  Recalculate window type and window actions if override_redirect state 
changed.
  Handle MapRequest event after core so that decorWindowUpdate sees window 
type and override_redirect state changes that might have happened during event 
processing.
  Re-query Xinerama information on root window reshape.
  Always update event windows when the allowed actions have changed.
  Revert Handle MapRequest event after core so that decorWindowUpdate sees 
window type and override_redirect state changes that might have happened during 
event processing.
  Call matchPropertyChanged handler when the override_redirect flag changed.
  Allow plugins to not only clear allowed window actions, but also to add 
allowed actions.
  Bump ABIVERSION.
  Remove Metacity bell settings integration.
  Added mouse wheel handling to g-w-d.
  Integrate Metacity's configurable middle and right click actions.
  Correct default behaviour of middle mouse button: It should be lowering 
the window, not raising it.
  Added minimization as title bar button action.
  Fixed Gconf setting parsing for title bar button actions.
  Merge branch 'compiz-0.6' of 
git+ssh://man...@git.freedesktop.org/git/xorg/app/compiz into compiz-0.6
  Make sure the position is randomized only for windows that are smaller 
than the workarea.
  Update decoration with a timer after resize.
  Rename focusWindowOnMap to allowWindowFocus and make it use the current 
window viewport, not the initial one.
  Support restack requests in ConfigureRequest events.
  Don't restack windows on map if their focus should be prevented.
  Fix map and restack ordering.
  Fix full window frame being painted once after shading.
  Fix warning.
  Delete property first and delete frame window after that to avoid race 
conditions.
  Use focus stealing prevention for application initiated active window 
change requests.
  Move input (if desired) focus after mapping the window.
  We don't need to care about converting the returned name string.
  Focus default window after switching viewports.
  Add NEWS entry for 0.6 release.
  Bump version.
  Post-release version increment.
  We always need to restack windows on map. Newly created windows are 
placed on top of the stack first, which is not desired for some windows that 
may be denied focus (such as desktop windows).
  Send synthetic configure notify events where needed according to ICCCM 
chapter 4.1.5.
  glGetString is allowed to return NULL in case an error happened, so avoid 
crashing in this case and bail out instead.
  An aboveId of None means that the window was placed on bottom of the 
stack, so also update the linked list accordingly.
  Don't restack desktop windows. They are placed correctly by 
updateWindowAttributes.
  Always use the old geometry passed to addWindowSizeChanges for 
comparisons.
  Fix handling of ConfigureRequest events with CWStackMode set, but without 
CWSibling set.
  Correct handling of grab window in case it is destroyed.
  Fix findLowestSiblingBelow function for desktop windows.
  Immediately update the internal stack representation on stack changes 
caused by MapRequest events.
  Don't prevent focus for desktop and dock windows on arrival of a 
_NET_ACTIVE_WINDOW message.
  Use client message timestamp rather than window user time when processing 
focus stealing prevention on _NET_ACTIVE_WINDOW messages.
  Update saved window coordinates when window is resized by some client.
  Clear all coordinates that match the server coordinates from the 
configure request mask to make sure a synthetic configure notify event is sent 
whenever needed.
  We have to send

compiz: Changes to 'refs/tags/compiz-0.8.4-2'

[Sean Finney]

Tag 'compiz-0.8.4-2' created by Sean Finney sean...@debian.org at 2010-02-11 
22:09 +

Tagging upload of compiz 0.8.4-2 to unstable.
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.10 (GNU/Linux)

iD8DBQBLdIABynjLPm522B0RAnBWAKCDycM/8PRc9Ss8iXIjZmw6U1JTIACfSStj
eGJCJcSgMgH9aQZjFit3wqU=
=zVva
-END PGP SIGNATURE-

Changes since compiz-0.8.4-1:
Sean Finney (2):
  Bump the dh_makeshlibs call to (= 0.8.4)
  prep 0.8.4-2

---
 debian/changelog |6 ++
 debian/rules |2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)
---


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

compiz: Changes to 'debian-unstable'

[Sean Finney]

 debian/changelog |6 ++
 debian/rules |2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 7f643032821d8b2242b4b50f67aa0fc2aa6a3ef3
Author: Sean Finney sean...@debian.org
Date:   Thu Feb 11 23:08:35 2010 +0100

prep 0.8.4-2

diff --git a/debian/changelog b/debian/changelog
index 7f2033a..b7a498f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+compiz (0.8.4-2) unstable; urgency=low
+
+  * Bump the dh_makeshlibs call to (= 0.8.4)
+
+ -- Sean Finney sean...@debian.org  Thu, 11 Feb 2010 23:08:16 +0100
+
 compiz (0.8.4-1) unstable; urgency=low
 
   * New upstream release.

commit 6523cd7703b42f0e9581947bed68054f6e934f69
Author: Sean Finney sean...@debian.org
Date:   Thu Feb 11 23:03:48 2010 +0100

Bump the dh_makeshlibs call to (= 0.8.4)

diff --git a/debian/rules b/debian/rules
index 04de8ad..d68ee9a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -123,7 +123,7 @@ binary-arch: build install
dh_strip
dh_compress
dh_fixperms
-   dh_makeshlibs -plibdecoration0 -V'libdecoration0 (= 0.8.2)'
+   dh_makeshlibs -plibdecoration0 -V'libdecoration0 (= 0.8.4)'
dh_shlibdeps
dh_installdeb
dh_gencontrol -- -Vcoreabiversion=$(CORE_ABIVERSION)


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

libcompizconfig: Changes to 'debian-unstable'

[Sean Finney]

 debian/changelog |3 ++-
 debian/control   |4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 809c90b03f6d936f413ad92b1479a917f61a2415
Author: Sean Finney sean...@debian.org
Date:   Thu Feb 11 20:33:21 2010 +0100

Update changelog to mention ABI bump.

diff --git a/debian/changelog b/debian/changelog
index 2aaf0c1..fc60f96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ libcompizconfig (0.8.4-1) unstable; urgency=low
   * New upstream release.
 - Includes fix for basic_string::_S_construct NULL not valid.
   (Closes: #531797)
+  * Update Build-Depends against compiz-dev to 0.8.4-1 for ABI bump.
 
- -- Sean Finney sean...@debian.org  Thu, 04 Feb 2010 18:01:12 +0100
+ -- Sean Finney sean...@debian.org  Thu, 11 Feb 2010 20:33:19 +0100
 
 libcompizconfig (0.8.2-2) unstable; urgency=low
 

commit e44428097b21f449d4ec6395aff0a6e308cef6c0
Author: Sean Finney sean...@debian.org
Date:   Thu Feb 11 20:31:52 2010 +0100

Update Build-Depends against compiz-dev to 0.8.4-1 for ABI bump.

diff --git a/debian/control b/debian/control
index 79f3fda..d375c61 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libcompizconfig
 Priority: extra
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Sean Finney sean...@debian.org
-Build-Depends: debhelper (= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (= 0.8.2-6), intltool, libtool, libglib2.0-dev, 
+Build-Depends: debhelper (= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (= 0.8.4-1), intltool, libtool, libglib2.0-dev, 
  libprotobuf-dev,
  libxml2-dev, libxslt1-dev,
  protobuf-compiler
@@ -14,7 +14,7 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/bling/libcompizconfig.git
 Package: libcompizconfig-dev
 Section: libdevel
 Architecture: any
-Depends: libcompizconfig0 (= ${binary:Version}), compiz-dev (= 0.8.2-6)
+Depends: libcompizconfig0 (= ${binary:Version})
 Description: Configuration settings library for compiz-fusion - development 
files
  Compiz Fusion is the result of the re-unification of the Beryl-project
  and the community around the Compiz Window Manager. It seeks to provide


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

compizconfig-backend-gconf: Changes to 'debian-unstable'

[Sean Finney]

 debian/changelog |5 -
 debian/control   |2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 3ca0a6296ce3b6be1312ca669f1eec3679d7d834
Author: Sean Finney sean...@debian.org
Date:   Thu Feb 11 21:52:53 2010 +0100

Update changelog with ABI bump

diff --git a/debian/changelog b/debian/changelog
index 8027a5f..86dd3a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,10 +2,13 @@ compizconfig-backend-gconf (0.8.4-1) unstable; urgency=low
 
   * New upstream release.
 
+  [ Sean Finney ]
+  * Update Build-Depends against compiz-dev to = 0.8.4 for ABI bump.
+
   [ Loïc Minier ]
   * Add Vcs-Git-* control headers
 
- -- Sean Finney sean...@debian.org  Thu, 04 Feb 2010 18:07:50 +0100
+ -- Sean Finney sean...@debian.org  Thu, 11 Feb 2010 21:52:41 +0100
 
 compizconfig-backend-gconf (0.8.2-1) unstable; urgency=low
 

commit bb73f95d45d4d07bf27887b049f9c3dcdb548001
Author: Sean Finney sean...@debian.org
Date:   Thu Feb 11 21:51:53 2010 +0100

Update Build-Depends against compiz-dev to = 0.8.4 for ABI bump.

diff --git a/debian/control b/debian/control
index 2c515f7..46a969d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: compizconfig-backend-gconf
 Priority: extra
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Sean Finney sean...@debian.org
-Build-Depends: debhelper (= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (= 0.8.2), intltool, libcompizconfig-dev (= 0.8.2), 
libglib2.0-dev, libgconf2-dev, libtool, pkg-config, xsltproc
+Build-Depends: debhelper (= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (= 0.8.4), intltool, libcompizconfig-dev (= 0.8.4), 
libglib2.0-dev, libgconf2-dev, libtool, pkg-config, xsltproc
 Standards-Version: 3.8.1
 Section: x11
 Vcs-Git: git://git.debian.org/git/pkg-xorg/bling/compizconfig-backend-gconf.git


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

compizconfig-backend-kconfig4: Changes to 'debian-unstable'

[Sean Finney]

 VERSION|2 +-
 debian/changelog   |7 +++
 debian/control |2 +-
 src/CMakeLists.txt |2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit d4f8536828de32c6d13dfdc6f2fa9b7c72cdb995
Author: Sean Finney sean...@debian.org
Date:   Thu Feb 11 21:55:06 2010 +0100

Update changelog with ABI bump

diff --git a/debian/changelog b/debian/changelog
index 0865ba7..160b0ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 compizconfig-backend-kconfig (0.8.4-1) unstable; urgency=low
 
   * New upstream release.
+  * Update Build-Depends against compiz-dev to = 0.8.4 for ABI bump.
 
- -- Sean Finney sean...@debian.org  Thu, 04 Feb 2010 21:42:17 +0100
+ -- Sean Finney sean...@debian.org  Thu, 11 Feb 2010 21:54:59 +0100
 
 compizconfig-backend-kconfig (0.8.2~git20090205.82ea41ec-1) unstable; 
urgency=low
  

commit 5827d2e4ca128c15aaff3de96eac4530b172ff7d
Author: Sean Finney sean...@debian.org
Date:   Thu Feb 11 21:54:40 2010 +0100

Update Build-Depends against compiz-dev to = 0.8.4 for ABI bump.

diff --git a/debian/control b/debian/control
index 60a4d0d..2c11657 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Sean Finney sean...@debian.org
 Build-Depends: debhelper (= 5), chrpath, 
  cmake,
- compiz-dev (= 0.8.2), intltool, kdebase-workspace-dev, libcompizconfig-dev 
(= 0.8.2), libtool, pkg-config, 
+ compiz-dev (= 0.8.4), intltool, kdebase-workspace-dev, libcompizconfig-dev 
(= 0.8.4), libtool, pkg-config, 
  quilt, 
  xsltproc
 Standards-Version: 3.8.1

commit eff300da630cf7023085f44763eed24bc852dbdf
Author: Sean Finney sean...@debian.org
Date:   Thu Feb 4 21:42:22 2010 +0100

prepare 0.8.4-1

diff --git a/debian/changelog b/debian/changelog
index 93aafe6..0865ba7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+compizconfig-backend-kconfig (0.8.4-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Sean Finney sean...@debian.org  Thu, 04 Feb 2010 21:42:17 +0100
+
 compizconfig-backend-kconfig (0.8.2~git20090205.82ea41ec-1) unstable; 
urgency=low
  
   * New upstream release.

commit 02bdf3593834bfc2c90d234f8269922fb4d89e8f
Author: Guillaume Seguin guilla...@segu.in
Date:   Wed Oct 14 04:09:10 2009 +0200

* Bump version to 0.8.4

diff --git a/VERSION b/VERSION
index fce301a..e4184f4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.7.7
+VERSION=0.8.4

commit 46bd2a93ffdaa2b140ccd16cd605aebb83aa94c5
Author: Guillaume Seguin guilla...@segu.in
Date:   Wed Oct 14 03:22:38 2009 +0200

Fix linking with libX11

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 69d26c0..6c861b6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -18,6 +18,6 @@ set(kconfig4_LIB_SRCS kconfig_backend.cpp 
${kconfig4_kwin_SRCS})
 
 kde4_add_library(kconfig4 SHARED ${kconfig4_LIB_SRCS})
 
-target_link_libraries(kconfig4 ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} 
${CCS_LIBRARIES})
+target_link_libraries(kconfig4 ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} 
${CCS_LIBRARIES} X11)
 
 install(TARGETS kconfig4 DESTINATION ${CCS_LIBDIR}/compizconfig/backends)


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org