compiz: Changes to 'debian-unstable'
.gitignore | 48
CMakeLists.txt | 130
Doxyfile | 1514 ++
INSTALL | 10
Makefile.am | 120
NEWS | 78
autogen.sh | 15
cmake/CMakeLists.txt | 32
cmake/CompizBcop.cmake | 41
cmake/CompizCommon.cmake | 277
cmake/CompizDefaults.cmake | 15
cmake/CompizDefaults.cmake.in | 5
cmake/CompizGconf.cmake | 52
cmake/CompizPackage.cmake | 101
cmake/CompizPlugin.cmake | 440
cmake/FindCompiz.cmake | 94
cmake/all_plugins_in_folder_example-CMakeLists.txt | 10
cmake/base.cmake | 63
cmake/plugin_extensions/CompizGenGconf.cmake | 79
cmake/plugin_extensions/CompizGenInstallData.cmake | 25
cmake/plugin_extensions/CompizGenInstallImages.cmake | 25
compiz-cube.pc.in | 13
compiz-gconf.pc.in | 6
compiz-kconfig.pc.in | 7
compiz-scale.pc.in | 12
compiz.pc.in | 2
config.h.core.in | 5
configure.ac | 654
debian/changelog | 31
debian/compat | 2
debian/compiz-core.install | 4
debian/compiz-core.manpages | 1
debian/compiz-decorator | 97
debian/compiz-decorator.1 | 15
debian/compiz-dev.install | 7
debian/compiz-gnome.gconf-defaults | 5
debian/compiz-gnome.install | 3
debian/compiz-gtk.install | 3
debian/compiz-gtk.links | 1
debian/compiz-kde.install | 1
debian/compiz-kde.manpages | 2
debian/compiz-plugins.install | 3
debian/compiz.1 | 54
debian/control | 45
debian/kde-window-decorator.1 | 40
debian/kde4-window-decorator.1 | 40
debian/patches/010-disable-child-window-clipping.patch | 42
debian/patches/012_snap-by-default.patch | 16
debian/patches/013-add-cursor-theme-support.patch | 243
debian/patches/014-fix-gtk-window-decorator-no-argb-crash.patch | 49
debian/patches/014_fix-no-border-window-shadow.patch | 21
debian/patches/015_draw_dock_shadows_on_desktop.patch | 85
debian/patches/015_optional-fbo.patch | 55
debian/patches/016_call_glxwaitx_before_drawing.patch | 17
debian/patches/017_always_unredirect_screensaver_on_nvidia.patch | 57
debian/patches/018_use_metacity_settings.patch | 18
debian/patches/020_disable_gdk_gtk_disable_deprecated | 18
debian/patches/020_fix_focus.patch | 81
debian/patches/029_default_options.patch | 143
debian/patches/030_from_git_crash_fix_multiscreen.patch | 45
debian/patches/031_from_git_fix_gnome_keybindings.patch | 43
debian/patches/035_ignore_workspaces.patch | 19
debian/patches/037_fullscreen_stacking_fixes.patch | 17
debian/patches/049-damage-report-non-empty.patch | 83
debian/patches/050_stacking.patch | 16
debian/patches/056_Preserve-DESTDIR-if-no-override-in-COMPIZ_DESTDIR.patch | 22
debian/patches/060_move_checks_to_compiz.patch | 291
debian/patches/061_KWD_stubs.patch | 17
debian/patches/562027-fix-gconf-ftbfs.patch | 21
debian/patches/series | 22
debian/rules | 141
debian/source/format | 1
debian/watch | 4
gtk/CMakeLists.txt | 93
gtk/Makefile.am | 1
gtk/config.h.gtk.in | 25
gtk/gnome/50-compiz-desktop-key.xml.in | 14
gtk/gnome/50-compiz-key.xml.in | 34
gtk/gnome/CMakeLists.txt | 84
gtk/gnome/Makefile.am | 97
gtk/gnome/compiz-window-manager.c | 86
gtk/window-decorator/CMakeLists.txt | 81
gtk/window-decorator/Makefile.am | 50
gtk/window-decorator/TODO | 1
gtk/window-decorator/actionmenu.c | 134
gtk/window-decorator/blurprops.c | 89
gtk/window-decorator/cairo.c | 915 +
gtk/window-decorator/decorator.c | 1301 +
gtk/window-decorator/decorprops.c | 161
gtk/window-decorator/events.c | 1172 +
gtk/window-decorator/forcequit.c | 201
gtk/window-decorator/frames.c | 316
gtk/window-decorator/gdk.c | 106
gtk/window-decorator/gtk-window-decorator.c | 7101 ----------
gtk/window-decorator/gtk-window-decorator.h | 1138 +
gtk/window-decorator/metacity.c | 1634 ++
gtk/window-decorator/settings.c | 546
gtk/window-decorator/style.c | 66
gtk/window-decorator/switcher.c | 515
gtk/window-decorator/tooltip.c | 205
gtk/window-decorator/util.c | 299
gtk/window-decorator/wnck.c | 680
images/CMakeLists.txt | 10
images/Makefile.am | 8
include/CMakeLists.txt | 11
include/Makefile.am | 13
include/compiz-common.h.in | 9
include/compiz-core.h | 3499 ----
include/compiz-cube.h | 230
include/compiz-plugin.h | 71
include/compiz-scale.h | 211
include/compiz.h | 180
include/core/CMakeLists.txt | 30
include/core/action.h | 178
include/core/atoms.h | 162
include/core/core.h | 88
include/core/countedlist.h | 114
include/core/icon.h | 53
include/core/match.h | 95
include/core/modifierhandler.h | 114
include/core/option.h | 242
include/core/output.h | 70
include/core/plugin.h | 332
include/core/pluginclasses.h | 70
include/core/pluginclasshandler.h | 167
include/core/point.h | 110
include/core/propertywriter.h | 54
include/core/rect.h | 227
include/core/region.h | 191
include/core/screen.h | 481
include/core/serialization.h | 158
include/core/session.h | 53
include/core/size.h | 69
include/core/timer.h | 116
include/core/window.h | 563
include/core/wrapsystem.h | 184
include/decoration.h | 53
kde/CMakeLists.txt | 1
kde/Makefile.am | 1
kde/window-decorator-kde4/CMakeLists.txt | 76
kde/window-decorator-kde4/Makefile.am | 15
kde/window-decorator-kde4/decorator.cpp | 328
kde/window-decorator-kde4/decorator.h | 10
kde/window-decorator-kde4/kdecoration_plugins.h | 4
kde/window-decorator-kde4/main.cpp | 21
kde/window-decorator-kde4/options.cpp | 4
kde/window-decorator-kde4/paintredirector.cpp | 3
kde/window-decorator-kde4/switcher.cpp | 65
kde/window-decorator-kde4/switcher.h | 4
kde/window-decorator-kde4/utils.cpp | 60
kde/window-decorator-kde4/utils.h | 7
kde/window-decorator-kde4/window.cpp | 562
kde/window-decorator-kde4/window.h | 34
kde/window-decorator/KWinInterface.h | 17
kde/window-decorator/Makefile.am | 44
kde/window-decorator/decorator.cpp | 1055 -
kde/window-decorator/decorator.h | 183
kde/window-decorator/main.cpp | 143
kde/window-decorator/options.cpp | 187
kde/window-decorator/options.h | 140
kde/window-decorator/utils.cpp | 205
kde/window-decorator/utils.h | 63
kde/window-decorator/window.cpp | 2091 --
kde/window-decorator/window.h | 243
legacy/compiz-cube.h | 230
legacy/compiz-cube.pc.in | 13
legacy/fs.xml.in | 13
legacy/fuse.cpp | 1442 ++
legacy/gconf.cpp | 848 +
legacy/gconf.xml.in | 18
legacy/metadata.cpp | 1160 +
legacy/metadata.h | 106
legacy/minimize.cpp | 1059 +
legacy/minimize.xml.in | 43
legacy/privatemetadata.h | 40
legacy/video.cpp | 1329 +
legacy/video.xml.in | 14
libdecoration/CMakeLists.txt | 59
libdecoration/Makefile.am | 12
libdecoration/config.h.libdecoration.in | 4
libdecoration/decoration.c | 256
metadata/CMakeLists.txt | 52
metadata/Makefile.am | 135
metadata/annotate.xml.in | 63
metadata/blur.xml.in | 111
metadata/clone.xml.in | 14
metadata/commands.xml.in | 225
metadata/core.xml.in | 268
metadata/core.xml.in.in | 335
metadata/cube.xml.in | 185
metadata/dbus.xml.in | 7
metadata/decoration.xml.in | 71
metadata/fade.xml.in | 92
metadata/fs.xml.in | 14
metadata/gconf.xml.in | 18
metadata/glib.xml.in | 7
metadata/gnomecompat.xml.in | 52
metadata/ini.xml.in | 6
metadata/inotify.xml.in | 7
metadata/kcfg.xslt | 322
metadata/kconfig.xml.in | 6
metadata/kconfig.xslt | 59
metadata/minimize.xml.in | 44
metadata/move.xml.in | 41
metadata/obs.xml.in | 169
metadata/place.xml.in | 161
metadata/png.xml.in | 9
metadata/regex.xml.in | 7
metadata/resize.xml.in | 105
metadata/rotate.xml.in | 276
metadata/scale.xml.in | 183
metadata/schemas.xslt | 419
metadata/screenshot.xml.in | 29
metadata/svg.xml.in | 9
metadata/switcher.xml.in | 157
metadata/video.xml.in | 15
metadata/water.xml.in | 58
metadata/wobbly.xml.in | 119
metadata/zoom.xml.in | 60
plugins/CMakeLists.txt | 10
plugins/Makefile.am | 188
plugins/annotate.c | 963 -
plugins/annotate/CMakeLists.txt | 5
plugins/annotate/annotate.xml.in | 92
plugins/annotate/src/annotate.cpp | 980 +
plugins/annotate/src/annotate.h | 213
plugins/blur.c | 3251 ----
plugins/blur/CMakeLists.txt | 16
plugins/blur/blur.xml.in | 112
plugins/blur/src/blur.cpp | 2333 +++
plugins/blur/src/blur.h | 241
plugins/clone.c | 937 -
plugins/clone/CMakeLists.txt | 5
plugins/clone/clone.xml.in | 22
plugins/clone/src/clone.cpp | 595
plugins/clone/src/clone.h | 147
plugins/commands.c | 352
plugins/commands/CMakeLists.txt | 5
plugins/commands/commands.xml.in | 385
plugins/commands/src/commands.cpp | 132
plugins/commands/src/commands.h | 50
plugins/compiztoolbox/CMakeLists.txt | 5
plugins/compiztoolbox/compiz-compiztoolbox.pc.in | 12
plugins/compiztoolbox/compiztoolbox.xml.in | 13
plugins/compiztoolbox/include/compiztoolbox/compiztoolbox.h | 168
plugins/compiztoolbox/src/compiztoolbox.cpp | 741 +
plugins/composite/CMakeLists.txt | 5
plugins/composite/compiz-composite.pc.in | 12
plugins/composite/composite.xml.in | 35
plugins/composite/include/composite/composite.h | 408
plugins/composite/src/composite.cpp | 103
plugins/composite/src/privates.h | 156
plugins/composite/src/screen.cpp | 997 +
plugins/composite/src/window.cpp | 630
plugins/copytex/CMakeLists.txt | 5
plugins/copytex/copytex.xml.in | 12
plugins/copytex/src/copytex.cpp | 341
plugins/copytex/src/copytex.h | 114
plugins/cube.c | 2233 ---
plugins/cube/CMakeLists.txt | 5
plugins/cube/compiz-cube.pc.in | 12
plugins/cube/cube.xml.in | 167
plugins/cube/include/cube/cube.h | 181
plugins/cube/src/cube.cpp | 1772 ++
plugins/cube/src/privates.h | 183
plugins/dbus.c | 2596 ---
plugins/dbus/CMakeLists.txt | 37
plugins/dbus/dbus.xml.in | 14
plugins/dbus/src/dbus.cpp | 2046 ++
plugins/dbus/src/dbus.h | 185
plugins/decor/CMakeLists.txt | 14
plugins/decor/decor.xml.in | 75
plugins/decor/src/decor.cpp | 2149 +++
plugins/decor/src/decor.h | 252
plugins/decoration.c | 1796 --
plugins/fade.c | 1049 -
plugins/fade/CMakeLists.txt | 5
plugins/fade/fade.xml.in | 85
plugins/fade/src/fade.cpp | 398
plugins/fade/src/fade.h | 102
plugins/fuse.c | 1443 --
plugins/gconf.c | 849 -
plugins/glib.c | 315
plugins/gnomecompat.c | 344
plugins/gnomecompat/CMakeLists.txt | 5
plugins/gnomecompat/gnomecompat.xml.in | 59
plugins/gnomecompat/src/gnomecompat.cpp | 131
plugins/gnomecompat/src/gnomecompat.h | 53
plugins/imgpng/CMakeLists.txt | 5
plugins/imgpng/imgpng.xml.in | 16
plugins/imgpng/src/imgpng.cpp | 358
plugins/imgpng/src/imgpng.h | 69
plugins/imgsvg/CMakeLists.txt | 5
plugins/imgsvg/imgsvg.xml.in | 24
plugins/imgsvg/src/imgsvg.cpp | 637
plugins/imgsvg/src/imgsvg.h | 136
plugins/ini.c | 1152 -
plugins/ini/CMakeLists.txt | 5
plugins/ini/ini.xml.in | 13
plugins/ini/src/ini.cpp | 611
plugins/ini/src/ini.h | 106
plugins/inotify.c | 316
plugins/inotify/CMakeLists.txt | 10
plugins/inotify/inotify.xml.in | 14
plugins/inotify/src/inotify.cpp | 169
plugins/inotify/src/inotify.h | 66
plugins/kconfig.cpp | 752 -
plugins/kde/CMakeLists.txt | 22
plugins/kde/kde.xml.in | 15
plugins/kde/src/dispatcher.cpp | 265
plugins/kde/src/dispatcher.h | 79
plugins/kde/src/kde.cpp | 68
plugins/kde/src/kde.h | 60
plugins/kde/src/socket.cpp | 67
plugins/kde/src/socket.h | 44
plugins/kde/src/timer.cpp | 69
plugins/kde/src/timer.h | 55
plugins/minimize.c | 1059 -
plugins/move.c | 1067 -
plugins/move/CMakeLists.txt | 5
plugins/move/move.xml.in | 48
plugins/move/src/move.cpp | 725 +
plugins/move/src/move.h | 129
plugins/obs.c | 746 -
plugins/obs/CMakeLists.txt | 5
plugins/obs/obs.xml.in | 161
plugins/obs/src/obs.cpp | 332
plugins/obs/src/obs.h | 102
plugins/opengl/CMakeLists.txt | 8
plugins/opengl/compiz-opengl.pc.in | 12
plugins/opengl/include/opengl/fragment.h | 124
plugins/opengl/include/opengl/matrix.h | 66
plugins/opengl/include/opengl/opengl.h | 590
plugins/opengl/include/opengl/texture.h | 223
plugins/opengl/include/opengl/vector.h | 127
plugins/opengl/opengl.xml.in | 48
plugins/opengl/src/fragment.cpp | 1145 +
plugins/opengl/src/matrix.cpp | 440
plugins/opengl/src/opengl.cpp | 101
plugins/opengl/src/paint.cpp | 1262 +
plugins/opengl/src/privatefragment.h | 54
plugins/opengl/src/privates.h | 172
plugins/opengl/src/privatetexture.h | 85
plugins/opengl/src/screen.cpp | 1219 +
plugins/opengl/src/texture.cpp | 616
plugins/opengl/src/vector.cpp | 276
plugins/opengl/src/window.cpp | 365
plugins/place.c | 2278 ---
plugins/place/CMakeLists.txt | 5
plugins/place/place.xml.in | 168
plugins/place/src/place.cpp | 1713 ++
plugins/place/src/place.h | 141
plugins/png.c | 575
plugins/regex.c | 567
plugins/regex/CMakeLists.txt | 5
plugins/regex/regex.xml.in | 14
plugins/regex/src/regex.cpp | 328
plugins/regex/src/regexplugin.h | 79
plugins/resize.c | 1570 --
plugins/resize/CMakeLists.txt | 5
plugins/resize/resize.xml.in | 193
plugins/resize/src/resize.cpp | 1824 ++
plugins/resize/src/resize.h | 187
plugins/rotate.c | 2023 --
plugins/rotate/CMakeLists.txt | 5
plugins/rotate/rotate.xml.in | 278
plugins/rotate/src/rotate.cpp | 1086 +
plugins/rotate/src/rotate.h | 173
plugins/scale.c | 2295 ---
plugins/scale/CMakeLists.txt | 5
plugins/scale/compiz-scale.pc.in | 12
plugins/scale/include/scale/scale.h | 173
plugins/scale/scale.xml.in | 179
plugins/scale/src/privates.h | 187
plugins/scale/src/scale.cpp | 1806 ++
plugins/screenshot.c | 755 -
plugins/screenshot/CMakeLists.txt | 5
plugins/screenshot/screenshot.xml.in | 35
plugins/screenshot/src/screenshot.cpp | 365
plugins/screenshot/src/screenshot.h | 83
plugins/svg.c | 1053 -
plugins/switcher.c | 2147 ---
plugins/switcher/CMakeLists.txt | 5
plugins/switcher/src/switcher.cpp | 1193 +
plugins/switcher/src/switcher.h | 180
plugins/switcher/switcher.xml.in | 166
plugins/video.c | 1329 -
plugins/water.c | 1824 --
plugins/water/CMakeLists.txt | 5
plugins/water/src/water.cpp | 1356 +
plugins/water/src/water.h | 173
plugins/water/water.xml.in | 64
plugins/wobbly.c | 3054 ----
plugins/wobbly/CMakeLists.txt | 5
plugins/wobbly/src/wobbly.cpp | 2380 +++
plugins/wobbly/src/wobbly.h | 369
plugins/wobbly/wobbly.xml.in | 126
plugins/zoom.c | 1203 -
plugins/zoom/CMakeLists.txt | 5
plugins/zoom/src/zoom.cpp | 742 +
plugins/zoom/src/zoom.h | 112
plugins/zoom/zoom.xml.in | 66
po/CMakeLists.txt | 56
po/POTFILES.in | 56
po/POTFILES.skip | 1
po/en_US.po | 1555 --
po/mr.po | 1599 --
src/CMakeLists.txt | 63
src/Makefile.am | 32
src/action.c | 41
src/action.cpp | 655
src/actions.cpp | 289
src/atoms.cpp | 324
src/core.c | 305
src/cursor.c | 196
src/display.c | 2877 ----
src/event.c | 2373 ---
src/event.cpp | 1955 ++
src/eventsource.cpp | 93
src/fragment.c | 1402 -
src/icon.cpp | 46
src/main.c | 489
src/main.cpp | 283
src/match.c | 782 -
src/match.cpp | 744 +
src/matrix.c | 369
src/metadata.c | 1467 --
src/modifierhandler.cpp | 207
src/object.c | 147
src/option.c | 965 -
src/option.cpp | 982 +
src/output.cpp | 90
src/paint.c | 1267 -
src/plugin.c | 794 -
src/plugin.cpp | 701
src/pluginclasses.cpp | 74
src/point.cpp | 100
src/privateaction.h | 55
src/privatematch.h | 88
src/privateoption.h | 97
src/privateregion.h | 41
src/privates.c | 68
src/privatescreen.h | 543
src/privatewindow.h | 325
src/propertywriter.cpp | 242
src/rect.cpp | 285
src/region.cpp | 425
src/screen.c | 4450 ------
src/screen.cpp | 4778 ++++++
src/session.c | 439
src/session.cpp | 427
src/size.cpp | 50
src/string.cpp | 88
src/texture.c | 504
src/timer.cpp | 272
src/window.c | 5570 -------
src/window.cpp | 5862 ++++++++
src/windowgeometry.cpp | 206
xslt/CMakeLists.txt | 13
xslt/bcop.xslt | 1581 ++
xslt/compiz_gconf_schemas.xslt | 410
xslt/default_plugins.xslt | 76
462 files changed, 93359 insertions(+), 90752 deletions(-)
New commits:
commit 37ca9e4152ee4f7c02b3009bda275ac59a660693
Author: Sean Finney <seanius@debian.org>
Date: Sat Feb 26 15:22:09 2011 +0100
Incorporate packaging work by Janos Guljas, update to 0.9.2.1+ snapshot
diff --git a/debian/changelog b/debian/changelog
index ab0d4b9..af56d75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,34 @@
+compiz (0.9.2.1+git20110226-1) unstable; urgency=low
+
+ [ Sean Finney ]
+ * Incorporate Janos Guljas' compiz packaging work, thanks!
+
+ -- Sean Finney <seanius@debian.org> Sat, 26 Feb 2011 15:21:34 +0100
+
+compiz (0.9.2.1-1.1) unstable; urgency=low
+
+ [ Janos Guljas ]
+ * New upstram release.
+ * Bump standards to 3.9.1.
+ * Rewrite debian/rules to use debhelper 7.
+ * Switch to dpkg format 3.0 (quilt).
+ * Updated *.install files for a new release.
+ * Synchronize ubuntu patches from 0.9.2.1+glibmainloop-0ubuntu2.
+ * 017_always_unredirect_screensaver_on_nvidia.patch
+ - Workaround for nvidia not allocating memory when VT non-active
+ * 018_use_metacity_settings.patch
+ - Use metacity control center applet instead of compiz one
+ * 056_Preserve-DESTDIR-if-no-override-in-COMPIZ_DESTDIR.patch
+ - Preserve DESTDIR if no override in COMPIZ_DESTDIR
+ * 060_move_checks_to_compiz.patch
+ - Add additional checks for features before running
+ * Added compiz-decorator and its manpage.
+ * Added compiz-gnome.gconf-defaults.
+ * kde-window-decorator is now kde4-window-decorator.
+ - renamed manpage
+
+ -- Janos Guljas <janos@resenje.org> Sun, 14 Nov 2010 20:52:37 +0100
+
compiz (0.8.4-5) UNRELEASED; urgency=low
* Drop compiz-core's README.Debian, which contained obsolete information
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/compiz-core.install b/debian/compiz-core.install
index 092e068..4c62fd8 100644
--- a/debian/compiz-core.install
+++ b/debian/compiz-core.install
@@ -1,4 +1,6 @@
usr/bin/compiz*
-usr/share/compiz
+debian/compiz-decorator usr/bin/
+usr/share/compiz/images/*.png
+usr/share/compiz/*xml
usr/share/locale
usr/share/applications/compiz.desktop
diff --git a/debian/compiz-core.manpages b/debian/compiz-core.manpages
index 8ddd72e..c37f7c4 100644
--- a/debian/compiz-core.manpages
+++ b/debian/compiz-core.manpages
@@ -1 +1,2 @@
debian/compiz.1
+debian/compiz-decorator.1
diff --git a/debian/compiz-decorator b/debian/compiz-decorator
new file mode 100755
index 0000000..4359e8e
--- /dev/null
+++ b/debian/compiz-decorator
@@ -0,0 +1,97 @@
+#!/bin/sh
+# Starts Compiz Decorator depending on the DE
+#
+# Copyright (c) 2007 CyberOrg <cyberorg@cyberorg.info>
+# Based on compiz-manager script by Kristian Lyngstøl <kristian@bohemians.org>
+# 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/kde4-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}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}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
+
diff --git a/debian/compiz-decorator.1 b/debian/compiz-decorator.1
new file mode 100644
index 0000000..fd0814b
--- /dev/null
+++ b/debian/compiz-decorator.1
@@ -0,0 +1,15 @@
+.TH COMPIZ-DECORATOR 1 "May 18, 2010"
+.SH NAME
+compiz-decorator \- Automatic decorator loader
+.SH SYNOPSIS
+.B compiz-decorator
+.SH DESCRIPTION
+.B compiz-decorator
+is a program that automatically launches the best decorator based on your
+environment and what decorators are available.
+.SH AUTHOR
+compiz-decorator was written by CyberOrg <cyberorg@cyberorg.info> and
+others.
+.PP
+This manual page was written by Travis Watkins <amaranth@ubuntu.com>,
+for the Ubuntu project (but may be used by others).
diff --git a/debian/compiz-dev.install b/debian/compiz-dev.install
index 6447793..7fccb55 100644
--- a/debian/compiz-dev.install
+++ b/debian/compiz-dev.install
@@ -1,2 +1,5 @@
-usr/include/compiz/compiz*.h
-usr/lib/pkgconfig/compiz*.pc
+usr/include/compiz/[!d]*
+usr/lib/pkgconfig/[!l]*
+usr/share/compiz/xslt
+usr/share/cmake*
+usr/share/compiz/cmake
diff --git a/debian/compiz-gnome.gconf-defaults b/debian/compiz-gnome.gconf-defaults
new file mode 100644
index 0000000..86173a2
--- /dev/null
+++ b/debian/compiz-gnome.gconf-defaults
@@ -0,0 +1,5 @@
+/apps/compiz/plugins/move/allscreens/options/constrain_y true
+/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
diff --git a/debian/compiz-gnome.install b/debian/compiz-gnome.install
index dfd4ec7..741b9fb 100644
--- a/debian/compiz-gnome.install
+++ b/debian/compiz-gnome.install
@@ -1,2 +1 @@
-usr/lib/window-manager-settings/libcompiz.so usr/lib/libgnome-window-settings1
-usr/share/gnome/wm-properties/compiz-wm.desktop
+usr/share/applications/compiz.desktop usr/share/gnome/wm-properties/
diff --git a/debian/compiz-gtk.install b/debian/compiz-gtk.install
index 1fb0c50..305564d 100644
--- a/debian/compiz-gtk.install
+++ b/debian/compiz-gtk.install
@@ -1,3 +1,2 @@
-usr/share/gconf/schemas/gwd.schemas
+usr/share/gconf/schemas/*.schemas
usr/bin/gtk-window-decorator
-usr/lib/compiz/libgconf.so
diff --git a/debian/compiz-gtk.links b/debian/compiz-gtk.links
deleted file mode 100644
index 804b22f..0000000
--- a/debian/compiz-gtk.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/gtk-window-decorator usr/bin/compiz-decorator
diff --git a/debian/compiz-kde.install b/debian/compiz-kde.install
index 5ecba97..3638fac 100644
--- a/debian/compiz-kde.install
+++ b/debian/compiz-kde.install
@@ -1 +1,2 @@
usr/bin/kde4-window-decorator
+usr/lib/compiz/libkde.so
diff --git a/debian/compiz-kde.manpages b/debian/compiz-kde.manpages
index 8a99637..434436e 100644
--- a/debian/compiz-kde.manpages
+++ b/debian/compiz-kde.manpages
@@ -1 +1 @@
-debian/kde-window-decorator.1
+debian/kde4-window-decorator.1
diff --git a/debian/compiz-plugins.install b/debian/compiz-plugins.install
index e6c5e2d..230f1b4 100644
--- a/debian/compiz-plugins.install
+++ b/debian/compiz-plugins.install
@@ -1,2 +1 @@
-usr/share/gconf/schemas/compiz-*.schemas
-usr/lib/compiz/lib*.so
+debian/tmp/usr/lib/compiz/lib[!k]*.so
diff --git a/debian/compiz.1 b/debian/compiz.1
index ccc6cf0..358a31e 100644
--- a/debian/compiz.1
+++ b/debian/compiz.1
@@ -1,4 +1,4 @@
-.TH COMPIZ 1 "July 13, 2007"
+.TH COMPIZ 1 "September 29, 2006"
.SH NAME
compiz \- OpenGL window and compositing manager
@@ -13,6 +13,12 @@ is a compositing window-manager using OpenGL for rendering.
.SH OPTIONS
.TP
+.B \-\-help
+Show summary of options.
+.TP
+.B \-v, \-\-version
+Show version of program.
+.TP
.BI "\-\-display " DISPLAY
Manage the display called
.I DISPLAY
@@ -20,11 +26,6 @@ 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
@@ -34,10 +35,11 @@ Use a fast texture filter.
.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.
+.BI \-\-strict\-binding
+Enable strict binding of textures. Use this when running compiz on AIGLX.
+.TP
+.BI \-\-use\-cow
+Make use of the composite overlay window.
.TP
.BI \-\-replace
Replace any existing window managers on the given X display.
@@ -50,34 +52,10 @@ 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.
+.BI "\-\-bg\-image " IMAGE
+Use
+.I IMAGE
+as background image.
.SH AUTHOR
compiz was written by David Reveman <davidr@novell.com> and others.
diff --git a/debian/control b/debian/control
index f6d90c2..659747e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,33 +3,35 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Sean Finney <seanius@debian.org>, Cyril Brulebois <kibi@debian.org>
-Build-Depends: autoconf, automake1.9, autotools-dev,
- debhelper (>= 5), intltool,
- kdebase-workspace-dev,
+Build-Depends: cmake (>= 2.6), debhelper (>= 7.0.50~), intltool, libtool,
libcairo2-dev,
libdbus-glib-1-dev, libgconf2-dev,
- libgl1-mesa-dev (>= 6.5.1) | libgl-dev, libglib2.0-dev, libgnome-desktop-dev,
- libgnomeui-dev,
+ libgl1-mesa-dev (>= 6.5.1) | libgl-dev, libglib2.0-dev, libgnome-desktop-dev,
+ libboost1.42-dev, libboost-serialization1.42-dev,
+ libgnomeui-dev,
libgnome-window-settings-dev, libgtk2.0-dev, libice-dev (>= 1:1.0.1),
- libmetacity-dev, libpango1.0-dev, libpng12-dev | libpng-dev, librsvg2-dev,
- libsm-dev (>= 1:1.0.1), libtool, libwnck-dev, libxcomposite-dev (>= 1:0.3-2),
- 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),
+ libmetacity-dev (>= 1:2.30.0), libpango1.0-dev, libpng12-dev | libpng-dev, librsvg2-dev,
+ libsm-dev (>= 1:1.0.1), 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,
+ x11proto-gl-dev (>= 1.4.8), xsltproc,
libglu1-mesa-dev,
-Standards-Version: 3.8.1
+ kdebase-workspace-dev, kdelibs5-dev (>= 4:4.2.2),
+ metacity-common, libx11-xcb-dev
+Standards-Version: 3.9.1
+Homepage: http://www.compiz.org/
Vcs-Git: git://git.debian.org/git/pkg-xorg/app/compiz.git
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/compiz.git
-
Package: compiz
Architecture: all
-Depends: compiz-core (>= ${source:Version}), compiz-plugins (>= ${source:Version}), compiz-gtk (>= ${source:Version}), compiz-gnome (>= ${source:Version}), ${misc:Depends}
+Provides: x-window-manager
+Depends: compiz-core (>= ${source:Version}), compiz-plugins (>= ${source:Version}), compiz-gnome | compiz-kde, compiz-fusion-plugins-main (>= 0.9), libcompizconfig0 (>= 0.9), ${misc:Depends}
Suggests: compizconfig-settings-manager
-Description: OpenGL window and compositing manager
+Description: OpenGL window and compositing manager - metapackage
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.
@@ -41,8 +43,11 @@ Description: OpenGL window and compositing manager
Package: compiz-core
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, mesa-utils
-Breaks: libcompizconfig0 (<< 0.8.0)
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: libcompizconfig0 (<< 0.9),
+ compiz-fusion-plugins-main (<< 0.9),
+ compiz-fusion-plugins-extra (<< 0.9),
+ compiz-gtk (<< 0.9)
Recommends: compiz-plugins (= ${binary:Version})
Suggests: nvidia-glx (>= 1.0.9625-1)
Provides: compiz-core-abiversion-${coreabiversion}
@@ -60,7 +65,7 @@ Description: OpenGL window and compositing manager
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
+Depends: compiz-core (= ${binary:Version}), ${misc:Depends}, libgl1-mesa-dev | libgl-dev, libpng-dev, libxcomposite-dev (>= 1:0.3-2), libxfixes-dev (>=1:4.0.1), libxdamage-dev (>= 1:1.0.3), libxinerama-dev, libxrandr-dev (>=2:1.1.0.2), libxcursor-dev, libice-dev (>= 1:1.0.1), libsm-dev (>= 1:1.0.1), libstartup-notification0-dev (>= 0.7), libxslt1-dev, libxml2-dev, libx11-xcb-dev, libglib2.0-dev, compiz-plugins (= ${binary:Version})
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
@@ -84,7 +89,9 @@ 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}, ${misc:Depends},
+ compiz-plugins (= ${binary:Version}),
+ compizconfig-backend-kconfig4
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
@@ -126,7 +133,7 @@ Description: Compiz window decoration library
Package: libdecoration0-dev
Section: libdevel
Architecture: any
-Depends: libdecoration0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, libx11-dev, libxrender-dev (>= 1:0.9.1)
+Depends: libdecoration0 (= ${binary:Version}), ${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
diff --git a/debian/kde-window-decorator.1 b/debian/kde-window-decorator.1
deleted file mode 100644
index 953779e..0000000
--- a/debian/kde-window-decorator.1
+++ /dev/null
@@ -1,40 +0,0 @@
-.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 <davidr@novell.com> and
-others.
-.PP
-This manual page was written by Thierry Reding <thierry@gilfi.de>,
-for the Debian project (but may be used by others).
diff --git a/debian/kde4-window-decorator.1 b/debian/kde4-window-decorator.1
new file mode 100644
index 0000000..d1e56e8
--- /dev/null
+++ b/debian/kde4-window-decorator.1
@@ -0,0 +1,40 @@
+.TH KDE4-WINDOW-DECORATOR 1 "January 3, 2007"
+.SH NAME
+kde4-window-decorator \- Compiz window decorator for the KDE desktop
+environment
+.SH SYNOPSIS
+.B kde4-window-decorator
+.RI [ options ]
+.SH DESCRIPTION
+.B kde4-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 kde4-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
Reply to: