compiz: Changes to 'debian-unstable'
debian/changelog | 12 +++++++-
debian/control | 16 +++++------
debian/patches/0001_upstream-fix-byteorder-check.patch | 23 +++++++++++++++++
debian/patches/series | 1
debian/rules | 2 -
debian/shlibs.local | 2 +
6 files changed, 45 insertions(+), 11 deletions(-)
New commits:
commit f620b87ebabd92c4dab135ef7f6683891a5212e0
Author: Thierry Reding <thierry@gilfi.de>
Date: Fri Jul 13 11:30:19 2007 +0200
Use package-local shlibs override file to get correct dependencies.
diff --git a/debian/changelog b/debian/changelog
index 551b8b7..3e23379 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,10 @@ compiz (0.5.0.dfsg-2) unstable; urgency=low
* Add upstream patch that fixes non-tfp textures (icons, cube top image
etc.) on big endian platforms. Thanks Michel Dänzer.
* Run dh_makeshlibs with -V. (Closes: 425463)
+ * Use package-local shlibs override file to depend on libmetacity0 (>=
+ 1:2.15.21) and libdecoration0 (>= 0.5.0). Thanks Sune Vuorela.
- -- Thierry Reding <thierry@gilfi.de> Fri, 13 Jul 2007 11:13:19 +0200
+ -- Thierry Reding <thierry@gilfi.de> Fri, 13 Jul 2007 11:25:13 +0200
compiz (0.5.0.dfsg-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index d572f30..02faa01 100644
--- a/debian/control
+++ b/debian/control
@@ -50,7 +50,6 @@ Description: OpenGL window and compositing manager - development files
Package: compiz-gtk
Architecture: any
Depends: compiz-core (= ${binary:Version}), ${shlibs:Depends}
-Conflicts: libmetacity0 (<< 1:2.15.21)
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
diff --git a/debian/rules b/debian/rules
index 119cdbc..f3450ed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -99,8 +99,8 @@ binary-arch: build install
dh_strip
dh_compress
dh_fixperms
- dh_makeshlibs -V
- dh_shlibdeps -L libdecoration0 -l debian/libdecoration0/usr/lib
+ dh_makeshlibs
+ dh_shlibdeps
dh_installdeb
dh_gencontrol
dh_md5sums
diff --git a/debian/shlibs.local b/debian/shlibs.local
new file mode 100644
index 0000000..37d6ac1
--- /dev/null
+++ b/debian/shlibs.local
@@ -0,0 +1,2 @@
+libmetacity-private 0 libmetacity0 (>= 1:2.15.21)
+libdecoration 0 libdecoration0 (>= 0.5.0)
commit 81987271fc5012fc9aecca4cf2db30debc1694aa
Author: Thierry Reding <thierry@gilfi.de>
Date: Fri Jul 13 11:14:20 2007 +0200
Conflict with libmetacity0 (<< 1:2.15.21). Pass -V to dh_makeshlibs.
diff --git a/debian/changelog b/debian/changelog
index 0de4610..551b8b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,13 +6,14 @@ compiz (0.5.0.dfsg-2) unstable; urgency=low
and --use-root-window respectively in the compiz.real manpage. Thanks
Michael Gilbert. (Closes: 432920)
* Rearrange and add missing command-line options in the compiz.real manpage.
- * compiz-gtk needs to depend on libmetacity0 (>= 1:2.15.21) because of an
- incompatible ABI change. This should really be fixed in libmetacity. A
- shlibs bump should do the trick.
+ * compiz-gtk needs to conflict with libmetacity0 (<< 1:2.15.21) because of
+ an incompatible ABI change. This should really be fixed in libmetacity. A
+ shlibs bump should do the trick. (Closes: 425631)
* Add upstream patch that fixes non-tfp textures (icons, cube top image
etc.) on big endian platforms. Thanks Michel Dänzer.
+ * Run dh_makeshlibs with -V. (Closes: 425463)
- -- Thierry Reding <thierry@gilfi.de> Fri, 13 Jul 2007 10:10:03 +0200
+ -- Thierry Reding <thierry@gilfi.de> Fri, 13 Jul 2007 11:13:19 +0200
compiz (0.5.0.dfsg-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 666e4ea..d572f30 100644
--- a/debian/control
+++ b/debian/control
@@ -49,7 +49,8 @@ Description: OpenGL window and compositing manager - development files
Package: compiz-gtk
Architecture: any
-Depends: compiz-core (= ${binary:Version}), ${shlibs:Depends}, libmetacity0 (>= 1:2.15.21)
+Depends: compiz-core (= ${binary:Version}), ${shlibs:Depends}
+Conflicts: libmetacity0 (<< 1:2.15.21)
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
diff --git a/debian/rules b/debian/rules
index 11b35f2..119cdbc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -99,7 +99,7 @@ binary-arch: build install
dh_strip
dh_compress
dh_fixperms
- dh_makeshlibs
+ dh_makeshlibs -V
dh_shlibdeps -L libdecoration0 -l debian/libdecoration0/usr/lib
dh_installdeb
dh_gencontrol
commit 1b7c8792dda9aa23fa9c634491d6312e4c83d2db
Author: Thierry Reding <thierry@gilfi.de>
Date: Fri Jul 13 10:24:43 2007 +0200
Cleanup dependencies. Drop ${misc:Depends} because it is not used anyway.
diff --git a/debian/control b/debian/control
index 4645a7a..666e4ea 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Description: OpenGL window and compositing manager
Package: compiz-core
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, mesa-utils
+Depends: ${shlibs:Depends}, mesa-utils
Recommends: compiz-plugins (= ${binary:Version})
Suggests: nvidia-glx (>= 1.0.9625-1)
Description: OpenGL window and compositing manager
@@ -38,7 +38,7 @@ Description: OpenGL window and compositing manager
Package: compiz-dev
Architecture: any
-Depends: compiz-core (= ${binary:Version}), libgl1-mesa-dev | libgl-dev, libpng-dev, libxcomposite-dev, libxdamage-dev, libxinerama-dev, libxrandr-dev, libice-dev, libsm-dev, libstartup-notification0-dev, ${shlibs:Depends}, ${misc:Depends}
+Depends: compiz-core (= ${binary:Version}), ${shlibs:Depends}, libgl1-mesa-dev | libgl-dev, libpng-dev, libxcomposite-dev, libxdamage-dev, libxinerama-dev, libxrandr-dev, libice-dev, libsm-dev, libstartup-notification0-dev
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
@@ -49,7 +49,7 @@ Description: OpenGL window and compositing manager - development files
Package: compiz-gtk
Architecture: any
-Depends: compiz-core (= ${binary:Version}), libmetacity0 (>= 1:2.15.21), ${shlibs:Depends}, ${misc:Depends}
+Depends: compiz-core (= ${binary:Version}), ${shlibs:Depends}, libmetacity0 (>= 1:2.15.21)
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
@@ -61,7 +61,7 @@ Description: OpenGL window and compositing manager - Gtk window decorator
Package: compiz-kde
Architecture: any
-Depends: compiz-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: compiz-core (= ${binary:Version}), ${shlibs:Depends}
Description: OpenGL window and compositing manager - KDE 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
@@ -72,7 +72,7 @@ Description: OpenGL window and compositing manager - KDE window decorator
Package: compiz-gnome
Architecture: any
-Depends: compiz-gtk (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: compiz-gtk (= ${binary:Version}), ${shlibs:Depends}
Description: OpenGL window and compositing manager - GNOME 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
@@ -83,7 +83,7 @@ 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}), ${shlibs: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
@@ -94,7 +94,7 @@ Description: OpenGL window and compositing manager - plugins
Package: libdecoration0
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}
Description: Compiz window decoration library
The window decoration library is responsible for drawing the window borders
and title bar of windows managed by Compiz. It is used by window decorators
@@ -102,7 +102,7 @@ Description: Compiz window decoration library
Package: libdecoration0-dev
Architecture: any
-Depends: libdecoration0 (= ${binary:Version}), libx11-dev, libxrender-dev, ${shlibs:Depends}, ${misc:Depends}
+Depends: libdecoration0 (= ${binary:Version}), ${shlibs:Depends}, libx11-dev, libxrender-dev
Description: Compiz window decoration library - development files
The window decoration library is responsible for drawing the window borders
and title bar of windows managed by Compiz. It is used by window decorators
commit 21e9f56dcfd177b6138d9e140876ac065f9d7f40
Author: Thierry Reding <thierry@gilfi.de>
Date: Fri Jul 13 10:13:56 2007 +0200
Add upstream patch to fix non-tfp textures on big endian platforms.
diff --git a/debian/changelog b/debian/changelog
index b2fc4d5..0de4610 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,10 @@ compiz (0.5.0.dfsg-2) unstable; urgency=low
* compiz-gtk needs to depend on libmetacity0 (>= 1:2.15.21) because of an
incompatible ABI change. This should really be fixed in libmetacity. A
shlibs bump should do the trick.
+ * Add upstream patch that fixes non-tfp textures (icons, cube top image
+ etc.) on big endian platforms. Thanks Michel Dänzer.
- -- Thierry Reding <thierry@gilfi.de> Fri, 13 Jul 2007 09:48:49 +0200
+ -- Thierry Reding <thierry@gilfi.de> Fri, 13 Jul 2007 10:10:03 +0200
compiz (0.5.0.dfsg-1) unstable; urgency=low
diff --git a/debian/patches/0001_upstream-fix-byteorder-check.patch b/debian/patches/0001_upstream-fix-byteorder-check.patch
new file mode 100644
index 0000000..b549e3b
--- /dev/null
+++ b/debian/patches/0001_upstream-fix-byteorder-check.patch
@@ -0,0 +1,23 @@
+commit 0e02a98ade9aeb1d374a46931e7fdc735a7e750d
+Author: David Reveman <davidr@novell.com>
+Date: Thu May 31 11:54:53 2007 -0400
+
+ Fix byte order check in imageBufferToTexture.
+
+diff --git a/src/texture.c b/src/texture.c
+index 384ae3d..bd0be59 100644
+--- a/src/texture.c
++++ b/src/texture.c
+@@ -166,10 +166,10 @@ imageBufferToTexture (CompScreen *screen,
+ {
+ #if IMAGE_BYTE_ORDER == MSBFirst
+ return imageToTexture (screen, texture, image, width, height,
+- GL_BGRA, GL_UNSIGNED_BYTE);
++ GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV);
+ #else
+ return imageToTexture (screen, texture, image, width, height,
+- GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV);
++ GL_BGRA, GL_UNSIGNED_BYTE);
+ #endif
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index 07ad35f..ac14667 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+0001_upstream-fix-byteorder-check.patch
011_snap-by-default.patch
014_fix-no-border-window-shadow.patch
015_optional-fbo.patch
commit d6a8f5b59dfc855ac879192497aaff98511a5792
Author: Thierry Reding <thierry@gilfi.de>
Date: Fri Jul 13 09:49:45 2007 +0200
compiz-gtk needs to depend on libmetacity0 (>= 1:2.15.21).
2.15.21 introduced a ABI-incompatible change. It introduced the
MetaButtonSpace structure, containing two GdkRectangle structures, replacing
a couple of single GdkRectangle structures. See The diff between
metacity-2.15.13 and metacity-2.15.21 (file src/theme.h) for the details.
diff --git a/debian/changelog b/debian/changelog
index 964384a..b2fc4d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,11 @@ compiz (0.5.0.dfsg-2) unstable; urgency=low
and --use-root-window respectively in the compiz.real manpage. Thanks
Michael Gilbert. (Closes: 432920)
* Rearrange and add missing command-line options in the compiz.real manpage.
+ * compiz-gtk needs to depend on libmetacity0 (>= 1:2.15.21) because of an
+ incompatible ABI change. This should really be fixed in libmetacity. A
+ shlibs bump should do the trick.
- -- Thierry Reding <thierry@gilfi.de> Fri, 13 Jul 2007 08:49:29 +0200
+ -- Thierry Reding <thierry@gilfi.de> Fri, 13 Jul 2007 09:48:49 +0200
compiz (0.5.0.dfsg-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 67b04f5..4645a7a 100644
--- a/debian/control
+++ b/debian/control
@@ -49,7 +49,7 @@ Description: OpenGL window and compositing manager - development files
Package: compiz-gtk
Architecture: any
-Depends: compiz-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: compiz-core (= ${binary:Version}), libmetacity0 (>= 1:2.15.21), ${shlibs:Depends}, ${misc:Depends}
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
Reply to: