[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

libcompizconfig: Changes to 'debian-unstable'



 CMakeLists.txt                     |  197 ++++++++
 INSTALL                            |  239 ----------
 Makefile.am                        |   25 -
 NEWS                               |   18 
 VERSION                            |    2 
 autogen.sh                         |   16 
 backend/CMakeLists.txt             |    5 
 backend/Makefile.am                |   18 
 backend/ini.c                      |  727 -------------------------------
 backend/src/ini.c                  |  721 +++++++++++++++++++++++++++++++
 cmake/CMakeLists.txt               |    8 
 cmake/FindCompizConfig.cmake       |   86 +++
 cmake/LibCompizConfigCommon.cmake  |  122 +++++
 config.h.in                        |    5 
 config/CMakeLists.txt              |   10 
 config/Makefile.am                 |    6 
 configure.ac                       |  156 ------
 debian/changelog                   |   16 
 debian/compat                      |    2 
 debian/control                     |    8 
 debian/libcompizconfig-dev.install |    9 
 debian/libcompizconfig0.install    |    3 
 debian/rules                       |   88 ---
 debian/source/format               |    1 
 debian/source/local-options        |    2 
 debian/watch                       |    4 
 include/CMakeLists.txt             |    9 
 include/Makefile.am                |    3 
 include/ccs.h                      |   33 -
 libcompizconfig.pc.in              |    2 
 metadata/Makefile.am               |    5 
 metadata/ccp.xml                   |    7 
 plugin/CMakeLists.txt              |    6 
 plugin/Makefile.am                 |   15 
 plugin/ccp.c                       |  844 -------------------------------------
 plugin/ccp.xml                     |    7 
 plugin/ccp/CMakeLists.txt          |   16 
 plugin/ccp/ccp.xml.in              |    7 
 plugin/ccp/src/ccp.cpp             |  532 +++++++++++++++++++++++
 plugin/ccp/src/ccp.cpp~            |  536 +++++++++++++++++++++++
 plugin/ccp/src/ccp.h               |   73 +++
 po/POTFILES.in                     |    2 
 src/CMakeLists.txt                 |   79 +++
 src/Makefile.am                    |   52 --
 src/compiz.cpp                     |  159 ++----
 src/compizconfig.proto             |    8 
 src/config.c                       |    2 
 src/main.c                         |   74 ---
 48 files changed, 2583 insertions(+), 2382 deletions(-)

New commits:
commit 3475736511c33db57ecc381d15a9fbf2d628d51d
Author: Sean Finney <seanius@debian.org>
Date:   Sun Feb 27 09:42:11 2011 +0000

    Temp hack for upstream cruft in repo and after build

diff --git a/debian/rules b/debian/rules
index 8b9be96..1ca6489 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,12 @@ CORE_ABIVERSION := $(shell sed -rn 's/^\#define[[:space:]]+CORE_ABIVERSION[[:spa
 %:
 	dh $@
 
+
+# temporary hack for a tmp file left in upstream repo
+override_dh_clean:
+	dh_clean -X plugin/ccp/src/ccp.cpp~
+	rm -f src/compizconfig.pb.cc src/compizconfig.pb.h
+
 override_dh_auto_configure:
 	dh_auto_configure -- -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCOMPIZ_PACKAGING_ENABLED=TRUE -DCOMPIZ_PLUGIN_INSTALL_TYPE=package
 

commit 8820916e88fc0182c4abf2146974e843a6bae51d
Author: Sean Finney <seanius@debian.org>
Date:   Sun Feb 27 09:40:26 2011 +0000

    Add unapply-patches and abort-on-upstream-changes to local-options

diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..8293bbd
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1,2 @@
+apply-patches
+abort-on-upstream-changes

commit fd868d88df9f814a3cea6e6c2c71425ef6a08ef7
Author: Sean Finney <seanius@debian.org>
Date:   Sun Feb 27 09:38:29 2011 +0000

    Prepare new release

diff --git a/debian/changelog b/debian/changelog
index c0acfc3..73a1623 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libcompizconfig (0.9.2.1+git20110226.78a7cc8c-1) experimental; urgency=low
+
+  * Incorporate Janos Guljas' compiz packaging work, thanks!
+
+ -- Sean Finney <seanius@debian.org>  Sun, 27 Feb 2011 09:36:37 +0000
+
 libcompizconfig (0.9.2.1-1.1) unstable; urgency=low
 
   * New upstream release

commit cdcbbe940b4e3f6fc68fbe60a8917ad1a7b722eb
Author: Sean Finney <seanius@debian.org>
Date:   Sun Feb 27 09:30:31 2011 +0000

    Incorporate Janos Guljas' packaging work

diff --git a/debian/changelog b/debian/changelog
index 10d0191..c0acfc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libcompizconfig (0.9.2.1-1.1) unstable; urgency=low
+
+  * New upstream release
+  * Bump standards to 3.9.1
+  * Switch to dpkg version 3.0 (quilt)
+  * Rewrite debian/rules to use debhelper 7.
+  * Added debian/watch file
+
+ -- Janos Guljas <janos@resenje.org>  Sun, 14 Nov 2010 20:13:28 +0100
+
 libcompizconfig (0.8.4-3) UNRELEASED; urgency=low
 
   * Update upstream git repo url in debian/copyright.
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/control b/debian/control
index 429b694..68f3771 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,12 @@ Source: libcompizconfig
 Priority: extra
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: Sean Finney <seanius@debian.org>
-Build-Depends: debhelper (>= 5), autoconf, automake1.9, autotools-dev, compiz-dev (>= 0.8.4-1), intltool, libtool, libglib2.0-dev, 
- libxml2-dev, libxslt1-dev,
-Standards-Version: 3.8.1
+Build-Depends: debhelper (>= 7.0.50~), cmake, intltool, compiz-dev (>= 0.9.2.1),
+ pkg-config, libxml2-dev, libxslt1-dev, libprotobuf-dev, protobuf-compiler,
+ libxslt1-dev, xsltproc, libboost1.42-dev, libboost-serialization1.42-dev
+Standards-Version: 3.9.1
 Section: libs
+Homepage: http://www.compiz.org/
 Vcs-Git: git://git.debian.org/git/pkg-xorg/bling/libcompizconfig.git
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/bling/libcompizconfig.git
 
diff --git a/debian/libcompizconfig-dev.install b/debian/libcompizconfig-dev.install
index 4ec7f46..73601af 100644
--- a/debian/libcompizconfig-dev.install
+++ b/debian/libcompizconfig-dev.install
@@ -1,6 +1,5 @@
-usr/include/*
-usr/lib/pkgconfig
 usr/lib/libcompizconfig.so
-usr/lib/*.a
-usr/lib/compiz/*.a
-usr/lib/compizconfig/backends/*.a
+usr/include/compizconfig/*.h
+usr/lib/pkgconfig/libcompizconfig.pc
+usr/share/compiz/cmake/
+usr/share/cmake*
diff --git a/debian/libcompizconfig0.install b/debian/libcompizconfig0.install
index 8cdfd85..02ace78 100644
--- a/debian/libcompizconfig0.install
+++ b/debian/libcompizconfig0.install
@@ -2,4 +2,5 @@ usr/lib/libcompizconfig.so.*
 usr/lib/compiz/*.so
 usr/lib/compizconfig/backends/*.so
 usr/share/compiz/*xml
-etc/compizconfig/config
+config/config /etc/compizconfig
+usr/share/gconf/schemas/
diff --git a/debian/rules b/debian/rules
index d102b19..8b9be96 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,80 +4,24 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+CORE_ABIVERSION := $(shell sed -rn 's/^\#define[[:space:]]+CORE_ABIVERSION[[:space:]]+//p' /usr/include/compiz/core/core.h )
 
-# shared library versions, option 1
-version=0.52
-major=0
+%:
+	dh $@
 
-CORE_ABIVERSION := $(shell sed -rn 's/^\#define[[:space:]]+CORE_ABIVERSION[[:space:]]+//p' /usr/include/compiz/compiz-core.h )
+override_dh_auto_configure:
+	dh_auto_configure -- -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCOMPIZ_PACKAGING_ENABLED=TRUE -DCOMPIZ_PLUGIN_INSTALL_TYPE=package
 
-# the following are generated by autoconf and have no way of being deleted
-# gracefully. 
-AUTOFOO_DELETE:=Makefile.in aclocal.m4 backend/Makefile.in config/Makefile.in \
-	configure include/Makefile.in intltool-extract.in intltool-merge.in \
-	intltool-update.in metadata/Makefile.in plugin/Makefile.in \
-	po/Makefile.in.in src/Makefile.in config.guess config.h.in config.sub \
-	depcomp install-sh ltmain.sh missing mkinstalldirs
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	./autogen.sh --prefix=/usr --sysconfdir=/etc --disable-protobuf
-	touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp 
-	dh_testdir
-	$(MAKE)
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	[ ! -f Makefile ] || $(MAKE) distclean
-	rm -f $(AUTOFOO_DELETE)
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+override_dh_gencontrol:
+	dh_gencontrol -- -Vcoreabiversion=$(CORE_ABIVERSION)
 
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
+override_dh_install:
+	# cmake findcompiz_install use COMPIZ_DESTDIR and using COMPIZ_DESTDIR
+	# and DESTDIR together is completely broken upstream
+	# So, doing the same in debian/rules to find a way to install things in the
+	# right place, sorry for the kittens
+	cmake_dir=`cmake --system-information 2> /dev/null | grep "^CMAKE_ROOT " | sed -e 's/.*"\(.*\)"/\1/'` && \
+	mkdir -p debian/tmp$${cmake_dir}/Modules && cp cmake/FindCompizConfig.cmake debian/tmp$${cmake_dir}/Modules
 
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-#	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
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol -- -Vcoreabiversion=$(CORE_ABIVERSION)
-	dh_md5sums
-	dh_builddeb
+	dh_install --fail-missing
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..683a0be
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,4 @@
+version=3
+http://releases.compiz.org/([\d\.]+)[02468]/ libcompizconfig-([\d\.]+)\.tar\.gz
+
+

commit 78a7cc8ca71020dff42dd2731071bfdf548ea2e8
Author: Sam Spilsbury <sam.spilsbury@canonical.com>
Date:   Thu Nov 25 18:22:33 2010 +0800

    Revert "Add a COMPIZCONFIG_PROFILE env var so that distributions and"
    
    This reverts commit e1438fb552487271ebed9894516c74210eb3de81.
    
    No need for it, we have COMPIZ_CONFIG_PROFILE

diff --git a/cmake/LibCompizConfigCommon.cmake b/cmake/LibCompizConfigCommon.cmake
index a5e154e..de27b71 100644
--- a/cmake/LibCompizConfigCommon.cmake
+++ b/cmake/LibCompizConfigCommon.cmake
@@ -5,7 +5,7 @@ include (CompizPackage)
 
 macro (_get_backend_parameters _prefix)
     set (_current_var _foo)
-    set (_supported_var PKGDEPS LDFLAGSADD CFLAGSADD LIBRARIES LIBDIRS INCDIRS FILESADD)
+    set (_supported_var PKGDEPS LDFLAGSADD CFLAGSADD LIBRARIES LIBDIRS INCDIRS)
     foreach (_val ${_supported_var})
 	set (${_prefix}_${_val})
     endforeach (_val)
@@ -87,8 +87,7 @@ function (compizconfig_backend bname)
     add_library (
 	${bname} SHARED ${_cpp_files}
 		        ${_h_files}
-		        ${_c_files}
-			${compizconfig_${_BACKEND}_FILESADD})
+		        ${_c_files})
 
     target_link_libraries (
 	${bname}
diff --git a/src/main.c b/src/main.c
index e052885..4d861f6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -59,13 +59,7 @@ initGeneralOptions (CCSContext * context)
     else
 	ccsSetBackend (context, "ini");
 
-    /* The session might ask for a specific profile */
-
-    if ((val = getenv ("COMPIZCONFIG_PROFILE")))
-    {
-	ccsSetProfile (context, val);
-    }
-    else if (ccsReadConfig (OptionProfile, &val))
+    if (ccsReadConfig (OptionProfile, &val))
     {
 	ccsSetProfile (context, val);
 	free (val);
@@ -566,7 +560,7 @@ openBackend (char *backend)
 
     if (home && strlen (home))
     {
-	asprintf (&dlname, "%s/.compizconfig/backends/lib%s.so",
+	asprintf (&dlname, "%s/.compizconfig/backends/lib%s.so", 
 		  home, backend);
 	dlerror ();
 	dlhand = dlopen (dlname, RTLD_NOW | RTLD_NODELETE | RTLD_LOCAL);
@@ -578,7 +572,7 @@ openBackend (char *backend)
         if (dlname) {
 	        free (dlname);
         }
-	asprintf (&dlname, "%s/compizconfig/backends/lib%s.so",
+	asprintf (&dlname, "%s/compizconfig/backends/lib%s.so", 
 		  LIBDIR, backend);
 	dlhand = dlopen (dlname, RTLD_NOW | RTLD_NODELETE | RTLD_LOCAL);
 	err = dlerror ();
@@ -1536,7 +1530,7 @@ ccsGetSortedPluginStringList (CCSContext * context)
 		    found = TRUE;
 		l2 = l2->next;
 	    }
-
+	    
 	    if (p && !ccsPluginListFind (plugins[i].after, p) && !found)
 		plugins[i].after = ccsPluginListAppend (plugins[i].after, p);
 
@@ -1774,9 +1768,9 @@ ccsReadSettings (CCSContext * context)
 {
     if (!context)
 	return;
-
+    
     CONTEXT_PRIV (context);
-
+    
     if (!cPrivate->backend)
 	return;
 
@@ -1842,7 +1836,7 @@ ccsWriteSettings (CCSContext * context)
 {
     if (!context)
 	return;
-
+    
     CONTEXT_PRIV (context);
 
     if (!cPrivate->backend)
@@ -1882,9 +1876,9 @@ ccsWriteChangedSettings (CCSContext * context)
 {
     if (!context)
 	return;
-
+    
     CONTEXT_PRIV (context);
-
+    
     if (!cPrivate->backend)
 	return;
 
@@ -2263,7 +2257,7 @@ ccsCanDisablePlugin (CCSContext * context, CCSPlugin * plugin)
 		}
 		pluginList = pluginList->next;
 	    }
-
+	    
 	}
 	if (conflict)
 	    list = ccsPluginConflictListAppend (list, conflict);
@@ -2279,9 +2273,9 @@ ccsGetExistingProfiles (CCSContext * context)
 {
     if (!context)
 	return NULL;
-
+    
     CONTEXT_PRIV (context);
-
+    
     if (!cPrivate->backend)
 	return NULL;
 
@@ -2296,9 +2290,9 @@ ccsDeleteProfile (CCSContext * context, char *name)
 {
     if (!context)
 	return;
-
+    
     CONTEXT_PRIV (context);
-
+    
     if (!cPrivate->backend)
 	return;
 
@@ -2473,7 +2467,7 @@ ccsExportToFile (CCSContext *context,
 	    if (skipDefaults && setting->isDefault)
 		continue;
 
-	    asprintf (&keyName, "s%d_%s",
+	    asprintf (&keyName, "s%d_%s", 
 		      context->screenNum, setting->name);
 
 	    switch (setting->type)
@@ -2573,7 +2567,7 @@ ccsImportFromFile (CCSContext *context,
 	    if (!setting->isDefault && !overwriteNonDefault)
 		continue;
 
-	    asprintf (&keyName, "s%d_%s",
+	    asprintf (&keyName, "s%d_%s", 
 		      context->screenNum, setting->name);
 
 	    switch (setting->type)

commit f7355bf03c3611e9349661c6cad2865a83d1b134
Author: Sam Spilsbury <sam.spilsbury@canonical.com>
Date:   Thu Nov 25 18:07:13 2010 +0800

    Ensure that we install the config defaults in SYSCONFDIR and also add a custom target for it

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6a57a81..8f9e686 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -132,7 +132,7 @@ install (
 )
 
 
-
+add_subdirectory (config)
 add_subdirectory (backend)
 add_subdirectory (plugin)
 add_subdirectory (src)
diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
new file mode 100644
index 0000000..728db4a
--- /dev/null
+++ b/config/CMakeLists.txt
@@ -0,0 +1,10 @@
+set (_config_file
+     config)
+
+compiz_opt_install_file (${_config_file} ${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file})
+
+add_custom_target (
+    config_install
+    ${CMAKE_COMMAND} -E make_directory ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules &&
+    ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/config/${_config_file} ${COMPIZ_DESTDIR}${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file}
+    )

commit e1438fb552487271ebed9894516c74210eb3de81
Author: Sam Spilsbury <sam.spilsbury@canonical.com>
Date:   Mon Nov 22 18:58:50 2010 +0800

    Add a COMPIZCONFIG_PROFILE env var so that distributions and
    session managers can specify per-session profiles

diff --git a/cmake/LibCompizConfigCommon.cmake b/cmake/LibCompizConfigCommon.cmake
index de27b71..a5e154e 100644
--- a/cmake/LibCompizConfigCommon.cmake
+++ b/cmake/LibCompizConfigCommon.cmake
@@ -5,7 +5,7 @@ include (CompizPackage)
 
 macro (_get_backend_parameters _prefix)
     set (_current_var _foo)
-    set (_supported_var PKGDEPS LDFLAGSADD CFLAGSADD LIBRARIES LIBDIRS INCDIRS)
+    set (_supported_var PKGDEPS LDFLAGSADD CFLAGSADD LIBRARIES LIBDIRS INCDIRS FILESADD)
     foreach (_val ${_supported_var})
 	set (${_prefix}_${_val})
     endforeach (_val)
@@ -87,7 +87,8 @@ function (compizconfig_backend bname)
     add_library (
 	${bname} SHARED ${_cpp_files}
 		        ${_h_files}
-		        ${_c_files})
+		        ${_c_files}
+			${compizconfig_${_BACKEND}_FILESADD})
 
     target_link_libraries (
 	${bname}
diff --git a/src/main.c b/src/main.c
index 4d861f6..e052885 100644
--- a/src/main.c
+++ b/src/main.c
@@ -59,7 +59,13 @@ initGeneralOptions (CCSContext * context)
     else
 	ccsSetBackend (context, "ini");
 
-    if (ccsReadConfig (OptionProfile, &val))
+    /* The session might ask for a specific profile */
+
+    if ((val = getenv ("COMPIZCONFIG_PROFILE")))
+    {
+	ccsSetProfile (context, val);
+    }
+    else if (ccsReadConfig (OptionProfile, &val))
     {
 	ccsSetProfile (context, val);
 	free (val);
@@ -560,7 +566,7 @@ openBackend (char *backend)
 
     if (home && strlen (home))
     {
-	asprintf (&dlname, "%s/.compizconfig/backends/lib%s.so", 
+	asprintf (&dlname, "%s/.compizconfig/backends/lib%s.so",
 		  home, backend);
 	dlerror ();
 	dlhand = dlopen (dlname, RTLD_NOW | RTLD_NODELETE | RTLD_LOCAL);
@@ -572,7 +578,7 @@ openBackend (char *backend)
         if (dlname) {
 	        free (dlname);
         }
-	asprintf (&dlname, "%s/compizconfig/backends/lib%s.so", 
+	asprintf (&dlname, "%s/compizconfig/backends/lib%s.so",
 		  LIBDIR, backend);
 	dlhand = dlopen (dlname, RTLD_NOW | RTLD_NODELETE | RTLD_LOCAL);
 	err = dlerror ();
@@ -1530,7 +1536,7 @@ ccsGetSortedPluginStringList (CCSContext * context)
 		    found = TRUE;
 		l2 = l2->next;
 	    }
-	    
+
 	    if (p && !ccsPluginListFind (plugins[i].after, p) && !found)
 		plugins[i].after = ccsPluginListAppend (plugins[i].after, p);
 
@@ -1768,9 +1774,9 @@ ccsReadSettings (CCSContext * context)
 {
     if (!context)
 	return;
-    
+
     CONTEXT_PRIV (context);
-    
+
     if (!cPrivate->backend)
 	return;
 
@@ -1836,7 +1842,7 @@ ccsWriteSettings (CCSContext * context)
 {
     if (!context)
 	return;
-    
+
     CONTEXT_PRIV (context);
 
     if (!cPrivate->backend)
@@ -1876,9 +1882,9 @@ ccsWriteChangedSettings (CCSContext * context)
 {
     if (!context)
 	return;
-    
+
     CONTEXT_PRIV (context);
-    
+
     if (!cPrivate->backend)
 	return;
 
@@ -2257,7 +2263,7 @@ ccsCanDisablePlugin (CCSContext * context, CCSPlugin * plugin)
 		}
 		pluginList = pluginList->next;
 	    }
-	    
+
 	}
 	if (conflict)
 	    list = ccsPluginConflictListAppend (list, conflict);
@@ -2273,9 +2279,9 @@ ccsGetExistingProfiles (CCSContext * context)
 {
     if (!context)
 	return NULL;
-    
+
     CONTEXT_PRIV (context);
-    
+
     if (!cPrivate->backend)
 	return NULL;
 
@@ -2290,9 +2296,9 @@ ccsDeleteProfile (CCSContext * context, char *name)
 {
     if (!context)
 	return;
-    
+
     CONTEXT_PRIV (context);
-    
+
     if (!cPrivate->backend)
 	return;
 
@@ -2467,7 +2473,7 @@ ccsExportToFile (CCSContext *context,
 	    if (skipDefaults && setting->isDefault)
 		continue;
 
-	    asprintf (&keyName, "s%d_%s", 
+	    asprintf (&keyName, "s%d_%s",
 		      context->screenNum, setting->name);
 
 	    switch (setting->type)
@@ -2567,7 +2573,7 @@ ccsImportFromFile (CCSContext *context,
 	    if (!setting->isDefault && !overwriteNonDefault)
 		continue;
 
-	    asprintf (&keyName, "s%d_%s", 
+	    asprintf (&keyName, "s%d_%s",
 		      context->screenNum, setting->name);
 
 	    switch (setting->type)

commit 9405fc95eb64147be29bd355575b013f104631bd
Author: Didier Roche <didrocks@ubuntu.com>
Date:   Thu Nov 18 13:57:40 2010 +0100

    Give a default value to COMPIZ_SYSCONFDIR
    
    That enables SYSCONFDIR to get one and so, reading the Global configuration
    file.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 904cc3d..6a57a81 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,6 +45,8 @@ else (COMPIZ_PACKAGING_ENABLED)
     set (exec_prefix ${CMAKE_INSTALL_PREFIX}/bin)
 endif (COMPIZ_PACKAGING_ENABLED)
 
+set (COMPIZ_SYSCONFDIR "/etc" CACHE PATH "/etc")
+
 option (USE_PROTOBUF
 	"Use Google Protocol Buffers library for faster XML loading"
 	ON

commit 0d25d2e9a2aaacacf5a6efe75f995fb1e51bea9c
Author: Sam Spilsbury <smspillaz@gmail.com>
Date:   Sat Nov 6 20:48:34 2010 +0800

    Update NEWS for 0.9.2.1 Release

diff --git a/NEWS b/NEWS
index 97466cf..1846b6c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,3 @@
-Release 0.9.2 (2010-11-06 Sam Spilsbury <sam.spilsbury@canonical.com>)
-=====================================================================
-Bugfix release.
-
 Release 0.9.0 (2010-07-03 Sam Spilsbury <smspillaz@gmail.com>)
 ==============================================================
 Development release.
@@ -15,3 +11,7 @@ Release 0.9.2 (2010-10-24 Sam Spilsbury <smspillaz@gmail.com>)
 Development release.
 
 Fixed symbol linking issue with backends
+
+Release 0.9.2.1 (2010-11-06 Sam Spilsbury <sam.spilsbury@canonical.com>)
+========================================================================
+Bugfix release.

commit 3fb22ea2e7a5a8a58ad5e8585c670fc9a7125aa4
Author: Sam Spilsbury <smspillaz@gmail.com>
Date:   Sat Nov 6 20:47:01 2010 +0800

    Update NEWS for 0.9.2.1 Release

diff --git a/NEWS b/NEWS
index ee0b25f..97466cf 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Release 0.9.2 (2010-11-06 Sam Spilsbury <sam.spilsbury@canonical.com>)
+=====================================================================
+Bugfix release.
+
 Release 0.9.0 (2010-07-03 Sam Spilsbury <smspillaz@gmail.com>)
 ==============================================================
 Development release.

commit 5d5926060559813f8e3a228318ed62e3e8c771d5
Author: Sam Spilsbury <smspillaz@gmail.com>
Date:   Sat Nov 6 20:35:45 2010 +0800

    Add a LIBCOMPIZCONFIG_VERSION_MACRO and update to 0.9.2.1

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6997555..904cc3d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,8 +14,9 @@ set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 # An even micro number indicates a released version.
 set (LIBCOMPIZCONFIG_VERSION_MAJOR 0)
 set (LIBCOMPIZCONFIG_VERSION_MINOR 9)
-set (LIBCOMPIZCONFIG_VERSION_MICRO 0)
-set (VERSION ${LIBCOMPIZCONFIG_VERSION_MAJOR}.${LIBCOMPIZCONFIG_VERSION_MINOR}.${LIBCOMPIZCONFIG_VERSION_MICRO})
+set (LIBCOMPIZCONFIG_VERSION_MICRO 2)
+set (LIBCOMPIZCONFIG_VERSION_MACRO 1)
+set (VERSION ${LIBCOMPIZCONFIG_VERSION_MAJOR}.${LIBCOMPIZCONFIG_VERSION_MINOR}.${LIBCOMPIZCONFIG_VERSION_MICRO}.${LIBCOMPIZCONFIG_VERSION_MACRO})
 
 set (_libcompizconfig_package_string "LibCompizConfig ${VERSION}")
 set (_libcompizconfig_package "LibCompizCompiz")

commit 2526029f717644ee856af8a462228fd40ed60424
Author: Sam Spilsbury <smspillaz@gmail.com>
Date:   Sun Oct 24 23:38:37 2010 +0800

    Fix warnings when protobuf is disabled

diff --git a/src/compiz.cpp b/src/compiz.cpp
index f99f1c6..99cbee6 100644
--- a/src/compiz.cpp
+++ b/src/compiz.cpp
@@ -2694,7 +2694,6 @@ static void
 loadPluginFromXMLFile (CCSContext * context, char *xmlName, char *xmlDirPath)
 {
     char *xmlFilePath = NULL;
-    char *pbFilePath = NULL;
     void *pluginInfoPBv = NULL;
 
     asprintf (&xmlFilePath, "%s/%s", xmlDirPath, xmlName);
@@ -2706,6 +2705,7 @@ loadPluginFromXMLFile (CCSContext * context, char *xmlName, char *xmlDirPath)
 
 #ifdef USE_PROTOBUF
     char *name = NULL;
+    char *pbFilePath = NULL;
     struct stat xmlStat;
     Bool removePB = FALSE;
 
@@ -3024,10 +3024,10 @@ void
 ccsLoadPluginSettings (CCSPlugin * plugin)
 {
     Bool ignoreXML = FALSE;
-    Bool loadedAtLeastBriefPB = FALSE;
     void *pluginPBToWrite = NULL;
 
 #ifdef USE_PROTOBUF
+    Bool loadedAtLeastBriefPB = FALSE;
     initPBLoading ();
 #endif
 

commit 0780051028371e006173c5a30ddd1d7930630375
Author: Sam Spilsbury <smspillaz@gmail.com>
Date:   Sun Oct 24 22:46:27 2010 +0800

    Update NEWS for 0.9.2

diff --git a/NEWS b/NEWS
index 86b9b7d..ee0b25f 100644
--- a/NEWS
+++ b/NEWS
@@ -5,3 +5,9 @@ Development release.
 Removed multiscreen support to reflect core API changes.
 
 Added CMake Buildsystem.
+
+Release 0.9.2 (2010-10-24 Sam Spilsbury <smspillaz@gmail.com>)
+==============================================================
+Development release.
+
+Fixed symbol linking issue with backends

commit 6f3254c30435d70712c53e532f491ac35c702a80
Author: Sam Spilsbury <smspillaz@gmail.com>
Date:   Wed Sep 29 22:13:57 2010 +0800

    Update INSTALL file

diff --git a/INSTALL b/INSTALL
index 23e5f25..16cfcef 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,236 +1,15 @@
-Installation Instructions
-*************************
+libcompizconfig uses out-of-tree builds with cmake, in order to generate the Makefiles for compiz use:
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+	$ mkdir build
+	$ cd build
+	$ cmake ..
 
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+After that, standard build procedures apply:
 
-Basic Installation
-==================
+	$ make
+	# make install
 
-These are generic installation instructions.
+In order to build other backends, you will need to install the compizconfig cmake set
 
-   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


Reply to: