compiz: Changes to 'debian-unstable'
INSTALL | 238 ---------------------
Makefile.am | 2
Makefile.in | 3
NEWS | 26 ++
compiz-cube.pc.in | 2
compiz-scale.pc.in | 2
configure | 88 ++++---
configure.ac | 9
debian/changelog | 10
debian/control | 2
debian/copyright | 4
debian/rules | 2
gtk/Makefile.in | 1
gtk/gnome/50-compiz-desktop-key.xml.in | 2
gtk/gnome/Makefile.in | 1
gtk/window-decorator/Makefile.in | 1
gtk/window-decorator/gtk-window-decorator.c | 309 ++++++++++++++++------------
gtk/window-decorator/gwd.schemas.in | 11
images/Makefile.in | 1
include/Makefile.in | 1
include/compiz.h | 30 +-
include/cube.h | 4
intltool-extract.in | 2
intltool-merge.in | 57 +++--
intltool-update.in | 8
kde/Makefile.in | 1
kde/window-decorator/Makefile.in | 1
kde/window-decorator/decorator.cpp | 28 +-
kde/window-decorator/decorator.h | 9
kde/window-decorator/main.cpp | 12 -
kde/window-decorator/window.cpp | 49 ++--
kde/window-decorator/window.h | 7
libdecoration/Makefile.am | 5
libdecoration/Makefile.in | 8
metadata/Makefile.am | 3
metadata/Makefile.in | 4
metadata/fade.xml.in | 5
metadata/resize.xml.in | 16 -
metadata/rotate.xml.in | 4
metadata/schemas.xslt | 21 +
mkinstalldirs | 111 ++++++++++
plugins/Makefile.in | 1
plugins/cube.c | 34 +--
plugins/decoration.c | 60 +++--
plugins/fade.c | 27 +-
plugins/fuse.c | 3
plugins/gconf.c | 37 ++-
plugins/ini.c | 22 +
plugins/inotify.c | 2
plugins/place.c | 28 +-
plugins/plane.c | 1
plugins/resize.c | 43 ++-
plugins/scale.c | 2
plugins/switcher.c | 6
plugins/video.c | 6
plugins/wobbly.c | 17 +
po/Makefile.in.in | 4
src/Makefile.in | 1
src/display.c | 67 ++----
src/event.c | 135 ++++++++++--
src/option.c | 15 -
src/screen.c | 93 +++++---
src/session.c | 7
src/window.c | 210 +++++++++++++------
64 files changed, 1150 insertions(+), 771 deletions(-)
New commits:
commit d5158737de7f3d235a5fcaf6194201311fd81f45
Author: Sean Finney <seanius@debian.org>
Date: Mon Nov 5 23:52:10 2007 +0100
+ * New upstream (git snapshot) release.
+ * Disable the (unused?) fuse plugin, explicitly enable the gconf plugin
+ * lintian: update FSF address
update the dependencies to be binnmuable (s/binary:version/source:version/
for arch: all packages, and >= instead of =).
prepare for upload
diff --git a/debian/changelog b/debian/changelog
index 9ef8500..dceaa56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,16 @@
-compiz (0.5.2-3) UNRELEASED; urgency=low
+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.
- -- Brice Goglin <bgoglin@debian.org> Wed, 12 Sep 2007 00:58:41 +0200
+ -- Sean Finney <seanius@debian.org> Sun, 04 Nov 2007 21:20:17 +0100
compiz (0.5.2-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 99b140c..94a3cf1 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.7.2
Package: compiz
Architecture: all
-Depends: compiz-core (= ${binary:Version}), compiz-plugins (= ${binary:Version}), compiz-gtk (= ${binary:Version}), compiz-gnome (= ${binary:Version})
+Depends: compiz-core (>= ${source:Version}), compiz-plugins (>= ${source:Version}), compiz-gtk (>= ${source:Version}), compiz-gnome (>= ${source:Version})
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
diff --git a/debian/copyright b/debian/copyright
index c7855d2..1f79614 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -79,8 +79,8 @@ For the 'place' plugin:
*
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*/
The 'plane' plugin was written by Søren Sandmann <sandmann@redhat.com>:
diff --git a/debian/rules b/debian/rules
index 0527885..a0c1b62 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,7 +37,9 @@ endif
INSTALL = /usr/bin/install
confflags += --disable-static \
+ --disable-fuse \
--enable-librsvg \
+ --enable-gconf \
--enable-gconf-dump
build: patch build-stamp
commit b842a70c6222b41a89c72374062139fe5aeae3d5
Author: Sean Finney <seanius@debian.org>
Date: Mon Nov 5 23:48:10 2007 +0100
re-run autogen.sh for new release.
add new autofoo-generated mkinstalldirs script
revert changes to INSTALL file so the reflect original upstream
version and not autofoo-generated version.
diff --git a/INSTALL b/INSTALL
index 23e5f25..fe1619a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,236 +1,12 @@
-Installation Instructions
-*************************
+compiz uses libstartup-notification which is available at
+ftp://ftp.gnome.org/pub/GNOME/sources/startup-notification/
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+compiz uses automake, in order to generate the Makefiles for compiz use:
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+ $ autogen.sh
-Basic Installation
-==================
+After that, standard build procedures apply:
-These are generic installation instructions.
-
- The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation. It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions. Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
- It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
-
- If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release. If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
- The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
- 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
-
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
-
- 2. Type `make' to compile the package.
-
- 3. Optionally, type `make check' to run any self-tests that come with
- the package.
-
- 4. Type `make install' to install the programs and any data files and
- documentation.
-
- 5. You can remove the program binaries and object files from the
- source code directory by typing `make clean'. To also remove the
- files that `configure' created (so you can compile the package for
- a different kind of computer), type `make distclean'. There is
- also a `make maintainer-clean' target, but that is intended mainly
- for the package's developers. If you use it, you may have to get
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about. Run `./configure --help' for
-details on some of the pertinent environment variables.
-
- You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment. Here
-is an example:
-
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-
- *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc. You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
- You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files. If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
- In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
- If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System). The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
- For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option. TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
- CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
- OS KERNEL-OS
-
- See the file `config.sub' for the possible values of each field. If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
- If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
- If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists. Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'. However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost. In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'. For example:
-
- ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script). Here is a another example:
-
- /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
- Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
- Print the version of Autoconf used to generate the `configure'
- script, and exit.
-
-`--cache-file=FILE'
- Enable the cache: use and save the results of the tests in FILE,
- traditionally `config.cache'. FILE defaults to `/dev/null' to
- disable caching.
-
-`--config-cache'
-`-C'
- Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
- Do not print messages saying which checks are being made. To
- suppress all normal output, redirect it to `/dev/null' (any error
- messages will still be shown).
-
-`--srcdir=DIR'
- Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options. Run
-`configure --help' for more details.
+ $ make
+ # make install
diff --git a/Makefile.in b/Makefile.in
index 988de67..6892e07 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -281,6 +281,7 @@ build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
+default_plugins = @default_plugins@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
@@ -881,7 +882,7 @@ release-publish-message: releases/$(sha1_file)
@echo ""
@echo " git clone git://git.freedesktop.org/git/xorg/app/compiz"
@echo ""
- @echo " will include a signed $(VERSION) tag which points to a commit named:"
+ @echo " will include a signed compiz-$(VERSION) tag which points to a commit named:"
@echo " `git cat-file tag compiz-$(VERSION) | grep ^object | sed -e 's,object ,,'`"
@echo ""
@echo " which can be verified with:"
diff --git a/configure b/configure
index 8fa62b0..bab9e3c 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for compiz 0.5.2.
+# Generated by GNU Autoconf 2.61 for compiz 0.6.3.
#
# Report bugs to <davidr@novell.com>.
#
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='compiz'
PACKAGE_TARNAME='compiz'
-PACKAGE_VERSION='0.5.2'
-PACKAGE_STRING='compiz 0.5.2'
+PACKAGE_VERSION='0.6.3'
+PACKAGE_STRING='compiz 0.6.3'
PACKAGE_BUGREPORT='davidr@novell.com'
# Factoring default headers for most tests.
@@ -917,6 +917,7 @@ POSUB
MKINSTALLDIRS
GETTEXT_PACKAGE
plugindir
+default_plugins
imagedir
metadatadir
PKG_CONFIG
@@ -1550,7 +1551,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures compiz 0.5.2 to adapt to many kinds of systems.
+\`configure' configures compiz 0.6.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1620,7 +1621,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of compiz 0.5.2:";;
+ short | recursive ) echo "Configuration of compiz 0.6.3:";;
esac
cat <<\_ACEOF
@@ -1659,6 +1660,7 @@ Optional Packages:
--with-pic try to use only PIC/non-PIC objects [default=use
both]
--with-tags[=TAGS] include additional configurations [automatic]
+ --with-default-plugins=PLUGINS
--with-gl-cflags=CFLAGS
--with-gl-libs=LIBS
--with-gconf-source=sourceaddress Config database for installing schema files.
@@ -1800,7 +1802,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-compiz configure 0.5.2
+compiz configure 0.6.3
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1814,7 +1816,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by compiz $as_me 0.5.2, which was
+It was created by compiz $as_me 0.6.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2169,8 +2171,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
COMPIZ_VERSION_MAJOR=0
-COMPIZ_VERSION_MINOR=5
-COMPIZ_VERSION_MICRO=2
+COMPIZ_VERSION_MINOR=6
+COMPIZ_VERSION_MICRO=3
@@ -2492,7 +2494,7 @@ fi
# Define the identity of the package.
PACKAGE='compiz'
- VERSION='0.5.2'
+ VERSION='0.6.3'
cat >>confdefs.h <<_ACEOF
@@ -3745,7 +3747,6 @@ echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
;;
esac
-sh -x
if test -n "0.23"; then
{ echo "$as_me:$LINENO: checking for intltool >= 0.23" >&5
echo $ECHO_N "checking for intltool >= 0.23... $ECHO_C" >&6; }
@@ -6435,7 +6436,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6437 "configure"' > conftest.$ac_ext
+ echo '#line 6439 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -8475,11 +8476,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8477: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8479: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8481: \$? = $ac_status" >&5
+ echo "$as_me:8483: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8765,11 +8766,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8767: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8769: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8771: \$? = $ac_status" >&5
+ echo "$as_me:8773: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8869,11 +8870,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8871: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8873: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8875: \$? = $ac_status" >&5
+ echo "$as_me:8877: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -11231,7 +11232,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11233 "configure"
+#line 11235 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11331,7 +11332,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11333 "configure"
+#line 11335 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13751,11 +13752,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13753: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13755: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13757: \$? = $ac_status" >&5
+ echo "$as_me:13759: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13855,11 +13856,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13857: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13859: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13861: \$? = $ac_status" >&5
+ echo "$as_me:13863: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15432,11 +15433,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15434: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15436: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15438: \$? = $ac_status" >&5
+ echo "$as_me:15440: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15536,11 +15537,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15538: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15540: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15542: \$? = $ac_status" >&5
+ echo "$as_me:15544: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17736,11 +17737,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17738: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17740: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17742: \$? = $ac_status" >&5
+ echo "$as_me:17744: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -18026,11 +18027,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18028: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18030: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18032: \$? = $ac_status" >&5
+ echo "$as_me:18034: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -18130,11 +18131,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18132: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18134: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18136: \$? = $ac_status" >&5
+ echo "$as_me:18138: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -22954,6 +22955,16 @@ esac
plugindir=$libdir/compiz
+
+# Check whether --with-default-plugins was given.
+if test "${with_default_plugins+set}" = set; then
+ withval=$with_default_plugins; default_plugins="$withval"
+else
+ default_plugins=""
+fi
+
+
+
imagedir=$datadir/compiz
@@ -26006,7 +26017,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by compiz $as_me 0.5.2, which was
+This file was extended by compiz $as_me 0.6.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -26059,7 +26070,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-compiz config.status 0.5.2
+compiz config.status 0.6.3
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -26451,6 +26462,7 @@ POSUB!$POSUB$ac_delim
MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
plugindir!$plugindir$ac_delim
+default_plugins!$default_plugins$ac_delim
imagedir!$imagedir$ac_delim
metadatadir!$metadatadir$ac_delim
PKG_CONFIG!$PKG_CONFIG$ac_delim
@@ -26495,7 +26507,6 @@ FUSE_CFLAGS!$FUSE_CFLAGS$ac_delim
FUSE_LIBS!$FUSE_LIBS$ac_delim
FUSE_PLUGIN_TRUE!$FUSE_PLUGIN_TRUE$ac_delim
FUSE_PLUGIN_FALSE!$FUSE_PLUGIN_FALSE$ac_delim
-ANNOTATE_CFLAGS!$ANNOTATE_CFLAGS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -26537,6 +26548,7 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+ANNOTATE_CFLAGS!$ANNOTATE_CFLAGS$ac_delim
ANNOTATE_LIBS!$ANNOTATE_LIBS$ac_delim
ANNOTATE_PLUGIN_TRUE!$ANNOTATE_PLUGIN_TRUE$ac_delim
ANNOTATE_PLUGIN_FALSE!$ANNOTATE_PLUGIN_FALSE$ac_delim
@@ -26576,7 +26588,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 37; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 38; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/gtk/Makefile.in b/gtk/Makefile.in
index 2ca6058..c9fb285 100644
--- a/gtk/Makefile.in
+++ b/gtk/Makefile.in
@@ -252,6 +252,7 @@ build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
+default_plugins = @default_plugins@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
diff --git a/gtk/gnome/Makefile.in b/gtk/gnome/Makefile.in
index 51c5ddc..06b3d08 100644
--- a/gtk/gnome/Makefile.in
+++ b/gtk/gnome/Makefile.in
@@ -266,6 +266,7 @@ build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
+default_plugins = @default_plugins@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
diff --git a/gtk/window-decorator/Makefile.in b/gtk/window-decorator/Makefile.in
index 26c9600..37c14c3 100644
--- a/gtk/window-decorator/Makefile.in
+++ b/gtk/window-decorator/Makefile.in
@@ -276,6 +276,7 @@ build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
+default_plugins = @default_plugins@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
diff --git a/images/Makefile.in b/images/Makefile.in
index 058dee8..e0f0a21 100644
--- a/images/Makefile.in
+++ b/images/Makefile.in
@@ -253,6 +253,7 @@ build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
+default_plugins = @default_plugins@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
diff --git a/include/Makefile.in b/include/Makefile.in
index 49120eb..a493558 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -256,6 +256,7 @@ build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
+default_plugins = @default_plugins@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
diff --git a/intltool-extract.in b/intltool-extract.in
index ffd36c9..7b83435 100644
--- a/intltool-extract.in
+++ b/intltool-extract.in
@@ -32,7 +32,7 @@
## Release information
my $PROGRAM = "intltool-extract";
my $PACKAGE = "intltool";
-my $VERSION = "0.36.0";
+my $VERSION = "0.36.2";
## Loaded modules
use strict;
diff --git a/intltool-merge.in b/intltool-merge.in
index e91d998..e5671d7 100644
--- a/intltool-merge.in
+++ b/intltool-merge.in
@@ -35,7 +35,7 @@
## Release information
my $PROGRAM = "intltool-merge";
my $PACKAGE = "intltool";
-my $VERSION = "0.36.0";
+my $VERSION = "0.36.2";
## Loaded modules
use strict;
@@ -100,24 +100,13 @@ sub isProgramInPath
{
my ($file) = @_;
# If either a file exists, or when run it returns 0 exit status
- return 1 if ((-x $file) or (system("$file --version >$devnull") == 0));
+ return 1 if ((-x $file) or (system("$file -l >$devnull") == 0));
return 0;
}
-sub isGNUGettextTool
+if (! isProgramInPath ("$iconv"))
{
- my ($file) = @_;
- # Check that we are using GNU gettext tools
- if (isProgramInPath ($file)) {
- my $version = `$file --version`;
- return 1 if ($version =~ m/.*\(GNU .*\).*/);
- }
- return 0;
-}
-
-if (! isGNUGettextTool ("$iconv"))
-{
- print STDERR " *** GNU iconv is not found on this system!\n".
+ print STDERR " *** iconv is not found on this system!\n".
" *** Without it, intltool-merge can not convert encodings.\n";
exit;
}
@@ -286,8 +275,42 @@ sub po_file2lang
sub gather_po_files
{
- for my $po_file (glob "$PO_DIR/*.po") {
- $po_files_by_lang{po_file2lang($po_file)} = $po_file;
+ if (my $linguas = $ENV{"LINGUAS"})
+ {
+ for my $lang (split / /, $linguas) {
+ my $po_file = $PO_DIR . "/" . $lang . ".po";
+ if (-e $po_file) {
+ $po_files_by_lang{$lang} = $po_file;
+ }
+ }
+ }
+ else
+ {
+ if (open LINGUAS_FILE, "$PO_DIR/LINGUAS")
+ {
+ while (<LINGUAS_FILE>)
+ {
+ next if /^#/;
+
+ if (/([-a-zA-Z_@.]+)\n/)
+ {
+ my $lang = $1;
+
+ my $po_file = $PO_DIR . "/" . $lang . ".po";
+ if (-e $po_file) {
+ $po_files_by_lang{$lang} = $po_file;
+ }
+ }
+ }
+
+ close LINGUAS_FILE;
+ }
+ else
+ {
+ for my $po_file (glob "$PO_DIR/*.po") {
+ $po_files_by_lang{po_file2lang($po_file)} = $po_file;
+ }
+ }
}
}
diff --git a/intltool-update.in b/intltool-update.in
index b7ce986..bffd10f 100644
--- a/intltool-update.in
+++ b/intltool-update.in
@@ -30,7 +30,7 @@
## Release information
my $PROGRAM = "intltool-update";
-my $VERSION = "0.36.0";
+my $VERSION = "0.36.2";
my $PACKAGE = "intltool";
## Loaded modules
@@ -917,15 +917,15 @@ sub Console_Write_CoverageReport
foreach my $lang (@languages)
{
- print "$lang: ";
+ print STDERR "$lang: ";
&POFile_Update ($lang, "");
}
- print "\n\n * Current translation support in $MODULE \n\n";
+ print STDERR "\n\n * Current translation support in $MODULE \n\n";
foreach my $lang (@languages)
{
- print "$lang: ";
+ print STDERR "$lang: ";
system ("$MSGFMT", "-o", "$devnull", "--verbose", "$SRCDIR/$lang.po");
}
}
diff --git a/kde/Makefile.in b/kde/Makefile.in
index d67e8db..eae1176 100644
--- a/kde/Makefile.in
+++ b/kde/Makefile.in
@@ -252,6 +252,7 @@ build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
+default_plugins = @default_plugins@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
diff --git a/kde/window-decorator/Makefile.in b/kde/window-decorator/Makefile.in
index 7de4de6..314776b 100644
--- a/kde/window-decorator/Makefile.in
+++ b/kde/window-decorator/Makefile.in
@@ -282,6 +282,7 @@ build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
+default_plugins = @default_plugins@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
diff --git a/libdecoration/Makefile.in b/libdecoration/Makefile.in
index 1a9bb3d..54eb76a 100644
--- a/libdecoration/Makefile.in
+++ b/libdecoration/Makefile.in
@@ -56,7 +56,7 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
-libdecoration_la_LIBADD =
+libdecoration_la_DEPENDENCIES =
am_libdecoration_la_OBJECTS = decoration.lo
libdecoration_la_OBJECTS = $(am_libdecoration_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -273,6 +273,7 @@ build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
+default_plugins = @default_plugins@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
Reply to: