--- compizconfig-backend-gconf-0.8.4.orig/debian/rules +++ compizconfig-backend-gconf-0.8.4/debian/rules @@ -0,0 +1,8 @@ +#!/usr/bin/make -f + +DEB_DESTDIR := $(CURDIR)/debian/tmp/ + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + --- compizconfig-backend-gconf-0.8.4.orig/debian/install +++ compizconfig-backend-gconf-0.8.4/debian/install @@ -0,0 +1 @@ +usr/lib/compizconfig/backends/*.so --- compizconfig-backend-gconf-0.8.4.orig/debian/docs +++ compizconfig-backend-gconf-0.8.4/debian/docs @@ -0,0 +1,2 @@ +NEWS +AUTHORS --- compizconfig-backend-gconf-0.8.4.orig/debian/copyright +++ compizconfig-backend-gconf-0.8.4/debian/copyright @@ -0,0 +1,19 @@ +This package was debianized by Sean Finney . + +It was downloaded from git://anongit.compiz-fusion.org/fusion/compizconfig/compizconfig-backend-gconf + +Upstream Authors (Lead Developers, see AUTHORS for full list): + + Danny Baumann + David Reveman + Dennis Kasprzyk + Erkin Bahceci + Guillaume Seguin - iXce + Kristian Lyngstøl + +License: + + GPL, see `/usr/share/common-licenses/GPL' + +The Debian packaging is (C) 2007, sean finney and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. --- compizconfig-backend-gconf-0.8.4.orig/debian/watch +++ compizconfig-backend-gconf-0.8.4/debian/watch @@ -0,0 +1,4 @@ +version=3 +http://releases.compiz.org/([\d\.]+)[02468]/ compizconfig-backend-gconf-([\d\.]+)\.tar\.gz + + --- compizconfig-backend-gconf-0.8.4.orig/debian/gbp.conf +++ compizconfig-backend-gconf-0.8.4/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 --- compizconfig-backend-gconf-0.8.4.orig/debian/control +++ compizconfig-backend-gconf-0.8.4/debian/control @@ -0,0 +1,34 @@ +Source: compizconfig-backend-gconf +Priority: extra +Maintainer: Michael Vogt +Build-Depends: cdbs, + debhelper (>= 7), + autoconf, + automake1.9, + autotools-dev, + compiz-dev (>= 0.8.4), + intltool, + libcompizconfig0-dev (>= 0.8.4), + libglib2.0-dev, + libgconf2-dev, + libtool, + pkg-config, + libxslt1-dev, + libxml2-dev +Standards-Version: 3.9.0 +Section: x11 +Vcs-Bzr: http://bazaar.launchpad.net/~compiz/libcompizconfig-backend-gconf/ubuntu + +Package: compizconfig-backend-gconf +Architecture: any +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 + an easy and fun-to-use windowing environment, allowing use of the + graphics hardware to provide impressive effects, amazing speed and + unrivalled usefulness + . + This package provides the gconf-based configuration backend for the + compiz-fusion plugin system --- compizconfig-backend-gconf-0.8.4.orig/debian/changelog +++ compizconfig-backend-gconf-0.8.4/debian/changelog @@ -0,0 +1,91 @@ +compizconfig-backend-gconf (0.8.4-1ubuntu4) maverick; urgency=low + + * Bump dh compat to 7; bump debhelper build-dep; fixes FTBFS with old + dh_install behavior. + * Wrap build-deps and deps to get cleaner diffs. + * Bump Standards-Version to 3.9.0. + + -- Loïc Minier Mon, 19 Jul 2010 00:17:57 +0200 + +compizconfig-backend-gconf (0.8.4-1ubuntu3) maverick; urgency=low + + * Set DEB_DESTDIR := $(CURDIR)/debian/tmp/ explicitly so that we can + cherry-pick the files we really want to install in debian/*install; stip + debian/compizconfig-backend-gconf/ prefix from debian/install; fixes + installation into /debian at the root; LP: #605474. + + -- Loïc Minier Sun, 18 Jul 2010 21:46:10 +0200 + +compizconfig-backend-gconf (0.8.4-1ubuntu2) maverick; urgency=low + + * debian/patches/resize-with-right-button.patch: + - honor resize_with_right_button gconf key (LP: #207065) + Thanks to Guido Iribarren + * debian/control: + - build-depend on libcompizconfig0-dev to make it actually build + * debian/install: + - fix backend install file + + -- Michael Vogt Thu, 08 Jul 2010 17:48:57 +0200 + +compizconfig-backend-gconf (0.8.4-1ubuntu1) maverick; urgency=low + + * Merge with Debian unstable, remaining Ubuntu changes: + * debian/control: + - Build-depend on cdbs + - Add Vcs-Bzr link + * debian/rules: + - Use CDBS + * debian/patches/02_debug.patch: + - Better debug output for invalid values + * debian/watch: + - Add watch file + + -- Robert Ancell Thu, 17 Jun 2010 16:33:36 +1000 + +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 Thu, 11 Feb 2010 21:52:41 +0100 + +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 Sun, 05 Apr 2009 22:27:13 +0200 + +compizconfig-backend-gconf (0.7.6-1) unstable; urgency=low + + * New upstream release. + + -- Sean Finney 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 + + -- Sean Finney Tue, 20 May 2008 19:17:00 +0200 + +compizconfig-backend-gconf (0.7.4-1) unstable; urgency=low + + * New upstream release. + * 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 Mon, 19 May 2008 21:17:54 +0200 + +compizconfig-backend-gconf (0.6.0-1) unstable; urgency=low + + * Initial release. + + -- Sean Finney Sun, 11 Nov 2007 18:37:21 +0100 --- compizconfig-backend-gconf-0.8.4.orig/debian/compat +++ compizconfig-backend-gconf-0.8.4/debian/compat @@ -0,0 +1 @@ +7 --- compizconfig-backend-gconf-0.8.4.orig/debian/patches/02_debug.patch +++ compizconfig-backend-gconf-0.8.4/debian/patches/02_debug.patch @@ -0,0 +1,29 @@ +Description: Better debug output for invalid values +Author: Michael Vogt + +diff --git a/settings-backend/gconf.c b/settings-backend/gconf.c +index 8d104b3..ca1ee7a 100644 +--- a/settings-backend/gconf.c ++++ b/settings-backend/gconf.c +@@ -1287,8 +1287,8 @@ readOption (CCSSetting * setting) + ret = readListValue (setting, gconfValue); + break; + default: +- printf("GConf backend: attempt to read unsupported setting type %d!\n", +- setting->type); ++ printf("GConf backend: attempt to read unsupported setting type %d from path %s!\n", ++ setting->type, pathName); + break; + } + +@@ -1388,8 +1388,8 @@ writeListValue (CCSSetting *setting, + } + break; + default: +- printf("GConf backend: attempt to write unsupported list type %d!\n", +- setting->info.forList.listType); ++ printf("GConf backend: attempt to write unsupported list type %d at path %s!\n", ++ setting->info.forList.listType, pathName); + valueType = GCONF_VALUE_INVALID; + break; + } --- compizconfig-backend-gconf-0.8.4.orig/debian/patches/resize-with-right-button.patch +++ compizconfig-backend-gconf-0.8.4/debian/patches/resize-with-right-button.patch @@ -0,0 +1,117 @@ +# http://cgit.compiz.org/compiz/compizconfig/compizconfig-backend-gconf/commit/?id=74c3fd404f0879b5d36c1167d0b43986d949fad4 +--- settings-backend/gconf.c.original 2010-03-01 19:06:50.807311482 -0300 ++++ settings-backend/gconf.c 2010-03-02 01:48:05.239345108 -0300 +@@ -166,6 +166,9 @@ + METACITY "/window_keybindings/activate_window_menu", OptionSpecial}, + {"mouse_button_modifier", NULL, FALSE, + METACITY "/general/mouse_button_modifier", OptionSpecial}, ++ /* integration of the new Metacity's option to swap mouse buttons */ ++ {"resize_with_right_button", NULL, FALSE, ++ METACITY "/general/resize_with_right_button", OptionSpecial}, + + {"visual_bell", "fade", TRUE, + METACITY "/general/visual_bell", OptionBool}, +@@ -544,8 +547,10 @@ + if (num < 0) + break; + +- if (strcmp (specialOptions[num].settingName, +- "mouse_button_modifier") == 0) ++ if ((strcmp (specialOptions[num].settingName, ++ "mouse_button_modifier") == 0) || ++ (strcmp (specialOptions[num].settingName, ++ "resize_with_right_button") == 0)) + { + CCSSetting *s; + +@@ -955,6 +960,27 @@ + return modMask; + } + ++static unsigned int ++getButtonBindingForSetting (CCSContext *context, ++ const char *plugin, ++ const char *setting) ++{ ++ CCSSetting *s; ++ CCSSettingButtonValue value; ++ ++ s = findDisplaySettingForPlugin (context, (char*) plugin, (char*) setting); ++ if (!s) ++ return 0; ++ ++ if (s->type != TypeButton) ++ return 0; ++ ++ value = s->value->value.asButton; ++ ++ return value.button; ++} ++ ++ + static Bool + readIntegratedOption (CCSContext *context, + CCSSetting *setting, +@@ -1086,15 +1112,21 @@ + ((strcmp (settingName, "window_menu_button") == 0) && + (strcmp (pluginName, "core") == 0))) + { ++ gboolean resizeWithRightButton; + CCSSettingButtonValue button; + memset (&button, 0, sizeof (CCSSettingButtonValue)); + ccsGetButton (setting, &button); + + button.buttonModMask = getGnomeMouseButtonModifier (); ++ ++ resizeWithRightButton = gconf_client_get_bool (client, ++ METACITY "/general/resize_with_right_button", ++ &err); ++ + if (strcmp (settingName, "window_menu_button") == 0) +- button.button = 3; ++ button.button = resizeWithRightButton ? 2 : 3; + else if (strcmp (pluginName, "resize") == 0) +- button.button = 2; ++ button.button = resizeWithRightButton ? 3 : 2; + else + button.button = 1; + +@@ -1611,6 +1643,24 @@ + (strcmp (pluginName, "core") == 0))) + { + unsigned int modMask; ++ Bool resizeWithRightButton = FALSE; ++ gboolean currentValue; ++ ++ if (( getButtonBindingForSetting (context, "resize", "initiate_button") == 3 ) || ++ ( getButtonBindingForSetting (context, "core", "window_menu_button") == 2 )) ++ { ++ resizeWithRightButton = TRUE; ++ } ++ ++ currentValue = gconf_client_get_bool (client, ++ METACITY "/general/resize_with_right_button", ++ &err); ++ ++ if (!err && ((currentValue && !resizeWithRightButton) || ++ (!currentValue && resizeWithRightButton))) ++ gconf_client_set_bool (client, ++ METACITY "/general/resize_with_right_button", ++ resizeWithRightButton, NULL); + + modMask = setting->value->value.asButton.buttonModMask; + if (setGnomeMouseButtonModifier (modMask)) +@@ -1618,10 +1668,11 @@ + setButtonBindingForSetting (context, "move", + "initiate_button", 1, modMask); + setButtonBindingForSetting (context, "resize", +- "initiate_button", 2, modMask); ++ "initiate_button", ++ resizeWithRightButton ? 3 : 2, modMask); + setButtonBindingForSetting (context, "core", + "window_menu_button", +- 3, modMask); ++ resizeWithRightButton ? 2 : 3, modMask); + } + } + }