compizconfig-backend-kconfig4: Changes to 'debian-unstable'
CMakeLists.txt | 1
NEWS | 15 ++++++
VERSION | 2
cmake/addons.cmake | 4 -
debian/changelog | 18 +++++++
debian/compat | 2
debian/control | 21 ++++----
debian/copyright | 2
debian/install | 2
debian/lintian-overrides | 2
debian/patches/build-system-broken.patch | 18 +++++++
debian/patches/series | 1
debian/rules | 75 ++-----------------------------
debian/source/format | 1
debian/source/local-options | 2
debian/watch | 4 +
src/CMakeLists.txt | 10 +++-
src/kconfig_backend.cpp | 39 ++--------------
18 files changed, 100 insertions(+), 119 deletions(-)
New commits:
commit 0a2dff25d212f35e833a799d5c2c4f469899b67d
Author: Sean Finney <seanius@debian.org>
Date: Sun Feb 27 12:20:01 2011 +0000
Update lintian/overrides
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
index 331b7d3..24dc892 100644
--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
@@ -1 +1 @@
-compizconfig-backend-kconfig: binary-or-shlib-defines-rpath ./usr/lib/compizconfig/backends/libkconfig4.so /usr/lib
+compizconfig-backend-kconfig4: binary-or-shlib-defines-rpath ./usr/lib/compizconfig/backends/libkconfig4.so /usr/lib
commit 5fdd84faf5cbfa76ba11912ee3d8604a8481466f
Author: Sean Finney <seanius@debian.org>
Date: Sun Feb 27 12:19:29 2011 +0000
Update debian/copyright
diff --git a/debian/copyright b/debian/copyright
index 12db44a..dd7e6a4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,8 @@ This package was debianized by Sean Finney <seanius@debian.org>.
It was downloaded from git://anongit.compiz-fusion.org/fusion/compizconfig/compizconfig-backend-gconf
+ * Copyright (c) 2008 Dennis Kasprzyk <onestone@compiz-fusion.org>
+
Upstream Authors (Lead Developers, see AUTHORS for full list):
Danny Baumann <dannybaumann@web.de>
commit 5986ac1779924ae54041c3de5531f5ad3d65fa6f
Author: Sean Finney <seanius@debian.org>
Date: Sun Feb 27 12:15:33 2011 +0000
Add a temporary workaround for broken upstream cmake config
diff --git a/debian/patches/build-system-broken.patch b/debian/patches/build-system-broken.patch
new file mode 100644
index 0000000..3f986cc
--- /dev/null
+++ b/debian/patches/build-system-broken.patch
@@ -0,0 +1,18 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 5612c4a..782afa8 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1,11 +1,11 @@
+ find_package(KDE4 REQUIRED)
++include(KDE4Defaults)
++include(MacroLibrary)
+ find_package (Compiz REQUIRED)
+
+ add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+
+-include(KDE4Defaults)
+ include(FindPkgConfig)
+-include(MacroLibrary)
+ include(CompizCommon)
+ include(CompizPackage)
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c88f5b9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+build-system-broken.patch
commit 7dff41101a5f37e605b744e28777bbabb090e359
Author: Sean Finney <seanius@debian.org>
Date: Sun Feb 27 11:24:31 2011 +0000
Prepare changelog for next upload
diff --git a/debian/changelog b/debian/changelog
index 399153f..334dade 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+compizconfig-backend-kconfig4 (0.9.2.1+git20110226.770eb464-1) experimental; urgency=low
+
+ * Incorporate packaging work by Janos. Thanks!
+
+ -- Sean Finney <seanius@debian.org> Sun, 27 Feb 2011 11:22:51 +0000
+
compizconfig-backend-kconfig4 (0.9.2.1-1.1) unstable; urgency=low
[ Janos Guljas ]
commit 815c734222234d252630ef63b137132c9c74d22f
Author: Sean Finney <seanius@debian.org>
Date: Sun Feb 27 11:23:32 2011 +0000
Add local-options used in other compiz packages
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..9cdfca9
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1,2 @@
+unapply-patches
+abort-on-upstream-changes
commit 63fb2622c58da36ccfea245407cc557da1c15bbf
Author: Sean Finney <seanius@debian.org>
Date: Sun Feb 27 11:21:42 2011 +0000
Incorporate Janos' packaging work
diff --git a/debian/changelog b/debian/changelog
index 0ac2420..399153f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+compizconfig-backend-kconfig4 (0.9.2.1-1.1) unstable; urgency=low
+
+ [ Janos Guljas ]
+ * New upstream release.
+ * Rename package to compizconfig-backend-kconfig4.
+ * Bump standards to 3.9.1.
+ * Switch to dpkg format 3.0 (quilt)
+ * Rewrite debian/rules to use debhelper 7.
+ * Add debian/watch file.
+
+ -- Janos Guljas <janos@resenje.org> Mon, 15 Nov 2010 16:19:52 +0100
+
compizconfig-backend-kconfig (0.8.4-2) unstable; urgency=low
* Add lintian override for the private libraries with defined rpath
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 2c11657..4aa6a84 100644
--- a/debian/control
+++ b/debian/control
@@ -1,24 +1,25 @@
-Source: compizconfig-backend-kconfig
+Source: compizconfig-backend-kconfig4
Priority: extra
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Sean Finney <seanius@debian.org>
-Build-Depends: debhelper (>= 5), chrpath,
- cmake,
- compiz-dev (>= 0.8.4), intltool, kdebase-workspace-dev, libcompizconfig-dev (>= 0.8.4), libtool, pkg-config,
- quilt,
- xsltproc
-Standards-Version: 3.8.1
+Build-Depends: debhelper (>= 7.0.50~), cmake, intltool, pkg-config, libtool,
+ compiz-dev (>= 0.9), libcompizconfig-dev (>= 0.9), kdebase-workspace-dev
+Standards-Version: 3.9.1
Section: x11
+Homepage: http://www.compiz.org/
+Vcs-Git: git://git.debian.org/git/pkg-xorg/bling/compizconfig-backend-kconfig4.git
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/bling/compizconfig-backend-kconfig4.git
-Package: compizconfig-backend-kconfig
+Package: compizconfig-backend-kconfig4
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: compizconfig-backend-kconfig
Description: Compiz Fusion configuration system - kconfig backend
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
+ unrivalled usefulness.
.
This package provides the kconfig-based (kde) configuration backend for the
- compiz-fusion plugin system
+ compiz-fusion plugin system.
diff --git a/debian/install b/debian/install
deleted file mode 100644
index 93451ff..0000000
--- a/debian/install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/compizconfig/backends/*.so
-usr/share/lintian/overrides/compizconfig-backend-kconfig
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/rules b/debian/rules
index bb1fb62..5b62395 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,74 +4,13 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/quilt/quilt.make
+CORE_ABIVERSION := $(shell sed -rn 's/^\#define[[:space:]]+CORE_ABIVERSION[[:space:]]+//p' /usr/include/compiz/core/core.h )
-CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
+%:
+ dh $@
-DEST:=$(CURDIR)/debian/tmp
+override_dh_auto_configure:
+ dh_auto_configure -- -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCOMPIZ_PACKAGING_ENABLED=TRUE -DCOMPIZ_PLUGIN_INSTALL_TYPE=package
-builddir/CMakeCache.txt: $(QUILT_STAMPFN)
- dh_testdir
- mkdir -p builddir
- cd builddir && cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_C_FLAGS="$(CFLAGS)" -DCMAKE_CXX_FLAGS="$(CFLAGS)" \
- -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
- -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
- -DCMAKE_EXE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed"
-
-build: build-stamp
-build-stamp: builddir/CMakeCache.txt
- dh_testdir
- cd builddir && $(MAKE)
- touch $@
-
-clean: unpatch
- dh_testdir
- dh_testroot
- rm -rf build-stamp builddir
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- cd builddir && $(MAKE) DESTDIR=$(DEST) install
- # copy in needed lintian overrides
- mkdir -p $(DEST)/usr/share/lintian/overrides
- cp debian/lintian-overrides \
- $(DEST)/usr/share/lintian/overrides/compizconfig-backend-kconfig
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
-# uncomment when upstream starts putting stuff in it
-# dh_installchangelogs ChangeLog
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
- 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
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+override_dh_gencontrol:
+ dh_gencontrol -- -Vcoreabiversion=$(CORE_ABIVERSION)
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..05c2727
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,4 @@
+version=3
+http://releases.compiz.org/([\d\.]+)[\d]/ compizconfig-backend-kconfig4-([\d\.]+)\.tar\.gz
+
+
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: