rendered paste body/compiz-plugins-beryl-premerge> git pull origin
remote: Generating pack...
remote: Done counting 200 objects.
remote: Result has 171 objects.
remote: Deltifying 171 objects.
remote: 100% (171/171) done
Unpacking 171 objects
remote: Total 171, written 171 (delta 124), reused 0 (delta 0)
100% (171/171) done
* refs/heads/origin: fast forward to branch 'master' of git://anongit.beryl-project.org/compiz/compiz-plugins-beryl-premerge
from 592dc66f6822f85ca5b9b58ef3241d498e98ed89 to cb39b6968deeda54b69264f4f4eb5dcf7cb2887b
Updating from 592dc66f6822f85ca5b9b58ef3241d498e98ed89 to cb39b6968deeda54b69264f4f4eb5dcf7cb2887b
Fast forward
Makefile.am | 2 +-
configure.ac | 5 +
metadata/Makefile.am | 25 +
metadata/addhelper.xml | 47 ++
metadata/bench.xml | 60 ++
metadata/crashhandler.xml | 26 +
metadata/extrawm.xml | 45 ++
metadata/fadedesktop.xml | 19 +
metadata/group.xml | 475 +++++++++++++
metadata/jpeg.xml | 14 +
metadata/mblur.xml | 54 ++
metadata/neg.xml | 30 +
metadata/opacify.xml | 80 +++
metadata/put.xml | 317 +++++++++
metadata/reflex.xml | 38 +
metadata/ring.xml | 209 ++++++
metadata/showdesktop.xml | 63 ++
metadata/snap.xml | 67 ++
metadata/snow.xml | 107 +++
metadata/splash.xml | 73 ++
metadata/thumbnail.xml | 102 +++
metadata/tile.xml | 113 +++
metadata/trailfocus.xml | 83 +++
metadata/wall.xml | 238 +++++++
src/3d/3d.c | 1205 +++++++++++++++++++++++++++++++
src/3d/3d.xml | 89 +++
src/3d/Makefile | 183 +++++
src/3d/NOTE | 2 +
src/3d/WARNING | 2 +
src/Makefile.am | 9 +-
src/addhelper.c | 1 +
src/addhelper.options | 39 -
src/bench.c | 1 +
src/bench.options | 51 --
src/crashhandler.c | 1 +
src/crashhandler.options | 22 -
src/extrawm.c | 1 +
src/extrawm.options | 28 -
src/fadedesktop.c | 1 +
src/fadedesktop.options | 16 -
src/group/Makefile.am | 4 +-
src/group/group.options | 405 -----------
src/group/init.c | 5 +-
src/group/paint.c | 6 +-
src/jpeg.c | 1 +
src/jpeg.options | 11 -
src/mblur.c | 5 +-
src/mblur.options | 40 --
src/neg.c | 1 +
src/neg.options | 21 -
src/opacify.c | 1 +
src/opacify.options | 70 --
src/put.c | 1 +
src/put.options | 222 ------
src/reflex.c | 1 +
src/reflex.options | 34 -
src/ring.c | 13 +-
src/ring.options | 182 -----
src/showdesktop.c | 9 +-
src/showdesktop.options | 55 --
src/snap.c | 25 +-
src/snap.options | 44 --
src/snow.c | 11 +-
src/snow.options | 93 ---
src/splash.c | 3 +-
src/splash.options | 65 --
src/text.c | 1 +
src/thumbnail.c | 1 +
src/thumbnail.options | 92 ---
src/tile.c | 1716 ++++++++++++++++++++-------------------------
src/tile.options | 86 ---
src/trailfocus.c | 1 +
src/trailfocus.options | 75 --
src/wall.c | 19 +-
src/wall.options | 191 -----
75 files changed, 4619 insertions(+), 2834 deletions(-)
create mode 100644 metadata/Makefile.am
create mode 100644 metadata/addhelper.xml
create mode 100644 metadata/bench.xml
create mode 100644 metadata/crashhandler.xml
create mode 100644 metadata/extrawm.xml
create mode 100644 metadata/fadedesktop.xml
create mode 100644 metadata/group.xml
create mode 100644 metadata/jpeg.xml
create mode 100644 metadata/mblur.xml
create mode 100644 metadata/neg.xml
create mode 100644 metadata/opacify.xml
create mode 100644 metadata/put.xml
create mode 100644 metadata/reflex.xml
create mode 100644 metadata/ring.xml
create mode 100644 metadata/showdesktop.xml
create mode 100644 metadata/snap.xml
create mode 100644 metadata/snow.xml
create mode 100644 metadata/splash.xml
create mode 100644 metadata/thumbnail.xml
create mode 100644 metadata/tile.xml
create mode 100644 metadata/trailfocus.xml
create mode 100644 metadata/wall.xml
create mode 100644 src/3d/3d.c
create mode 100644 src/3d/3d.xml
create mode 100644 src/3d/Makefile
create mode 100644 src/3d/NOTE
create mode 100644 src/3d/WARNING
delete mode 100644 src/addhelper.options
delete mode 100644 src/bench.options
delete mode 100644 src/crashhandler.options
delete mode 100644 src/extrawm.options
delete mode 100644 src/fadedesktop.options
delete mode 100644 src/group/group.options
delete mode 100644 src/jpeg.options
delete mode 100644 src/mblur.options
delete mode 100644 src/neg.options
delete mode 100644 src/opacify.options
delete mode 100644 src/put.options
delete mode 100644 src/reflex.options
delete mode 100644 src/ring.options
delete mode 100644 src/showdesktop.options
delete mode 100644 src/snap.options
delete mode 100644 src/snow.options
delete mode 100644 src/splash.options
delete mode 100644 src/thumbnail.options
delete mode 100644 src/tile.options
delete mode 100644 src/trailfocus.options
delete mode 100644 src/wall.options
Sam@ACER-SUSE:~/compiz-plugins-beryl-premerge> make
cd . && /bin/sh /home/Sam/compiz-plugins-beryl-premerge/missing --run aclocal-1.9
cd . && /bin/sh /home/Sam/compiz-plugins-beryl-premerge/missing --run automake-1.9 --gnu
cd . && /bin/sh /home/Sam/compiz-plugins-beryl-premerge/missing --run autoconf
/bin/sh ./config.status --recheck
running CONFIG_SHELL=/bin/sh /bin/sh ./configure --enable-maintainer-mode --no-create --no-recursion
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking whether to enable maintainer-specific portions of Makefiles... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking for C compiler default output file name... a.out
checking whether the C compiler works... yes
checking whether we are cross compiling... no
checking for suffix of executables...
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking how to run the C preprocessor... gcc -E
checking build system type... i686-suse-linux-gnu
checking host system type... i686-suse-linux-gnu
checking for a sed that does not truncate output... /usr/bin/sed
checking for grep that handles long lines and -e... /usr/bin/grep
checking for egrep... /usr/bin/grep -E
checking for ld used by gcc... /usr/i586-suse-linux/bin/ld
checking if the linker (/usr/i586-suse-linux/bin/ld) is GNU ld... yes
checking for /usr/i586-suse-linux/bin/ld option to reload object files... -r
checking for BSD-compatible nm... /usr/bin/nm -B
checking whether ln -s works... yes
checking how to recognise dependent libraries... pass_all
checking for ANSI C header files... yes
checking for sys/types.h... yes
checking for sys/stat.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for memory.h... yes
checking for strings.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for unistd.h... yes
checking dlfcn.h usability... yes
checking dlfcn.h presence... yes
checking for dlfcn.h... yes
checking for g++... g++
checking whether we are using the GNU C++ compiler... yes
checking whether g++ accepts -g... yes
checking dependency style of g++... gcc3
checking how to run the C++ preprocessor... g++ -E
checking for g77... no
checking for f77... no
checking for xlf... no
checking for frt... no
checking for pgf77... no
checking for cf77... no
checking for fort77... no
checking for fl32... no
checking for af77... no
checking for f90... no
checking for xlf90... no
checking for pgf90... no
checking for pghpf... no
checking for epcf90... no
checking for gfortran... no
checking for g95... no
checking for f95... no
checking for fort... no
checking for xlf95... no
checking for ifort... no
checking for ifc... no
checking for efc... no
checking for pgf95... no
checking for lf95... no
checking for ftn... no
checking whether we are using the GNU Fortran 77 compiler... no
checking whether accepts -g... no
checking the maximum length of command line arguments... 32768
checking command to parse /usr/bin/nm -B output from gcc object... ok
checking for objdir... .libs
checking for ar... ar
checking for ranlib... ranlib
checking for strip... strip
checking if gcc supports -fno-rtti -fno-exceptions... no
checking for gcc option to produce PIC... -fPIC
checking if gcc PIC flag -fPIC works... yes
checking if gcc static flag -static works... yes
checking if gcc supports -c -o file.o... yes
checking whether the gcc linker (/usr/i586-suse-linux/bin/ld) supports shared libraries... yes
checking whether -lc should be explicitly linked in... no
checking dynamic linker characteristics... GNU/Linux ld.so
checking how to hardcode library paths into programs... immediate
checking whether stripping libraries is possible... yes
checking if libtool supports shared libraries... yes
checking whether to build shared libraries... yes
checking whether to build static libraries... yes
configure: creating libtool
appending configuration tag "CXX" to libtool
checking for ld used by g++... /usr/i586-suse-linux/bin/ld
checking if the linker (/usr/i586-suse-linux/bin/ld) is GNU ld... yes
checking whether the g++ linker (/usr/i586-suse-linux/bin/ld) supports shared libraries... yes
checking for g++ option to produce PIC... -fPIC
checking if g++ PIC flag -fPIC works... yes
checking if g++ static flag -static works... yes
checking if g++ supports -c -o file.o... yes
checking whether the g++ linker (/usr/i586-suse-linux/bin/ld) supports shared libraries... yes
checking dynamic linker characteristics... GNU/Linux ld.so
checking how to hardcode library paths into programs... immediate
appending configuration tag "F77" to libtool
checking for ANSI C header files... (cached) yes
checking for stdlib.h... (cached) yes
checking sys/time.h usability... yes
checking sys/time.h presence... yes
checking for sys/time.h... yes
checking for unistd.h... (cached) yes
checking for intltool >= 0.35.0... 0.35.0 found
checking for perl... /usr/bin/perl
checking for XML::Parser... ok
checking for iconv... /usr/bin/iconv
checking for msgfmt... /usr/bin/msgfmt
checking for msgmerge... /usr/bin/msgmerge
checking for xgettext... /usr/bin/xgettext
checking locale.h usability... yes
checking locale.h presence... yes
checking for locale.h... yes
checking for LC_MESSAGES... yes
checking libintl.h usability... yes
checking libintl.h presence... yes
checking for libintl.h... yes
checking for ngettext in libc... yes
checking for dgettext in libc... yes
checking for bind_textdomain_codeset... yes
checking for msgfmt... /usr/bin/msgfmt
checking for dcgettext... yes
checking for gmsgfmt... /usr/bin/msgfmt
checking for xgettext... /usr/bin/xgettext
checking whether byte ordering is bigendian... no
configure: Using PKG_CONFIG_PATH=NONE/lib/pkgconfig:NONE/lib/pkgconfig:/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig:/opt/kde3/lib/pkgconfig:/opt/gnome/lib/pkgconfig:/opt/gnome/lib/pkgconfig:/opt/gnome/share/pkgconfig
checking for pkg-config... /usr/bin/pkg-config
checking pkg-config is at least version 0.9.0... yes
checking for COMPIZ... yes
checking for BCOP... yes
checking for GL_CFLAGS...
checking for GL_LIBS... -lGL
checking for TEXT... yes
checking for WALL... yes
checking for GROUP... yes
configure: creating ./config.status
/bin/sh ./config.status
config.status: creating Makefile
config.status: creating metadata/Makefile
config.status: creating src/Makefile
config.status: creating src/group/Makefile
config.status: creating po/Makefile.in
config.status: creating config.h
config.status: config.h is unchanged
config.status: executing depfiles commands
config.status: executing intltool commands
config.status: executing default-1 commands
config.status: executing po/stamp-it commands
cd . && /bin/sh /home/Sam/compiz-plugins-beryl-premerge/missing --run autoheader
rm -f stamp-h1
touch config.h.in
cd . && /bin/sh ./config.status config.h
config.status: creating config.h
config.status: config.h is unchanged
make all-recursive
make[1]: Entering directory `/home/Sam/compiz-plugins-beryl-premerge'
Making all in metadata
make[2]: Entering directory `/home/Sam/compiz-plugins-beryl-premerge/metadata'
make[2]: Nothing to be done for `all'.
make[2]: Leaving directory `/home/Sam/compiz-plugins-beryl-premerge/metadata'
Making all in src
make[2]: Entering directory `/home/Sam/compiz-plugins-beryl-premerge/src'
Making all in group
make[3]: Entering directory `/home/Sam/compiz-plugins-beryl-premerge/src/group'
/usr/local/bin/bcop --header group_options.h ../../metadata/group.xml
Parsing XML Option file "../../metadata/group.xml"...done
Parsing XML tree...error
[ERROR]: document of the wrong type, root node != plugindone
make[3]: *** [group_options.h] Error 1
make[3]: Leaving directory `/home/Sam/compiz-plugins-beryl-premerge/src/group'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory `/home/Sam/compiz-plugins-beryl-premerge/src'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/home/Sam/compiz-plugins-beryl-premerge'
make: *** [all] Error 2