compiz: Changes to 'debian-experimental'

2007-05-01 Thread Thierry Reding
 debian/changelog |7 +--
 debian/rules |4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 51059f5da987c3ceacfcf1b81fd8d065900d2424
Author: Thierry Reding <[EMAIL PROTECTED]>
Date:   Wed May 2 07:48:17 2007 +0200

Pass QTDIR=/usr to the configure script so that the moc can be found.

diff --git a/debian/changelog b/debian/changelog
index 077a8f5..b22664f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,8 +22,9 @@ compiz (0.5.0.dfsg-1) UNRELEASED; urgency=low
 (Closes: #408605)
   * Drop po/*.gmo and kde/window-decorator/*.moc.cpp from the original
 tarball.
+  * Pass QTDIR=/usr to the configure script so that the moc can be found.
 
- -- Thierry Reding <[EMAIL PROTECTED]>  Sun, 22 Apr 2007 13:42:50 +0200
+ -- Thierry Reding <[EMAIL PROTECTED]>  Wed, 02 May 2007 07:48:02 +0200
 
 compiz (0.3.6-1) experimental; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 87989d3..e69f0ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,7 +47,7 @@ build-stamp:
mkdir obj-$(DEB_BUILD_GNU_TYPE)
cd obj-$(DEB_BUILD_GNU_TYPE) && \
../configure --prefix=/usr --sysconfdir=\$${prefix}/share $(confflags) \
-CFLAGS="$(CFLAGS)"
+CFLAGS="$(CFLAGS)" QTDIR=/usr
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)

touch $@

commit 45d061c38039a08e416b5b993ee11337673e0ec2
Author: Thierry Reding <[EMAIL PROTECTED]>
Date:   Sun Apr 22 13:45:09 2007 +0200

Drop po/*.gmo and kde/window-decorator/*.moc.cpp from the original tarball.

diff --git a/debian/changelog b/debian/changelog
index 44e70c0..077a8f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-compiz (0.5.0-1) UNRELEASED; urgency=low
+compiz (0.5.0.dfsg-1) UNRELEASED; urgency=low
 
   * New upstream development release:
 - Remove stencil buffer requirement.
@@ -20,8 +20,10 @@ compiz (0.5.0-1) UNRELEASED; urgency=low
 unstable. (Closes: #411012)
   * Add symlink to the compiz-core README to the compiz package.
 (Closes: #408605)
+  * Drop po/*.gmo and kde/window-decorator/*.moc.cpp from the original
+tarball.
 
- -- Thierry Reding <[EMAIL PROTECTED]>  Thu, 19 Apr 2007 17:44:56 +0200
+ -- Thierry Reding <[EMAIL PROTECTED]>  Sun, 22 Apr 2007 13:42:50 +0200
 
 compiz (0.3.6-1) experimental; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 10918a6..87989d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,7 +55,7 @@ build-stamp:
 prune:
rm -f autogen.sh
find -name .cvsignore | xargs rm -f
-   rm -f po/*.gmo
+   rm -f po/*.gmo kde/window-decorator/*.moc.cpp
 
 clean: prune unpatch
dh_testdir


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Re: compiz: Changes to 'debian-experimental'

2007-04-27 Thread rsea


Brice Goglin wrote:
> 
> Right now, compiz is in our git repo, with 0.3.6 in the debian-unstable
> branch and 0.5.0 in the debian-experimental branch. So if you want
> 0.5.0, just do:
> git clone git://git.debian.org/git/pkg-xorg/app/compiz.git
> cd compiz
> git-checkout -b debian-experimental origin/debian-experimental
> and pass -i.git to dpkg-buildpackage when building
> 

I did that and I've got two problems:

The first was when I tried to clone, I had to use 
"cg clone git://git.debian.org/git/pkg-xorg/app/compiz.git"

And the second appeared when I tried to use git-checkout, It said that 

"# git-checkout -b debian-experimental origin/debian-experimental
git checkout: updating paths is incompatible with switching branches/forcing
Did you intend to checkout 'origin/debian-experimental' which can not be
resolved as commit?".

I tried to fix using
"git-checkout -b debian-experimental" 

But didn't worked because the version that came out was 0.3.6 and I'm
interested in 0.5.0. 

Any advice?

-- 
View this message in context: 
http://www.nabble.com/compiz%3A-Changes-to-%27debian-experimental%27-tf3608450.html#a10222428
Sent from the debian-x mailing list archive at Nabble.com.


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Re: compiz: Changes to 'debian-experimental'

2007-04-22 Thread emisca

So there are no plans to build the 0.4 branch?

2007/4/21, Brice Goglin <[EMAIL PROTECTED]>:

emisca wrote:
> Where is it?
> Do the compiz 0.4 (stable) version will be built? I would like to
> backport it to debian Etch...

Right now, compiz is in our git repo, with 0.3.6 in the debian-unstable
branch and 0.5.0 in the debian-experimental branch. So if you want
0.5.0, just do:
git clone git://git.debian.org/git/pkg-xorg/app/compiz.git
cd compiz
git-checkout -b debian-experimental origin/debian-experimental
and pass -i.git to dpkg-buildpackage when building

Brice





--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Re: compiz: Changes to 'debian-experimental'

2007-04-21 Thread Brice Goglin
emisca wrote:
> Where is it?
> Do the compiz 0.4 (stable) version will be built? I would like to
> backport it to debian Etch...

Right now, compiz is in our git repo, with 0.3.6 in the debian-unstable
branch and 0.5.0 in the debian-experimental branch. So if you want
0.5.0, just do:
git clone git://git.debian.org/git/pkg-xorg/app/compiz.git
cd compiz
git-checkout -b debian-experimental origin/debian-experimental
and pass -i.git to dpkg-buildpackage when building

Brice


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Re: compiz: Changes to 'debian-experimental'

2007-04-21 Thread emisca

Where is it?
Do the compiz 0.4 (stable) version will be built? I would like to
backport it to debian Etch...

Thanks

2007/4/19, Thierry Reding <[EMAIL PROTECTED]>:

 debian/changelog|6 --
 debian/compiz.links |1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit ead4d366bc6fdf7064a8163e42835953aa7807e3
Author: Thierry Reding <[EMAIL PROTECTED]>
Date:   Thu Apr 19 18:22:29 2007 +0200

Add symlink to the compiz-core README.Debian to the compiz package.

diff --git a/debian/changelog b/debian/changelog
index ec53c67..44e70c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,8 +18,10 @@ compiz (0.5.0-1) UNRELEASED; urgency=low
   * Add build-dependency on libfuse-dev needed by the fuse plugin.
   * No longer conflict with metacity >= 2.15.21, now that metacity 2.18 is in
 unstable. (Closes: #411012)
+  * Add symlink to the compiz-core README to the compiz package.
+(Closes: #408605)

- -- Thierry Reding <[EMAIL PROTECTED]>  Thu, 19 Apr 2007 17:33:10 +0200
+ -- Thierry Reding <[EMAIL PROTECTED]>  Thu, 19 Apr 2007 17:44:56 +0200

 compiz (0.3.6-1) experimental; urgency=low

diff --git a/debian/compiz.links b/debian/compiz.links
new file mode 100644
index 000..0353d95
--- /dev/null
+++ b/debian/compiz.links
@@ -0,0 +1 @@
+/usr/share/doc/compiz-core/README.Debian /usr/share/doc/compiz/README.Debian

commit 35e885efd05e869c4f868a6edd70dff2764f1fd0
Author: Thierry Reding <[EMAIL PROTECTED]>
Date:   Thu Apr 19 17:34:55 2007 +0200

Add closer for bug #411012. Thanks Brice.

diff --git a/debian/changelog b/debian/changelog
index 90aea8f..ec53c67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,9 +17,9 @@ compiz (0.5.0-1) UNRELEASED; urgency=low
   * Use compiz' default set of plugins.
   * Add build-dependency on libfuse-dev needed by the fuse plugin.
   * No longer conflict with metacity >= 2.15.21, now that metacity 2.18 is in
-unstable.
+unstable. (Closes: #411012)

- -- Thierry Reding <[EMAIL PROTECTED]>  Thu, 05 Apr 2007 18:22:10 +0200
+ -- Thierry Reding <[EMAIL PROTECTED]>  Thu, 19 Apr 2007 17:33:10 +0200

 compiz (0.3.6-1) experimental; urgency=low



--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]





--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



compiz: Changes to 'debian-experimental'

2007-04-19 Thread Thierry Reding
 debian/changelog|6 --
 debian/compiz.links |1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit ead4d366bc6fdf7064a8163e42835953aa7807e3
Author: Thierry Reding <[EMAIL PROTECTED]>
Date:   Thu Apr 19 18:22:29 2007 +0200

Add symlink to the compiz-core README.Debian to the compiz package.

diff --git a/debian/changelog b/debian/changelog
index ec53c67..44e70c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,8 +18,10 @@ compiz (0.5.0-1) UNRELEASED; urgency=low
   * Add build-dependency on libfuse-dev needed by the fuse plugin.
   * No longer conflict with metacity >= 2.15.21, now that metacity 2.18 is in
 unstable. (Closes: #411012)
+  * Add symlink to the compiz-core README to the compiz package.
+(Closes: #408605)
 
- -- Thierry Reding <[EMAIL PROTECTED]>  Thu, 19 Apr 2007 17:33:10 +0200
+ -- Thierry Reding <[EMAIL PROTECTED]>  Thu, 19 Apr 2007 17:44:56 +0200
 
 compiz (0.3.6-1) experimental; urgency=low
 
diff --git a/debian/compiz.links b/debian/compiz.links
new file mode 100644
index 000..0353d95
--- /dev/null
+++ b/debian/compiz.links
@@ -0,0 +1 @@
+/usr/share/doc/compiz-core/README.Debian /usr/share/doc/compiz/README.Debian

commit 35e885efd05e869c4f868a6edd70dff2764f1fd0
Author: Thierry Reding <[EMAIL PROTECTED]>
Date:   Thu Apr 19 17:34:55 2007 +0200

Add closer for bug #411012. Thanks Brice.

diff --git a/debian/changelog b/debian/changelog
index 90aea8f..ec53c67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,9 +17,9 @@ compiz (0.5.0-1) UNRELEASED; urgency=low
   * Use compiz' default set of plugins.
   * Add build-dependency on libfuse-dev needed by the fuse plugin.
   * No longer conflict with metacity >= 2.15.21, now that metacity 2.18 is in
-unstable.
+unstable. (Closes: #411012)
 
- -- Thierry Reding <[EMAIL PROTECTED]>  Thu, 05 Apr 2007 18:22:10 +0200
+ -- Thierry Reding <[EMAIL PROTECTED]>  Thu, 19 Apr 2007 17:33:10 +0200
 
 compiz (0.3.6-1) experimental; urgency=low
 


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



compiz: Changes to 'debian-experimental'

2007-04-17 Thread Thierry Reding
 debian/changelog |2 ++
 debian/control   |1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ce9bb3b523da5067c21a24f68ef0ebea1d96124f
Author: Thierry Reding <[EMAIL PROTECTED]>
Date:   Mon Apr 16 19:34:47 2007 +0200

No longer conflict with metacity >= 2.15.21.

Now that metacity 2.18 has entered unstable, compiz should build against it
instead.

diff --git a/debian/changelog b/debian/changelog
index 5e579b0..90aea8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ compiz (0.5.0-1) UNRELEASED; urgency=low
 - Refresh other patches.
   * Use compiz' default set of plugins.
   * Add build-dependency on libfuse-dev needed by the fuse plugin.
+  * No longer conflict with metacity >= 2.15.21, now that metacity 2.18 is in
+unstable.
 
  -- Thierry Reding <[EMAIL PROTECTED]>  Thu, 05 Apr 2007 18:22:10 +0200
 
diff --git a/debian/control b/debian/control
index b2e8db0..f758706 100644
--- a/debian/control
+++ b/debian/control
@@ -51,7 +51,6 @@ Package: compiz-gtk
 Architecture: any
 Depends: compiz-core (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
 Suggests: gnome-themes
-Conflicts: libmetacity0 (>= 1:2.15.21)
 Description: OpenGL window and compositing manager - Gtk window decorator
  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 [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



compiz: Changes to 'debian-experimental'

2007-04-05 Thread Thierry Reding
 debian/changelog |3 ++-
 debian/control   |2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 0a30ed9acfcf898003c0f5607fc6aca78eab45bd
Author: Thierry Reding <[EMAIL PROTECTED]>
Date:   Thu Apr 5 18:22:34 2007 +0200

Add build-dependency on libfuse-dev needed by the fuse plugin.

diff --git a/debian/changelog b/debian/changelog
index df0831e..5e579b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,9 @@ compiz (0.5.0-1) UNRELEASED; urgency=low
 - Dropped 013_set-qtdir-fallback.patch, no longer needed.
 - Refresh other patches.
   * Use compiz' default set of plugins.
+  * Add build-dependency on libfuse-dev needed by the fuse plugin.
 
- -- Thierry Reding <[EMAIL PROTECTED]>  Thu, 05 Apr 2007 10:17:26 +0200
+ -- Thierry Reding <[EMAIL PROTECTED]>  Thu, 05 Apr 2007 18:22:10 +0200
 
 compiz (0.3.6-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 3afb4e7..b2e8db0 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
 Uploaders: Thierry Reding <[EMAIL PROTECTED]>, David Nusinow <[EMAIL 
PROTECTED]>
-Build-Depends: debhelper (>= 5), quilt (>= 0.40), libglib2.0-dev, 
libgconf2-dev, libpng12-dev | libpng-dev, libxcomposite-dev (>= 1:0.3-2), 
libxfixes-dev (>= 1:4.0.1), libxdamage-dev (>=1:1.0.3), libxrandr-dev (>= 
2:1.1.0.2), libxrender-dev (>= 1:0.9.1), libice-dev (>= 1:1.0.1), libsm-dev (>= 
1:1.0.1), libgl1-mesa-dev (>= 6.5.1) | libgl-dev, libcairo-dev, librsvg2-dev, 
libgnome-desktop-dev, libgnome-window-settings-dev, libdbus-glib-1-dev, 
libwnck-dev, libgtk2.0-dev, libpango1.0-dev, x11proto-gl-dev (>= 1.4.8-1), 
libxinerama-dev, libmetacity-dev, kdebase-dev, libdbus-qt-1-dev
+Build-Depends: debhelper (>= 5), quilt (>= 0.40), libglib2.0-dev, 
libgconf2-dev, libpng12-dev | libpng-dev, libxcomposite-dev (>= 1:0.3-2), 
libxfixes-dev (>= 1:4.0.1), libxdamage-dev (>=1:1.0.3), libxrandr-dev (>= 
2:1.1.0.2), libxrender-dev (>= 1:0.9.1), libice-dev (>= 1:1.0.1), libsm-dev (>= 
1:1.0.1), libgl1-mesa-dev (>= 6.5.1) | libgl-dev, libcairo-dev, librsvg2-dev, 
libgnome-desktop-dev, libgnome-window-settings-dev, libdbus-glib-1-dev, 
libwnck-dev, libgtk2.0-dev, libpango1.0-dev, x11proto-gl-dev (>= 1.4.8-1), 
libxinerama-dev, libmetacity-dev, kdebase-dev, libdbus-qt-1-dev, libfuse-dev
 Standards-Version: 3.7.2
 
 Package: compiz


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



compiz: Changes to 'debian-experimental'

2007-04-05 Thread Thierry Reding
 AUTHORS  |5 
 COPYING  |7 
 COPYING.LGPL |  510 +++
 Makefile.am  |1 
 Makefile.in  |5 
 NEWS |   30 
 compiz.pc.in |2 
 config.h.in  |6 
 configure|  239 +
 configure.ac |   33 
 debian/changelog |   20 
 debian/patches/011_snap-by-default.patch |   12 
 debian/patches/012_debian-kde-includes-dir.patch |   34 
 debian/patches/013_set-qtdir-fallback.patch  |   13 
 debian/patches/014_fix-no-border-window-shadow.patch |   13 
 debian/patches/015_optional-fbo.patch|   51 
 debian/patches/series|2 
 debian/rules |5 
 gtk/Makefile.in  |4 
 gtk/gnome/Makefile.in|4 
 gtk/gnome/compiz-window-manager.c|2 
 gtk/window-decorator/Makefile.in |4 
 gtk/window-decorator/gtk-window-decorator.c  |  342 +-
 gtk/window-decorator/gwd.schemas.in  |   11 
 images/Makefile.in   |4 
 include/Makefile.in  |4 
 include/compiz.h |  680 +++-
 include/decoration.h |   36 
 kde/Makefile.in  |4 
 kde/window-decorator/Makefile.in |4 
 kde/window-decorator/decorator.cpp   |   49 
 kde/window-decorator/decorator.h |8 
 kde/window-decorator/main.cpp|   16 
 kde/window-decorator/utils.cpp   |3 
 kde/window-decorator/utils.h |1 
 kde/window-decorator/window.cpp  |  177 +
 kde/window-decorator/window.h|4 
 libdecoration/Makefile.in|4 
 libdecoration/decoration.c   |  226 +
 plugins/Makefile.am  |   75 
 plugins/Makefile.in  |  168 -
 plugins/annotate.c   |   11 
 plugins/blur.c   | 2908 +++
 plugins/clone.c  |   45 
 plugins/compiz.schemas.in| 1320 +---
 plugins/cube.c   |  118 
 plugins/dbus.c   |  166 -
 plugins/decoration.c |  666 ++--
 plugins/fade.c   |  159 -
 plugins/fuse.c   | 1611 ++
 plugins/gconf-dump.c |   17 
 plugins/gconf.c  |   35 
 plugins/ini.c| 1473 +
 plugins/inotify.c|7 
 plugins/minimize.c   |  114 
 plugins/move.c   |   37 
 plugins/place.c  |  543 +++
 plugins/plane.c  |   94 
 plugins/regex.c  |  488 +++
 plugins/resize.c |   55 
 plugins/rotate.c |   58 
 plugins/scale.c  |  406 +-
 plugins/screenshot.c |   48 
 plugins/switcher.c   |  340 +-
 plugins/video.c  | 1265 
 plugins/water.c  |  448 +-
 plugins/wobbly.c |  464 +--
 plugins/zoom.c   |   11 
 po/POTFILES.in   |   13 
 po/af.po | 1871 
 po/ar.po | 1859 
 po/bg.po | 2159 ++
 po/bn.po | 1998 +
 po/bs.po | 1924 
 po/ca.po | 1990 +
 po/cs.po | 1994 +
 po/cy.po | 1965 
 po/da.po   

compiz: Changes to 'debian-experimental'

2007-01-17 Thread David Nusinow
 debian/changelog |3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 991004274154e6fb332e36ab87c230b95e65412d
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Wed Jan 17 23:46:47 2007 -0500

Prepare changelog for release

diff --git a/debian/changelog b/debian/changelog
index 93fa80a..8ea3492 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 compiz (0.3.6-1) experimental; urgency=low
 
+  [ Thierry Reding ]
   * New upstream release:
 + Drop 002_tfp-server-extension.patch, obsolete.
 + Drop 005_glfinish.patch, fixed upstream.
@@ -28,7 +29,7 @@ compiz (0.3.6-1) experimental; urgency=l
 direct or indirect rendering contexts. If it is available only in indirect
 rendering contexts, force compiz to use indirect rendering.
 
- -- Thierry Reding <[EMAIL PROTECTED]>  Fri,  5 Jan 2007 12:34:42 +0100
+ -- David Nusinow <[EMAIL PROTECTED]>  Wed, 17 Jan 2007 23:46:34 -0500
 
 compiz (0.3.4-1) experimental; urgency=low
 


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



compiz: Changes to 'debian-experimental'

2007-01-14 Thread Thierry Reding
New branch 'debian-experimental' available with the following commits:


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



compiz: Changes to 'debian-experimental'

2007-01-10 Thread David Nusinow
New branch 'debian-experimental' available with the following commits:


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]