--- compiz-0.8.6.orig/debian/compiz-gnome.install +++ compiz-0.8.6/debian/compiz-gnome.install @@ -0,0 +1,6 @@ +usr/lib/window-manager-settings/libcompiz.so usr/lib/libgnome-window-settings1 +usr/share/gnome/wm-properties/compiz-wm.desktop +usr/share/gnome-control-center +usr/share/gconf/schemas/gwd.schemas +usr/bin/gtk-window-decorator +usr/lib/compiz/libgconf.so --- compiz-0.8.6.orig/debian/libdecoration0-dev.install +++ compiz-0.8.6/debian/libdecoration0-dev.install @@ -0,0 +1,3 @@ +usr/include/compiz/decoration.h +usr/lib/libdecoration.so +usr/lib/pkgconfig/libdecoration.pc --- compiz-0.8.6.orig/debian/libdecoration0.docs +++ compiz-0.8.6/debian/libdecoration0.docs @@ -0,0 +1,4 @@ +AUTHORS +NEWS +README +TODO --- compiz-0.8.6.orig/debian/rules +++ compiz-0.8.6/debian/rules @@ -0,0 +1,183 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/quilt/quilt.make + +export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 + +PACKAGE = compiz + +CFLAGS = -Wall -g +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + confflags += --build=$(DEB_HOST_GNU_TYPE) +else + confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) +endif + +CORE_ABIVERSION := $(shell sed -rn 's/^\#define[[:space:]]+CORE_ABIVERSION[[:space:]]+//p' include/compiz-core.h ) + +INSTALL = /usr/bin/install + +# generated via: +# python -c "import compizconfig; print ','.join(compizconfig.Context().Plugins['core'].Display['active_plugins'].Value)" +PLUGINS = core,ccp,dbus,place,mousepoll,gnomecompat,move,resize,decoration,png,svg,imgjpeg,text,commands,neg,wall,snap,animation,scale,scaleaddon,expo,staticswitcher,regex,resizeinfo,workarounds,ezoom,vpswitch,fade,session + +confflags += --disable-static \ + --disable-fuse \ + --disable-kde \ + --enable-kde4 \ + --disable-kconfig \ + --enable-librsvg \ + --enable-gconf \ + --with-default-plugins="$(PLUGINS)" + +# the following files are modified in the build process, but shouldn't be. +# UPSTREAM_PRESERVE:=po/Makefile.in.in + +# the following are generated by autoconf and have no way of being deleted +# gracefully. +AUTOFOO_DELETE:=aclocal.m4 config.guess config.h.in config.sub configure \ + depcomp install-sh intltool-extract.in intltool-merge.in \ + intltool-update.in ltmain.sh missing mkinstalldirs \ + Makefile.in gtk/Makefile.in gtk/gnome/Makefile.in \ + gtk/window-decorator/Makefile.in images/Makefile.in \ + include/Makefile.in kde/Makefile.in \ + kde/window-decorator/Makefile.in libdecoration/Makefile.in \ + metadata/Makefile.in plugins/Makefile.in po/Makefile.in.in \ + src/Makefile.in kde/window-decorator-kde4/Makefile.in + +# brief shorthand for cleaner rules below +DESTDIR:=$(CURDIR)/debian/tmp + +build: build-stamp +build-stamp: $(QUILT_STAMPFN) + dh_testdir + for f in $(UPSTREAM_PRESERVE); do \ + cp -a $$f $$f.preserve; \ + done + autoreconf -vi + intltoolize --copy --force --automake + ./configure --prefix=/usr --sysconfdir=\$${prefix}/share $(confflags) \ + CFLAGS="$(CFLAGS)" QTDIR=/usr + $(MAKE) + (cd po; intltool-update -p --verbose) + touch $@ + +unpatch: distclean + +distclean: + [ ! -f Makefile ] || $(MAKE) distclean + +clean: unpatch + dh_testdir + dh_testroot + rm -f po/*.gmo + rm -f build-stamp + rm -f $(AUTOFOO_DELETE) + for f in $(UPSTREAM_PRESERVE); do \ + if [ -f $$f.preserve ]; then \ + cp -a $$f.preserve $$f; rm -f $$f.preserve; \ + fi; \ + done + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + $(MAKE) DESTDIR=$(DESTDIR) install + # remove unneeded .la files + find $(DESTDIR)/usr/lib -type f -name '*.la' | xargs rm -f + + $(INSTALL) --mode 0755 debian/compiz-decorator $(CURDIR)/debian/tmp/usr/bin/ + + # apport hook + mkdir -p $(CURDIR)/debian/tmp/usr/share/apport/package-hooks + $(INSTALL) --mode 0644 debian/source_compiz.py $(CURDIR)/debian/tmp/usr/share/apport/package-hooks + + # Language packs + for d in $$(find debian/tmp -type f \( -name "*.desktop" -o -name "*.directory" \) ); do \ + sed -ri '/^(Name|GenericName|Comment|X-GNOME-FullName)\[/d' $$d; \ + echo "X-Ubuntu-Gettext-Domain=compiz" >> $$d; \ + done; \ + for d in $$(find debian/tmp -type f -name "*.schemas" ); do \ + GETTEXT_DOMAIN="compiz" perl /usr/lib/cdbs/strip-schema.pl $$d > $$d.new; mv $$d.new $$d; \ + done; + + # create compiz keybidings file based on the metacity ones + mkdir -p $(CURDIR)/debian/tmp/usr/share/gnome-control-center/keybindings/ + sed 's/wm_name=\"Metacity\" package=\"metacity\"/wm_name=\"compiz\" package=\"compiz\"/' /usr/share/gnome-control-center/keybindings/50-metacity-desktop-key.xml > $(CURDIR)/debian/tmp/usr/share/gnome-control-center/keybindings/50-compiz-desktop-key.xml + sed 's/wm_name=\"Metacity\" package=\"metacity\"/wm_name=\"compiz\" package=\"compiz\"/' /usr/share/gnome-control-center/keybindings/50-metacity-key.xml > $(CURDIR)/debian/tmp/usr/share/gnome-control-center/keybindings/50-compiz-key.xml + sed -i 's#key=\"/apps/metacity/general/num_workspaces\" comparison=\"gt\"##g' $(CURDIR)/debian/tmp/usr/share/gnome-control-center/keybindings/50-compiz-key.xml + + # add some selected keys + sed -i -f debian/compiz-keybindings.sed $(CURDIR)/debian/tmp/usr/share/gnome-control-center/keybindings/50-compiz-desktop-key.xml + + # remove unsupported keys from compiz xml + for unsupported in switch_group switch_panels cycle_windows cycle_group cycle_panels; do \ + sed -i "/metacity\/global_keybindings\/$$unsupported/d" $(CURDIR)/debian/tmp/usr/share/gnome-control-center/keybindings/50-compiz-key.xml; \ + done; + + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + + dh_installdocs + dh_installchangelogs ChangeLog + dh_install -pcompiz-plugins -Xcore.xml --sourcedir=debian/tmp + dh_install -pcompiz-core --sourcedir=debian/tmp + dh_install -pcompiz-dev --sourcedir=debian/tmp + dh_install -pcompiz-gnome --sourcedir=debian/tmp + dh_install -pcompiz-kde --sourcedir=debian/tmp + dh_install -pcompiz-wrapper --sourcedir=debian/tmp + dh_install -plibdecoration0 --sourcedir=debian/tmp + dh_install -plibdecoration0-dev --sourcedir=debian/tmp + # the gconf and kconfig plugins are seperately installed into + # the -gnome and -kde packages respectively + rm -f $(CURDIR)/debian/tmp/usr/lib/compiz/libkconfig.so + rm -f $(CURDIR)/debian/compiz-plugins/usr/lib/compiz/libkconfig.so + rm $(CURDIR)/debian/tmp/usr/lib/compiz/libgconf.so + rm $(CURDIR)/debian/compiz-plugins/usr/lib/compiz/libgconf.so + dh_installman + dh_link + dh_gconf + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs -plibdecoration0 -V'libdecoration0 (>= 0.8.4)' + dh_shlibdeps + dh_installdeb + dh_gencontrol -- -Vcoreabiversion=$(CORE_ABIVERSION) + dh_md5sums + dh_builddeb + +# Build architecture-independent files here. +binary-indep: build install +# Nothing to do + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install + --- compiz-0.8.6.orig/debian/compiz-core.install +++ compiz-0.8.6/debian/compiz-core.install @@ -0,0 +1,6 @@ +usr/bin/compiz* +usr/share/compiz/*.png +usr/share/compiz/core.xml +usr/share/locale +usr/share/applications/compiz.desktop +usr/share/apport --- compiz-0.8.6.orig/debian/compiz-core.README.Debian +++ compiz-0.8.6/debian/compiz-core.README.Debian @@ -0,0 +1,36 @@ +Xorg Server Configuration +========================= + +In order for compiz to work you need to add the following to you server +configuration file (/etc/X11/xorg.conf): + + + Enable the composite extension: locate the section named "Extensions" and + add the following line: + + Option "Composite" "enable" + + If there is no section "Extensions" yet, you should add one that looks + like this: + + Section "Extensions" + Option "Composite" "enable" + EndSection + + + Make XAA not hold any pixmaps in offscreen memory. This slows down compiz + in many configurations. You can disable this by adding the following line + to your "Device" section: + + Option "XAANoOffscreenPixmaps" "true" + +Now restart your X server and login to your favorite session. After the +session has loaded completely, open a terminal window and type the following +command: + + $ compiz --replace & + +Which will start compiz, make it replace the current window manager and +background the process so you can safely close the terminal again. If all went +well, compiz should start up and enable a whole bunch of desktop effects. + + -- Thierry Reding Tue, 3 Oct 2006 14:12:26 +0200 + --- compiz-0.8.6.orig/debian/compiz-keybindings.sed +++ compiz-0.8.6/debian/compiz-keybindings.sed @@ -0,0 +1,4 @@ +s/<\/KeyListEntries>/ \n\n<\/KeyListEntries>/ +s/<\/KeyListEntries>/ \n\n<\/KeyListEntries>/ +s/<\/KeyListEntries>/ \n\n<\/KeyListEntries>/ +s/<\/KeyListEntries>/ \n\n<\/KeyListEntries>/ --- compiz-0.8.6.orig/debian/libdecoration0-dev.docs +++ compiz-0.8.6/debian/libdecoration0-dev.docs @@ -0,0 +1,4 @@ +AUTHORS +NEWS +README +TODO --- compiz-0.8.6.orig/debian/compiz-plugins.docs +++ compiz-0.8.6/debian/compiz-plugins.docs @@ -0,0 +1,4 @@ +AUTHORS +NEWS +README +TODO --- compiz-0.8.6.orig/debian/kde-window-decorator.1 +++ compiz-0.8.6/debian/kde-window-decorator.1 @@ -0,0 +1,40 @@ +.TH KDE-WINDOW-DECORATOR 1 "January 3, 2007" +.SH NAME +kde-window-decorator \- Compiz window decorator for the KDE desktop +environment +.SH SYNOPSIS +.B kde-window-decorator +.RI [ options ] +.SH DESCRIPTION +.B kde-window-decorator +is a window decorator for +.B compiz +that provides a look and feel similar to that of the default KDE window +manager. +.SH OPTIONS +.B kde-window-decorator +accepts the following options: +.TP +.BI \-\-replace +Replaces any running window decorator. +.TP +.BI \-\-opacity " float" +Sets the decoration opacity (range: 0.0\-1.0, default: 0.75). +.TP +.BI \-\-no-opacity-shade +Disables opacity shading for decorations. +.TP +.BI \-\-active-opacity " float" +Sets the opacity for active decorations (range: 0.0\-1.0, default: 1.0). +.TP +.BI \-\-no-active-opacity-shade +Disables opacity shading for active decorations. +.TP +.BI \-\-help +Prints the list of accepted options. +.SH AUTHOR +kde-window-decorator was written by David Reveman and +others. +.PP +This manual page was written by Thierry Reding , +for the Debian project (but may be used by others). --- compiz-0.8.6.orig/debian/compiz-plugins.install +++ compiz-0.8.6/debian/compiz-plugins.install @@ -0,0 +1,3 @@ +usr/share/gconf/schemas/compiz-*.schemas +usr/lib/compiz/lib*.so +usr/share/compiz/*.xml --- compiz-0.8.6.orig/debian/compiz-decorator +++ compiz-0.8.6/debian/compiz-decorator @@ -0,0 +1,101 @@ +#!/bin/sh +# Starts Compiz Decorator depending on the DE +# +# Copyright (c) 2007 CyberOrg +# Based on compiz-manager script by Kristian Lyngstøl +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# +# Contributions by: crdlb +# +COMPIZ_BIN_PATH=/usr/bin/ +KWIN=`which kwin` +METACITY="/usr/bin/metacity" + +# +# Default to gtk/kde(4)-window-decorator +# +USE_EMERALD="no" +DECORATOR="" + +#Do not leave users without decoration if decorator fails +if [ "$DESKTOP_SESSION" = "kde" ]; then + FALLBACKWM="${KWIN}" +else + FALLBACKWM="${METACITY}" +fi +FALLBACKWM_OPTIONS=" --replace" + +# +# Set to yes to enable verbose +# +VERBOSE="yes" + +# +# Echos the arguments if verbose +# +verbose() +{ + if [ "x$VERBOSE" = "xyes" ]; then + printf "$*" + fi +} + +# Read configuration from XDG paths +if [ -z "$XDG_CONFIG_DIRS" ]; then + test -f /etc/xdg/compiz/compiz-manager && . /etc/xdg/compiz/compiz-manager +else + test -f $XDG_CONFIG_DIRS/compiz/compiz-manager && . $XDG_CONFIG_DIRS/compiz/compiz-manager +fi + +if [ -z "$XDG_CONFIG_HOME" ]; then + test -f $HOME/.config/compiz/compiz-manager && . $HOME/.config/compiz/compiz-manager +else + test -f $XDG_CONFIG_HOME/compiz/compiz-manager && . $XDG_CONFIG_HOME/compiz/compiz-manager +fi + +# start a decorator +if [ -x ${COMPIZ_BIN_PATH}emerald ] && [ "$USE_EMERALD" = "yes" ]; then + DECORATOR=emerald +elif [ -x ${COMPIZ_BIN_PATH}gtk-window-decorator ] && [ -n "$GNOME_DESKTOP_SESSION_ID" ]; then + DECORATOR=gtk-window-decorator +elif [ -x ${COMPIZ_BIN_PATH}kde-window-decorator ] && [ -n "$KDE_FULL_SESSION" ]; then + DECORATOR=kde-window-decorator +elif [ -x ${COMPIZ_BIN_PATH}kde4-window-decorator ] && [ x$KDE_SESSION_VERSION = x"4" ]; then + DECORATOR=kde4-window-decorator +fi + +# fall back to any decorator that is installed +if [ -z "$DECORATOR" ]; then + verbose "Couldn't find a perfect decorator match; trying all decorators\n" + if [ -x ${COMPIZ_BIN_PATH}emerald ]; then + DECORATOR=emerald + elif [ -x ${COMPIZ_BIN_PATH}gtk-window-decorator ]; then + DECORATOR=gtk-window-decorator + elif [ -x ${COMPIZ_BIN_PATH}kde-window-decorator ]; then + DECORATOR=kde-window-decorator + elif [ -x ${COMPIZ_BIN_PATH}kde4-window-decorator ]; then + DECORATOR=kde4-window-decorator + fi +fi + +if [ -n "$DECORATOR" ]; then + verbose "Starting ${DECORATOR}\n" + exec ${COMPIZ_BIN_PATH}$DECORATOR "$@" +else + verbose "Found no decorator to start\n" + exec $FALLBACKWM $FALLBACKWM_OPTIONS +fi + --- compiz-0.8.6.orig/debian/compiz-gnome.manpages +++ compiz-0.8.6/debian/compiz-gnome.manpages @@ -0,0 +1 @@ +debian/gtk-window-decorator.1 --- compiz-0.8.6.orig/debian/compiz-kde.manpages +++ compiz-0.8.6/debian/compiz-kde.manpages @@ -0,0 +1 @@ +debian/kde-window-decorator.1 --- compiz-0.8.6.orig/debian/compiz-kde.install +++ compiz-0.8.6/debian/compiz-kde.install @@ -0,0 +1 @@ +usr/bin/kde4-window-decorator --- compiz-0.8.6.orig/debian/copyright +++ compiz-0.8.6/debian/copyright @@ -0,0 +1,131 @@ +This package was debianized by Thierry Reding on +Fri, 18 Aug 2006 09:46:24 +0200. + +It was downloaded from http://xorg.freedesktop.org/releases/individual/app. + +Upstream author: David Reveman +Contributors: + Radek Doulik + Jeremy C. Reed + Dan Winship + Kristian Høgsberg + +------------------------------------------------------------------------------ + +The original source tarball was repackaged to remove the following generated +and/or unused files: + + kde/window-decorator/*.moc.cpp + kde/window-decorator/KWinInterface_skel.cpp + po/*.gmo + +------------------------------------------------------------------------------ + +Copyright: + +This software is copyright © 2005, 2006 Novell, Inc. + +You can redistribute this software and/or modify it under the terms of the GNU +General Public License as published by the Free Software Foundation; version 2 +dated June, 1991. + +This program is distributed in the hope that it will be useful, but- +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU- +General Public License for more details. + +------------------------------------------------------------------------------ + +The convertProperty / convert_property and handleSelectionRequest / +handle_selection_request functions in 'src/display.c' and +'gtk/window-decorator/gtk-window-decorator.c' are taken from the source code +of fvwm2 and copyright © Matthias Clasen and Dominik Vogt. + +Parts of the code in 'src/window.c': + + /* Ater gdk_window_constrain_size(), which is partially borrowed from fvwm. + * + * Copyright 1993, Robert Nation + * You may use this code for any purpose, as long as the original + * copyright remains in the source code and all documentation + * + * which in turn borrows parts of the algorithm from uwm + */ + +------------------------------------------------------------------------------ +-- Plugins: -- +-------------- + +Skydome support for the 'cube' plugin was written by Mirco Müller +. + +For the 'place' plugin: + + /* + * Copyright (C) 2001 Havoc Pennington + * Copyright (C) 2002, 2003 Red Hat, Inc. + * Copyright (C) 2003 Rob Adams + * Copyright (C) 2005 Novell, Inc. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301, USA. + */ + +The 'plane' plugin was written by Søren Sandmann : + + /* + * Copyright © 2006 Red Hat, Inc. + * + * Permission to use, copy, modify, distribute, and sell this software + * and its documentation for any purpose is hereby granted without + * fee, provided that the above copyright notice appear in all copies + * and that both that copyright notice and this permission notice + * appear in supporting documentation, and that the name of + * Red Hat, Inc. not be used in advertising or publicity pertaining to + * distribution of the software without specific, written prior permission. + * Red Hat, Inc. makes no representations about the suitability of this + * software for any purpose. It is provided "as is" without express or + * implied warranty. + * + * RED HAT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN + * NO EVENT SHALL RED HAT, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS + * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, + * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION + * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * Author: Søren Sandmann + */ + +------------------------------------------------------------------------------ +-- Translations: -- +------------------- + +The Finnish translation in 'po/fi.po' is copyright © 2003 SuSE Linux AG and © +2005 SUSE Linux Products GmbH. + +The Polish translation in 'po/pl.po' are copyright © 2005 SUSE Linux Products +GmbH. + +The makefile 'po/Makefile.in.in' is copyright © 1995, 1996, 1997 by Ulrich +Drepper . + +------------------------------------------------------------------------------ + +The Debian packaging is copyright © 2006, 2007 by Thierry Reding + and is licensed under the GPL, see +`/usr/share/common-licenses/GPL'. + --- compiz-0.8.6.orig/debian/watch +++ compiz-0.8.6/debian/watch @@ -0,0 +1,3 @@ +version=3 +http://releases.compiz.org/([\d\.]+)[02468]/ compiz-(\d.*)\.tar\.gz + --- compiz-0.8.6.orig/debian/compiz-core.manpages +++ compiz-0.8.6/debian/compiz-core.manpages @@ -0,0 +1 @@ +debian/compiz.1 --- compiz-0.8.6.orig/debian/compiz-core.docs +++ compiz-0.8.6/debian/compiz-core.docs @@ -0,0 +1,4 @@ +AUTHORS +NEWS +README +TODO --- compiz-0.8.6.orig/debian/compiz-dev.install +++ compiz-0.8.6/debian/compiz-dev.install @@ -0,0 +1,3 @@ +usr/include/compiz/compiz*.h +usr/lib/pkgconfig/compiz*.pc +usr/share/compiz/schemas.xslt --- compiz-0.8.6.orig/debian/compiz-dev.docs +++ compiz-0.8.6/debian/compiz-dev.docs @@ -0,0 +1,4 @@ +AUTHORS +NEWS +README +TODO --- compiz-0.8.6.orig/debian/gbp.conf +++ compiz-0.8.6/debian/gbp.conf @@ -0,0 +1,8 @@ +[DEFAULT] +debian-branch = debian-unstable +debian-tag = compiz-%(version)s +upstream-branch = upstream-unstable +upstream-tag = compiz-%(version)s + +[git-dch] +meta = 1 --- compiz-0.8.6.orig/debian/compiz-gnome.docs +++ compiz-0.8.6/debian/compiz-gnome.docs @@ -0,0 +1,4 @@ +AUTHORS +NEWS +README +TODO --- compiz-0.8.6.orig/debian/gtk-window-decorator.1 +++ compiz-0.8.6/debian/gtk-window-decorator.1 @@ -0,0 +1,30 @@ +.TH GTK-WINDOW-DECORATOR 1 "September 25, 2006" +.SH NAME +gtk-window-decorator \- Compiz window decorator using the Gtk toolkit +.SH SYNOPSIS +.B gtk-window-decorator +.RI [ options ] +.SH DESCRIPTION +.B gtk-window-decorator +is a window decorator for +.B compiz +that uses the Gtk toolkit to provide a look and feel similar to that of the +metacity window manager. +.SH OPTIONS +.B gtk-window-decorator +accepts the following options: +.TP +.BI \-\-minimal +Runs only with minimal window decorations. +.TP +.BI \-\-replace +Replaces any running window decorator. +.TP +.BI \-\-help +Prints the list of accepted options. +.SH AUTHOR +gtk-window-decorator was written by David Reveman and +others. +.PP +This manual page was written by Thierry Reding , +for the Debian project (but may be used by others). --- compiz-0.8.6.orig/debian/control +++ compiz-0.8.6/debian/control @@ -0,0 +1,141 @@ +Source: compiz +Section: x11 +Priority: optional +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Debian X Strike Force +Uploaders: David Nusinow , Sean Finney , Cyril Brulebois +Build-Depends: autoconf, automake1.9, autotools-dev, + cdbs, + debhelper (>= 5), intltool, + kdebase-workspace-dev, + libcairo2-dev, + libdbus-glib-1-dev, libgconf2-dev, + libgl1-mesa-dev (>= 6.5.1) | libgl-dev, libglib2.0-dev, libgnome-desktop-dev, + libgnomeui-dev, + libgnome-window-settings-dev, libgtk2.0-dev, libice-dev (>= 1:1.0.1), + libmetacity-dev (>= 1:2.30.0-0ubuntu1), libpango1.0-dev, libpng12-dev | libpng-dev, librsvg2-dev, + libsm-dev (>= 1:1.0.1), libtool, libwnck-dev, libx11-dev, libxcomposite-dev (>= 1:0.3-2), libxext-dev, + libxdamage-dev (>=1:1.0.3), libxfixes-dev (>= 1:4.0.1), libxinerama-dev, + libxml-parser-perl, libxrandr-dev (>= 2:1.1.0.2), libxrender-dev (>= 1:0.9.1), + libxcursor-dev, + libxml2-dev, libxslt1-dev, + libstartup-notification0-dev (>= 0.7), + quilt (>= 0.40), x11proto-gl-dev (>= 1.4.8), xsltproc, + libglu1-mesa-dev, + kdebase-workspace-dev, kdelibs5-dev (>= 4:4.2.2), + metacity-common, libx11-xcb-dev, + gnome-control-center-dev, +Standards-Version: 3.8.1 +Vcs-Bzr: https://code.launchpad.net/~compiz/compiz/ubuntu + +Package: compiz +Architecture: all +Provides: x-window-manager +Depends: compiz-core (>= ${source:Version}), compiz-plugins (>= ${source:Version}), compiz-gnome | compiz-kde, compiz-fusion-plugins-main (>= 0.8.6), libcompizconfig0 (>= 0.8.4-0ubuntu3), ${misc:Depends} +Suggests: compizconfig-settings-manager +Description: OpenGL window and compositing manager + 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 + with special needs. + . + This metapackage provides the components necessary for running compiz. It + provides the compiz core, a set of standard plugins, a window decorator using + the Gtk toolkit and the files necessary to integrate compiz with the GNOME + desktop environment. + +Package: compiz-core +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Breaks: libcompizconfig0 (<< 0.8.4-0ubuntu3), + compiz-fusion-plugins-main (<< 0.8.6), + compiz-fusion-plugins-extra (<< 0.8.6) +Recommends: compiz-plugins (= ${binary:Version}) +Suggests: nvidia-glx (>= 1.0.9625-1) +Provides: compiz-core-abiversion-${coreabiversion} +Conflicts: compiz-wrapper (<< 1:0.8.4-0ubuntu4) +Replaces: compiz-wrapper (<< 1:0.8.4-0ubuntu4), + compiz-gnome (<< 1:0.8.4-4ubuntu1) +Description: OpenGL window and compositing manager + 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 + with special needs. + . + Compiz combines together a window manager and a composite manager using + OpenGL for rendering. A "window manager" allows the manipulation of the + multiple applications and dialog windows that are presented on the screen. A + "composite manager" allows windows and other graphics to be combined together + to create composite images. Compiz achieves its stunning effects by doing + both of these functions. + +Package: compiz-dev +Architecture: any +Depends: compiz-core (= ${binary:Version}), ${shlibs:Depends}, ${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 +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 + with special needs. + . + This package contains the headers and libraries needed to compile compiz + plugins. + +Package: compiz-kde +Architecture: any +Depends: compiz-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, + compiz-plugins (= ${binary:Version}), + compizconfig-backend-kconfig +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 + with special needs. + . + This package contains a window decorator that uses KDE to provide a look and + feel similar to that of the default KDE window manager. + +Package: compiz-gnome +Architecture: any +Suggests: gnome-themes +Depends: ${shlibs:Depends}, ${misc:Depends}, + compiz-plugins (= ${binary:Version}), + compizconfig-backend-gconf (>= 0.7.4) +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 + with special needs. + . + This package contains files needed to integrate compiz with the GNOME desktop + environment. + +Package: compiz-plugins +Architecture: any +Depends: compiz-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Replaces: compiz-gnome (<< 1:0.8.4-4ubuntu1) +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 + with special needs. + . + This package contains the standard plugins that come with compiz. Compiz + without these plugins is not very useful. + +Package: libdecoration0 +Architecture: any +Depends: ${shlibs:Depends}, ${misc: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 + like gtk-window-decorator and kde-window-decorator. + +Package: libdecoration0-dev +Section: libdevel +Architecture: any +Depends: libdecoration0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, libx11-dev, libxrender-dev (>= 1:0.9.1) +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 + like gtk-window-decorator and kde-window-decorator. + . + This package contains files required for developing window decorators + compatible with Compiz. + +# vim: tw=0 --- compiz-0.8.6.orig/debian/changelog +++ compiz-0.8.6/debian/changelog @@ -0,0 +1,725 @@ +compiz (1:0.8.6-0ubuntu10) natty; urgency=low + + * New patch, 635258-fix-pixmap-size-calculations, from commit + 0f95c41a0aa175ddf7947ba18b01f746c95594a9 in the 0.8 branch; thanks + Paul Donohue; LP: #635258. + + -- Loïc Minier Sun, 17 Oct 2010 22:02:58 +0200 + +compiz (1:0.8.6-0ubuntu9) maverick; urgency=low + + * debian/compiz-gnome.gconf-defaults: /apps/gwd/metacity_theme_opacity + is a float (1.0), not int (1). + + -- Anders Kaseorg Fri, 24 Sep 2010 21:09:32 -0400 + +compiz (1:0.8.6-0ubuntu8) maverick; urgency=low + + * debian/compiz-gnome.gconf-defaults + - move the shadow 4 pixels down, in order to reduce the shadow between + menubaritems and the menu frame (LP: #634417) + + * debian/patches/029_default_options.patch + - get rid of the transparency on the unfocused window frame. (LP: #634417) + + -- Ken VanDine Tue, 21 Sep 2010 16:59:27 -0400 + +compiz (1:0.8.6-0ubuntu7) maverick; urgency=low + + * 060_move_checks_to_compiz.patch: Remove Sandybridge bridge devices from + the blacklist, they were preventing compiz from loading on machines + with discreet GPU's as well. (LP: #644372) + + -- Robert Hooker Tue, 21 Sep 2010 09:46:36 -0400 + +compiz (1:0.8.6-0ubuntu6) maverick; urgency=low + + * Update 060_move_checks_to_compiz.patch to add Intel Sandybridge pci id's + to the blacklist, the mesa dri driver claims it instead of swrast so + compiz tries to use it but does not work currently. (LP: #633376) + + -- Robert Hooker Wed, 08 Sep 2010 13:10:11 -0400 + +compiz (1:0.8.6-0ubuntu5) maverick; urgency=low + + * Fix LP: #622195 - dh_install can't rename files. In trying to do so, + compiz-wm.desktop is installed one folder too deep, breaking + gnome-{appearance,window}-properties + - update debian/compiz-gnome.install + + -- Chris Coulson Thu, 26 Aug 2010 21:33:53 +0100 + +compiz (1:0.8.6-0ubuntu4) maverick; urgency=low + + * debian/control: Argh, also reduce the libcompizconfig0 dependency to the + version that actually rebuilt against 0.8.6. + + -- Martin Pitt Tue, 03 Aug 2010 10:40:30 +0200 + +compiz (1:0.8.6-0ubuntu3) maverick; urgency=low + + * debian/control: Reduce libcompizconfig0 breaks to << the version that + actually rebuilt against 0.8.6. + + -- Martin Pitt Tue, 03 Aug 2010 00:13:46 +0200 + +compiz (1:0.8.6-0ubuntu2) maverick; urgency=low + + * control: Don't build-depends on libdbus-qt-1-dev, it's deprecated + + -- Sebastien Bacher Mon, 02 Aug 2010 17:49:08 +0200 + +compiz (1:0.8.6-0ubuntu1) maverick; urgency=low + + * New upstream release: + - Maintenance release. + - Various focus and window placement fixes. + - Fixed handling of windows that have a (server-drawn) border. + - Fixed handling of window icons that have a colour depth of 1 bit. + - Added KDE 4.4 support to KDE4 window decorator. + * debian/control: + - Build-depend on libx11-dev, libxext-dev + * debian/patches/020_fix_focus.patch: + * debian/patches/030_from_git_crash_fix_multiscreen.patch: + * debian/patches/031_from_git_fix_gnome_keybindings.patch: + * debian/patches/070_remove_deprecated_gtk_symbol.patch: + - Applied upstream + + -- Robert Ancell Tue, 27 Jul 2010 17:23:05 +0200 + +compiz (1:0.8.4-4ubuntu1) maverick; urgency=low + + * Merge with Debian unstable, remaining Ubuntu changes: + * debian/control: + - Build-depend on cdbs for strip-schemas + - Add version on libmetacity-dev build-depend + - Add KDE build-depends + - Add metacity-common build-depends (for getting keybindings) + - Add gnome-control-center-dev build-depends (may not be required) + - Add libx11-xcb-dev build-depend + - Add Vcs-Bzr link + - compiz provides x-window-manager + - compiz-core does not provide mesa-utils + - compiz-core breaks old version of compiz-fusion-plugins-main and + compiz-fusion-plugins-extra + - compiz-core replaces old compiz-wrapper + - compiz-dev depends on libx11-xcb-dev + - compiz-gnome and compiz-kde depend on compiz-plugins and their backends + * debian/rules: + - Compile a subset of the plugins + - Do not build the kconfig plugin (in favior of libcompizconfig) + - Build with --enable-gconf + - Build translations/language packs + - Install compiz-decorator wrapper + - Install apport hook + - Copy keybindings from metacity + - Exclude some files from compiz-plugins + * debian/compiz-core.install: + - Don't install plugin files + - Install apport hooks + * debian/compiz-decorator: + - Script to run the appropriate decorator for the current session + * debian/compiz-dev.install: + - Install XSLT file + * debian/compiz-gtk.*: + - Not required, merged into compiz-gnome + * debian/compiz-gnome.gconf-defaults: + - Set Ubuntu defaults + * debian/compiz-gnome.install: + - Rename wm-properties desktop file, don't know why + - Install gnome-control-center keybindings files + - Add files from compiz-gtk + * debian/compiz-gnome.manpages: + - Add files from compiz-gtk + * debian/compiz-keybindings.sed: + - Script to add keybindings + * debian/compiz-plugins.install: + - Install XML files for the plugins + * debian/source_compiz.py: + - Apport hook + * debian/patches/012_snap-by-default.patch: + - Not enabled, not sure if we want this in Ubuntu + * debian/patches/021_hide_tooltip_on_decorator.patch: + - Make decorator tooltips optional + * debian/patches/029_default_options.patch: + - Updated with additional changes over Debian + * debian/patches/090_profiling.patch: + - Timing profiling patch (disabled) + * debian/watch: + - Update download location + + -- Robert Ancell Thu, 17 Jun 2010 10:12:18 +1000 + +compiz (0.8.4-4) unstable; urgency=low + + * Drop libdbus-qt-1-dev from Build-Depends, as kindly requested by + Michael Biebl (Closes: #581788). Qt3 is going away, we already use + --disable-kde and --enable-kde4 to that effect, so libdbus-qt-1-dev + can be kicked away. + * Add libglu1-mesa-dev, needed for . + + -- Cyril Brulebois Sun, 16 May 2010 20:44:51 +0200 + +compiz (0.8.4-3) unstable; urgency=high + + [ Brice Goglin ] + * Remove Thierry Reding from Uploaders, closes: #572540. + + [ Cyril Brulebois ] + * Add patch to prevent FTBFS due to deprecated GDK/GTK stuff: + * 020_disable_gdk_gtk_disable_deprecated (Closes: #577352). + * Add myself to Uploaders. + * Set urgency to high due to RC bugfix. + + -- Cyril Brulebois Thu, 15 Apr 2010 03:29:29 +0200 + +compiz (0.8.4-2) unstable; urgency=low + + * Bump the dh_makeshlibs call to (>= 0.8.4) + + -- Sean Finney Thu, 11 Feb 2010 23:08:16 +0100 + +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 (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 drawing to make sure X is done + handling rendering calls. Suggested by Michel Dänzer to ensure + we don't have any rendering glitches. + * 017_always_unredirect_screensaver_on_nvidia.patch: + - always unredirect gnome-screensaver when using nvidia, workaround + for LP #160264 while still disabling unredirect fullscreen + windows for nvidia users + * 020_fix_focus.patch: + - give back the focus to the previous focused window (LP: #455900) + * 030_from_git_crash_fix_multiscreen.patch: + - merge commit 24dea72a395071b533dcf66b2eef37b20522cbba to fix + crash with wobbly windows in a multi screen setup + * 031_from_git_fix_gnome_keybindings.patch: + - fix gnome keybindings (terminal key) + * 060_move_checks_to_compiz.patch: + - add all relevant checks from compiz-manager to compiz itself + Compiz already checks for almost everything it needs so there is no + need to check twice. + * 061_KWD_stubs.patch (updated locally to remove fuzz): + - Horrible hack to define empty stubs for some new pure virtual + functions in KWD::Window, to fix FTBFS. + * The following patches have been updated to cleanly apply: + * 014-fix-gtk-window-decorator-no-argb-crash.patch + * 015_optional-fbo.patch + * ubuntu/010-disable-child-window-clipping.patch + * ubuntu/013-add-cursor-theme-support.patch + * ubuntu/018_use_metacity_settings.patch + * ubuntu/029_default_options + * ubuntu/035_ignore_workspaces + * ubuntu/037_fullscreen_stacking_fixes.patch + * ubuntu/049-damage-report-non-empty.patch + * ubuntu/050_stacking.patch + * Transition from compiz-manager to compiz binary for /usr/bin/compiz + * Remove all patches to the embedded compiz-manager script + * 028_compiz_manager_blacklist + * 029_compiz_manager_decoration.patch + * 029_compiz_manager_nvidia_settings.patch + * 030_compiz_manager_multi_display + * 031_compiz_manager_extra_blacklist_support + * 032_compiz_manager_add_gnomecompat + * 033_compiz_manager_xdg_dirs + * 042-compiz-manager-default-plugin + * 046_compiz_manager_second_screen.patch + + -- Sean Finney Thu, 11 Feb 2010 20:17:39 +0100 + +compiz (0.8.2-6) unstable; urgency=low + + * Add libxcursor-dev build-dep as required by patch + ubuntu/013-add-cursor-theme-support; also let compiz-dev pull it as it's + referenced in the .pc file; closes: #525240, #524943. + * Add a virtual compiz-core-abiversion-2009xxyy provides to compiz-core to + allow for strict dependencies of plugins on the compiz-core + CORE_ABIVERSION they were built with, as read from include/compiz-core.h. + * Use the new Breaks feature for the compiz-core -> libcompizconfig0 dep. + This makes upgrades smoother than Conflicts. + * Bump the compiz-core Breaks on libcompizconfig0 to 0.8.0 as the last + CORE_ABIVERSION bump happened between 0.7.8 and 0.8.0; closes: #523514. + * Add a missing libxml2-dev build-dep and update the compiz-dev deps to + match what compiz.pc requires and use the same versions as the build-deps. + * Build-dep on libcairo2-dev instead of libcairo-dev. + * Add missing libstartup-notification0-dev (>= 0.7) bdep and version the + compiz-dev dep to match. + * Use the same version in the libdecoration0-dev dep on libxrender-dev as + in the libxrender-dev bdep. + + -- Loic Minier Fri, 24 Apr 2009 15:15:24 +0200 + +compiz (0.8.2-5) unstable; urgency=low + + * remove obsolete --enable-gconf-dump configure option + * add build-dependency on libgnomeui-dev to fix new FTBFS (Closes: #524446) + * add Vcs-Git and Vcs-Browser headers to debian/control + + -- Sean Finney Sun, 19 Apr 2009 18:45:39 +0200 + +compiz (0.8.2-4) unstable; urgency=low + + * disable child window clipping patch: it breaks the abi + + -- Sean Finney Sat, 11 Apr 2009 18:55:35 +0200 + +compiz (0.8.2-3) unstable; urgency=low + + * import of some ubuntu patches for 0.8.2 with some modifications + - see debian/patches/ubuntu for patches + - see debian/patches/series for which patches are used and which + are not. + - includes patch to copy gnome/metacity keyboard shortcuts + (Closes: #503442, #454922). + + -- Sean Finney Sat, 11 Apr 2009 14:26:06 +0200 + +compiz (0.8.2-2) unstable; urgency=low + + * upgrading compiz-manager backed out some locally modified but not + quilt-using changes in paths. so, new patch compiz-debian-paths.patch + should fix this (closes: #522985). + + -- Sean Finney Wed, 08 Apr 2009 23:13:19 +0200 + +compiz (0.8.2-1) unstable; urgency=low + + * new upstream release. + * update location of compiz-gnome desktop file + * add new app desktop file for compiz to compiz-core + * update build-deps to use kdebase-workspace-dev + * add build-dep on libxslt1-dev + * disable kde3 decorator and enable kde4 decorator + * include a gbp.conf for use with git-buildpackage + * bump the libdecoration0 shlibs version to 0.8.2 + * update compiz-manager to upstream's 223180bf + * Obsolete patches now removed: + - disable-libx11-xcb-support.patch + - xscreensaver-damage-fix.patch + - compiz-manager-posixly-correct.patch + * Lintian fixes: + - update Standards-Version to 3.8.1 + - add misc:Depends to compiz + + -- Sean Finney Wed, 01 Apr 2009 00:00:10 +0200 + +compiz (0.7.6-8) unstable; urgency=low + + * Don't run glib-gettextize, to fix FTBFS caused by intltoolize changes + (closes: #518909). + * Rebuild against new metacity (closes: #518910). + + -- Julien Cristau Mon, 09 Mar 2009 18:44:13 +0100 + +compiz (0.7.6-7) unstable; urgency=medium + + * refresh quilt patches to apply with no fuzz/offsets. + * add fglrx driver to compiz-manager whitelist (closes: #495539). + + -- Sean Finney Mon, 01 Sep 2008 08:00:56 +0200 + +compiz (0.7.6-6) unstable; urgency=high + + * backport commit aed97c441881d9c382c7865d0305fc8f884c10ac to fix the + problems that seem to come up with certain xscreensavers the Right Way. + (closes: #483170). + + -- Sean Finney Sat, 30 Aug 2008 11:39:17 +0200 + +compiz (0.7.6-5) unstable; urgency=high + + * Brown paper bag: remove shlibs.local and libdecoration0.shlibs, call + dh_makeshlibs with the proper flags to actually fix dependencies on + libdecoration0. + + -- Julien Cristau Fri, 01 Aug 2008 18:57:30 +0200 + +compiz (0.7.6-4) unstable; urgency=low + + [ Julien Cristau ] + * Bump libdecoration0 shlibs to >= 0.7.6 (closes: #485775). + + [ Sean Finney ] + * Include fix for posixly-incorrect usage of ENV (closes: #484225). + + -- Julien Cristau Sat, 26 Jul 2008 21:44:51 +0200 + +compiz (0.7.6-3) unstable; urgency=high + + * Add a versioned Replaces on older compiz-plugins to compiz-gtk, to prevent + file conflicts. Thanks to Daniel Burrows for the report (closes: #485436). + + -- Sean Finney Mon, 09 Jun 2008 18:39:57 +0200 + +compiz (0.7.6-2) unstable; urgency=low + + * Add Conflicts against xscreensaver-data-extra as an unfortunately + heavy handed workaround to prevent graphical lockups with an as-of-yet + unknown bug somewhere in the screensaver-compiz-driver-xserver chain. + (See: #483170, and other bugs/urls referenced in that report) + + -- Sean Finney Sat, 07 Jun 2008 14:22:15 +0200 + +compiz (0.7.6-1) unstable; urgency=low + + * New upstream release + + [ Sean Finney ] + * Special-case the gconf and kconfig plugins to go into the -gtk and -kde + packages respectively, as they are semi-obsoleted by the ccp plugin anyway + and cause potentially problematic dependencies. Thanks to Fabiano + Manoel de Andrade for the report (closes: #482150). + * Add versioned Conflicts on libcompizconfig0 to compiz-core, to reflect + ABI breakage without introducing a circular dependency. Thanks + to Mike Hommey for the report (closes: #482646). + * Make debian/rules stricter about catching uninstalled files. + * Make debian/rules able to build/clean/build again. + * Misc cleanups in debian/rules. + * Lintian fixes: + - Spelling correction in debian/control + - Fix for build-depends-on-1-revision for x11proto-gl-dev + + [ Julien Cristau ] + * Add Depends: libxslt1-dev, libxml2-dev to compiz-dev, as they are required + by compiz.pc (closes: #482192). + + -- Sean Finney Mon, 26 May 2008 23:04:24 +0200 + +compiz (0.7.4-1) unstable; urgency=low + + * New upstream release + * Incorporate xcb-disabling patch from + http://gitweb.opencompositing.org/?p=users/3v1n0/compiz-patches + + -- Sean Finney Sun, 18 May 2008 19:15:13 +0200 + +compiz (0.6.3~git20080115.0ea58487-1) unstable; urgency=low + + * New upstream (git snapshot) release. Refreshed quilt patches. + * Contains upstream fix for kde-window-decorator problems with not properly + mapping/rendering titlebars. closes: #458464, #460186. + * Remove timestamps from quilt patches (package maintainers, you + should put QUILT_NO_DIFF_TIMESTAMPS=1 in your ~/.quiltrc). + * add compizconfig-settings-manager to Suggests field for compiz. + * don't blindly assume that the nvidia-settings program is present. + patch: compiz-manager-nvidia-settings-optional.patch. closes: #463645. + + -- sean finney Tue, 26 Feb 2008 20:08:31 +0100 + +compiz (0.6.3~git20071222.061ff159-1) unstable; urgency=low + + * New upstream (git snapshot) release. Refreshed quilt patches. + * Remove build-dependency on libfuse-dev, since we explicitly disable the + fuse plugin and it causes FTBFS on non-linux arches. It should also make + backporting easier (closes: #451149, #455516). + * compiz-manager-posixly-correct.patch: fix from Brian Carlson to get + compiz-manager to run when POSIXLY_CORRECT is set (always pass + options before arguments closes: #456628). + * Remove libmetacity entry from shlibs override (closes: #455515) Thanks to + Rober Millan for noticing this. + * Remove outdated info in README.Debian for compiz-core (closes: #454340). + * lintian: + - Standards-Version to 3.7.3 + - libdecoration0-dev to section libdevel + + -- Sean Finney Sat, 22 Dec 2007 12:01:54 +0100 + +compiz (0.6.3~git20071208.25941d14-1) unstable; urgency=low + + [Sean Finney] + * New upstream (git snapshot) release. + * Remove autofoo generated content and create/remove it as part of the + standard build process instead. + * Similarly, add Build-Deps on autoconf and similar stuff. + * Remove the old/buggy compiz.wrapper script and now use Kristian Lyngstol's + compiz-manager script as a drop-in replacement for it. This should fix + numerous problems with plugin settings and window decorators not behaving + properly. specifically, it closes: #449389, #390929, #400583, #440095. + it also closes: #446901, #447345 closes: #393501, #445026. + * Update copyright file accordingly. + + -- Sean Finney Sun, 16 Dec 2007 17:29:03 +0100 + +compiz (0.6.3~git20071104.c9009efd-1) unstable; urgency=low + + [Sean Finney] + * New upstream (git snapshot) release. + * Disable the (unused?) fuse plugin, explicitly enable the gconf plugin + * lintian: update FSF address + + [Brice Goglin] + * Make compiz dependencies on compiz-* packages versioned, + closes: #440494. + * Make the build-dependency on libfuse-dev require >= 2.7.0. + + -- Sean Finney Sun, 04 Nov 2007 21:20:17 +0100 + +compiz (0.5.2-2) unstable; urgency=low + + * oops, shipping copies of a few .h and .pc files in both compiz-dev + and libdecoration0-dev. fixed. + + -- sean finney Wed, 29 Aug 2007 21:06:29 +0200 + +compiz (0.5.2-1) unstable; urgency=low + + * New upstream release. + * updated/massaged various quilt patches + * make sure configure is executable at build time. seems that this + causes problems in a pbuilder environment + * new build-dependencies on libxml-parser-perl and xsltproc + * modify compiz-dev.install to install all the extra .h/.pc files + being generated in this new version. + + -- sean finney Wed, 22 Aug 2007 22:58:09 -0700 + +compiz (0.5.0.dfsg-3) UNRELEASED; urgency=low + + * Restore all ${misc:Depends} in debian/control so that for instance + compiz-gtk and compiz-plugins gets the required dependency on gconf2 + (for gconf-schemas in postinst), closes: #436432. + + -- Brice Goglin Tue, 07 Aug 2007 15:10:49 +0200 + +compiz (0.5.0.dfsg-2) unstable; urgency=low + + * Drop the now obsolete Source-Version in favour of binary:Version in + debian/control. + * Replace --strict-binding and --use-cow documentation by --loose-binding + 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 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) + * Use package-local shlibs override file to depend on libmetacity0 (>= + 1:2.15.21) and libdecoration0 (>= 0.5.0). Thanks Sune Vuorela. + + -- Thierry Reding Fri, 13 Jul 2007 11:25:13 +0200 + +compiz (0.5.0.dfsg-1) unstable; urgency=low + + [ Thierry Reding ] + * New upstream development release: + - Remove stencil buffer requirement. + - Focus stealing prevention support. + - Better occlusion detection and more efficient rendering. + - Added plugins: + + blur: blur windows and contents behind translucent windows + + fuse: map compiz options to a file-system + + ini: flat file configuration backend + + inotify: file change notification + + video: composited video interface for efficient playback + * Forward-port patches: + - Dropped 012_debian-kde-includes-dir.patch, no longer needed. + - 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. + * 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) + * Drop po/*.gmo and kde/window-decorator/*.moc.cpp from the original + tarball. Add a note to debian/copyright. + * Pass QTDIR=/usr to the configure script so that the moc can be found. + * shlibs bump for libdecoration because it contains added symbols. + Thanks Julien Cristau. + + [ Julien Cristau ] + * Don't remove .cvsignore files and autogen.sh in clean. + + -- Thierry Reding Sat, 19 May 2007 17:34:51 +0200 + +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. + + Refresh 011_snap-by-default.patch. + * Replace build-dependency on libdbus-1-dev by libdbus-glib-1-dev. + * Add build-dependency on kdebase-dev and libdbus-qt-1-dev for the KDE + window decorator. + * Add patch 012_debian-kde-includes-dir to correctly detect the KDE include + directory on Debian systems. + * Add patch 013_set-qtdir-fallback to set the QTDIR variable to /usr if it + has not explicitly been set before. This allows the configure script to + correctly detect the moc compiler. + * Add the compiz-kde package which provides a window decorator for KDE. + Closes: #390338. + * Add the libdecoration0 and libdecoration0-dev packages. libdecoration0 is + needed by both Gtk and KDE window decorators while libdecoration0-dev can + be used to write additional decorators. + * Add patch 015_optional-fbo which adds a command-line option for disabling + the use of FBOs (work around buggy drivers). Add the --no-fbo option to + command-line in the compiz wrapper. + * Remove the --strict-binding and --use-cow options from the command-line in + the compiz wrapper. These are now the defaults. + * Add png and svg to the list of default plugins. They are needed to load + PNG and SVG images (e.g. for the cube's top face). + * Check whether the GLX_EXT_texture_from_pixmap extension is available in + direct or indirect rendering contexts. If it is available only in indirect + rendering contexts, force compiz to use indirect rendering. + + -- David Nusinow Wed, 17 Jan 2007 23:46:34 -0500 + +compiz (0.3.4-1) experimental; urgency=low + + * New upstream release: + + Drop 012_metacity-theme-support.patch, fixed upstream. + + Drop 013_fix-default-plugins.patch, fixed upstream. + + Refresh all other patches. + * Don't use xsfbs anymore until there's an easy way to keep it up-to-date + in git repositories. For now using quilt works just fine. + * Drop build-dependencies on automake1.9 and libtool because we don't run + the complete autotools stack anymore. + * Add missing dependencies to the compiz-dev package. It needs to pull in + all packages required by its pkgconfig file. + * Add a dependency on libgl1-mesa-dev | libgl-dev to compiz-dev because + compiz.h includes files provided in that package. + + -- Thierry Reding Sun, 26 Nov 2006 00:36:39 +0100 + + +compiz (0.3.2-1) experimental; urgency=low + + * New upstream release. Closes: #396770. + + Remove 010_snap-inverted.patch, applied upstream. + + Refreshed other patches to apply cleanly again. + + Remove gtk-window-decorator.schemas and use the one provided by + upstream (gtk/window-decorator/gwd.schemas). + * Targetted at experimental until the release of etch. + + -- Thierry Reding Tue, 14 Nov 2006 02:36:40 +0100 + +compiz (0.2.2-1) unstable; urgency=low + + [ Thierry Reding ] + * New upstream release: + + Drop 013_dont-fail-if-theme-not-found.patch, applied upstream. + * Make 012_metacity-theme-support also patch the configure script, not only + configure.ac. + * Add 013_fix-default-plugins.patch which fixes upstream's handling of the + default plugins configuration variable. + * Make all plugins that were enabled in previous versions default plugins so + compiz' behaviour doesn't change. Drop the 'water' plugin because our X + server does not support it yet. + * Drop --disable-kde from the configure flags because it is now disabled by + default. + * Add a dependency on mesa-utils to compiz-core to provide glxinfo that is + needed by the compiz wrapper. Thanks Per Bojsen. + Closes: #393113. + * Conflict with libmetacity0 (>= 1:2.15.21) because it would currently make + gtk-window-decorator segfault. + + [ David Nusinow ] + * Add myself to uploaders. Thierry is still the primary maintainer. + + -- David Nusinow Mon, 6 Nov 2006 23:13:41 -0500 + +compiz (0.2.0-1) unstable; urgency=low + + [ Thierry Reding ] + * New upstream release. + + Drop 011_plane-plugin-schema.patch, applied upstream. + + Drop 012_freedesktop-schema.patch, applied upstream. + * Replace 010_snap-by-default by the upstream patch 010_snap-inverted and + add 011_snap-by-default to enable snapping by default. + * Add 012_metacity-theme-support.patch which uses an older version of the + metacity library for theme support so that compiz can be built for Debian + unstable. + * Install a schemas file for the Gtk window decorator which is used to + enable the use of metacity themes. + * Suggest nvidia-glx (>= 1.0.9625-1). (Closes: #390326). + * Add code to the compiz wrapper to handle the NVIDIA GLX implementation + Closes: #390814. + * No longer build static versions of the plugins. + * Remove .la files manually because they are not needed. + * Clean up build-dependencies: + + Remove unnecessarily versioned build-dependencies. + + Tighten the build-dependency on libxcomposite-dev to (>= 1:0.3-2). + Closes: 390304, 390416. + * Add a manpage documenting the compiz wrapper. + * Check if the gconf plugin is installed before trying to load it in the + wrapper. + * Enable building the gconf-dump plugin. + * Add a README file to the compiz-core package. + * List copyright holders and contributors in the copyright file. + Closes: #392422. + * Add 013_dont-fail-if-theme-not-found.patch which will make compiz use its + default theme if the metacity theme cannot be found. + * Make compiz-gtk suggest gnome-themes so people can take advantage of the + metacity theme support. + + [ David Nusinow ] + * Tighten up all the X library build-depends by explicitly using current + versions. Thanks aj. + + -- David Nusinow Fri, 13 Oct 2006 16:22:17 -0400 + +compiz (0.0.13+git20060928-2) unstable; urgency=low + + * Change the maintainer field to the Debian X Strike Force. + * Add myself to the uploaders field. + * Move compiz.{docs,install,manpages} to compiz-core.{docs,install,manpages} + so the installed files end up in the correct package. + * Rename compiz.1 to compiz.real.1, because it's actually documenting the + real compiz binary. + + -- Thierry Reding Fri, 29 Sep 2006 09:24:30 +0200 + +compiz (0.0.13+git20060928-1) unstable; urgency=low + + * Initial release. (Closes: #352151) + * Install the compiz schema during postinst and removes it during prerm + (using dh_gconf). + * Add patches by Kristian Høgsberg to make compiz work on AIGLX: + + 002_tfp-server-extension.patch + + 005_glfinish.patch + * No longer build the compiz-kde package, because it is unusable. + * Add gtk-window-decorator.1 manpage. + * Install the window settings configuration plugin into the right location + (/usr/lib/libgnome-window-settings1/libcompiz.so). + * Bump build-dependency on libxcomposite-dev (>= 0.3) because it provides + the XComposite{Get,Release}OverlayWindow functions. + * Install a compiz wrapper as /usr/bin/compiz to call compiz.real with + required arguments (load gconf plugin). + * Add 010_snap-by-default.patch to turn snapping on by default. + * Add a versioned build-dependency on x11proto-gl-dev (>= 1.4.8-1) to make + sure compiz gets built with the correct opcodes for the GLX_EXT_tfp + extension. + * Add build-dependency on libmetacity-dev, which is needed for metacity + theme support. + * Add the compiz-gtk package containing the former gnome-window-decorator. + The compiz-gnome package provides the files necessary to integrate compiz + and compiz-gtk with the GNOME desktop environment. + * Add a build-dependency on libxinerama-dev, needed to build compiz with + support for the xinerama extension. + * Revise the compiz.1 manpage. + * Rename the compiz package to compiz-core and make compiz a meta-package + pulling in everything necessary to run compiz from within GNOME. + * Add 011_plane-plugin-schema.patch by Eugene Konev adding gconf settings + for the plane plugin. + * Add 012_freedesktop-schema.patch that fixes a typo in compiz.schema.in. + + -- Thierry Reding Fri, 29 Sep 2006 07:56:05 +0200 + --- compiz-0.8.6.orig/debian/libdecoration0.install +++ compiz-0.8.6/debian/libdecoration0.install @@ -0,0 +1 @@ +usr/lib/libdecoration*.so.* --- compiz-0.8.6.orig/debian/compiz-gnome.gconf-defaults +++ compiz-0.8.6/debian/compiz-gnome.gconf-defaults @@ -0,0 +1,7 @@ +/apps/compiz/plugins/decoration/allscreens/options/shadow_radius 9.0 +/apps/compiz/plugins/move/allscreens/options/constrain_y true +/apps/compiz/plugins/scale/allscreens/options/initiate_edge Disabled +/apps/compiz/general/screen0/options/hsize 4 +/apps/gwd/blur_type all +/apps/gwd/metacity_theme_opacity 1.0 +/apps/gwd/metacity_theme_shade_opacity true --- compiz-0.8.6.orig/debian/compiz.1 +++ compiz-0.8.6/debian/compiz.1 @@ -0,0 +1,86 @@ +.TH COMPIZ 1 "July 13, 2007" + +.SH NAME +compiz \- OpenGL window and compositing manager + +.SH SYNOPSIS +.B compiz +.RI [ options ] +.RI [ plugins ] +.SH DESCRIPTION +.B compiz +is a compositing window-manager using OpenGL for rendering. + +.SH OPTIONS +.TP +.BI "\-\-display " DISPLAY +Manage the display called +.I DISPLAY +instead of the name obtained from the +.I $DISPLAY +environment variable. +.TP +.BI "\-\-bg\-image " IMAGE +Use +.I IMAGE +as background image. +.TP +.BI "\-\-refresh\-rate " RATE +Set the default refresh rate. +.TP +.BI \-\-fast\-filter +Use a fast texture filter. +.TP +.BI \-\-indirect\-rendering +Force an indirect rendering context. Use this when running compiz on AIGLX. +.TP +.BI \-\-loose\-binding +Disable strict binding of textures. This may improve performance in some +situations (running on XGL). As opposed to strict binding, however, this isn't +guaranteed to work. Use with care. +.TP +.BI \-\-replace +Replace any existing window managers on the given X display. +.TP +.BI \-\-sm\-disable +Disable the session management. +.TP +.BI "\-\-sm\-client\-id " ID +Use the given +.I ID +as the client ID for session management. +.TP +.BI \-\-no\-detection +Disable output screen detection. +.TP +.BI \-\-no\-fbo +Disable the use of FBOs (frame buffer objects). This can be useful to work +around drivers with broken FBO implementations. +.TP +.BI \-\-ignore\-desktop\-hints +Do not use desktop hints (number of desktops, current desktop) as left by the +previous window manager. +.TP +.BI \-\-only\-current\-screen +Manage only the screen defined by +.I $DISPLAY +(or given by the +.I \-\-display +option) and leave all other screens alone. +.TP +.BI \-\-use\-root\-window +Use the root window instead of the composite overlay window for drawing. +.TP +.BI \-\-version +Show the +.B compiz +version string. +.TP +.BI \-\-help +Show a summary of the command-line options. + +.SH AUTHOR +compiz was written by David Reveman and others. +.PP +This manual page was written by Thierry Reding , +for the Debian project (but may be used by others). --- compiz-0.8.6.orig/debian/source_compiz.py +++ compiz-0.8.6/debian/source_compiz.py @@ -0,0 +1,52 @@ +'''apport package hook for compiz + +(c) 2009 Canonical Ltd. +Author: Brian Murray +''' + +from apport.hookutils import * +from os import path + +def add_info(report): + # Build System Environment + report['system'] = "distro = Ubuntu, architecture = %s, kernel = %s" % (command_output(['uname','-m']), command_output(['uname','-r'])) + + attach_related_packages(report, [ + "xserver-xorg", + "libgl1-mesa-glx", + "libdrm2", + "xserver-xorg-video-intel", + "xserver-xorg-video-ati" + ]) + + attach_file_if_exists(report, path.expanduser('~/.xsession-errors'), 'XsessionErrors') + attach_file(report, '/etc/X11/xorg.conf', 'XorgConf') + attach_file_if_exists(report, '/var/log/Xorg.0.log', 'XorgLog') + attach_file_if_exists(report, '/var/log/Xorg.0.log.old', 'XorgLogOld') + + attach_hardware(report) + + # One-line description of display hardware + report['PciDisplay'] = pci_devices(PCI_DISPLAY).split('\n')[0] + + # For resolution/multi-head bugs + report['Xrandr'] = command_output(['xrandr', '--verbose']) + attach_file_if_exists(report, + os.path.expanduser('~/.config/monitors.xml'), + 'monitors.xml') + + # GLX + report['glxinfo'] = command_output(['glxinfo']) + + # Plugins + report['CompizPlugins'] = command_output(['gconftool-2', '--get', '/apps/compiz/general/allscreens/options/active_plugins']) + + # User configuration + report['GconfCompiz'] = command_output(['gconftool-2', '-R', '/apps/compiz']) + +## DEBUGING ## +if __name__ == '__main__': + report = {} + add_info(report) + for key in report: + print '[%s]\n%s' % (key, report[key]) --- compiz-0.8.6.orig/debian/compat +++ compiz-0.8.6/debian/compat @@ -0,0 +1 @@ +5 --- compiz-0.8.6.orig/debian/compiz-kde.docs +++ compiz-0.8.6/debian/compiz-kde.docs @@ -0,0 +1,4 @@ +AUTHORS +NEWS +README +TODO --- compiz-0.8.6.orig/debian/patches/037_fullscreen_stacking_fixes.patch +++ compiz-0.8.6/debian/patches/037_fullscreen_stacking_fixes.patch @@ -0,0 +1,17 @@ +Author: Travis Watkins +Description: keep window on top of fullscreen windows during move +Origin: vendor, ubuntu (1:0.7.2-0ubuntu2) +--- compiz.orig/plugins/move.c ++++ compiz/plugins/move.c +@@ -124,6 +124,11 @@ moveInitiate (CompDisplay *d, + xid = getIntOptionNamed (option, nOption, "window", 0); + + w = findWindowAtDisplay (d, xid); ++ ++ /* make window stay above fullscreen windows while moving */ ++ if (w) ++ updateWindowAttributes (w, CompStackingUpdateModeAboveFullscreen); ++ + if (w && (w->actions & CompWindowActionMoveMask)) + { + XRectangle workArea; --- compiz-0.8.6.orig/debian/patches/050_stacking.patch +++ compiz-0.8.6/debian/patches/050_stacking.patch @@ -0,0 +1,18 @@ +Author: Michael Vogt +Description: map windows with focus_on_map=FALSE in the background + map windows with focus_on_map=FALSE in the background (just like metacity) +Origin: vendor, ubuntu (1:0.8.2-0ubuntu6) +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/333284 +Index: compiz-0.8.6/src/event.c +=================================================================== +--- compiz-0.8.6.orig/src/event.c 2010-07-27 17:37:02.653643001 +0200 ++++ compiz-0.8.6/src/event.c 2010-07-27 17:37:09.843643001 +0200 +@@ -2073,7 +2073,7 @@ + focus = allowWindowFocus (w, NO_FOCUS_MASK, + w->screen->x, w->screen->y, 0); + +- if (focus == CompFocusDenied) ++ if ((focus == CompFocusDenied || focus == CompFocusPrevent) && (w->type & ~NO_FOCUS_MASK)) + stackingMode = CompStackingUpdateModeInitialMapDeniedFocus; + else + stackingMode = CompStackingUpdateModeInitialMap; --- compiz-0.8.6.orig/debian/patches/017_always_unredirect_screensaver_on_nvidia.patch +++ compiz-0.8.6/debian/patches/017_always_unredirect_screensaver_on_nvidia.patch @@ -0,0 +1,32 @@ +Author: Travis Watkins +Description: Always unredirect gnome-screensaver when using nvidia + Workaround for LP #160264 while still disabling unredirect fullscreen + windows for nvidia users +Origin: vendor, ubuntu (1:0.8.3+git20090917-0ubuntu4) +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/160264 +--- compiz.orig/src/paint.c ++++ compiz/src/paint.c +@@ -262,6 +262,7 @@ paintOutputRegion (CompScreen *sc + CompTransform vTransform; + int offX, offY; + Region clip = region; ++ int dontcare; + + if (!tmpRegion) + { +@@ -341,8 +342,14 @@ paintOutputRegion (CompScreen *sc + XSubtractRegion (tmpRegion, w->region, tmpRegion); + + /* unredirect top most fullscreen windows. */ ++ /* if the fullscreen window is gnome-screensaver and we're ++ on nvidia we want to always unredirect even if this ++ option is disabled to work around LP #160264 */ + if (count == 0 && +- screen->opt[COMP_SCREEN_OPTION_UNREDIRECT_FS].value.b) ++ (screen->opt[COMP_SCREEN_OPTION_UNREDIRECT_FS].value.b || ++ (w->resName && !strcmp(w->resName, "gnome-screensaver") && ++ XQueryExtension (screen->display->display, "NV-GLX", ++ &dontcare, &dontcare, &dontcare)))) + { + if (XEqualRegion (w->region, &screen->region) && + !REGION_NOT_EMPTY (tmpRegion)) --- compiz-0.8.6.orig/debian/patches/010-disable-child-window-clipping.patch +++ compiz-0.8.6/debian/patches/010-disable-child-window-clipping.patch @@ -0,0 +1,46 @@ +Author: Matthew Garrett +Description: Disable clipping of child windows + * This patch was modified to apply cleanly in 0.8.4-1 +Last-Modified: Thu, 11 Feb 2010 20:06:12 +0100 +Origin: vendor, ubuntu (1:0.3.6-1ubuntu10) +Index: compiz-0.8.6/src/display.c +=================================================================== +--- compiz-0.8.6.orig/src/display.c 2010-03-28 14:15:35.000000000 +0200 ++++ compiz-0.8.6/src/display.c 2010-07-27 17:28:04.793643002 +0200 +@@ -2234,6 +2234,23 @@ + lastScreen = ScreenCount (dpy) - 1; + } + ++ { ++ XSetWindowAttributes attr; ++ Atom atom; ++ ++ attr.override_redirect = TRUE; ++ d->glIncludeInferiorsOwner = ++ XCreateWindow (dpy, XRootWindow (dpy, 0), ++ -100, -100, 1, 1, 0, ++ CopyFromParent, CopyFromParent, ++ CopyFromParent, ++ CWOverrideRedirect, ++ &attr); ++ ++ atom = XInternAtom (dpy, "_COMPIZ_GL_INCLUDE_INFERIORS", False); ++ XSetSelectionOwner(dpy, atom, d->glIncludeInferiorsOwner, CurrentTime); ++ } ++ + for (i = firstScreen; i <= lastScreen; i++) + { + Window newWmSnOwner = None, newCmSnOwner = None; +Index: compiz-0.8.6/include/compiz-core.h +=================================================================== +--- compiz-0.8.6.orig/include/compiz-core.h 2010-07-27 17:28:03.553643001 +0200 ++++ compiz-0.8.6/include/compiz-core.h 2010-07-27 17:28:04.793643002 +0200 +@@ -1028,6 +1028,8 @@ + + GLenum textureFilter; + ++ Window glIncludeInferiorsOwner; ++ + Window activeWindow; + Window nextActiveWindow; + --- compiz-0.8.6.orig/debian/patches/049-damage-report-non-empty.patch +++ compiz-0.8.6/debian/patches/049-damage-report-non-empty.patch @@ -0,0 +1,87 @@ +Author: Michael Vogt +Description: Workaround for problems with damage extension and refresh + Add workaround patch by Aaron Plattner to fix problems with the damage + extension and refresh (LP: #269904) +Origin: vendor, ubuntu (1:0.7.8-0ubuntu4) +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/269904 +Index: compiz-0.8.6/src/event.c +=================================================================== +--- compiz-0.8.6.orig/src/event.c 2010-07-27 17:36:53.393643002 +0200 ++++ compiz-0.8.6/src/event.c 2010-07-27 17:37:02.653643001 +0200 +@@ -2297,32 +2297,50 @@ + + if (w) + { ++ XserverRegion parts = XFixesCreateRegion(de->display, NULL, 0); ++ XRectangle *rects; ++ int nRects; ++ + w->texture->oldMipmaps = TRUE; + ++ // Get the damage region ++ XDamageSubtract(de->display, de->damage, None, parts); ++ rects = XFixesFetchRegion(de->display, parts, &nRects); ++ XFixesDestroyRegion(de->display, parts); ++ + if (w->syncWait) + { +- if (w->nDamage == w->sizeDamage) ++ int i; ++ ++ if (w->nDamage + nRects - 1 >= w->sizeDamage) + { + w->damageRects = realloc (w->damageRects, +- (w->sizeDamage + 1) * ++ (w->sizeDamage + nRects) * + sizeof (XRectangle)); +- w->sizeDamage += 1; ++ w->sizeDamage += nRects; + } + +- w->damageRects[w->nDamage].x = de->area.x; +- w->damageRects[w->nDamage].y = de->area.y; +- w->damageRects[w->nDamage].width = de->area.width; +- w->damageRects[w->nDamage].height = de->area.height; +- w->nDamage++; ++ for (i = 0; i < nRects; i++) ++ { ++ w->damageRects[w->nDamage] = rects[i]; ++ w->nDamage++; ++ } + } + else + { +- handleWindowDamageRect (w, +- de->area.x, +- de->area.y, +- de->area.width, +- de->area.height); ++ int i; ++ ++ for (i = 0; i < nRects; i++) ++ { ++ handleWindowDamageRect (w, ++ rects[i].x, ++ rects[i].y, ++ rects[i].width, ++ rects[i].height); ++ } + } ++ ++ XFree(rects); + } + } + else if (d->shapeExtension && +Index: compiz-0.8.6/src/window.c +=================================================================== +--- compiz-0.8.6.orig/src/window.c 2010-07-27 17:36:53.393643002 +0200 ++++ compiz-0.8.6/src/window.c 2010-07-27 17:37:02.653643001 +0200 +@@ -2207,7 +2207,7 @@ + XUnionRegion (&rect, w->region, w->region); + + w->damage = XDamageCreate (d->display, id, +- XDamageReportRawRectangles); ++ XDamageReportNonEmpty); + + /* need to check for DisplayModal state on all windows */ + w->state = getWindowState (d, w->id); --- compiz-0.8.6.orig/debian/patches/060_move_checks_to_compiz.patch +++ compiz-0.8.6/debian/patches/060_move_checks_to_compiz.patch @@ -0,0 +1,277 @@ +Author: Travis Watkins +Description: Add all relevant checks from compiz-manager to compiz itself + Compiz already checks for almost everything it needs so there is no + need to check twice. +Origin: vendor, ubuntu (1:0.8.4-0ubuntu4) +diff --git a/src/main.c b/src/main.c +index 0427975..d703024 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -74,6 +74,20 @@ Bool useCow = TRUE; + + CompMetadata coreMetadata; + ++char *blacklist[] = { ++ "8086:3577", /* Intel 830MG, 845G (LP: #259385) */ ++ "8086:2562", ++ "8086:0102", /* Intel Sandybridge Desktop Chipsets (LP: #633376) */ ++ "8086:0112", ++ "8086:0122", ++ "8086:0106", /* Intel Sandybridge Mobile Chipsets */ ++ "8086:0116", ++ "8086:0126", ++ "8086:010A", /* Intel Sandybridge Server Chipsets */ ++ ++ NULL ++}; ++ + static void + usage (void) + { +@@ -157,6 +171,28 @@ logLevelToString (CompLogLevel level) + return "Unknown"; + } + ++void ++launchFallbackWM (void) ++{ ++ char *fallback = NULL; ++ ++ if (getenv ("KDE_FULL_SESSION") != NULL) ++ fallback = "kwin"; ++ else if (getenv ("GNOME_DESKTOP_SESSION_ID") != NULL) ++ fallback = "metacity"; ++ else if (access ("/usr/bin/xfwm4", F_OK) == 0) ++ fallback = "xfwm4"; ++ ++ printf ("\nLaunching fallback window manager\n"); ++ if (fallback != NULL) ++ execlp (fallback, fallback, "--replace", (char *)NULL); ++ else ++ execlp ("xterm", "xterm", (char *)NULL); ++ ++ /* we should never get here but if we do just exit */ ++ exit (EXIT_FAILURE); ++} ++ + static void + signalHandler (int sig) + { +@@ -166,6 +202,9 @@ signalHandler (int sig) + case SIGCHLD: + waitpid (-1, &status, WNOHANG | WUNTRACED); + break; ++ case SIGSEGV: ++ launchFallbackWM (); ++ break; + case SIGHUP: + restartSignal = TRUE; + break; +@@ -259,15 +298,35 @@ main (int argc, char **argv) + Bool disableSm = FALSE; + char *clientId = NULL; + char *refreshRateArg = NULL; ++ char *command; + + programName = argv[0]; + programArgc = argc; + programArgv = argv; + ++ if (getenv ("GNOME_DESKTOP_SESSION_ID") != NULL && ++ strcmp (getenv ("GNOME_DESKTOP_SESSION_ID"), "Failsafe") == 0) ++ { ++ printf ("Detected GNOME failsafe session.\n"); ++ launchFallbackWM (); ++ } ++ ++ for (i = 0; blacklist[i] != NULL; i++) ++ { ++ asprintf (&command, "lspci -n | grep -q %s", blacklist[i]); ++ if (system(command) == 0) ++ { ++ printf ("Blacklisted PCI ID %s detected\n", blacklist[i]); ++ launchFallbackWM (); ++ } ++ free (command); ++ } ++ + signal (SIGHUP, signalHandler); + signal (SIGCHLD, signalHandler); + signal (SIGINT, signalHandler); + signal (SIGTERM, signalHandler); ++ signal (SIGSEGV, signalHandler); + + emptyRegion.rects = &emptyRegion.extents; + emptyRegion.numRects = 0; +@@ -286,6 +345,13 @@ main (int argc, char **argv) + + memset (&ctx, 0, sizeof (ctx)); + ++ /* if no options are passed run with defaults */ ++ if (argc == 1) ++ { ++ useDesktopHints = FALSE; ++ replaceCurrentWm = TRUE; ++ } ++ + for (i = 1; i < argc; i++) + { + if (!strcmp (argv[i], "--help")) +@@ -388,6 +454,16 @@ main (int argc, char **argv) + } + } + ++ /* add in default plugins if none are given */ ++ if (nPlugin == 0) ++ { ++ plugin[nPlugin++] = "ccp"; ++ plugin[nPlugin++] = "move"; ++ plugin[nPlugin++] = "resize"; ++ plugin[nPlugin++] = "place"; ++ plugin[nPlugin++] = "decoration"; ++ } ++ + if (refreshRateArg) + { + ctx.refreshRateData = malloc (strlen (refreshRateArg) + 256); +@@ -459,10 +535,20 @@ main (int argc, char **argv) + coreInitialized = TRUE; + + if (!disableSm) ++ { ++ if (clientId == NULL) ++ { ++ char *desktop_autostart_id = getenv ("DESKTOP_AUTOSTART_ID"); ++ if (desktop_autostart_id != NULL) ++ clientId = strdup (desktop_autostart_id); ++ unsetenv ("DESKTOP_AUTOSTART_ID"); ++ } ++ + initSession (clientId); ++ } + + if (!addDisplay (displayName)) +- return 1; ++ launchFallbackWM (); + + eventLoop (); + +diff --git a/src/screen.c b/src/screen.c +index c71fc20..d49fbf6 100644 +--- a/src/screen.c ++++ b/src/screen.c +@@ -1722,7 +1722,7 @@ addScreen (CompDisplay *display, + Window *children; + unsigned int nchildren; + int defaultDepth, nvisinfo, nElements, value, i; +- const char *glxExtensions, *glExtensions; ++ const char *glxExtensions, *glExtensions, *glRenderer; + XSetWindowAttributes attrib; + GLfloat globalAmbient[] = { 0.1f, 0.1f, 0.1f, 0.1f }; + GLfloat ambientLight[] = { 0.0f, 0.0f, 0.0f, 0.0f }; +@@ -1989,6 +1989,34 @@ addScreen (CompDisplay *display, + glxExtensions = glXQueryExtensionsString (dpy, screenNum); + if (!strstr (glxExtensions, "GLX_EXT_texture_from_pixmap")) + { ++ /* try again with indirect rendering */ ++ if (!indirectRendering) ++ { ++ char **copy; ++ ++ copy = (char **)malloc ((programArgc + 2) * sizeof (char *)); ++ for (i = 0; i < programArgc; i++) ++ { ++ copy[i] = strdup (programArgv[i]); ++ } ++ copy[i++] = "--indirect-rendering"; ++ copy[i] = NULL; ++ execvp (programName, copy); ++ ++ /* if we made it here execvp failed */ ++ for (i = 0; copy[i] != NULL; i++) ++ { ++ free (copy[i]); ++ } ++ free (copy); ++ ++ compLogMessage ("core", CompLogLevelFatal, ++ "Failed to launch with --indirect-rendering"); ++ XFree (visinfo); ++ ++ return FALSE; ++ } ++ + compLogMessage ("core", CompLogLevelFatal, + "GLX_EXT_texture_from_pixmap is missing"); + XFree (visinfo); +@@ -2074,6 +2102,16 @@ addScreen (CompDisplay *display, + return FALSE; + } + ++ glRenderer = (const char *) glGetString (GL_RENDERER); ++ if (glRenderer != NULL && ++ (strcmp (glRenderer, "Software Rasterizer") == 0 || ++ strcmp (glRenderer, "Mesa X11") == 0)) ++ { ++ compLogMessage ("core", CompLogLevelFatal, ++ "Software rendering detected."); ++ return FALSE; ++ } ++ + s->textureNonPowerOfTwo = 0; + if (strstr (glExtensions, "GL_ARB_texture_non_power_of_two")) + s->textureNonPowerOfTwo = 1; +diff --git a/src/texture.c b/src/texture.c +index 9782f61..8fe2619 100644 +--- a/src/texture.c ++++ b/src/texture.c +@@ -33,6 +33,8 @@ + + #include + ++void launchFallbackWM (void); ++ + static CompMatrix _identity_matrix = { + 1.0f, 0.0f, + 0.0f, 1.0f, +@@ -244,13 +246,21 @@ bindPixmapToTexture (CompScreen *screen, + CompFBConfig *config = &screen->glxPixmapFBConfigs[depth]; + int attribs[7], i = 0; + ++ if (width > screen->maxTextureSize || height > screen->maxTextureSize) ++ { ++ compLogMessage ("core", CompLogLevelWarn, ++ "Exceeded max texture size"); ++ ++ launchFallbackWM (); ++ } ++ + if (!config->fbConfig) + { + compLogMessage ("core", CompLogLevelWarn, + "No GLXFBConfig for depth %d", + depth); + +- return FALSE; ++ launchFallbackWM (); + } + + attribs[i++] = GLX_TEXTURE_FORMAT_EXT; +@@ -295,7 +305,7 @@ bindPixmapToTexture (CompScreen *screen, + compLogMessage ("core", CompLogLevelWarn, + "glXCreatePixmap failed"); + +- return FALSE; ++ launchFallbackWM (); + } + + if (!target) +@@ -345,7 +355,7 @@ bindPixmapToTexture (CompScreen *screen, + (*screen->destroyPixmap) (screen->display->display, texture->pixmap); + texture->pixmap = None; + +- return FALSE; ++ launchFallbackWM (); + } + + if (!texture->name) --- compiz-0.8.6.orig/debian/patches/562027-fix-gconf-ftbfs.patch +++ compiz-0.8.6/debian/patches/562027-fix-gconf-ftbfs.patch @@ -0,0 +1,21 @@ +Author: Sean Finney +Description: Fix FTBFS: "gconf/gconf-client.h: No such file or directory" + It seems that @GNOME_WINDOW_SETTINGS_LIBS@ used to implicitly include + gconf-related compiler flags, but not always. This should explicitly + include them. +Thanks: Sebastian Harl +Origin: vendor, debian +Bug-Debian: http://bugs.debian.org/562027 +Bug-Debian: http://bugs.debian.org/562438 +--- compiz.orig/gtk/gnome/Makefile.am ++++ compiz/gtk/gnome/Makefile.am +@@ -2,7 +2,8 @@ moduledir = $(DESTDIR)$(windowsettingsli + + if USE_GNOME + libcompiz_la_LDFLAGS = -export-dynamic -avoid-version -rpath $(moduledir) +-libcompiz_la_LIBADD = @GNOME_WINDOW_SETTINGS_LIBS@ ++libcompiz_la_LIBADD = @GNOME_WINDOW_SETTINGS_LIBS@ @GCONF_LIBS@ ++libcompiz_la_CFLAGS = @GCONF_CFLAGS@ + libcompiz_la_SOURCES = \ + compiz-window-manager.c \ + compiz-window-manager.h --- compiz-0.8.6.orig/debian/patches/020_disable_gdk_gtk_disable_deprecated +++ compiz-0.8.6/debian/patches/020_disable_gdk_gtk_disable_deprecated @@ -0,0 +1,18 @@ +Stop breaking on deprecated GTK_WIDGET_VISIBLE. +--- a/gtk/window-decorator/gtk-window-decorator.c ++++ b/gtk/window-decorator/gtk-window-decorator.c +@@ -31,14 +31,6 @@ + #include + #include + +-#ifndef GDK_DISABLE_DEPRECATED +-#define GDK_DISABLE_DEPRECATED +-#endif +- +-#ifndef GTK_DISABLE_DEPRECATED +-#define GTK_DISABLE_DEPRECATED +-#endif +- + #include + #include + #include --- compiz-0.8.6.orig/debian/patches/012_snap-by-default.patch +++ compiz-0.8.6/debian/patches/012_snap-by-default.patch @@ -0,0 +1,16 @@ +Author: Thierry Reding +Description: Enable snapping of windows by default in wobbly plugin. + This patch originally by Thierry Reding, later modified/updated by + Sean Finney. Not submitted to upstream. +Origin: vendor, debian (0.0.13+git20060928-1) +--- compiz.orig/metadata/wobbly.xml.in ++++ compiz/metadata/wobbly.xml.in +@@ -20,7 +20,7 @@ + + ++ ++ + +