compizconfig-backend-kconfig4: Changes to 'upstream-unstable'
CMakeLists.txt | 1 -
NEWS | 15 +++++++++++++++
VERSION | 2 +-
cmake/addons.cmake | 4 ++--
src/CMakeLists.txt | 10 +++++++++-
src/kconfig_backend.cpp | 39 +++++++--------------------------------
6 files changed, 34 insertions(+), 37 deletions(-)
New commits:
commit 770eb46487b271541fb23a6a74dcb1030797f94e
Author: Sam Spilsbury <smspillaz@gmail.com>
Date: Sat Nov 6 20:48:58 2010 +0800
Update NEWS for 0.9.2.1 Release
diff --git a/NEWS b/NEWS
index 62f37ce..0e4faa2 100644
--- a/NEWS
+++ b/NEWS
@@ -10,3 +10,6 @@ Release 0.9.2 (2010-10-24 Sam Spilsbury <smspillaz@gmail.com>)
==============================================================
Development release.
+Release 0.9.2.1 (2010-11-06 Sam Spilsbury <sam.spilsbury@canonical.com>)
+========================================================================
+Bugfix release.
commit 0bb0cd3906e56a55a53810a069c3fe004b0b47b1
Author: Sam Spilsbury <smspillaz@gmail.com>
Date: Sat Nov 6 20:42:34 2010 +0800
Update to 0.9.2.1
diff --git a/VERSION b/VERSION
index f626ec2..5d08606 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.9.0
+VERSION=0.9.2.1
commit 762987fe678873a9af90fa7815b52338f84433c5
Author: Sam Spilsbury <smspillaz@gmail.com>
Date: Sun Oct 24 22:49:54 2010 +0800
Update NEWS for 0.9.2 release
diff --git a/NEWS b/NEWS
index c0d9009..62f37ce 100644
--- a/NEWS
+++ b/NEWS
@@ -4,4 +4,9 @@ Development release.
Integrate into libcompizconfig buildsystem.
-Adjust for libcompizconfig API changes
\ No newline at end of file
+Adjust for libcompizconfig API changes
+
+Release 0.9.2 (2010-10-24 Sam Spilsbury <smspillaz@gmail.com>)
+==============================================================
+Development release.
+
commit 73eb88f089bee4043d35b4f4c1793eff18c20561
Author: Sam Spilsbury <smspillaz@gmail.com>
Date: Sun Jul 4 09:11:00 2010 +0800
Update NEWS for 0.9.0 release
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..c0d9009
--- /dev/null
+++ b/NEWS
@@ -0,0 +1,7 @@
+Release 0.9.0 (2010-07-03 Sam Spilsbury <smspillaz@gmail.com>)
+==============================================================
+Development release.
+
+Integrate into libcompizconfig buildsystem.
+
+Adjust for libcompizconfig API changes
\ No newline at end of file
commit ff1d449fd09e70e1ee8accae386614bd87a25cdc
Author: Sam Spilsbury <SmSpillaz@gmail.com>
Date: Fri May 21 00:53:59 2010 +0800
Added COMPIZ_DESTDIR support
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6c861b6..7b29852 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,6 +6,11 @@ include(KDE4Defaults)
include(FindPkgConfig)
include(MacroLibrary)
+set (CMAKE_SKIP_RPATH FALSE)
+
+option (COMPIZ_BUILD_WITH_RPATH "Leave as ON unless building packages" ON)
+set (COMPIZ_DESTDIR ${COMPIZ_DESTDIR} CACHE STRING "Leave blank unless building packages")
+
pkg_check_modules(CCS REQUIRED libcompizconfig)
QT4_ADD_DBUS_INTERFACE( kconfig4_kwin_SRCS org.kde.KWin.xml kwin_interface )
@@ -20,4 +25,4 @@ kde4_add_library(kconfig4 SHARED ${kconfig4_LIB_SRCS})
target_link_libraries(kconfig4 ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${CCS_LIBRARIES} X11)
-install(TARGETS kconfig4 DESTINATION ${CCS_LIBDIR}/compizconfig/backends)
+install(TARGETS kconfig4 DESTINATION ${COMPIZ_DESTDIR}${CCS_LIBDIR}/compizconfig/backends)
commit 1749b0a0a1172963e09b4f4aa667793ee0d763b1
Author: Sam Spilsbury <smspillaz@gmail.com>
Date: Fri May 14 12:22:32 2010 +0000
Add dist and uninstall targets
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e3467d..cf8f47c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,4 +21,6 @@ add_subdirectory(src)
cf_print_configure_header ()
-cf_add_package_generation ("CompizConfig KDE 4 storage backend")
\ No newline at end of file
+compiz_add_uninstall ()
+cf_add_package_generation ("CompizConfig KDE 4 storage backend")
+compiz_add_git_dist ()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6c861b6..c72963e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,10 +1,13 @@
find_package(KDE4 REQUIRED)
+find_package (Compiz REQUIRED)
add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
include(KDE4Defaults)
include(FindPkgConfig)
include(MacroLibrary)
+include(CompizCommon)
+include(CompizPackage)
pkg_check_modules(CCS REQUIRED libcompizconfig)
commit d0cbf24911e20717e200a7f73f65a08feb3e6413
Author: Sam Spilsbury <SmSpillaz@gmail.com>
Date: Fri May 7 10:35:21 2010 +0800
Remove dummy
diff --git a/dummy b/dummy
deleted file mode 100644
index e69de29..0000000
commit df91ed16fff3f3f140bd6d12f1cf27a3c8c5b2b9
Author: Sam Spilsbury <SmSpillaz@gmail.com>
Date: Fri May 7 10:35:15 2010 +0800
Dummy commit
diff --git a/dummy b/dummy
new file mode 100644
index 0000000..e69de29
commit 7f6404839715fc5a35b9ef08bbd46b2229dcb62f
Author: Sam Spilsbury <smspillaz@gmail.com>
Date: Sun Apr 25 14:28:09 2010 +0000
Remove dummy
diff --git a/dummy b/dummy
deleted file mode 100644
index e69de29..0000000
commit cfc25baf32f18264de11aac9ba598ff267fb1d87
Author: Sam Spilsbury <smspillaz@gmail.com>
Date: Sun Apr 25 14:27:06 2010 +0000
Dummy commit
diff --git a/dummy b/dummy
new file mode 100644
index 0000000..e69de29
commit 31f3347089d6a208294503a0c715ef50ca38bb2e
Author: Sam Spilsbury <smspillaz@gmail.com>
Date: Sun Apr 25 14:25:54 2010 +0000
Allow building with Compiz 0.9.0
diff --git a/VERSION b/VERSION
index bc600a0..f626ec2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.8.5
+VERSION=0.9.0
diff --git a/cmake/addons.cmake b/cmake/addons.cmake
index 4590610..20133eb 100644
--- a/cmake/addons.cmake
+++ b/cmake/addons.cmake
@@ -58,7 +58,7 @@ macro (cf_print_configure_header)
_format_string ("${PROJECT_NAME}" 40 _project)
_format_string ("${VERSION}" 40 _version)
_color_message ("\n${_escape}[40;37m************************************************************${_escape}[0m")
- _color_message ("${_escape}[40;37m* ${_escape}[1;31mCompiz ${_escape}[1;37mFusion ${_escape}[0;40;34mBuildsystem${_escape}[0m${_escape}[40;37m *${_escape}[0m")
+ _color_message ("${_escape}[40;37m* ${_escape}[1;31mCompiz ${_escape}[0;40;34mBuildsystem${_escape}[0m${_escape}[40;37m *${_escape}[0m")
_color_message ("${_escape}[40;37m* *${_escape}[0m")
_color_message ("${_escape}[40;37m* Package : ${_escape}[32m${_project} ${_escape}[37m *${_escape}[0m")
_color_message ("${_escape}[40;37m* Version : ${_escape}[32m${_version} ${_escape}[37m *${_escape}[0m")
@@ -131,7 +131,7 @@ macro (cf_add_package_generation description)
include(InstallRequiredSystemLibraries)
set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "${description}")
- set (CPACK_PACKAGE_VENDOR "Compiz Fusion")
+ set (CPACK_PACKAGE_VENDOR "Compiz")
set (CPACK_PACKAGE_VERSION "${VERSION}")
set (CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION}")
diff --git a/src/kconfig_backend.cpp b/src/kconfig_backend.cpp
index 4ab0b94..41f2890 100644
--- a/src/kconfig_backend.cpp
+++ b/src/kconfig_backend.cpp
@@ -593,13 +593,7 @@ readSetting (CCSContext *c,
QString key (setting->name);
QString group (setting->parent->name);
- if (setting->isScreen)
- {
- group += "_screen";
- group += QString::number (setting->screenNum);
- }
- else
- group += "_display";
+ group += "_display";
KConfigGroup cfg = cFiles->main->group (group);
@@ -1045,13 +1039,7 @@ writeIntegratedOption (CCSSetting *setting)
QString group (setting->parent->name);
- if (setting->isScreen)
- {
- group += "_screen";
- group += QString::number (setting->screenNum);
- }
- else
- group += "_display";
+ group += "_display";
KConfigGroup cfg = cFiles->main->group (group);
@@ -1129,14 +1117,10 @@ writeIntegratedOption (CCSSetting *setting)
int iVal = 0;
CCSSetting *edges = ccsFindSetting(setting->parent,
- "edges_categories",
- setting->isScreen,
- setting->screenNum);
+ "edges_categories");
CCSSetting *dist = ccsFindSetting(setting->parent,
- "resistance_distance",
- setting->isScreen,
- setting->screenNum);
+ "resistance_distance");
if (!edges || !dist || !ccsGetList (edges, &sList) ||
!ccsGetInt(dist, &iVal))
@@ -1254,13 +1238,10 @@ writeIntegratedOption (CCSSetting *setting)
break;
CCSSetting *valSet = ccsFindSetting(setting->parent,
- "edge_flip_window",
- setting->isScreen,
- setting->screenNum);
+ "edge_flip_window");
if (!valSet)
- valSet = ccsFindSetting(setting->parent, "edgeflip_move",
- setting->isScreen, setting->screenNum);
+ valSet = ccsFindSetting(setting->parent, "edgeflip_move");
if (valSet && ccsGetBool (valSet, &val2))
{
@@ -1328,13 +1309,7 @@ writeSetting (CCSContext *c,
QString key (setting->name);
QString group (setting->parent->name);
- if (setting->isScreen)
- {
- group += "_screen";
- group += QString::number (setting->screenNum);
- }
- else
- group += "_display";
+ group += "_display";
KConfigGroup cfg = cFiles->main->group (group);
commit 32d235e01a8fc251df58b2ca827bedec3e0ed38c
Author: Guillaume Seguin <guillaume@segu.in>
Date: Wed Oct 14 04:09:11 2009 +0200
* Bump version to 0.8.5
diff --git a/VERSION b/VERSION
index e4184f4..bc600a0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.8.4
+VERSION=0.8.5
Reply to: