compizconfig-backend-gconf: Changes to 'debian-unstable'

2011-08-03 Thread Janos Guljas
 AUTHORS  |   19 +
 CMakeLists.txt   |   12 
 ChangeLog|  738 +++
 NEWS |   17 -
 VERSION  |2 
 debian/changelog |7 
 debian/control   |2 
 debian/watch |2 
 src/gconf.c  |8 
 9 files changed, 773 insertions(+), 34 deletions(-)

New commits:
commit 72d13ac56655ff5cdd792e247e8bf26a570df660
Author: Janos Guljas ja...@resenje.org
Date:   Wed Aug 3 23:10:00 2011 +0200

Prepare changelog and bump Standards-Version.

diff --git a/debian/changelog b/debian/changelog
index 378a617..25183e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+compizconfig-backend-gconf (0.9.5.0-0.1) experimental; urgency=low
+
+  * Non-maintainer upload.
+  * New upstream release.
+
+ -- Janos Guljas ja...@resenje.org  Tue, 02 Aug 2011 21:25:13 +0200
+
 compizconfig-backend-gconf (0.9.2.1+git20110226.g861a1d4-2) experimental; 
urgency=low
 
   * Add a Depends compiz-core-abiversion-${coreabiversion}
diff --git a/debian/control b/debian/control
index 0e4159a..b763e88 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Uploaders: Sean Finney sean...@debian.org
 Build-Depends: debhelper (= 7.0.50~), cmake, intltool, pkg-config, libtool,
  compiz-dev (= 0.9.0), libcompizconfig-dev (= 0.9.0), libglib2.0-dev,
  libgconf2-dev, libxslt1-dev, libxml2-dev
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Section: x11
 Homepage: http://www.compiz.org/
 Vcs-Git: git://git.debian.org/git/pkg-xorg/bling/compizconfig-backend-gconf.git

commit fa24b9a140e813b56c86c32d64de28af9f7c0163
Author: Janos Guljas ja...@resenje.org
Date:   Tue Aug 2 21:25:12 2011 +0200

Imported Upstream version 0.9.5.0

diff --git a/AUTHORS b/AUTHORS
index 8b13789..dd427ff 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1 +1,18 @@
-
+Christopher Williams christoph...@verizon.net
+Danny Baumann dannybaum...@web.de
+Dennis Kasprzyk onest...@beryl-project.org
+Dennis Kasprzyk onest...@opencompositing.org
+Didier Roche didro...@ubuntu.com
+Erkin Bahceci erkin...@gmail.com
+Guido Iribarren guido...@guidoi.com.ar
+Guillaume Seguin guilla...@segu.in
+Jigish Gohil cyberorg@prime.(none)
+Kristian Lyngstøl kristian@albus.(none)
+Robert Carr racarr@gorbie.(none)
+Sam Spilsbury smspil...@gmail.com
+Sam Spilsbury sam.spilsb...@canonical.com
+Sam Spilsbury smspillaz@XPS-FEDORA.(none)
+Sam Spilsbury smspillaz@XPS-UNITY.(none)
+Sam Spilsbury smspil...@gmail.com
+Scott Moreau ore...@gmail.com
+maniac maniac
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ab43d0..caee4b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,18 +6,6 @@ include (LibCompizConfigCommon)
 
 compizconfig_backend (gconf PKGDEPS glib-2.0 gconf-2.0)
 
-# compizconfig-gconf package version number
-# An odd micro number indicates in-progress development.
-# An even micro number indicates a released version.
-set (COMPIZCONFIG_GCONF_VERSION_MAJOR 0)
-set (COMPIZCONFIG_GCONF_VERSION_MINOR 9)
-set (COMPIZCONFIG_GCONF_VERSION_MICRO 2)
-set (COMPIZCONFIG_GCONF_VERSION_MACRO 1)
-set (VERSION 
${COMPIZCONFIG_GCONF_VERSION_MAJOR}.${COMPIZCONFIG_GCONF_VERSION_MINOR}.${COMPIZCONFIG_GCONF_VERSION_MICRO}.${COMPIZCONFIG_GCONF_VERSION_MACRO})
-
 compiz_print_configure_header (CompizConfig GConf Storage Backend)
 compiz_print_configure_footer ()
-
-compiz_add_uninstall ()
 compiz_package_generation (CompizConfig GConf Storage Backend)
-compiz_add_git_dist ()
diff --git a/ChangeLog b/ChangeLog
index e69de29..fde4aa2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -0,0 +1,738 @@
+Sam Spilsbury sam.spilsb...@canonical.com2011-07-13
+
+Added some extended debugging info when failing to read keys
+
+Sam Spilsbury sam.spilsb...@canonical.com2011-07-07
+
+Add new release commands
+
+Sam Spilsbury sam.spilsb...@canonical.com2011-07-07
+
+Bump VERSION
+
+Scott Moreau ore...@gmail.com2011-05-13
+
+* Bump version to 0.9.5
+
+Sam Spilsbury sam.spilsb...@canonical.com2011-03-07
+
+Bump VERSION to 0.9.4
+
+Sam Spilsbury sam.spilsb...@canonical.com2011-03-07
+
+Update CMake Version
+
+Sam Spilsbury sam.spilsb...@canonical.com2011-03-07
+
+Update news for 0.9.4 release
+
+Sam Spilsbury smspillaz@XPS-UNITY.(none) 2010-12-13
+
+Fix branch confusion
+
+Merge: 9e2664b 55a267f
+Sam Spilsbury sam.spilsb...@canonical.com2010-12-10
+
+Merge branch 'master' of 
git+ssh://git.compiz.org/git/compiz/compizconfig/compizconfig-backend-gconf
+
+Sam Spilsbury sam.spilsb...@canonical.com2010-12-10
+
+Add multiscreen support
+
+Sam Spilsbury sam.spilsb...@canonical.com2010-12-10
+
+Fix setting /allscreens, we should set /screen%i (defaults to screen 0)
+
+Didier Roche didro...@ubuntu.com 2010-11-26
+
+fix schema owner and typo
+
+Sam Spilsbury sam.spilsb...@canonical.com2010-11-23
+
+Change paths so that old and new settings don't conflict
+
+Sam Spilsbury smspil...@gmail.com2010-11-06
+
+Update NEWS for 

compizconfig-backend-gconf: Changes to 'debian-unstable'

2011-03-07 Thread Sean Finney
 debian/changelog |6 ++
 debian/control   |3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 0ba268ebf19601f54d74cc58c9ed826568d70022
Author: Sean Finney sean...@debian.org
Date:   Mon Mar 7 21:30:15 2011 +0100

Prepare for upload

diff --git a/debian/changelog b/debian/changelog
index ef1283e..378a617 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+compizconfig-backend-gconf (0.9.2.1+git20110226.g861a1d4-2) experimental; 
urgency=low
+
+  * Add a Depends compiz-core-abiversion-${coreabiversion}
+
+ -- Sean Finney sean...@debian.org  Mon, 07 Mar 2011 21:29:43 +0100
+
 compizconfig-backend-gconf (0.9.2.1+git20110226.g861a1d4-1) experimental; 
urgency=low
 
   * Incorporate Janos Guljas' compiz packaging work, thanks!

commit d08945d2367c88a11ee270756357cc3d58aaa532
Author: Sean Finney sean...@debian.org
Date:   Mon Mar 7 21:29:04 2011 +0100

Add a Depends compiz-core-abiversion-${coreabiversion}

diff --git a/debian/control b/debian/control
index edd14eb..0e4159a 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,8 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/bling/compizconfig-backend-gconf.
 
 Package: compizconfig-backend-gconf
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: compiz-core-abiversion-${coreabiversion},
+ ${shlibs:Depends}, ${misc:Depends}
 Description: Compiz Fusion configuration system - gconf 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


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pwh7t-0007zr...@alioth.debian.org



compizconfig-backend-gconf: Changes to 'debian-unstable'

2011-02-27 Thread Sean Finney
 CMakeLists.txt   |   23 
 Makefile.am  |7 
 NEWS |   15 
 VERSION  |2 
 autogen.sh   |   16 
 configure.ac |   84 -
 debian/changelog |   17 
 debian/compat|2 
 debian/control   |   11 
 debian/copyright |4 
 debian/install   |1 
 debian/rules |   74 -
 debian/source/format |1 
 debian/source/local-options  |2 
 debian/watch |4 
 settings-backend/Makefile.am |   14 
 settings-backend/gconf.c | 2070 --
 src/gconf.c  | 2108 +++
 18 files changed, 2190 insertions(+), 2265 deletions(-)

New commits:
commit db10ac36078a5dcdde0d5f872d5eb033792df4cd
Author: Sean Finney sean...@debian.org
Date:   Sun Feb 27 10:38:53 2011 +

update debian/copyright

diff --git a/debian/copyright b/debian/copyright
index 12db44a..7dbd7ff 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,10 @@ This package was debianized by Sean Finney 
sean...@debian.org.
 
 It was downloaded from 
git://anongit.compiz-fusion.org/fusion/compizconfig/compizconfig-backend-gconf
 
+ * Copyright (c) 2006 Robert Carr rac...@opencompositing.org
+ * Copyright (c) 2007 Danny Baumann man...@opencompositing.org
+ * Copyright (c) 2007 Dennis Kasprzyk onest...@opencompositing.org
+
 Upstream Authors (Lead Developers, see AUTHORS for full list): 
 
Danny Baumann dannybaum...@web.de

commit c7ab6cd52ef8b9467092c755bbc062cb233289dd
Author: Sean Finney sean...@debian.org
Date:   Sun Feb 27 10:31:59 2011 +

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 000..9cdfca9
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1,2 @@
+unapply-patches
+abort-on-upstream-changes

commit 0a4c862b6feb1941bbaab36eca8cd06430ecbb30
Author: Sean Finney sean...@debian.org
Date:   Sun Feb 27 10:31:35 2011 +

Incorporate Janos' packaging work

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 46a969d..edd14eb 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,12 @@ Source: compizconfig-backend-gconf
 Priority: extra
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Sean Finney sean...@debian.org
-Build-Depends: debhelper (= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (= 0.8.4), intltool, libcompizconfig-dev (= 0.8.4), 
libglib2.0-dev, libgconf2-dev, libtool, pkg-config, xsltproc
-Standards-Version: 3.8.1
+Build-Depends: debhelper (= 7.0.50~), cmake, intltool, pkg-config, libtool,
+ compiz-dev (= 0.9.0), libcompizconfig-dev (= 0.9.0), libglib2.0-dev,
+ libgconf2-dev, libxslt1-dev, libxml2-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-gconf.git
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/bling/compizconfig-backend-gconf.git
 
@@ -16,7 +19,7 @@ Description: Compiz Fusion configuration system - gconf 
backend
  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 gconf-based 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 b73f6a0..000
--- a/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/compizconfig/backends/*.so
diff --git a/debian/rules b/debian/rules
index 69e92c1..5b62395 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,73 +4,13 @@
 # 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 )
 
-AUTOFOO_DELETE:=Makefile.in aclocal.m4 config.guess config.sub configure \
-   depcomp install-sh intltool-extract.in intltool-merge.in \
-   intltool-update.in ltmain.sh missing mkinstalldirs \
-   settings-backend/Makefile.in po
+%:
+   dh $@
 
-configure: configure-stamp
-configure-stamp:
-   dh_testdir
-   ./autogen.sh --prefix=/usr --disable-static
-   touch configure-stamp
+override_dh_auto_configure:
+   dh_auto_configure -- -DCOMPIZ_BUILD_WITH_RPATH=FALSE 
-DCOMPIZ_PACKAGING_ENABLED=TRUE -DCOMPIZ_PLUGIN_INSTALL_TYPE=package
 
-build: build-stamp

compizconfig-backend-gconf: Changes to 'debian-unstable'

2010-02-11 Thread Sean Finney
 debian/changelog |5 -
 debian/control   |2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 3ca0a6296ce3b6be1312ca669f1eec3679d7d834
Author: Sean Finney sean...@debian.org
Date:   Thu Feb 11 21:52:53 2010 +0100

Update changelog with ABI bump

diff --git a/debian/changelog b/debian/changelog
index 8027a5f..86dd3a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,10 +2,13 @@ compizconfig-backend-gconf (0.8.4-1) unstable; urgency=low
 
   * New upstream release.
 
+  [ Sean Finney ]
+  * Update Build-Depends against compiz-dev to = 0.8.4 for ABI bump.
+
   [ Loïc Minier ]
   * Add Vcs-Git-* control headers
 
- -- Sean Finney sean...@debian.org  Thu, 04 Feb 2010 18:07:50 +0100
+ -- Sean Finney sean...@debian.org  Thu, 11 Feb 2010 21:52:41 +0100
 
 compizconfig-backend-gconf (0.8.2-1) unstable; urgency=low
 

commit bb73f95d45d4d07bf27887b049f9c3dcdb548001
Author: Sean Finney sean...@debian.org
Date:   Thu Feb 11 21:51:53 2010 +0100

Update Build-Depends against compiz-dev to = 0.8.4 for ABI bump.

diff --git a/debian/control b/debian/control
index 2c515f7..46a969d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: compizconfig-backend-gconf
 Priority: extra
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Sean Finney sean...@debian.org
-Build-Depends: debhelper (= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (= 0.8.2), intltool, libcompizconfig-dev (= 0.8.2), 
libglib2.0-dev, libgconf2-dev, libtool, pkg-config, xsltproc
+Build-Depends: debhelper (= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (= 0.8.4), intltool, libcompizconfig-dev (= 0.8.4), 
libglib2.0-dev, libgconf2-dev, libtool, pkg-config, xsltproc
 Standards-Version: 3.8.1
 Section: x11
 Vcs-Git: git://git.debian.org/git/pkg-xorg/bling/compizconfig-backend-gconf.git


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



compizconfig-backend-gconf: Changes to 'debian-unstable'

2010-02-04 Thread Sean Finney
 VERSION  |2 +-
 debian/changelog |9 +
 settings-backend/gconf.c |   29 -
 3 files changed, 26 insertions(+), 14 deletions(-)

New commits:
commit a40313a9f1e5244c666505737f0cfa8e9a0106b3
Author: Sean Finney sean...@debian.org
Date:   Thu Feb 4 18:08:01 2010 +0100

prepare 0.8.4-1

diff --git a/debian/changelog b/debian/changelog
index 511e07c..8027a5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+compizconfig-backend-gconf (0.8.4-1) unstable; urgency=low
+
+  * New upstream release.
+
+  [ Loïc Minier ]
+  * Add Vcs-Git-* control headers
+
+ -- Sean Finney sean...@debian.org  Thu, 04 Feb 2010 18:07:50 +0100
+
 compizconfig-backend-gconf (0.8.2-1) unstable; urgency=low
 
   * New upstream release.

commit 92d910aa088dd6f42f39eec5c804b141a2d5e5e9
Author: Guillaume Seguin guilla...@segu.in
Date:   Wed Oct 14 04:09:09 2009 +0200

* Bump version to 0.8.4

diff --git a/VERSION b/VERSION
index 9b265c0..e4184f4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.8.3
+VERSION=0.8.4

commit 5d392b4c1f4e216656369ab2bd5ef783f60e9d86
Author: Erkin Bahceci erkin...@gmail.com
Date:   Fri Sep 25 11:07:54 2009 -0500

Sync metacity with staticswitcher instead of switcher.

diff --git a/settings-backend/gconf.c b/settings-backend/gconf.c
index 7cca9b3..e94d825 100644
--- a/settings-backend/gconf.c
+++ b/settings-backend/gconf.c
@@ -172,9 +172,9 @@ const SpecialOption specialOptions[] = {
 {fullscreen_visual_bell, fade, TRUE,
  METACITY /general/visual_bell_type, OptionSpecial},
 
-{next_key, switcher, FALSE,
+{next_key, staticswitcher, FALSE,
  METACITY /global_keybindings/switch_windows, OptionKey},
-{prev_key, switcher, FALSE,
+{prev_key, staticswitcher, FALSE,
  METACITY /global_keybindings/switch_windows_backward, OptionKey},
 
 {toggle_sticky_key, extrawm, FALSE,

commit c08a69a7e917209d88bc45e2c82c1a4a40d1969a
Author: Erkin Bahceci erkin...@gmail.com
Date:   Thu Sep 24 19:04:00 2009 -0500

Fix crash (LP: #407020).

diff --git a/settings-backend/gconf.c b/settings-backend/gconf.c
index 6a1d30a..7cca9b3 100644
--- a/settings-backend/gconf.c
+++ b/settings-backend/gconf.c
@@ -1834,17 +1834,20 @@ checkProfile (CCSContext *context)
 else
currentProfile = strdup (profile);
 
-if (strcmp (lastProfile, currentProfile) != 0)
+if (!lastProfile || strcmp (lastProfile, currentProfile) != 0)
 {
char *pathName;
 
-   /* copy /apps/compiz tree to profile path */
-   asprintf (pathName, %s/%s, PROFILEPATH, lastProfile);
-   if (pathName)
+   if (lastProfile)
{
-   copyGconfTree (context, COMPIZ, pathName,
-  TRUE, /schemas COMPIZ);
-   free (pathName);
+   /* copy /apps/compiz tree to profile path */
+   asprintf (pathName, %s/%s, PROFILEPATH, lastProfile);
+   if (pathName)
+   {
+   copyGconfTree (context, COMPIZ, pathName,
+  TRUE, /schemas COMPIZ);
+   free (pathName);
+   }
}
 
/* reset /apps/compiz tree */

commit 7d8ba7d820e43af40e2b8407fbb5606ff10c501f
Author: Danny Baumann dannybaum...@web.de
Date:   Wed Apr 8 20:31:08 2009 +0200

Fix warning.

diff --git a/settings-backend/gconf.c b/settings-backend/gconf.c
index cce63b1..6a1d30a 100644
--- a/settings-backend/gconf.c
+++ b/settings-backend/gconf.c
@@ -406,7 +406,7 @@ isIntegratedOption (CCSSetting *setting,
 
 for (i = 0; i  N_SOPTIONS; i++)
 {
-   SpecialOption *opt = specialOptions[i];
+   const SpecialOption *opt = specialOptions[i];
 
if (strcmp (setting-name, opt-settingName) != 0)
continue;

commit f67aaea7e1161b221423d6015c38e6d7dd0af32d
Author: Danny Baumann dannybaum...@web.de
Date:   Wed Apr 8 20:30:16 2009 +0200

Fix setting integration for screenshot and terminal commands.

diff --git a/settings-backend/gconf.c b/settings-backend/gconf.c
index 8d104b3..cce63b1 100644
--- a/settings-backend/gconf.c
+++ b/settings-backend/gconf.c
@@ -351,11 +351,11 @@ const SpecialOption specialOptions[] = {
 {rotate_right_window_key, rotate, FALSE,
  METACITY /window_keybindings/move_to_workspace_right, OptionKey},
 
-{command_screenshot, core, FALSE,
+{command_screenshot, gnomecompat, FALSE,
  METACITY /keybinding_commands/command_screenshot, OptionString},
-{command_window_screenshot, core, FALSE,
+{command_window_screenshot, gnomecompat, FALSE,
  METACITY /keybinding_commands/command_window_screenshot, OptionString},
-{command_terminal, core, FALSE,
+{command_terminal, gnomecompat, FALSE,
  /desktop/gnome/applications/terminal/exec, OptionString},
 
 {current_viewport, thumbnail, TRUE,

commit 62a307f19702e08a99d6d95ba0b683d6b0b06dc7
Author: Guillaume Seguin guilla...@segu.in
Date:   Mon Mar 9 15:43:49 2009 +0100

* Bump version to 

compizconfig-backend-gconf: Changes to 'debian-unstable'

2009-04-24 Thread Loïc Minier
 debian/control |3 ++-
 debian/rules   |4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 30988d10854b113092026284d5a4c77b42915785
Author: Loïc Minier l...@dooz.org
Date:   Fri Apr 24 14:37:26 2009 +0200

Depend on compiz-core and -abiversion-2009xxyy

Let compizconfig-backend-gconf depend on compiz-core and
compiz-core-abiversion-2009xxyy to avoid package mismatches.

diff --git a/debian/control b/debian/control
index 1e6372d..71dad84 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,8 @@ Section: x11
 
 Package: compizconfig-backend-gconf
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ compiz-core, compiz-core-abiversion-${coreabiversion}
 Description: Compiz Fusion configuration system - gconf 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
diff --git a/debian/rules b/debian/rules
index 69e92c1..b6dfef8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,8 @@ else
CFLAGS += -O2
 endif
 
+CORE_ABIVERSION := $(shell sed -rn 
's/^\#define[[:space:]]+CORE_ABIVERSION[[:space:]]+//p' 
/usr/include/compiz/compiz-core.h )
+
 AUTOFOO_DELETE:=Makefile.in aclocal.m4 config.guess config.sub configure \
depcomp install-sh intltool-extract.in intltool-merge.in \
intltool-update.in ltmain.sh missing mkinstalldirs \
@@ -68,7 +70,7 @@ binary-arch: build install
dh_makeshlibs
dh_installdeb
dh_shlibdeps
-   dh_gencontrol
+   dh_gencontrol -- -Vcoreabiversion=$(CORE_ABIVERSION)
dh_md5sums
dh_builddeb
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



compizconfig-backend-gconf: Changes to 'debian-unstable'

2009-04-24 Thread Loïc Minier
 debian/control |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 36118dbb6eaedf5fbac53edc1792fd3f9fa586a8
Author: Loïc Minier l...@dooz.org
Date:   Fri Apr 24 14:40:25 2009 +0200

Add Vcs-Git-* control headers

diff --git a/debian/control b/debian/control
index 71dad84..d520207 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,8 @@ Uploaders: Sean Finney sean...@debian.org
 Build-Depends: debhelper (= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (= 0.8.2), intltool, libcompizconfig-dev (= 0.8.2), 
libglib2.0-dev, libgconf2-dev, libtool, pkg-config, xsltproc
 Standards-Version: 3.8.1
 Section: x11
+Vcs-Git: git://git.debian.org/git/pkg-xorg/bling/compizconfig-backend-gconf.git
+Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/bling/compizconfig-backend-gconf.git
 
 Package: compizconfig-backend-gconf
 Architecture: any


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



compizconfig-backend-gconf: Changes to 'debian-unstable'

2009-04-24 Thread Loïc Minier
 debian/control |3 +--
 debian/rules   |4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit a78288a7f1174e171bdaeeb45d063350c45e3941
Author: Loïc Minier l...@dooz.org
Date:   Fri Apr 24 15:09:21 2009 +0200

Revert Depend on compiz-core and -abiversion-2009xxyy

This reverts commit 30988d10854b113092026284d5a4c77b42915785.

diff --git a/debian/control b/debian/control
index d520207..2c515f7 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,7 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/bling/compizconfig-backend-gconf.
 
 Package: compizconfig-backend-gconf
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
- compiz-core, compiz-core-abiversion-${coreabiversion}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Compiz Fusion configuration system - gconf 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
diff --git a/debian/rules b/debian/rules
index b6dfef8..69e92c1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,8 +11,6 @@ else
CFLAGS += -O2
 endif
 
-CORE_ABIVERSION := $(shell sed -rn 
's/^\#define[[:space:]]+CORE_ABIVERSION[[:space:]]+//p' 
/usr/include/compiz/compiz-core.h )
-
 AUTOFOO_DELETE:=Makefile.in aclocal.m4 config.guess config.sub configure \
depcomp install-sh intltool-extract.in intltool-merge.in \
intltool-update.in ltmain.sh missing mkinstalldirs \
@@ -70,7 +68,7 @@ binary-arch: build install
dh_makeshlibs
dh_installdeb
dh_shlibdeps
-   dh_gencontrol -- -Vcoreabiversion=$(CORE_ABIVERSION)
+   dh_gencontrol
dh_md5sums
dh_builddeb
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



compizconfig-backend-gconf: Changes to 'debian-unstable'

2009-04-05 Thread Sean Finney
 VERSION  |2 
 debian/changelog |9 +++
 debian/control   |4 -
 debian/gbp.conf  |8 ++
 settings-backend/gconf.c |  136 ++-
 5 files changed, 97 insertions(+), 62 deletions(-)

New commits:
commit 9b343836c39387815fedcc1fa51cd2b828472f0d
Author: Sean Finney sean...@debian.org
Date:   Sun Apr 5 22:27:55 2009 +0200

prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index ba432b6..511e07c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+compizconfig-backend-gconf (0.8.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * add gbp.conf for use with git-buildpackage
+  * update compiz related build-deps to 0.8.2
+  * update Standards-Version to 3.8.1
+
+ -- Sean Finney sean...@debian.org  Sun, 05 Apr 2009 22:27:13 +0200
+
 compizconfig-backend-gconf (0.7.6-1) unstable; urgency=low
 
   * New upstream release. 

commit 03847a3a04126a00c15b8999bfa078ea66a5bb54
Author: Sean Finney sean...@debian.org
Date:   Sun Apr 5 22:23:03 2009 +0200

update Standards-Version to 3.8.1

diff --git a/debian/control b/debian/control
index 0f86e5d..1e6372d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: extra
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Sean Finney sean...@debian.org
 Build-Depends: debhelper (= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (= 0.8.2), intltool, libcompizconfig-dev (= 0.8.2), 
libglib2.0-dev, libgconf2-dev, libtool, pkg-config, xsltproc
-Standards-Version: 3.7.2
+Standards-Version: 3.8.1
 Section: x11
 
 Package: compizconfig-backend-gconf

commit 79894d56fb3c1a5697066125aa5107c66af8e2fe
Author: Sean Finney sean...@debian.org
Date:   Sun Apr 5 22:22:40 2009 +0200

update compiz related build-deps to 0.8.2

diff --git a/debian/control b/debian/control
index 5cc23f2..0f86e5d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: compizconfig-backend-gconf
 Priority: extra
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Sean Finney sean...@debian.org
-Build-Depends: debhelper (= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (= 0.7.6), intltool, libcompizconfig-dev (= 0.7.6), 
libglib2.0-dev, libgconf2-dev, libtool, pkg-config, xsltproc
+Build-Depends: debhelper (= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (= 0.8.2), intltool, libcompizconfig-dev (= 0.8.2), 
libglib2.0-dev, libgconf2-dev, libtool, pkg-config, xsltproc
 Standards-Version: 3.7.2
 Section: x11
 

commit 3ca3a75846c5a2b49d610a433b1141ef1af3aa56
Author: Sean Finney sean...@debian.org
Date:   Sun Apr 5 22:21:55 2009 +0200

add gbp.conf for use with git-buildpackage

diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 000..1729250
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,8 @@
+[DEFAULT]
+debian-branch = debian-unstable
+debian-tag = compizconfig-backend-gconf-%(version)s
+upstream-branch = upstream-unstable
+upstream-tag = %(version)s
+
+[git-dch]
+meta = 1

commit b5699e6559d09a1b27314db42682c03faee206f5
Author: Guillaume Seguin guilla...@segu.in
Date:   Mon Mar 9 15:43:49 2009 +0100

* Bump version to 0.8.2

diff --git a/VERSION b/VERSION
index 1357b31..2dcc312 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.7.9
+VERSION=0.8.2

commit ad3a92b4ae2aa1fd8717cb8798addda661661d06
Author: Danny Baumann dannybaum...@web.de
Date:   Thu Feb 5 08:27:42 2009 +0100

Track option movements.

diff --git a/settings-backend/gconf.c b/settings-backend/gconf.c
index 9b72c91..8d104b3 100644
--- a/settings-backend/gconf.c
+++ b/settings-backend/gconf.c
@@ -115,15 +115,15 @@ typedef struct _SpecialOption {
 } SpecialOption;
 
 const SpecialOption specialOptions[] = {
-{run_key, core, FALSE,
+{run_key, gnomecompat, FALSE,
  METACITY /global_keybindings/panel_run_dialog, OptionKey},
-{main_menu_key, core, FALSE,
+{main_menu_key, gnomecompat, FALSE,
  METACITY /global_keybindings/panel_main_menu, OptionKey},
-{run_command_screenshot_key, core, FALSE,
+{run_command_screenshot_key, gnomecompat, FALSE,
  METACITY /global_keybindings/run_command_screenshot, OptionKey},
-{run_command_window_screenshot_key, core, FALSE,
+{run_command_window_screenshot_key, gnomecompat, FALSE,
  METACITY /global_keybindings/run_command_window_screenshot, OptionKey},
-{run_command_terminal_key, core, FALSE,
+{run_command_terminal_key, gnomecompat, FALSE,
  METACITY /global_keybindings/run_command_terminal, OptionKey},
 
 {toggle_window_maximized_key, core, FALSE,
@@ -182,54 +182,54 @@ const SpecialOption specialOptions[] = {
 {toggle_fullscreen_key, extrawm, FALSE,
  METACITY /window_keybindings/toggle_fullscreen, OptionKey},
 
-{command0, core, FALSE,
+{command0, commands, FALSE,
  METACITY /keybinding_commands/command_1, OptionString},
-{command1, core, 

compizconfig-backend-gconf: Changes to 'debian-unstable'

2008-06-02 Thread Sean Finney
 VERSION  |2 -
 debian/changelog |6 
 debian/control   |2 -
 settings-backend/gconf.c |   58 +--
 4 files changed, 25 insertions(+), 43 deletions(-)

New commits:
commit 07478268cfbede9f336ba6468c76ecb323a0a1e6
Author: Sean Finney [EMAIL PROTECTED]
Date:   Tue Jun 3 00:49:30 2008 +0200

new upstream release

diff --git a/debian/changelog b/debian/changelog
index 9b54da4..ba432b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+compizconfig-backend-gconf (0.7.6-1) unstable; urgency=low
+
+  * New upstream release. 
+
+ -- Sean Finney [EMAIL PROTECTED]  Tue, 03 Jun 2008 00:48:54 +0200
+
 compizconfig-backend-gconf (0.7.4-2) unstable; urgency=low
 
   * Add build-deps on autoconf, automake1.9, libglib2.0-dev, and libtool  
diff --git a/debian/control b/debian/control
index d50038e..5cc23f2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: compizconfig-backend-gconf
 Priority: extra
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Sean Finney [EMAIL PROTECTED]
-Build-Depends: debhelper (= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (= 0.7.3), intltool, libcompizconfig-dev (= 0.7.3), 
libglib2.0-dev, libgconf2-dev, libtool, pkg-config, xsltproc
+Build-Depends: debhelper (= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (= 0.7.6), intltool, libcompizconfig-dev (= 0.7.6), 
libglib2.0-dev, libgconf2-dev, libtool, pkg-config, xsltproc
 Standards-Version: 3.7.2
 Section: x11
 

commit 3f1c3f5d7502fd8e91b183568dcc63d0e736f32b
Author: Guillaume Seguin [EMAIL PROTECTED]
Date:   Sat May 31 14:08:55 2008 +0200

* Bump version to 0.7.6

diff --git a/VERSION b/VERSION
index 130f2d5..6410fd5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION=0.7.5
+VERSION=0.7.6

commit fc1a518877207bfbc7abcfb97202d0199acdc8ef
Author: Danny Baumann [EMAIL PROTECTED]
Date:   Wed Apr 23 11:30:49 2008 +0200

Fixed applying schemas to copied profiles.

diff --git a/settings-backend/gconf.c b/settings-backend/gconf.c
index e837147..428057a 100644
--- a/settings-backend/gconf.c
+++ b/settings-backend/gconf.c
@@ -701,16 +701,19 @@ copyGconfValues (GConfEngine *conf,
if (associate  schemaPath)
asprintf (newSchema, %s/%s, schemaPath, name + 1);
 
-   value = gconf_engine_get_without_default (conf, key, NULL);
-   if (value  newKey)
-   {
-   if (newSchema)
-   gconf_engine_associate_schema (conf, newKey,
-  newSchema, NULL);
-   gconf_engine_set (conf, newKey, value, NULL);
+   if (newKey  newSchema)
+   gconf_engine_associate_schema (conf, newKey, newSchema, NULL);
 
-   gconf_value_free (value);
+   if (newKey)
+   {
+   value = gconf_engine_get_without_default (conf, key, NULL);
+   if (value)
+   {
+   gconf_engine_set (conf, newKey, value, NULL);
+   gconf_value_free (value);
+   }
}
+
if (newSchema)
free (newSchema);
if (newKey)
@@ -766,12 +769,10 @@ copyGconfRecursively (GConfEngine *conf,
if (newSchema)
free (newSchema);
 
-   if (to)
-   {
-   if (newKey)
-   free (newKey);
-   }
-   else
+   if (newKey)
+   free (newKey);
+
+   if (!to)
gconf_engine_remove_dir (conf, path, NULL);
}
 
@@ -1848,8 +1849,8 @@ checkProfile (CCSContext *context)
asprintf (pathName, %s/%s, PROFILEPATH, lastProfile);
if (pathName)
{
-   copyGconfTree (context, /apps/compiz, pathName,
-  TRUE, /schemas/apps/compiz);
+   copyGconfTree (context, COMPIZ, pathName,
+  TRUE, /schemas COMPIZ);
free (pathName);
}
 

commit ba560d5f21d9564439e59d3653ccf59d3b092e77
Author: Danny Baumann [EMAIL PROTECTED]
Date:   Fri Apr 18 21:12:55 2008 +0200

Remove integration for plane plugin settings.

diff --git a/settings-backend/gconf.c b/settings-backend/gconf.c
index e837147..9443609 100644
--- a/settings-backend/gconf.c
+++ b/settings-backend/gconf.c
@@ -262,31 +262,6 @@ const SpecialOption specialOptions[] = {
 {rotate_right_key, rotate, FALSE,
  METACITY /global_keybindings/switch_to_workspace_right, OptionKey},
 
-{plane_to_1_key, plane, FALSE,
- METACITY /global_keybindings/switch_to_workspace_1, OptionKey},
-{plane_to_2_key, plane, FALSE,
- METACITY /global_keybindings/switch_to_workspace_2, OptionKey},
-{plane_to_3_key, plane, FALSE,
- METACITY /global_keybindings/switch_to_workspace_3, OptionKey},
-{plane_to_4_key, plane, FALSE,
- METACITY /global_keybindings/switch_to_workspace_4, 

compizconfig-backend-gconf: Changes to 'debian-unstable'

2008-06-01 Thread Julien Cristau
 debian/changelog |6 --
 debian/control   |2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

New commits:
commit a7694aa60f571c0c83c44c6fb0de08de2bce81cc
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sun Jun 1 12:11:13 2008 +0200

Revert Add build-dep on libxml2-dev (closes: #482192).

This reverts commit 02edcf5dd51e0f9a036f03d7f3d3373fc9697e0d.

The dependency should be in compiz-dev instead.

diff --git a/debian/changelog b/debian/changelog
index a9cb4bd..9b54da4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
-compizconfig-backend-gconf (0.7.4-3) UNRELEASED; urgency=low
-
-  * Add build-dep on libxml2-dev (closes: #482192).
-
- -- Julien Cristau [EMAIL PROTECTED]  Wed, 21 May 2008 14:18:08 +0200
-
 compizconfig-backend-gconf (0.7.4-2) unstable; urgency=low
 
   * Add build-deps on autoconf, automake1.9, libglib2.0-dev, and libtool  
diff --git a/debian/control b/debian/control
index 848bf81..d50038e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: compizconfig-backend-gconf
 Priority: extra
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Sean Finney [EMAIL PROTECTED]
-Build-Depends: debhelper (= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (= 0.7.3), intltool, libcompizconfig-dev (= 0.7.3), 
libglib2.0-dev, libgconf2-dev, libtool, libxml2-dev, pkg-config, xsltproc
+Build-Depends: debhelper (= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (= 0.7.3), intltool, libcompizconfig-dev (= 0.7.3), 
libglib2.0-dev, libgconf2-dev, libtool, pkg-config, xsltproc
 Standards-Version: 3.7.2
 Section: x11
 


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



compizconfig-backend-gconf: Changes to 'debian-unstable'

2008-05-21 Thread Julien Cristau
 debian/changelog |6 ++
 debian/control   |2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 02edcf5dd51e0f9a036f03d7f3d3373fc9697e0d
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Wed May 21 14:19:48 2008 +0200

Add build-dep on libxml2-dev (closes: #482192).

diff --git a/debian/changelog b/debian/changelog
index 9b54da4..a9cb4bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+compizconfig-backend-gconf (0.7.4-3) UNRELEASED; urgency=low
+
+  * Add build-dep on libxml2-dev (closes: #482192).
+
+ -- Julien Cristau [EMAIL PROTECTED]  Wed, 21 May 2008 14:18:08 +0200
+
 compizconfig-backend-gconf (0.7.4-2) unstable; urgency=low
 
   * Add build-deps on autoconf, automake1.9, libglib2.0-dev, and libtool  
diff --git a/debian/control b/debian/control
index d50038e..848bf81 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: compizconfig-backend-gconf
 Priority: extra
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Sean Finney [EMAIL PROTECTED]
-Build-Depends: debhelper (= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (= 0.7.3), intltool, libcompizconfig-dev (= 0.7.3), 
libglib2.0-dev, libgconf2-dev, libtool, pkg-config, xsltproc
+Build-Depends: debhelper (= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (= 0.7.3), intltool, libcompizconfig-dev (= 0.7.3), 
libglib2.0-dev, libgconf2-dev, libtool, libxml2-dev, pkg-config, xsltproc
 Standards-Version: 3.7.2
 Section: x11
 


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



compizconfig-backend-gconf: Changes to 'debian-unstable'

2008-05-20 Thread Sean Finney
 debian/changelog |6 ++
 debian/control   |2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 39a99b32b7115e577273e2dcc21201fe0bc974eb
Author: Sean Finney [EMAIL PROTECTED]
Date:   Tue May 20 19:17:34 2008 +0200

update build-deps for autofoo

diff --git a/debian/changelog b/debian/changelog
index 2ca3b51..9b54da4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+compizconfig-backend-gconf (0.7.4-2) unstable; urgency=low
+
+  * Add build-deps on autoconf, automake1.9, libglib2.0-dev, and libtool  
+
+ -- Sean Finney [EMAIL PROTECTED]  Tue, 20 May 2008 19:17:00 +0200
+
 compizconfig-backend-gconf (0.7.4-1) unstable; urgency=low
 
   * New upstream release. 
diff --git a/debian/control b/debian/control
index aafc871..d50038e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: compizconfig-backend-gconf
 Priority: extra
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Sean Finney [EMAIL PROTECTED]
-Build-Depends: debhelper (= 5), autotools-dev, compiz-dev (= 0.7.3), 
intltool, libcompizconfig-dev (= 0.7.3), libglib2.0-dev, libgconf2-dev, 
pkg-config, xsltproc
+Build-Depends: debhelper (= 5), autoconf, automake1.9, autotools-dev, 
compiz-dev (= 0.7.3), intltool, libcompizconfig-dev (= 0.7.3), 
libglib2.0-dev, libgconf2-dev, libtool, pkg-config, xsltproc
 Standards-Version: 3.7.2
 Section: x11
 


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



compizconfig-backend-gconf: Changes to 'debian-unstable'

2008-05-19 Thread Sean Finney
 Makefile.in  |  606 -
 VERSION  |2 
 aclocal.m4   | 7618 --
 config.guess | 1516 --
 config.sub   | 1626 ---
 configure|22651 ---
 configure.ac |2 
 debian/changelog |7 
 debian/control   |2 
 debian/rules |   11 
 depcomp  |  530 -
 install-sh   |  323 
 intltool-extract.in  |  861 -
 intltool-merge.in| 1451 --
 intltool-update.in   | 1164 --
 ltmain.sh| 6938 -
 missing  |  360 
 mkinstalldirs|  111 
 po/Makefile.in.in|  218 
 settings-backend/Makefile.in |  471 
 settings-backend/gconf.c |  903 -
 21 files changed, 385 insertions(+), 46986 deletions(-)

New commits:
commit ebf33f4f3d60ecf00649ab041f19f3ad219edcb6
Author: Sean Finney [EMAIL PROTECTED]
Date:   Mon May 19 22:20:24 2008 +0200

new upstream release

diff --git a/debian/changelog b/debian/changelog
index 807f9b7..487c5c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+compizconfig-backend-gconf (0.7.4-1) unstable; urgency=low
+
+  * New upstream release. 
+  * Update build-depends from libcompizconfig0-dev to libcompizconfig-dev
+
+ -- Sean Finney [EMAIL PROTECTED]  Mon, 19 May 2008 21:17:54 +0200
+
 compizconfig-backend-gconf (0.6.0-1) unstable; urgency=low
 
   * Initial release.
diff --git a/debian/control b/debian/control
index d67d667..b7839d6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: compizconfig-backend-gconf
 Priority: extra
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Sean Finney [EMAIL PROTECTED]
-Build-Depends: debhelper (= 5), autotools-dev, compiz-dev (= 0.6.0), 
intltool, libcompizconfig0-dev (= 0.6.0), libglib2.0-dev, libgconf2-dev, 
pkg-config, xsltproc
+Build-Depends: debhelper (= 5), autotools-dev, compiz-dev (= 0.6.0), 
intltool, libcompizconfig-dev (= 0.6.0), libglib2.0-dev, libgconf2-dev, 
pkg-config, xsltproc
 Standards-Version: 3.7.2
 Section: x11
 
diff --git a/debian/rules b/debian/rules
index 56b999a..69e92c1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,11 +11,15 @@ else
CFLAGS += -O2
 endif
 
+AUTOFOO_DELETE:=Makefile.in aclocal.m4 config.guess config.sub configure \
+   depcomp install-sh intltool-extract.in intltool-merge.in \
+   intltool-update.in ltmain.sh missing mkinstalldirs \
+   settings-backend/Makefile.in po
+
 configure: configure-stamp
 configure-stamp:
dh_testdir
-   chmod +x ./configure ./install-sh
-   ./configure --prefix=/usr --disable-static
+   ./autogen.sh --prefix=/usr --disable-static
touch configure-stamp
 
 build: build-stamp
@@ -27,8 +31,9 @@ build-stamp: configure-stamp
 clean:
dh_testdir
dh_testroot
-   rm -f build-stamp configure-stamp
[ ! -f Makefile ] || $(MAKE) distclean
+   rm -f build-stamp configure-stamp
+   rm -rf $(AUTOFOO_DELETE)
dh_clean 
 
 install: build

commit d4683b639932a064f3840111abcdd28a47d6d3cb
Author: Sean Finney [EMAIL PROTECTED]
Date:   Sun May 18 21:21:46 2008 +0200

remove upstream-disappeared files

diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index 5d8fcb4..000
--- a/Makefile.in
+++ /dev/null
@@ -1,606 +0,0 @@
-# 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.
-
[EMAIL PROTECTED]@
-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@
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-   $(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \
-   ChangeLog INSTALL NEWS config.guess config.sub depcomp \
-   install-sh 

compizconfig-backend-gconf: Changes to 'debian-unstable'

2008-05-19 Thread Sean Finney
 debian/changelog |3 ++-
 debian/control   |2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 2a754585b40ace8052a121f86c698a6a1defe58e
Author: Sean Finney [EMAIL PROTECTED]
Date:   Tue May 20 07:24:47 2008 +0200

update build deps

diff --git a/debian/changelog b/debian/changelog
index 487c5c0..2ca3b51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 compizconfig-backend-gconf (0.7.4-1) unstable; urgency=low
 
   * New upstream release. 
-  * Update build-depends from libcompizconfig0-dev to libcompizconfig-dev
+  * Update build-depends from libcompizconfig0-dev to libcompizconfig-dev,
+and for libcompizconfig-dev and compiz-dev from = 0.6.0 to = 0.7.3.
 
  -- Sean Finney [EMAIL PROTECTED]  Mon, 19 May 2008 21:17:54 +0200
 
diff --git a/debian/control b/debian/control
index b7839d6..aafc871 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: compizconfig-backend-gconf
 Priority: extra
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Sean Finney [EMAIL PROTECTED]
-Build-Depends: debhelper (= 5), autotools-dev, compiz-dev (= 0.6.0), 
intltool, libcompizconfig-dev (= 0.6.0), libglib2.0-dev, libgconf2-dev, 
pkg-config, xsltproc
+Build-Depends: debhelper (= 5), autotools-dev, compiz-dev (= 0.7.3), 
intltool, libcompizconfig-dev (= 0.7.3), libglib2.0-dev, libgconf2-dev, 
pkg-config, xsltproc
 Standards-Version: 3.7.2
 Section: x11
 


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



compizconfig-backend-gconf: Changes to 'debian-unstable'

2007-11-11 Thread Sean Finney
New branch 'debian-unstable' available with the following commits:
commit b5b0c9fc5597e2f068f769ca56b6254ca83fb328
Author: Sean Finney [EMAIL PROTECTED]
Date:   Sun Nov 11 18:44:12 2007 +0100

initial debianization

commit 85212dd6a5a9cec72370758376d7b324f21633e2
Author: Sean Finney [EMAIL PROTECTED]
Date:   Sun Nov 11 18:35:27 2007 +0100

run autogen.sh

commit 181522f503ffd0792137ff54a696aca1a020b4a1
Merge: 25e1825f6bc52a7f34e38e20887433df9a475a8d 
3d1a4ff8df3b468224afc4c1194c89dbf16e9150
Author: Danny Baumann [EMAIL PROTECTED]
Date:   Thu Oct 11 13:51:24 2007 +0200

Merge branch '0.6.0' of git+ssh://[EMAIL 
PROTECTED]/git/fusion/compizconfig/compizconfig-backend-gconf into 0.6.0

commit 25e1825f6bc52a7f34e38e20887433df9a475a8d
Author: Michael Vogt [EMAIL PROTECTED]
Date:   Thu Oct 11 13:51:13 2007 +0200

Fix empty binding handling.

commit 3d1a4ff8df3b468224afc4c1194c89dbf16e9150
Author: Robert Noland [EMAIL PROTECTED]
Date:   Wed Oct 10 12:27:03 2007 -0400

Replace another occurrence of strndup with malloc/strncpy

commit 326cd5b53f41d21bb1ac1c8ea8d7c0bafdf7a515
Author: Danny Baumann [EMAIL PROTECTED]
Date:   Wed Oct 10 12:07:26 2007 +0200

Fix integration of maximize vertically/horizontally actions.

commit 282d74b1c487c22a93e4a290d37a3bde9c67dea5
Author: Danny Baumann [EMAIL PROTECTED]
Date:   Fri Oct 5 14:32:42 2007 +0200

Fix typo.

commit 032f7843fc8f847f038c8594dc2f6cb7217dfc7c
Author: Danny Baumann [EMAIL PROTECTED]
Date:   Fri Oct 5 09:22:26 2007 +0200

Fix handling of disabled integrated keybindings.
Thanks to Michael Vogt.

commit 5b464c9d56192b4d239c5f6948d531da4cc79cf7
Merge: 93010e3d90e37b8d70ff54beb0b6644adf5b01f2 
4526d21825f0bef28debf8389bf3817f953e704e
Author: Danny Baumann [EMAIL PROTECTED]
Date:   Wed Sep 19 11:45:34 2007 +0200

Merge branch '0.6.0' of git+ssh://[EMAIL 
PROTECTED]/git/fusion/compizconfig/compizconfig-backend-gconf into 0.6.0

commit 93010e3d90e37b8d70ff54beb0b6644adf5b01f2
Author: Danny Baumann [EMAIL PROTECTED]
Date:   Wed Sep 19 11:45:23 2007 +0200

Remove cruft.

commit 4526d21825f0bef28debf8389bf3817f953e704e
Author: Kristian Lyngstøl [EMAIL PROTECTED](none)
Date:   Tue Sep 18 20:32:51 2007 +0200

Ignore num_workspaces (Patch by Mirco Müller)

commit dad3ce8445c53e78becfe6dca1fe8e6b5caa291e
Author: Danny Baumann [EMAIL PROTECTED]
Date:   Sat Sep 8 14:12:17 2007 +0200

Integrate visual_bell and fullscreen_visual_bell options of the fade plugin.

commit cc68d92248a3e1dba56a937d419ec6f7c14a36e1
Author: Dennis Kasprzyk [EMAIL PROTECTED]
Date:   Sun Sep 2 22:34:44 2007 +0200

Support empty lists.

commit 4bf472de6895f100dba2e1bb7b361f4223bb0fd1
Merge: 192eb0d21f38f58c3a90145a06dcfd72f594f538 
91d3d635fff6c268a8ac34ea1627be5fbc578918
Author: Danny Baumann [EMAIL PROTECTED]
Date:   Tue Aug 14 14:08:47 2007 +0200

Merge branch 'master' of git+ssh://[EMAIL 
PROTECTED]/git/fusion/compizconfig/compizconfig-backend-gconf

commit 192eb0d21f38f58c3a90145a06dcfd72f594f538
Author: Danny Baumann [EMAIL PROTECTED]
Date:   Tue Aug 14 14:08:14 2007 +0200

Integrate current_viewport option of thumbnail.

commit 91d3d635fff6c268a8ac34ea1627be5fbc578918
Merge: 410e847d35ba53c8f8e646cf82e4c26a7e07940b 
c75ac33698cb46fe11938ed1a215b58353ec3415
Author: Danny Baumann [EMAIL PROTECTED]
Date:   Tue Aug 14 11:23:58 2007 +0200

Merge branch 'master' of git+ssh://[EMAIL 
PROTECTED]/git/fusion/compizconfig/compizconfig-backend-gconf

commit 410e847d35ba53c8f8e646cf82e4c26a7e07940b
Author: Danny Baumann [EMAIL PROTECTED]
Date:   Tue Aug 14 11:23:24 2007 +0200

Add VERSION to EXTRA_DIST.

commit c75ac33698cb46fe11938ed1a215b58353ec3415
Author: Danny Baumann [EMAIL PROTECTED]
Date:   Tue Aug 14 11:18:40 2007 +0200

Add VERSION to EXTRA_DIST.

commit 2d9442d1d2a36ec270a3cf13bd6b0187a077d9f7
Author: Danny Baumann [EMAIL PROTECTED]
Date:   Tue Aug 14 07:35:03 2007 +0200

gotovp - vpswitch

commit 8492139098e012f7b5ff587e7145ebd115639c72
Author: Danny Baumann [EMAIL PROTECTED]
Date:   Mon Aug 13 18:42:04 2007 +0200

Loop through all integrated options on Gconf value change notification to 
re-read all integrated options if multiple compiz options are integrated with a 
single metacity option.

commit c58a7d20b24fb07cfe7ecafd92eb3dd1fedb3353
Author: Danny Baumann [EMAIL PROTECTED]
Date:   Mon Aug 13 18:28:56 2007 +0200

Integrate gotovp bindings.

commit 16a98e0c14653c68147f1fbd26c2f1c864027815
Author: Danny Baumann [EMAIL PROTECTED]
Date:   Mon Aug 13 18:27:12 2007 +0200

Revert Use gotovp to integrate Metacity's switch_to_workspace_x bindings.

This reverts commit b1a761184b4fde669534b844f4926a2e19855eeb.

commit b1a761184b4fde669534b844f4926a2e19855eeb
Author: Danny Baumann [EMAIL PROTECTED]
Date:   Mon Aug 13 18:18:57 2007 +0200

Use gotovp to integrate Metacity's switch_to_workspace_x bindings.

commit ef05475b656049ef12182adce46b0dae476b951c
Author: Danny Baumann [EMAIL PROTECTED]
Date:   Mon