Author: beatle Date: 2006-09-29 05:52:50 -0400 (Fri, 29 Sep 2006) New Revision: 3554
Added: trunk/app/compiz/debian/compiz.1 Modified: trunk/app/compiz/debian/changelog trunk/app/compiz/debian/compiz-core.manpages trunk/app/compiz/debian/compiz.real.1 trunk/app/compiz/debian/compiz.wrapper trunk/app/compiz/debian/control Log: * Remove unnecessarily versioned build-dependencies. * Tighten the build-dependency on libxcomposite-dev to (>= 1:0.3-1). * Document compiz.real in the compiz.real.1 manpage and add compiz.1 to document the compiz wrapper. * Check if the gconf plugin is installed before trying to load it. Modified: trunk/app/compiz/debian/changelog =================================================================== --- trunk/app/compiz/debian/changelog 2006-09-29 08:36:20 UTC (rev 3553) +++ trunk/app/compiz/debian/changelog 2006-09-29 09:52:50 UTC (rev 3554) @@ -2,8 +2,14 @@ * 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-1). + * Add a manpage documenting the compiz wrapper. + * Check if the gconf plugin is installed before trying to load it in the + wrapper. - -- Thierry Reding <[EMAIL PROTECTED]> Fri, 29 Sep 2006 10:34:16 +0200 + -- Thierry Reding <[EMAIL PROTECTED]> Fri, 29 Sep 2006 11:51:53 +0200 compiz (0.0.13+git20060928-2) unstable; urgency=low Modified: trunk/app/compiz/debian/compiz-core.manpages =================================================================== --- trunk/app/compiz/debian/compiz-core.manpages 2006-09-29 08:36:20 UTC (rev 3553) +++ trunk/app/compiz/debian/compiz-core.manpages 2006-09-29 09:52:50 UTC (rev 3554) @@ -1 +1,2 @@ debian/compiz.real.1 +debian/compiz.1 Added: trunk/app/compiz/debian/compiz.1 =================================================================== --- trunk/app/compiz/debian/compiz.1 (rev 0) +++ trunk/app/compiz/debian/compiz.1 2006-09-29 09:52:50 UTC (rev 3554) @@ -0,0 +1,32 @@ +.TH COMPIZ 1 "September 29, 2006" + +.SH NAME +compiz \- OpenGL window and compositing manager + +.SH SYNOPSIS +.B compiz +.RI [ options ] +.RI [ plugins ] +.SH DESCRIPTION +\fBcompiz\fR is a wrapper around the real \fBcompiz.real\fR binary that +automatically sets up everything needed to properly run compiz on a Debian +system. + +In order to use the X server's accelerated indirect rendering (AIGLX) +capabilities, the wrapper will call \fBcompiz.real\fR with the necessary +command-line arguments. + +If the package \fBcompiz-gtk\fR is installed, the wrapper will automatically +start the \fBgtk-window-decorator\fR. + +The wrapper will also check if the \fBcompiz-plugins\fR package has been +installed and load the \fBgconf\fR plugin which will in turn load the standard +set of plugins. + +.SH AUTHOR +The compiz wrapper was written by Thierry Reding <[EMAIL PROTECTED]> for the +Debian project (but may be used by others). + +.SH "SEE ALSO" +.BR compiz.real(1) + Modified: trunk/app/compiz/debian/compiz.real.1 =================================================================== --- trunk/app/compiz/debian/compiz.real.1 2006-09-29 08:36:20 UTC (rev 3553) +++ trunk/app/compiz/debian/compiz.real.1 2006-09-29 09:52:50 UTC (rev 3554) @@ -1,10 +1,10 @@ .TH COMPIZ 1 "September 29, 2006" .SH NAME -compiz \- OpenGL window and compositing manager +compiz.real \- OpenGL window and compositing manager .SH SYNOPSIS -.B compiz +.B compiz.real .RI [ options ] .RI [ plugins ] .SH DESCRIPTION Modified: trunk/app/compiz/debian/compiz.wrapper =================================================================== --- trunk/app/compiz/debian/compiz.wrapper 2006-09-29 08:36:20 UTC (rev 3553) +++ trunk/app/compiz/debian/compiz.wrapper 2006-09-29 09:52:50 UTC (rev 3554) @@ -1,10 +1,18 @@ #!/bin/sh +PLUGINS="" + # start the gtk-window-decorator if present if [ -x /usr/bin/gtk-window-decorator ]; then /usr/bin/gtk-window-decorator --replace & fi +# load the gconf plugin if present +if [ -f /usr/lib/compiz/libgconf.so ]; then + PLUGINS="$PLUGINS gconf" +fi + # always load the gconf plugin -/usr/bin/compiz.real --strict-binding --indirect-rendering --use-cow "$@" gconf +/usr/bin/compiz.real --strict-binding --indirect-rendering --use-cow \ + "$@" "$PLUGINS" Modified: trunk/app/compiz/debian/control =================================================================== --- trunk/app/compiz/debian/control 2006-09-29 08:36:20 UTC (rev 3553) +++ trunk/app/compiz/debian/control 2006-09-29 09:52:50 UTC (rev 3554) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> Uploaders: Thierry Reding <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 5), quilt (>= 0.40), automake1.9, libtool, libglib2.0-dev, libgconf2-dev, libpng12-dev | libpng-dev, libxcomposite-dev (>= 0.3), libxfixes-dev (>= 4.0.1), libxdamage-dev (>= 1.0.3), libxrandr-dev (>= 1.1.0.2), libxrender-dev (>= 0.9.1), libice-dev (>= 1.0.1), libsm-dev (>= 1.0.1), libgl1-mesa-dev (>= 6.5.1) | libgl-dev, libcairo-dev, librsvg2-dev, libgnome-desktop-dev, libgnome-window-settings-dev, libdbus-1-dev, libwnck-dev, libgtk2.0-dev, libpango1.0-dev, x11proto-gl-dev (>= 1.4.8-1), libmetacity-dev, libxinerama-dev +Build-Depends: debhelper (>= 5), quilt (>= 0.40), automake1.9, libtool, libglib2.0-dev, libgconf2-dev, libpng12-dev | libpng-dev, libxcomposite-dev (>= 1:0.3-1), libxfixes-dev, libxdamage-dev, libxrandr-dev, libxrender-dev, libice-dev, libsm-dev, libgl1-mesa-dev (>= 6.5.1) | libgl-dev, libcairo-dev, librsvg2-dev, libgnome-desktop-dev, libgnome-window-settings-dev, libdbus-1-dev, libwnck-dev, libgtk2.0-dev, libpango1.0-dev, x11proto-gl-dev (>= 1.4.8-1), libmetacity-dev, libxinerama-dev Standards-Version: 3.7.2 Package: compiz -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]