--- metacity-2.18.2.orig/debian/control +++ metacity-2.18.2/debian/control @@ -0,0 +1,63 @@ +Source: metacity +Section: x11 +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Marco Cabizza +Uploaders: Debian GNOME Maintainers , Andrew Lau , Clément Stenac , Dafydd Harries , Guilherme de S. Pastore , Gustavo Franco , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Kilian Krause , Loic Minier , Marc 'HE' Brockschmidt , Marco Cabizza , Oystein Gisnas , Ondřej Surý , Ross Burton , Sebastien Bacher , Sjoerd Simons +Build-Depends: cdbs (>= 0.4.37), debhelper (>= 4.1.0), gettext, libgtk2.0-dev (>= 2.10.0-1), liborbit2-dev (>= 1:2.10.2-1.1), libpopt-dev, libxml2-dev (>= 2.4.23), libgconf2-dev (>= 2.6.1-2), libglade2-dev (>= 2.4.0-1), libice-dev, libsm-dev, libx11-dev, libxt-dev, libxext-dev, libxrandr-dev, x11proto-core-dev, libxinerama-dev, libstartup-notification0-dev (>= 0.7), libxml-parser-perl, gnome-pkg-tools (>= 0.6), dpkg-dev (>= 1.13.19) +Standards-Version: 3.7.2 + +Package: libmetacity0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, metacity-common (>= ${gnome:Version}), metacity-common (<< ${gnome:NextVersion}) +Description: library of lightweight GTK2 based Window Manager + Metacity is a small window manager, using gtk2 to do everything. + . + As the author says, metacity is a "Boring window manager for the adult in + you. Many window managers are like Marshmallow Froot Loops; Metacity is + like Cheerios." + . + This package contains the shared library. + +Package: metacity +Section: x11 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, metacity-common (>= ${gnome:Version}), metacity-common (<< ${gnome:NextVersion}) +Provides: x-window-manager +Suggests: gnome-control-center (>= 1:2.5.4) +Description: A lightweight GTK2 based Window Manager + Metacity is a small window manager, using gtk2 to do everything. + . + As the author says, metacity is a "Boring window manager for the adult in + you. Many window managers are like Marshmallow Froot Loops; Metacity is + like Cheerios." + . + This package contains the core binaries. + +Package: metacity-common +Section: misc +Architecture: all +Depends: ${misc:Depends} +Conflicts: metacity (<< 1:2.12.3-1) +Description: Shared files of lightweight GTK2 based Window Manager + Metacity is a small window manager, using gtk2 to do everything. + . + As the author says, metacity is a "Boring window manager for the adult in + you. Many window managers are like Marshmallow Froot Loops; Metacity is + like Cheerios." + . + This package contains the shared files. + +Package: libmetacity-dev +Section: libdevel +Architecture: any +Depends: libmetacity0 (= ${binary:Version}), libgtk2.0-dev (>= 2.4) +Description: Development files of lightweight GTK2 based Window Manager + Metacity is a small window manager, using gtk2 to do everything. + . + As the author says, metacity is a "Boring window manager for the adult in + you. Many window managers are like Marshmallow Froot Loops; Metacity is + like Cheerios." + . + This package contains the development files. --- metacity-2.18.2.orig/debian/changelog +++ metacity-2.18.2/debian/changelog @@ -0,0 +1,767 @@ +metacity (1:2.18.2-0ubuntu1) feisty; urgency=low + + * New upstream version: + - This release fixes a bug with missing pixels in themes with rounded + corners. (Ubuntu: #83847) + + -- Sebastien Bacher Mon, 9 Apr 2007 10:49:07 +0200 + +metacity (1:2.18.1-0ubuntu1) feisty; urgency=low + + * New upstream version: + This release fixes a bug breaking some QT apps (thanks to Bradley + Hughes for a good test case and lots of patience) a hang with gtk + trunk (not that we expect many to use stable tarball releases of + metacity and bleeding edge versions of gtk together), and a couple + other odds and ends. + - prevent nasty metacity/gdk interactions causing hangs with gtk trunk + - avoid some crashes when dragging windows partially offscreen + - avoid mousenav vs. keynav focus problems with the run application + dialog in mouse/sloppy focus modes + - send synthetic configure notify events in response to appropriate + MapRequest events too + * debian/patches/007_from_bugzilla_fix_edge_resistance_crasher.patch: + - dropped, integrated upstream now + + -- Sebastien Bacher Sun, 8 Apr 2007 16:48:39 +0200 + +metacity (1:2.18.0-0ubuntu1) feisty; urgency=low + + * New upstream version: + - Only change in this release was updated translations. + + -- Sebastien Bacher Tue, 13 Mar 2007 11:03:40 +0100 + +metacity (1:2.17.8-0ubuntu1) feisty; urgency=low + + * New upstream version: + - Change icon in the "kill window" dialog because the old + one was removed from GNOME + - refactor the code which handles mouse events on the title bar + - Add MAINTAINERS to EXTRA_DIST + * debian/control.in: + - package maintained by the Ubuntu Desktop Team + + -- Sebastien Bacher Tue, 27 Feb 2007 11:46:52 +0100 + +metacity (1:2.17.5-0ubuntu1) feisty; urgency=low + + * New upstream release: + - make window menu arrangement more sensible. + - unmaximise button keeps pressed appearance when moved off and back. + - fix a couple of compositor crashes + - new environment variables checked if the compositor is enabled; see the + new file doc/compositor-control.txt for details. + * debian/control.in: + - dropped one of the duplicate Build-Depends libxinerama-dev + + -- Daniel Holbach Thu, 18 Jan 2007 14:51:25 +0100 + +metacity (1:2.17.3-0ubuntu1) feisty; urgency=low + + * Sync with Debian + * New upstream version: + - fix longstanding problem about windows flickering in and out of + maximised state when dragging between xineramas + - grab server when switching workspaces + - replace changing text on window menu with pairs of radio buttons + and checkboxes + * debian/metacity-common.gconf-defaults: + - set the default number of workspaces to 2 + * debian/patches/001_strict_focus.patch: + - strict focus mode + * debian/patches/003_workspaces_default_name.patch: + - use "Desk" instead of "Workspace" for default workspaces naming + * debian/patches/006_raise_on_click_for_click_mode.patch: + - use the raise_on_click option instead of forcing the behaviour for + that mode + * debian/patches/007_from_bugzilla_fix_edge_resistance_crasher.patch: + - patch from http://bugzilla.gnome.org/show_bug.cgi?id=353513 to fix + a crasher to edge resistance code (Ubuntu: #64009) + + -- Sebastien Bacher Mon, 11 Dec 2006 10:20:55 +0100 + +metacity (1:2.16.3-1) experimental; urgency=low + + [ Marco Cabizza ] + * New upstream release. + + [ Loic Minier ] + * Merge 1:2.14.5-2. + + [ Josselin Mouette ] + * Use ${gnome:Version} and ${gnome:NextVersion} to loosen the + dependencies. + * Build-depend on gnome-pkg-tools 0.6. + * Call gnome-version.mk. + * Replace the x-dev build-dependency by x11proto-core-dev. + + -- Josselin Mouette Tue, 21 Nov 2006 20:50:05 +0100 + +metacity (1:2.16.2-1) experimental; urgency=low + + * New upstream release, with backwards incompatible changes in internal API. + + -- Loic Minier Mon, 25 Sep 2006 17:47:56 +0200 + +metacity (1:2.16.1-1) experimental; urgency=low + + [ Loïc Minier ] + * Remove superfluous dh_installcatalogs call and bump cdbs build-dep to + >= 0.4.37, thanks Peter Eisentraut. (Closes: #361156) + [debian/control, debian/control.in, debian/rules] + * Don't mention non-existing Info documentation in the metacity and + metacity-message man pages, thanks Piotr Engelking. (Closes: #365450) + [debian/metacity.1, debian/metacity-message.1] + * Fix watch file. + + [ Marco Cabizza ] + * New upstream release, target experimental: + - Bumping up libgtk2.0-dev build-dep to 2.10 + * Setting myself as the maintainer. + + -- Marco Cabizza Wed, 13 Sep 2006 18:46:45 +0200 + +metacity (1:2.14.5-2) unstable; urgency=low + + * Remove superfluous dh_installcatalogs call and bump cdbs build-dep to + >= 0.4.37, thanks Peter Eisentraut. (Closes: #361156) + [debian/control, debian/control.in, debian/rules] + * Don't mention non-existing Info documentation in the metacity and + metacity-message man pages, thanks Piotr Engelking. (Closes: #365450) + [debian/metacity.1, debian/metacity-message.1] + * Fix watch file. + * Fix typo in debian/metacity-message.1; thanks Per Bojsen; closes: #397864. + + -- Loic Minier Fri, 10 Nov 2006 09:38:49 +0100 + +metacity (1:2.14.5-1) unstable; urgency=low + + * New upstream release. + + -- Loic Minier Tue, 30 May 2006 15:47:36 +0200 + +metacity (1:2.14.3-1) unstable; urgency=low + + [ Gustavo Noronha Silva ] + * New upstream release. + + Doesn't steal focus (closes: #361273). + + [ Josselin Mouette ] + * Make the package binNMU-safe. + + Build-depend on dpkg-dev 1.13.19. + + Use ${source:Version} and ${binary:Version}. + * Standards version is 3.7.2. + * Bump shlibs version to 2.14. + + [ Loic Minier ] + * Stop shipping /usr/lib/*.la files in libmetacity-dev. + [debian/libmetacity-dev.install] + + -- Josselin Mouette Sun, 14 May 2006 23:30:56 +0200 + +metacity (1:2.14.1-2) unstable; urgency=low + + * Simple rebuild to get rid of references to Xcursor.la / Xrender.la. + + -- Loic Minier Tue, 2 May 2006 16:45:22 +0200 + +metacity (1:2.14.1-1) unstable; urgency=low + + * New upstram version. + * Adds edge resistance. Closes: #191649. + * patches/000_raise-on-click.patch: Fixed upstream; dropped. + + -- Dafydd Harries Thu, 30 Mar 2006 19:50:23 +0100 + +metacity (1:2.12.3-3) unstable; urgency=low + + * Also explicitely remove catalogs installed by past metacity packages. + [debian/metacity-common.preinst] + * Move these clenaups to postinst. + [debian/metacity-common.preinst, debian/metacity-common.postinst] + + -- Loic Minier Sun, 12 Feb 2006 16:53:48 +0100 + +metacity (1:2.12.3-2) unstable; urgency=low + + * Clean up metacity's postinst. + [debian/metacity.postinst] + * Clean up /etc/sgml/metacity.cat and .old left over by metacity. + [debian/metacity-common.preinst] + + -- Loic Minier Sun, 12 Feb 2006 16:35:07 +0100 + +metacity (1:2.12.3-1) unstable; urgency=low + + * New upstream release. + * Update patch to support a new raise on click mode and choice of this mode + to apply without fuzz. Also note this patch has been rejected upstream. + [debian/patches/000_raise-on-click.patch] + * New metacity-common package holds arch-independent files and registers + schemas. (Closes: #218365, #234665, #240211) + [debian/metacity.dirs, debian/metacity-common.links, + debian/metacity.install, debian/control, debian/control.in, + debian/metacity-common.postinst, debian/metacity.catalog, + debian/metacity-common.manpages, debian/metacity.postrm, + debian/metacity-common.dirs, debian/metacity-common.install, + debian/metacity-common.catalog, debian/changelog, + debian/metacity-common.postrm, debian/rules, debian/metacity.links, + debian/metacity.postinst, debian/metacity.manpages] + * Actually ship license information. + [debian/copyright] + * Version the metacity and libmetacity dependency on metacity-common with + Source-Version. + [debian/control, debian/control.in] + * Install SGML catalogs with dh_installcatalogs, move them below + /usr/share/sgml/metacity-common, in the metacity-common package. + [debian/control, debian/control, debian/metacity-common.catalog, + debian/metacity-common.postinst, debian/metacity-common.postrm, + debian/metacity-common.sgmlcatalogs, debian/rules] + * Drop the /usr/share/metacity/dtd symlink. + [debian/metacity-common.links] + * Drop /usr/share/sgml/dtd creation. + [debian/metacity-common.dirs] + * Drop useless /usr/share/metacity from metacity-common. + [debian/metacity-common.install] + * Drop obsolete cleanup "rm -rf". + [debian/rules] + * Give .dtd installation to dh_install. + [debian/metacity-common.install, debian/rules] + + -- Loic Minier Sat, 11 Feb 2006 21:10:40 +0100 + +metacity (1:2.12.2-3) unstable; urgency=high + + * Add xorg build-deps (libice-dev, libsm-dev, libx11-dev, libxext-dev, + libxinerama-dev, libxrandr-dev, x-dev) thanks to "xlibs-split". + (Closes: #347000) + [debian/control, debian/control.in] + * Relibtoolizing would get Debian's AC_PATH_XTRA, but I add a libxt-dev + build-dep and pass --as-needed because the patch was like uh 1.1 MB. + [debian/control, debian/control.in, debian/rules] + + -- Loic Minier Mon, 9 Jan 2006 22:47:36 +0100 + +metacity (1:2.12.2-2) unstable; urgency=low + + * Upload to unstable. + + -- Josselin Mouette Sun, 8 Jan 2006 01:49:55 +0100 + +metacity (1:2.12.2-1) experimental; urgency=low + + * New upstream release. + + -- Jordi Mallach Sun, 25 Dec 2005 23:20:10 +0100 + +metacity (1:2.12.1-1) experimental; urgency=low + + * New upstream release. + * watch: update for 2.12. + * 000_raise-on-click.patch: update to make patch apply cleanly. + * rules: bump shlibs for new symbols. + + -- Josselin Mouette Sun, 9 Oct 2005 16:50:22 +0200 + +metacity (1:2.10.3-2) unstable; urgency=low + + * debian/control.in: + - don't Build-Depends on xlibs-pic, Build-Depend on libxinerama-dev + (Closes: #320589). + * debian/patches/000_metacity-debian-xinerama-pic.patch: + - not useful with xorg. + + -- Sebastien Bacher Tue, 2 Aug 2005 17:40:43 +0200 + +metacity (1:2.10.3-1) unstable; urgency=low + + * New upstream version. + * Bump Standards-Version to 3.6.2. + * Add CDBS' utils to rules. + + -- Loic Minier Fri, 29 Jul 2005 10:56:05 +0200 + +metacity (1:2.10.2-1) unstable; urgency=low + + * New upstream version. + + -- Sebastien Bacher Tue, 28 Jun 2005 23:09:14 +0200 + +metacity (1:2.10.1-2) unstable; urgency=low + + * Upload to unstable. + + -- Jordi Mallach Sun, 12 Jun 2005 19:03:18 +0200 + +metacity (1:2.10.1-1) experimental; urgency=low + + * New upstream version. + + -- Sebastien Bacher Wed, 13 Apr 2005 17:35:20 +0200 + +metacity (1:2.10.0-1) experimental; urgency=low + + * New upstream version. + * debian/patches/000_raise-on-click.patch: + - updated. + * debian/watch: + - updated. + + -- Sebastien Bacher Fri, 8 Apr 2005 21:33:44 +0200 + +metacity (1:2.8.8-1) unstable; urgency=low + + * GNOME team upload. + * New upstream release. + + -- Jordi Mallach Wed, 29 Dec 2004 17:18:05 +0100 + +metacity (1:2.8.6-1) unstable; urgency=low + + * New upstream release. + * Upload to unstable. + + -- Sebastien Bacher Thu, 18 Nov 2004 13:23:27 +0100 + +metacity (1:2.8.5-2) experimental; urgency=low + + * debian/metacity.postinst: + - removed the static gconf registration. + * debian/metacity-theme-viewer.1: + - manpage written by Jose M. Moya" (Closes: #252108). + * debian/metacity-window-demo.1: + - manpage written by Jose M. Moya" (Closes: #252110). + * debian/metacity.manpages: + - updated. + + -- Sebastien Bacher Fri, 17 Sep 2004 22:11:51 +0200 + +metacity (1:2.8.5-1) experimental; urgency=low + + * GNOME team upload. + * New upstream release. + * Sebastien Bacher: + - Switched to CDBS. + - debian/rules: converted to CDBS + - debian/*.files: replaced with .install files. + * J.H.M. Dassen (Ray): + - [debian/control.in] Bumped libstartup-notification0-dev as + configure requires 0.7. + * Jordi Mallach: + - debian/control.in: add cdbs to build-deps. + + -- Jordi Mallach Tue, 14 Sep 2004 20:30:36 +0200 + +metacity (1:2.8.1-4) unstable; urgency=low + + * debian/rules: + - added a dh_gconf call. + * debian/metacity.postinst: + - removed the static schemas registration, dh_gconf handles that right. + + -- Sebastien Bacher Fri, 6 Aug 2004 18:17:03 +0200 + +metacity (1:2.8.1-3) unstable; urgency=low + + * GNOME Team Upload. + * Upload in unstable. + + -- Sebastien Bacher Wed, 26 May 2004 14:28:32 +0200 + +metacity (1:2.8.1-2) experimental; urgency=low + + * debian/patches/000_raise-on-click.patch: + + patch from bugzilla to choose to raise or not the window which has + the focus in mouse and sloppy modes. (Closes: #228768). + The gconf key to use is /apps/metacity/general/raise_on_click. + * Gnome Team Upload. + + -- Sebastien Bacher Wed, 26 May 2004 14:19:51 +0200 + +metacity (1:2.8.1-1) experimental; urgency=low + + * New upstream release. + * debian/patches/000_metacity-debian-xinerama-pic.patch: + + updated + * GNOME Team Upload. + + -- Sebastien Bacher Wed, 5 May 2004 21:17:15 +0200 + +metacity (1:2.8.0-3) experimental; urgency=low + + * GNOME team upload. + * debian/rules: get the epoch included in the shlib version for + libmetacity0. + + -- Jordi Mallach Tue, 6 Apr 2004 14:04:36 +0200 + +metacity (1:2.8.0-2) experimental; urgency=low + + * Added Build-Depends on gnome-pkg-tools and libxml-parser-perl + (Closes: #240639). + + -- Sebastien Bacher Sat, 3 Apr 2004 23:46:56 +0200 + +metacity (1:2.8.0-1) experimental; urgency=low + + * New upstream release: + + converts "show desktop mode" to "all windows are minimized" when + you open a new window (Closes: #217467). + + fixes bug with panel not listed before clicking on them + (Closes: #224054). + + fixes multi-tab handling (Closes: #227708). + + includes always on top menu entry (Closes: #204212). + + includes wireframes support (Closes: #184849). + + should fix bug with applications changing workspace + (Closes: #224156, #230782). + + switches window truncates title (Closes: #186324). + * debian/control.in, debian/rules: + + adapted for the Gnome Team. + * debian/patches/000_metacity-debian-xinerama-pic.patch: + + updated. + * debian/patches/001_metacity-focus.patch: + + removed since the changes are included in the new version. + * debian/watch: + + updated to 2.8 branch. + + -- Sebastien Bacher Sun, 28 Mar 2004 12:26:22 +0200 + +metacity (1:2.6.3-2) unstable; urgency=low + + * debian/patches/001_metacity-focus.patch : + + new patch to fix focus problem with panels in mouse and sloppy modes + (Closes: #224858). + * Gnome Team Upload. + + -- Sebastien Bacher Sun, 18 Jan 2004 19:31:49 +0100 + +metacity (1:2.6.3-1) unstable; urgency=low + + * New upstream release. + * Gnome Team Upload. + + -- Sebastien Bacher Sat, 20 Dec 2003 23:17:21 +0100 + +metacity (1:2.6.2-2) unstable; urgency=low + + * debian/patches/000_metacity-debian-xinerama-pic.patch: + - updated to fix a link problem (Closes: #216693). + + -- Sebastien Bacher Tue, 21 Oct 2003 13:56:24 +0200 + +metacity (1:2.6.2-1) unstable; urgency=low + + * New upstream release. + * debian/patches/: + - 000_metacity-2.4.34-usage.patch: removed. + - 000_metacity-debian-xinerama-pic.patch: updated. + - 001_metacity-2.4.55-non-weak-symbols.patch: removed. + * Update Build-Depends. + * Gnome Team Upload. + + -- Sebastien Bacher Sat, 18 Oct 2003 19:33:23 +0200 + +metacity (1:2.4.55-3) unstable; urgency=low + + * debian/metacity.1: + - fixed the incorrect option. (closes: Bug#209159) + * debian/metacity.prerm: + - fixed removing alternatives issue. (closes: Bug#211502) + + -- Akira TAGOH Wed, 8 Oct 2003 18:44:56 +0900 + +metacity (1:2.4.55-2) unstable; urgency=low + + * debian/patches/000_metacity-debian-xinerama-pic.patch: + - update to fix the unnecessary library dependencies in .la. + (closes: Bug#195774) + + -- Akira TAGOH Thu, 12 Jun 2003 01:25:45 +0900 + +metacity (1:2.4.55-1) unstable; urgency=low + + * New upstream release. + * debian/patches/: + - 000_metacity-2.4.34-save-workspace.patch: removed. + - 001_metacity-2.4.55-non-weak-symbols.patch: updated. + + -- Akira TAGOH Mon, 2 Jun 2003 02:50:50 +0900 + +metacity (1:2.4.34-3) unstable; urgency=low + + * debian/control: + - suggests gnome-control-center instead of metacity-properties. + (closes: Bug#192752) + - bumped Standards-Version to 3.5.10.0. + * debian/patches/001_metacity-2.4.34-non-weak-symbols.patch: + - applied a backported patch to fix undefined non-weak symbols. + (closes: Bug#187347) + * debian/metacity.postinst: + - set a priority to 60 for x-window-manager according to the latest + policy. + + -- Akira TAGOH Mon, 19 May 2003 06:30:37 +0900 + +metacity (1:2.4.34-2) unstable; urgency=low + + * Revert to 2.4.34 to use stable release. + - should works now. (closes: Bug#187749, Bug#187387, Bug#187982) + * debian/README.Debian: + - described NVidia drivers issue. (closes: Bug#181056) + * debian/patches/: + - 000_metacity-2.4.34-usage.patch: applied it again. + - 000_metacity-2.4.34-save-workspace.patch: applied a backported patch + from CVS to really fix Bug#186033 in 2.4.34. + - 000_metacity-2.5.0-noframe-window.patch: removed. + + -- Akira TAGOH Mon, 14 Apr 2003 00:29:52 +0900 + +metacity (2.5.0-2) unstable; urgency=low + + * debian/patches/: + - 000_metacity-debian-xinerama-pic.patch: + use libXinerama_pic.a instead of libXinerama.a. + - 000_metacity-2.5.0-noframe-window.patch: + applied a backported patch from CVS to work no frame window. + (closes: Bug#187316) + * debian/control: + - requires xlibs-pic >= 4.2.1-6. + + -- Akira TAGOH Fri, 4 Apr 2003 04:26:49 +0900 + +metacity (2.5.0-1) unstable; urgency=low + + * New upsream release. + - Workspace names are saved now. (closes: Bug#186033) + * debian/control: + - bumped Standards-Version to 3.5.9. + - changed a section for libmetacity-dev to libdevel. + * debian/compat: + - use it instead of DH_COMPAT. + * debian/patches/ + - 000_metacity-2.4.34-usage.patch: removed. + + -- Akira TAGOH Wed, 2 Apr 2003 00:16:38 +0900 + +metacity (2.4.34-1) unstable; urgency=low + + * New upstream release. + - contains a fix of 64-bit bug. so should be fixed. (closes: Bug#179698) + - should be fixed. (closes: Bug#177814) + * debian/patches/000_metacity-2.4.34-usage.patch: + applied to fix a typo in usage. (closes: Bug#179699) + + -- Akira TAGOH Fri, 7 Feb 2003 04:38:32 +0900 + +metacity (2.4.21-2) unstable; urgency=low + + * debian/control: + - suggests metacity-properties instead of gnome-control-center. + * debian/metacity.docs: + - moved from libmetacity0. (closes: Bug#178966) + * debian/metacity.postinst: + - run gconftool-2 with HOME=/root + + -- Akira TAGOH Sun, 2 Feb 2003 16:50:02 +0900 + +metacity (2.4.21-1) unstable; urgency=low + + * New upstream release. + * debian/patches/: + - 000_metacity-2.4.13-args.patch: removed, because it was merged to the + upstream. + - 000_metacity-2.4.8-properties.patch: removed. + * debian/control: add Suggests: gnome-control-center. + * debian/rules: drop --enable-config-dialog. metacity-properties is + obsolete. use gnome-window-properties in gnome-control-center instead of. + + -- Akira TAGOH Wed, 29 Jan 2003 00:39:57 +0900 + +metacity (2.4.13-2) unstable; urgency=low + + * debian/docs: add NEWS file (closes: Bug#176317) + + -- Akira TAGOH Tue, 14 Jan 2003 23:15:48 +0900 + +metacity (2.4.13-1) unstable; urgency=low + + * New upstream release. + * debian/control: + - updated Build-Depends. + - add libgtk2.0-dev to Depends for libmetacity-dev + * debian/rules: enable startup-notification. + * debian/patches/: + - 000_metacity-2.4.8-dont-pass-NULL.patch: + removed. + - 000_metacity-2.4.13-args.patch: + applied to fix the working of configure options. + + -- Akira TAGOH Sat, 11 Jan 2003 07:06:24 +0900 + +metacity (2.4.8-4) unstable; urgency=low + + * upstream bug was closed. so it should be fixed. (closes: Bug#152075) + * debian/rules: don't use dh_installwm until it will supports the + registration of manpage as slave. + * debian/metacity.postinst: runs update-alternatives. (closes: Bug#175756) + * debian/metacity.prerm: runs update-alternatives. + + -- Akira TAGOH Thu, 9 Jan 2003 03:40:15 +0900 + +metacity (2.4.8-3) unstable; urgency=low + + * debian/metacity.postinst: + fix the wrong registration. (closes: Bug#173789, Bug#174358) + + -- Akira TAGOH Fri, 27 Dec 2002 05:01:25 +0900 + +metacity (2.4.8-2) unstable; urgency=low + + * debian/patches/000_metacity-2.4.8-dont-pass-NULL.patch: + applied to fix the segfault at startup. (closes: Bug#173594, Bug#173604) + + -- Akira TAGOH Fri, 20 Dec 2002 01:08:43 +0900 + +metacity (2.4.8-1) unstable; urgency=low + + * New upstream release. + * debian/patches/000_metacity-2.4.3-stack.patch: + removed, because this release contains it. + * debian/control: + - fix description-synopsis-ends-with-full-stop. + - add libmetacity0 and libmetacity-dev + * debian/rules: + - install metacity-theme.dtd as a sgml catalog. (closes: Bug#170041) + - build with --enable-config-dialog until we upload GNOME 2.2. + * debian/metacity.postinst: + - use gconftool-2 --get-default-source to get GCONF_CONFIG_SOURCE + - runs update-catalog. + * debian/patches/000_metacity-2.4.8-properties.patch: + applied to fix the missing file. + + -- Akira TAGOH Thu, 12 Dec 2002 09:21:35 +0900 + +metacity (2.4.3-2) unstable; urgency=low + + * debian/patches/000_metacity-2.4.3-stack.patch: backported to fix the + random crashes. (closes: Bug#168653) + + -- Akira TAGOH Wed, 13 Nov 2002 00:32:14 +0900 + +metacity (2.4.3-1) unstable; urgency=low + + * New upstream release. (closes: Bug#166919) + * debian/rules: support noopt option for DEB_BUILD_OPTIONS. + * debian/control: improve a description. Thanks stephen farrell. + + -- Akira TAGOH Thu, 7 Nov 2002 23:16:47 +0900 + +metacity (2.4.1-1) unstable; urgency=low + + * New upstream release. (closes: Bug#160535) + - Should be fixed. (closes: Bug#157995) + * Set a priority to 40 for x-window-manager according to Bug#155680. + (closes: Bug#155494) + * debian/metacity.1: updated. + * debian/metacity-message.1: added. + * debian/control: + - bumped Standards-Version to 3.5.7. + - updated Build-Depends. + + -- Akira TAGOH Sat, 14 Sep 2002 20:01:35 +0900 + +metacity (2.4.0-1) unstable; urgency=low + + * New upstream release. + - switching the workspaces should works now. (closes: Bug#151500) + * debian/control: update Build-Depends for libgtk2.0-dev. + + -- Akira TAGOH Fri, 9 Aug 2002 02:35:15 +0900 + +metacity (2.3.987-1) unstable; urgency=low + + * New upstream release. + * debian/control: add libglade2-dev to Build-Depends (closes: Bug#149489) + + -- Akira TAGOH Tue, 11 Jun 2002 14:38:06 +0900 + +metacity (2.3.610-1) unstable; urgency=low + + * New upstream release. + - Should be fixed in this release. (closes: Bug#146127) + + -- Akira TAGOH Wed, 5 Jun 2002 19:15:41 +0900 + +metacity (2.3.377-2) unstable; urgency=low + + * debian/docs: includes theme-format.txt (closes: Bug#147644) + + -- Akira TAGOH Tue, 21 May 2002 19:24:00 +0900 + +metacity (2.3.377-1) unstable; urgency=low + + * New upstream release. + + -- Akira TAGOH Tue, 21 May 2002 11:02:28 +0900 + +metacity (2.3.233-2) unstable; urgency=low + + * debian/control: fix the misleading description. (closes: Bug#145942) + + -- Akira TAGOH Tue, 7 May 2002 14:29:36 +0900 + +metacity (2.3.233-1) unstable; urgency=low + + * New upstream release. + + -- Akira TAGOH Sun, 5 May 2002 03:21:05 +0900 + +metacity (2.3.144-2) unstable; urgency=low + + * debian/control: Add Provides: x-window-manager. + + -- Akira TAGOH Fri, 3 May 2002 07:31:17 +0900 + +metacity (2.3.144-1) unstable; urgency=low + + * New upstream release. + - keybindings are configurable now. (closes: Bug#144657) + + -- Akira TAGOH Tue, 30 Apr 2002 03:32:36 +0900 + +metacity (2.3.89-1) unstable; urgency=low + + * New upstream release. + * debian/scripts/vars.build: fix bashism. + * debian/rules: add GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=yes to install + rule. + * debian/metacity.manpages: remove metacity-restart.1 entry. this command + no longer exists. + + -- Akira TAGOH Tue, 16 Apr 2002 21:35:19 +0900 + +metacity (2.3.55-1) unstable; urgency=low + + * I have taken over from Thom. + * New upstream release. + * Build against the latest libraries (closes: Bug#139215) + * debian/rules: + - support DEB_HOST_GNU_TYPE and DEB_BUILD_GNU_TYPE. + - support debug and nostrip options for DEB_BUILD_OPTIONS. + - copying the latest config.sub and config.guess. + + -- Akira TAGOH Tue, 26 Mar 2002 02:18:26 +0900 + +metacity (2.3.34-2) unstable; urgency=low + + * Added build-depend on docbook-to-man (Closes: #134433) + + -- Thom May Sun, 17 Feb 2002 20:14:28 +0000 + +metacity (2.3.34-1) unstable; urgency=low + + * Initial Release. (Closes: #107181) + + -- Thom May Sun, 10 Feb 2002 12:03:22 +0000 + --- metacity-2.18.2.orig/debian/metacity-message.1 +++ metacity-2.18.2/debian/metacity-message.1 @@ -0,0 +1,50 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH METACITY\-MESSAGE 1 "28 August 2002" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +METACITY\-MESSAGE \- a command to send a message to Metacity +.SH SYNOPSIS +.B METACITY\-MESSAGE +[restart|reload\-theme|enable\-keybindings|disable\-keybindings] +.SH DESCRIPTION +This manual page documents briefly the +.B metacity\-message\fP. +This manual page was written for the Debian distribution +because the original program does not have a manual page. +.PP +.\" TeX users may be more comfortable with the \fB\fP and +.\" \fI\fP escape sequences to invode bold face and italics, +.\" respectively. +\fBmetacity\-message\fP send a specified message to \fBmetacity\fP(1). +.SH OPTIONS +.TP +.B restart +Restart \fBmetacity\fP(1) which is running. +.TP +.B reload-theme +Reload a theme which is specified on gconf database. +.TP +.B enable-keybindings +Enable all of keybindings which is specified on gconf database. +.TP +.B disable-keybindings +Disable all of keybindings which is specified on gconf database. +.SH SEE ALSO +.BR metacity (1) +.SH AUTHOR +This manual page was written by Akira TAGOH , +for the Debian GNU/Linux system (but may be used by others). --- metacity-2.18.2.orig/debian/metacity.postinst +++ metacity-2.18.2/debian/metacity.postinst @@ -0,0 +1,26 @@ +#! /bin/sh + +set -e + +case "$1" in + configure) + # register the alternatives of x-window-manager manually + # because dh_installwm doesn't register manpage as slave yet. + update-alternatives --install /usr/bin/x-window-manager \ + x-window-manager /usr/bin/metacity 60 \ + --slave /usr/share/man/man1/x-window-manager.1.gz \ + x-window-manager.1.gz /usr/share/man/man1/metacity.1.gz + + ;; + abort-upgrade|abort-remove|abort-deconfigure) + ;; + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 + --- metacity-2.18.2.orig/debian/metacity.1 +++ metacity-2.18.2/debian/metacity.1 @@ -0,0 +1,53 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH METACITY 1 "19 August 2002" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +METACITY \- minimal GTK2 Window Manager +.SH SYNOPSIS +.B metacity +[\-\-sm\-disable] [\-\-sm\-save\-file=\fIFILENAME\fP] [\-\-display=\fIDISPLAY\fP] [\-\-replace] +.SH DESCRIPTION +This manual page documents briefly the +.B metacity\fP. +This manual page was written for the Debian distribution +because the original program does not have a manual page. +.PP +.\" TeX users may be more comfortable with the \fB\fP and +.\" \fI\fP escape sequences to invode bold face and italics, +.\" respectively. +\fBmetacity\fP is a minimal X window manager that tries to be as crack free as possible. It supports sloppy focussing and multiple desktops. +.SH OPTIONS +.TP +.B \-\-sm\-disable +Disable the session management. +.TP +.B \-\-sm\-save\-file=FILENAME +Save a session to \fIFILENAME\fP. +.TP +.B \-\-display=DISPLAY +Connect to X display \fIDISPLAY\fP. +.TP +.B \-\-replace +a window manager which is running is replaced by \fBmetacity\fP. +.TP +.B \-h, \-\-help +Show summary of options. +.SH SEE ALSO +.BR metacity-message (1) +.SH AUTHOR +This manual page was written by Akira TAGOH , +for the Debian GNU/Linux system (but may be used by others). The original manual page was written by Thom May . --- metacity-2.18.2.orig/debian/rules +++ metacity-2.18.2/debian/rules @@ -0,0 +1,17 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/utils.mk + +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk + +DEB_CONFIGURE_EXTRA_FLAGS += --enable-startup-notification=yes --enable-xsync=yes +DEB_DH_MAKESHLIBS_ARGS_libmetacity0 += -V 'libmetacity0 (>= 1:2.14)' +DEB_INSTALL_DOCS_metacity := doc/theme-format.txt + +# Compile options +DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-O1 -Wl,--as-needed" + --- metacity-2.18.2.orig/debian/watch +++ metacity-2.18.2/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://ftp.gnome.org/pub/GNOME/sources/metacity/([\d\.]+)[02468]/ metacity-(.*)\.tar\.gz debian uupdate --- metacity-2.18.2.orig/debian/libmetacity0.install +++ metacity-2.18.2/debian/libmetacity0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/lib*.so.* --- metacity-2.18.2.orig/debian/metacity.install +++ metacity-2.18.2/debian/metacity.install @@ -0,0 +1,2 @@ +debian/tmp/usr/bin/* +debian/tmp/usr/lib/metacity/* --- metacity-2.18.2.orig/debian/metacity-common.postinst +++ metacity-2.18.2/debian/metacity-common.postinst @@ -0,0 +1,12 @@ +#!/bin/sh -e + +# clean up old catalogs installed by the metacity package in the past +# (to be dropped after etch releases) +/usr/sbin/install-sgmlcatalog --quiet --remove metacity || true +/usr/sbin/update-catalog --quiet --remove --super /etc/sgml/metacity.cat || true +rm -f /etc/sgml/metacity.cat /etc/sgml/metacity.cat.old + +#DEBHELPER# + +exit 0 + --- metacity-2.18.2.orig/debian/metacity-common.manpages +++ metacity-2.18.2/debian/metacity-common.manpages @@ -0,0 +1,4 @@ +debian/metacity.1 +debian/metacity-message.1 +debian/metacity-theme-viewer.1 +debian/metacity-window-demo.1 --- metacity-2.18.2.orig/debian/libmetacity-dev.install +++ metacity-2.18.2/debian/libmetacity-dev.install @@ -0,0 +1,3 @@ +debian/tmp/usr/include/* +debian/tmp/usr/lib/lib*.{so,a} +debian/tmp/usr/lib/pkgconfig/*.pc --- metacity-2.18.2.orig/debian/metacity-common.catalog +++ metacity-2.18.2/debian/metacity-common.catalog @@ -0,0 +1,2 @@ +PUBLIC "-//MetacityTheme//DTD MetacityTheme 1.0//EN//XML" "metacity-theme.dtd" + --- metacity-2.18.2.orig/debian/metacity-common.install +++ metacity-2.18.2/debian/metacity-common.install @@ -0,0 +1,8 @@ +debian/tmp/etc +debian/tmp/usr/share/control-center-2.0/* +debian/tmp/usr/share/pixmaps/* +debian/tmp/usr/share/sgml/* +debian/tmp/usr/share/themes/* +debian/tmp/usr/share/gnome/* +debian/tmp/usr/share/locale/* +doc/metacity-theme.dtd usr/share/sgml/metacity-common --- metacity-2.18.2.orig/debian/compat +++ metacity-2.18.2/debian/compat @@ -0,0 +1 @@ +4 --- metacity-2.18.2.orig/debian/metacity-window-demo.1 +++ metacity-2.18.2/debian/metacity-window-demo.1 @@ -0,0 +1,25 @@ +.\" In .TH, FOO should be all caps, SECTION should be 1-8, maybe w/ subsection +.\" other parms are allowed: see man(7), man(1) +.\" +.\" Based on template provided by Tom Christiansen . +.\" +.TH METACITY-WINDOW-DEMO 1 "1 June 2004" +.SH NAME +metacity-window-demo \- demo of window features +.SH SYNOPSIS +.B metacity-window-demo +.SH DESCRIPTION +.\" Putting a newline after each sentence can generate better output. +This program demonstrates various kinds of windows that window +managers and window manager themes should handle. +.PP +Be sure to tear off the menu and toolbar, those are also a special +kind of window. +.SH AUTHOR +This manual page was written by Jose M. Moya , for +the Debian GNU/Linux system (but may be used by others). +.SH "SEE ALSO" +.\" Always quote multiple words for .SH +.BR x-window-manager (1), +.BR metacity (1), +.BR metacity-theme-viewer (1). --- metacity-2.18.2.orig/debian/metacity.menu +++ metacity-2.18.2/debian/metacity.menu @@ -0,0 +1,2 @@ +?package(metacity):needs="wm" section="WindowManagers"\ + title="Metacity" command="/usr/bin/metacity" --- metacity-2.18.2.orig/debian/README.Debian +++ metacity-2.18.2/debian/README.Debian @@ -0,0 +1,12 @@ +metacity for Debian +-------------------- + +NVidia drivers issue +===================== +Older X driver from NVidia causes a problem, like rendering is slow. it seems +to be fixed in 4349 for now. if you use the NVidia drivers older than that, +please update it. see Bug#181056 for more info. + + + -- Akira TAGOH , Fri, 04 Apr 2003 18:24:40 +0900 + --- metacity-2.18.2.orig/debian/control.in +++ metacity-2.18.2/debian/control.in @@ -0,0 +1,63 @@ +Source: metacity +Section: x11 +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Marco Cabizza +Uploaders: @GNOME_TEAM@ +Build-Depends: cdbs (>= 0.4.37), debhelper (>= 4.1.0), gettext, libgtk2.0-dev (>= 2.10.0-1), liborbit2-dev (>= 1:2.10.2-1.1), libpopt-dev, libxml2-dev (>= 2.4.23), libgconf2-dev (>= 2.6.1-2), libglade2-dev (>= 2.4.0-1), libice-dev, libsm-dev, libx11-dev, libxt-dev, libxext-dev, libxrandr-dev, x11proto-core-dev, libxinerama-dev, libstartup-notification0-dev (>= 0.7), libxml-parser-perl, gnome-pkg-tools (>= 0.6), dpkg-dev (>= 1.13.19) +Standards-Version: 3.7.2 + +Package: libmetacity0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, metacity-common (>= ${gnome:Version}), metacity-common (<< ${gnome:NextVersion}) +Description: library of lightweight GTK2 based Window Manager + Metacity is a small window manager, using gtk2 to do everything. + . + As the author says, metacity is a "Boring window manager for the adult in + you. Many window managers are like Marshmallow Froot Loops; Metacity is + like Cheerios." + . + This package contains the shared library. + +Package: metacity +Section: x11 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, metacity-common (>= ${gnome:Version}), metacity-common (<< ${gnome:NextVersion}) +Provides: x-window-manager +Suggests: gnome-control-center (>= 1:2.5.4) +Description: A lightweight GTK2 based Window Manager + Metacity is a small window manager, using gtk2 to do everything. + . + As the author says, metacity is a "Boring window manager for the adult in + you. Many window managers are like Marshmallow Froot Loops; Metacity is + like Cheerios." + . + This package contains the core binaries. + +Package: metacity-common +Section: misc +Architecture: all +Depends: ${misc:Depends} +Conflicts: metacity (<< 1:2.12.3-1) +Description: Shared files of lightweight GTK2 based Window Manager + Metacity is a small window manager, using gtk2 to do everything. + . + As the author says, metacity is a "Boring window manager for the adult in + you. Many window managers are like Marshmallow Froot Loops; Metacity is + like Cheerios." + . + This package contains the shared files. + +Package: libmetacity-dev +Section: libdevel +Architecture: any +Depends: libmetacity0 (= ${binary:Version}), libgtk2.0-dev (>= 2.4) +Description: Development files of lightweight GTK2 based Window Manager + Metacity is a small window manager, using gtk2 to do everything. + . + As the author says, metacity is a "Boring window manager for the adult in + you. Many window managers are like Marshmallow Froot Loops; Metacity is + like Cheerios." + . + This package contains the development files. --- metacity-2.18.2.orig/debian/metacity-common.sgmlcatalogs +++ metacity-2.18.2/debian/metacity-common.sgmlcatalogs @@ -0,0 +1 @@ +debian/metacity-common.catalog /usr/share/sgml/metacity-common/catalog --- metacity-2.18.2.orig/debian/metacity-theme-viewer.1 +++ metacity-2.18.2/debian/metacity-theme-viewer.1 @@ -0,0 +1,43 @@ +.\" In .TH, FOO should be all caps, SECTION should be 1-8, maybe w/ subsection +.\" other parms are allowed: see man(7), man(1) +.\" +.\" Based on template provided by Tom Christiansen . +.\" +.TH METACITY-THEME-VIEWER 1 "1 June 2004" +.SH NAME +metacity-theme-viewer \- view metacity themes +.SH SYNOPSIS +.B metacity-theme-viewer +[ +.I THEMENAME +] +.SH DESCRIPTION +.\" Putting a newline after each sentence can generate better output. +.B metacity-theme-viewer +allows you to preview any installed Metacity theme. +.PP +When designing a new Metacity theme, you can use +.B metacity-theme-viewer +to measure the performance of a window frame option, and to preview +the option. +.SH OPTIONS +.TP +.I THEMENAME +Name of the theme to be shown (\fIAtlanta\fR by default). +It is case-sensitive. +.SH FILES +.br +.nf +.TP +.I /usr/share/themes +system themes directory +.TP +.I /usr/share/themes/*/metacity-1/metacity-theme-1.xml +theme specification file +.SH AUTHOR +This manual page was written by Jose M. Moya , for +the Debian GNU/Linux system (but may be used by others). +.SH "SEE ALSO" +.\" Always quote multiple words for .SH +.BR metacity (1), +.BR metacity-window-demo (1). --- metacity-2.18.2.orig/debian/copyright +++ metacity-2.18.2/debian/copyright @@ -0,0 +1,26 @@ +This package was debianized by Thom May on +Sun, 10 Feb 2002 12:03:22 +0000. + +It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/metacity/ + +Upstream Author and Copyright Holder: Havoc Pennington - hp@redhat.com + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + --- metacity-2.18.2.orig/debian/metacity.prerm +++ metacity-2.18.2/debian/metacity.prerm @@ -0,0 +1,43 @@ +#! /bin/sh +# prerm script for #PACKAGE# +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `upgrade' +# * `failed-upgrade' +# * `remove' `in-favour' +# * `deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + remove) + update-alternatives --remove x-window-manager \ + /usr/bin/metacity + ;; + upgrade|deconfigure) +# install-info --quiet --remove /usr/info/#PACKAGE#.info.gz + ;; + failed-upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- metacity-2.18.2.orig/debian/metacity-common.gconf-defaults +++ metacity-2.18.2/debian/metacity-common.gconf-defaults @@ -0,0 +1 @@ +/apps/metacity/general/num_workspaces 2 --- metacity-2.18.2.orig/debian/patches/001_strict_focus.patch +++ metacity-2.18.2/debian/patches/001_strict_focus.patch @@ -0,0 +1,61 @@ +diff -Nur metacity-2.16.3/src/common.h metacity-2.16.3.new/src/common.h +--- metacity-2.16.3/src/common.h 2006-09-13 18:32:32.000000000 +0200 ++++ metacity-2.16.3.new/src/common.h 2006-10-03 11:59:54.000000000 +0200 +@@ -152,7 +152,8 @@ + { + META_FOCUS_MODE_CLICK, + META_FOCUS_MODE_SLOPPY, +- META_FOCUS_MODE_MOUSE ++ META_FOCUS_MODE_MOUSE, ++ META_FOCUS_MODE_STRICT + } MetaFocusMode; + + typedef enum +diff -Nur metacity-2.16.3/src/display.c metacity-2.16.3.new/src/display.c +--- metacity-2.16.3/src/display.c 2006-10-02 23:04:44.000000000 +0200 ++++ metacity-2.16.3.new/src/display.c 2006-10-03 12:00:28.000000000 +0200 +@@ -1845,6 +1845,7 @@ + { + switch (meta_prefs_get_focus_mode ()) + { ++ case META_FOCUS_MODE_STRICT: + case META_FOCUS_MODE_SLOPPY: + case META_FOCUS_MODE_MOUSE: + display->mouse_mode = TRUE; +diff -Nur metacity-2.16.3/src/prefs.c metacity-2.16.3.new/src/prefs.c +--- metacity-2.16.3/src/prefs.c 2006-08-21 21:06:25.000000000 +0200 ++++ metacity-2.16.3.new/src/prefs.c 2006-10-03 11:59:54.000000000 +0200 +@@ -1095,6 +1095,8 @@ + focus_mode = META_FOCUS_MODE_SLOPPY; + else if (g_ascii_strcasecmp (value, "mouse") == 0) + focus_mode = META_FOCUS_MODE_MOUSE; ++ else if (g_ascii_strcasecmp (value, "strict") == 0) ++ focus_mode = META_FOCUS_MODE_STRICT; + else + meta_warning (_("GConf key '%s' is set to an invalid value\n"), + KEY_FOCUS_MODE); +diff -Nur metacity-2.16.3/src/window.c metacity-2.16.3.new/src/window.c +--- metacity-2.16.3/src/window.c 2006-10-02 23:04:44.000000000 +0200 ++++ metacity-2.16.3.new/src/window.c 2006-10-03 11:59:54.000000000 +0200 +@@ -2072,7 +2072,7 @@ + if (window->showing_for_first_time) + { + window->showing_for_first_time = FALSE; +- if (takes_focus_on_map) ++ if (takes_focus_on_map && meta_prefs_get_focus_mode () != META_FOCUS_MODE_STRICT) + { + meta_window_focus (window, timestamp); + } +diff -Nur metacity-2.16.3/src/workspace.c metacity-2.16.3.new/src/workspace.c +--- metacity-2.16.3/src/workspace.c 2006-09-13 18:32:33.000000000 +0200 ++++ metacity-2.16.3.new/src/workspace.c 2006-10-03 11:59:54.000000000 +0200 +@@ -921,7 +921,8 @@ + } + else if (meta_prefs_get_focus_mode () == META_FOCUS_MODE_SLOPPY) + focus_ancestor_or_mru_window (workspace, not_this_one, timestamp); +- else if (meta_prefs_get_focus_mode () == META_FOCUS_MODE_MOUSE) ++ else if (meta_prefs_get_focus_mode () == META_FOCUS_MODE_MOUSE || ++ meta_prefs_get_focus_mode () == META_FOCUS_MODE_STRICT) + { + meta_topic (META_DEBUG_FOCUS, + "Setting focus to no_focus_window, since no valid " --- metacity-2.18.2.orig/debian/patches/006_raise_on_click_for_click_mode.patch +++ metacity-2.18.2/debian/patches/006_raise_on_click_for_click_mode.patch @@ -0,0 +1,15 @@ +diff -Nur metacity-2.16.2/src/prefs.c metacity-2.16.2.new/src/prefs.c +--- metacity-2.16.2/src/prefs.c 2006-09-30 15:09:06.000000000 +0200 ++++ metacity-2.16.2.new/src/prefs.c 2006-09-30 15:10:04.000000000 +0200 +@@ -1194,10 +1194,7 @@ + gboolean + meta_prefs_get_raise_on_click (void) + { +- /* Force raise_on_click on for click-to-focus, as requested by Havoc +- * in #326156. +- */ +- return raise_on_click || focus_mode == META_FOCUS_MODE_CLICK; ++ return raise_on_click; + } + + const char* --- metacity-2.18.2.orig/debian/patches/003_workspaces_default_name.patch +++ metacity-2.18.2/debian/patches/003_workspaces_default_name.patch @@ -0,0 +1,53 @@ +diff -Nur metacity-2.16.1/src/menu.c metacity-2.16.1.new/src/menu.c +--- metacity-2.16.1/src/menu.c 2006-08-27 23:49:44.000000000 +0200 ++++ metacity-2.16.1.new/src/menu.c 2006-09-11 22:34:12.000000000 +0200 +@@ -156,23 +156,23 @@ + g_assert (name != NULL); + + /* +- * If the name is of the form "Workspace x" where x is an unsigned ++ * If the name is of the form "Desk x" where x is an unsigned + * integer, insert a '_' before the number if it is less than 10 and + * return it + */ + number = 0; +- if (sscanf (name, _("Workspace %d"), &number) == 1) ++ if (sscanf (name, _("Desk %d"), &number) == 1) + { + char *new_name; + + /* +- * Above name is a pointer into the Workspace struct. Here we make ++ * Above name is a pointer into the Desk struct. Here we make + * a copy copy so we can have our wicked way with it. + */ + if (number == 10) +- new_name = g_strdup_printf (_("Workspace 1_0")); ++ new_name = g_strdup_printf (_("Desk 1_0")); + else +- new_name = g_strdup_printf (_("Workspace %s%d"), ++ new_name = g_strdup_printf (_("Desk %s%d"), + number < 10 ? "_" : "", + number); + return new_name; +diff -Nur metacity-2.16.1/src/prefs.c metacity-2.16.1.new/src/prefs.c +--- metacity-2.16.1/src/prefs.c 2006-09-11 22:32:51.000000000 +0200 ++++ metacity-2.16.1.new/src/prefs.c 2006-09-11 22:34:59.000000000 +0200 +@@ -2141,7 +2141,7 @@ + #else + int i; + for (i = 0; i < MAX_REASONABLE_WORKSPACES; i++) +- workspace_names[i] = g_strdup_printf (_("Workspace %d"), i + 1); ++ workspace_names[i] = g_strdup_printf (_("Desk %d"), i + 1); + + meta_topic (META_DEBUG_PREFS, + "Initialized workspace names\n"); +@@ -2676,7 +2676,7 @@ + /* use a default name */ + char *d; + +- d = g_strdup_printf (_("Workspace %d"), i + 1); ++ d = g_strdup_printf (_("Desk %d"), i + 1); + if (workspace_names[i] && strcmp (workspace_names[i], d) == 0) + { + g_free (d);