libcompizconfig: Changes to 'debian-unstable'
Makefile.am | 3
Makefile.in | 7
VERSION | 2
backend/Makefile.in | 2
config/Makefile.am | 6
config/Makefile.in | 406 ++++++++++++++++++++++++++++++++++++
config/config | 16 +
configure | 23 +-
configure.ac | 1
debian/changelog | 4
debian/control | 23 +-
debian/libcompizconfig-dev.install | 5
debian/libcompizconfig0-dev.docs | 3
debian/libcompizconfig0-dev.install | 6
debian/libcompizconfig0.docs | 3
debian/libcompizconfig0.install | 5
debian/rules | 12 -
include/Makefile.in | 2
intltool-extract.in | 2
intltool-merge.in | 57 +++--
intltool-update.in | 8
metadata/Makefile.in | 2
metadata/global.xml | 1
plugin/Makefile.in | 2
src/Makefile.in | 2
src/compiz.c | 14 +
src/ini.c | 19 +
src/iniparser.c | 6
src/main.c | 5
29 files changed, 579 insertions(+), 68 deletions(-)
New commits:
commit 22851a2624f94436484b7c371ab9ae0c500c39b2
Author: Sean Finney <seanius@debian.org>
Date: Wed Nov 7 19:03:53 2007 +0100
- update debian packaging for new upstream
- add --sysconfdir to ./configure flags to avoid some files being plopped
in /usr/etc
- rework some of the file installing/moving/removing in debian/rules
- libcompizconfig-dev -> libcompizconfig0-dev which provides the former
- build-dep on compiz > 0.6.0 to make sure we don't build against an old
compiz package
- don't bother installing upstream changelogs until they have content
- add a decent description
diff --git a/debian/changelog b/debian/changelog
index 398e5d6..1fbd580 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-libcompizconfig (0.5.2-1) unstable; urgency=low
+libcompizconfig (0.6.0-1) unstable; urgency=low
* Initial release (Closes: #431787)
- -- Sean Finney <seanius@debian.org> Wed, 05 Sep 2007 21:17:27 +0200
+ -- Sean Finney <seanius@debian.org> Wed, 07 Nov 2007 08:33:47 +0100
diff --git a/debian/control b/debian/control
index a8b0793..2e30778 100644
--- a/debian/control
+++ b/debian/control
@@ -2,20 +2,35 @@ Source: libcompizconfig
Priority: extra
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Sean Finney <seanius@debian.org>
-Build-Depends: debhelper (>= 5), autotools-dev, compiz-dev, intltool, libxml2-dev, libxslt1-dev
+Build-Depends: debhelper (>= 5), autotools-dev, compiz-dev (>= 0.6.0), intltool, libxml2-dev, libxslt1-dev
Standards-Version: 3.7.2
Section: libs
-Package: libcompizconfig-dev
+Package: libcompizconfig0-dev
Section: libdevel
Architecture: any
Depends: libcompizconfig0 (= ${binary:Version})
+Provides: libcompizconfig-dev
Description: Configuration settings library for compiz-fusion - development files
- TODO
+ Compiz Fusion is the result of the re-unification of the Beryl-project
+ and the community around the Compiz Window Manager. It seeks to provide
+ an easy and fun-to-use windowing environment, allowing use of the
+ graphics hardware to provide impressive effects, amazing speed and
+ unrivalled usefulness
+ .
+ This package provides the development files for the compiz-fusion
+ configuration system.
Package: libcompizconfig0
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Configuration settings library for compiz-fusion
- TODO
+ Compiz Fusion is the result of the re-unification of the Beryl-project
+ and the community around the Compiz Window Manager. It seeks to provide
+ an easy and fun-to-use windowing environment, allowing use of the
+ graphics hardware to provide impressive effects, amazing speed and
+ unrivalled usefulness
+ .
+ This package provides the libraries and runtime files for the compiz-fusion
+ configuration system.
diff --git a/debian/libcompizconfig-dev.install b/debian/libcompizconfig-dev.install
deleted file mode 100644
index 21ab231..0000000
--- a/debian/libcompizconfig-dev.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/include/*
-usr/lib/libcompizconfig.so
-usr/lib/*.a
-usr/lib/compiz/*.a
-usr/lib/compizconfig/backends/*.a
diff --git a/debian/libcompizconfig0-dev.docs b/debian/libcompizconfig0-dev.docs
new file mode 100644
index 0000000..a3d08bc
--- /dev/null
+++ b/debian/libcompizconfig0-dev.docs
@@ -0,0 +1,3 @@
+NEWS
+AUTHORS
+TODO
diff --git a/debian/libcompizconfig0-dev.install b/debian/libcompizconfig0-dev.install
new file mode 100644
index 0000000..4ec7f46
--- /dev/null
+++ b/debian/libcompizconfig0-dev.install
@@ -0,0 +1,6 @@
+usr/include/*
+usr/lib/pkgconfig
+usr/lib/libcompizconfig.so
+usr/lib/*.a
+usr/lib/compiz/*.a
+usr/lib/compizconfig/backends/*.a
diff --git a/debian/libcompizconfig0.docs b/debian/libcompizconfig0.docs
new file mode 100644
index 0000000..a3d08bc
--- /dev/null
+++ b/debian/libcompizconfig0.docs
@@ -0,0 +1,3 @@
+NEWS
+AUTHORS
+TODO
diff --git a/debian/libcompizconfig0.install b/debian/libcompizconfig0.install
index 118e6b3..247e4f2 100644
--- a/debian/libcompizconfig0.install
+++ b/debian/libcompizconfig0.install
@@ -1,2 +1,5 @@
-usr/lib/*
+usr/lib/libcompizconfig.so.*
+usr/lib/compiz/*.so
+usr/lib/compizconfig/backends/*.so
usr/share/compizconfig
+etc/compizconfig/config
diff --git a/debian/rules b/debian/rules
index 1eb2ba4..f3d3176 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ configure: configure-stamp
configure-stamp:
dh_testdir
chmod +x ./configure ./install-sh
- ./configure --prefix=/usr
+ ./configure --prefix=/usr --sysconfdir=/etc
touch configure-stamp
build: build-stamp
@@ -50,15 +50,13 @@ binary-indep: build install
binary-arch: build install
dh_testdir
dh_testroot
- dh_installchangelogs ChangeLog
+# uncomment when upstream stops shipping an entry changelog...
+# dh_installchangelogs ChangeLog
+ dh_installchangelogs
dh_installdocs
dh_installexamples
+ find debian/tmp -type f -name '*.la' | xargs rm -f
dh_install --sourcedir=debian/tmp --fail-missing
- rm debian/libcompizconfig0/usr/lib/libcompizconfig.so
- for f in lib lib/compiz lib/compizconfig/backends; do \
- rm -f debian/libcompizconfig0/usr/$$f/*.a; \
- done
-# dh_installinfo
dh_installman
dh_link
dh_strip
commit e5ba96af58d41cd8f48053a1bc51503c1133ab3d
Author: Sean Finney <seanius@debian.org>
Date: Wed Nov 7 08:33:27 2007 +0100
re-run autogen.sh
diff --git a/Makefile.in b/Makefile.in
index 1dc5f74..2e03b92 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -40,7 +40,7 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(srcdir)/libcompizconfig.pc.in $(top_srcdir)/configure \
AUTHORS COPYING ChangeLog INSTALL NEWS TODO config.guess \
- config.sub depcomp install-sh ltmain.sh missing
+ config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -48,7 +48,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno configure.status.lineno
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = libcompizconfig.pc
SOURCES =
@@ -244,7 +244,8 @@ ALL_SUBDIRS = \
src \
backend \
plugin \
- metadata
+ metadata \
+ config
SUBDIRS = $(ALL_SUBDIRS)
EXTRA_DIST = \
diff --git a/backend/Makefile.in b/backend/Makefile.in
index f1daef5..cdbb338 100644
--- a/backend/Makefile.in
+++ b/backend/Makefile.in
@@ -42,7 +42,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
diff --git a/config/Makefile.in b/config/Makefile.in
new file mode 100644
index 0000000..a3b9a8f
--- /dev/null
+++ b/config/Makefile.in
@@ -0,0 +1,406 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = config
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(globalconfigdir)"
+globalconfigDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(globalconfig_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+COMPIZ_CFLAGS = @COMPIZ_CFLAGS@
+COMPIZ_LIBS = @COMPIZ_LIBS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
+LIBXML2_LIBS = @LIBXML2_LIBS@
+LIBXML2_REQUIRES = @LIBXML2_REQUIRES@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+METADATADIR = @METADATADIR@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PLUGINDIR = @PLUGINDIR@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+globalmetadata = @globalmetadata@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+plugindir = @plugindir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+globalconfigdir = $(sysconfdir)/compizconfig
+globalconfig_DATA = \
+ config
+
+EXTRA_DIST = \
+ config
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu config/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu config/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+distclean-libtool:
+ -rm -f libtool
+uninstall-info-am:
+install-globalconfigDATA: $(globalconfig_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(globalconfigdir)" || $(mkdir_p) "$(DESTDIR)$(globalconfigdir)"
+ @list='$(globalconfig_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(globalconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(globalconfigdir)/$$f'"; \
+ $(globalconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(globalconfigdir)/$$f"; \
+ done
+
+uninstall-globalconfigDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(globalconfig_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(globalconfigdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(globalconfigdir)/$$f"; \
+ done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+ if test -d $$d/$$file; then \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ else \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+ for dir in "$(DESTDIR)$(globalconfigdir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-globalconfigDATA
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-globalconfigDATA uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-exec install-exec-am \
+ install-globalconfigDATA install-info install-info-am \
+ install-man install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+ ps ps-am uninstall uninstall-am uninstall-globalconfigDATA \
+ uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/configure b/configure
index 2924822..3c6599c 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 libcompizconfig 0.5.2.
+# Generated by GNU Autoconf 2.61 for libcompizconfig 0.6.1.
#
# Report bugs to <dev@opencompositing.org>.
#
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='libcompizconfig'
PACKAGE_TARNAME='libcompizconfig'
-PACKAGE_VERSION='0.5.2'
-PACKAGE_STRING='libcompizconfig 0.5.2'
+PACKAGE_VERSION='0.6.1'
+PACKAGE_STRING='libcompizconfig 0.6.1'
PACKAGE_BUGREPORT='dev@opencompositing.org'
# Factoring default headers for most tests.
@@ -1448,7 +1448,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 libcompizconfig 0.5.2 to adapt to many kinds of systems.
+\`configure' configures libcompizconfig 0.6.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1518,7 +1518,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libcompizconfig 0.5.2:";;
+ short | recursive ) echo "Configuration of libcompizconfig 0.6.1:";;
esac
cat <<\_ACEOF
@@ -1631,7 +1631,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libcompizconfig configure 0.5.2
+libcompizconfig configure 0.6.1
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1645,7 +1645,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 libcompizconfig $as_me 0.5.2, which was
+It was created by libcompizconfig $as_me 0.6.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2324,7 +2324,7 @@ fi
# Define the identity of the package.
PACKAGE='libcompizconfig'
- VERSION='0.5.2'
+ VERSION='0.6.1'
cat >>confdefs.h <<_ACEOF
@@ -23340,7 +23340,7 @@ _ACEOF
fi
-ac_config_files="$ac_config_files libcompizconfig.pc Makefile src/Makefile backend/Makefile plugin/Makefile include/Makefile metadata/Makefile po/Makefile.in"
+ac_config_files="$ac_config_files libcompizconfig.pc Makefile src/Makefile backend/Makefile plugin/Makefile include/Makefile metadata/Makefile po/Makefile.in config/Makefile"
cat >confcache <<\_ACEOF
@@ -23778,7 +23778,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 libcompizconfig $as_me 0.5.2, which was
+This file was extended by libcompizconfig $as_me 0.6.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -23831,7 +23831,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-libcompizconfig config.status 0.5.2
+libcompizconfig config.status 0.6.1
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -23960,6 +23960,7 @@ do
"include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
"metadata/Makefile") CONFIG_FILES="$CONFIG_FILES metadata/Makefile" ;;
"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+ "config/Makefile") CONFIG_FILES="$CONFIG_FILES config/Makefile" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
diff --git a/include/Makefile.in b/include/Makefile.in
index f0cae8a..1ca5086 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -43,7 +43,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
SOURCES =
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/metadata/Makefile.in b/metadata/Makefile.in
index cbc70e6..64bcd79 100644
--- a/metadata/Makefile.in
+++ b/metadata/Makefile.in
@@ -42,7 +42,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
SOURCES =
diff --git a/plugin/Makefile.in b/plugin/Makefile.in
index 9c2c3ef..6bde8ba 100644
--- a/plugin/Makefile.in
+++ b/plugin/Makefile.in
@@ -42,7 +42,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
diff --git a/src/Makefile.in b/src/Makefile.in
index 6136b9b..48369e9 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -42,7 +42,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
commit bc9b09f3c5d1e1667e13b32afa1a12f4cef872a0
Author: Guillaume Seguin <guillaume@segu.in>
Date: Sat Oct 20 22:00:44 2007 +0200
* Bump VERSION to 0.6.1
diff --git a/VERSION b/VERSION
index de3b1c2..161c807 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.6.0
+VERSION=0.6.1
commit 5615cac87c48455128cc42f6144bfa3493cb1dd9
Author: Jigish Gohil <cyberorg@prime.(none)>
Date: Wed Oct 3 13:29:52 2007 +0530
bump version to 0.6.0
diff --git a/VERSION b/VERSION
index 2313ac4..de3b1c2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.5.2
+VERSION=0.6.0
commit 6ab37f581c1322d5a64e97baaaae063e5608e081
Author: Danny Baumann <dannybaumann@web.de>
Date: Mon Sep 17 19:06:43 2007 +0200
Prevent binding key combinations with invalid key names.
XStringToKeysym fails for those, leading to the unwanted effect that the binding was grabbed as modifier-only binding.
diff --git a/src/compiz.c b/src/compiz.c
index b71e015..fcb0702 100644
--- a/src/compiz.c
+++ b/src/compiz.c
@@ -607,7 +607,14 @@ stringToKey (const char *binding, int *keysym, unsigned int *mods)
while (*binding && !isalnum (*binding))
binding++;
- *keysym = XStringToKeysym (binding);
+ if (*binding)
+ {
+ *keysym = XStringToKeysym (binding);
+ if (!*keysym)
+ *mods = 0;
+ }
+ else
+ *keysym = NoSymbol;
}
commit 9c6ad85017253a9415f02b532a2107e19a0af1cb
Author: Dennis Kasprzyk <onestone@opencompositing.org>
Date: Sun Sep 2 22:22:18 2007 +0200
Allow empty lists.
Reply to: