--- awn-extras-applets-0.2.6.orig/debian/watch +++ awn-extras-applets-0.2.6/debian/watch @@ -0,0 +1,2 @@ +version=3 +https://launchpad.net/awn-extras/+download http://launchpad.net/awn-extras/.*/awn-extras-applets-(.+).tar.gz --- awn-extras-applets-0.2.6.orig/debian/rules +++ awn-extras-applets-0.2.6/debian/rules @@ -0,0 +1,25 @@ +#!/usr/bin/make -f +DEB_DH_INSTALL_SOURCEDIR=debian/tmp + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +DEB_CONFIGURE_EXTRA_FLAGS += --disable-pymod-checks + +DEB_DH_MAKESHLIBS_ARGS_awn-applets-c-extras += -n + +binary-install/python-libawn-extras:: + dh_pycentral -ppython-libawn-extras + +binary-install/python-awnlib:: + dh_pycentral -ppython-awnlib + +binary-install/awn-applets-python-core:: + dh_pycentral -pawn-applets-python-core + +binary-install/awn-applets-python-extras:: + dh_pycentral -pawn-applets-python-extras + +binary-install/python-awn-extras:: + dh_pycentral -ppython-awn-extras --- awn-extras-applets-0.2.6.orig/debian/copyright +++ awn-extras-applets-0.2.6/debian/copyright @@ -0,0 +1,511 @@ +This package was debianized by Julien Lavergne on +Sat, 1 Nov 2007 23:36:52 +0200. + +It was downloaded from https://launchpad.net/awn-extras + +Upstream Authors: + + Neil J. Patel + Nicolas de BONFILS + Rodney Cryderman + Mike (mosburger) Desjardins + Randal Barlow + Timon David Ter Braak + Mehdi Abaakouk + Richard "nazrat" Beyer + Jeff "Jawbreaker" Hubbard + Rodney Cryderman + +Copyright: + Copyright (C) 2007 Neil Jagdish Patel + Copyright (C) 2006 Christian Hammond + Copyright (C) 2005 John (J5) Palmieri + Copyright (c) 2007 Mike (mosburger) Desjardins + Copyright (c) 2007 Rodney Cryderman + Copyright (C) 2004, 2005 Jody Goldberg (jody@gnome.org) + Copyright (c) 2007 Randal Barlow + Copyright (c) 2007 Timon David Ter Braak + Copyright (C) 2002 Anders Carlsson + Copyright (c) 2006 Mehdi Abaakouk + Copyright (c) 2004 Michiel Sikkes , + Copyright (c) 2004 Emmanuele Bassi + Copyright (C) 1999, 2000, 2001 Eazel, Inc. + Copyright (C) 2004 Canonical Ltd. + Copyright (C) 2002 Sun Microsystems Inc. + Copyright (c) 1997-2002 Alfredo K. Kojima + Copyright (c) 2007 Richard "nazrat" Beyer + Copyright (c) 2007 Jeff "Jawbreaker" Hubbard + Copyright (c) 2007 Nicolas de BONFILS + Copyright (C) 2006 Christian Hammond + Copyright (c) 2007 Aantn + Copyright (C) 2006 Google Inc. + Copyright (c) 2008 sharkbaitbobby + Copyright (c) 2007 Tomas Kramar (kramar.tomas@gmail.com), + Jonathan Rauprich (joni@noplu.de) + Copyright (C) 2004, 2005 Jody Goldberg (jody@gnome.org) + Copyright (C) 2001-2002 Open Source Telecom Corporation. + Copyright (c) 2007, 2008 Mark Lee + Copyright 2007 Pavel Panchekha + Copyright (c) 2007 Arvind Ganga + Copyright 2007 Isaac J. + Copyright (C) 2002 Red Hat, Inc. + Copyright (c) 2004 James M. Cape + Copyright (C) 2007 John Stowers + +The Oxygen Icon Theme (in battery-applet/icons) + Copyright (C) 2007 David Vignoni + Copyright (C) 2007 Johann Ollivier Lapeyre + Copyright (C) 2007 Kenneth Wimer + Copyright (C) 2007 Nuno Fernades Pinheiro + Copyright (C) 2007 Riccardo Iaconelli + Copyright (C) 2007 David Miller + + +Licence for applets and folders arss + awnsystemmonitor + awnterm + battery-applet + cairo-menu + cairo-menu-classic + calendar + filebrowser + file-browser-launcher + lastfm + libawn-extras + main-menu + media-control + media-icon-* + MiMenu + mount-applet + notification-area + places + plugger + python-test + quit-applet + separator + shiny-switcher + stack + switcher + trash + trasher + weather + wobblyzini +and files: + trash/applet.c + src/affinity/eggaccelerators.* + src/affinity/egg-pixbuf-thumbnail.* + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the + Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + MA 02110-1301, USA. + + See also /usr/share/common-licenses/LGPL-2 + +Licence for src/calendar/google/ + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + See also /usr/share/common-licenses/Apache-2.0 for the complete licence. + + +Licence for volume-control/Themes/Black is Creative Commons Attribution-Share +Alike 3.0 License. + + See below for the complete licence. + + +License (for others files): + + This program 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, or (at your option) + any later version. + + This program 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 program; if not, write to the Free Software + Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + MA 02110-1301, USA. + + See also /usr/share/common-licenses/GPL-2 or COPYING + +The Debian packaging is (C) 2007, Julien Lavergne +and is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'. + +===================COMPLETE LICENCES============================== + +Creative Commons Attribution-Share Alike 3.0 License. + + THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE + COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY + COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS + AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. + + BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO + BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE + CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED + HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. + + 1. Definitions + + 1. "Adaptation" means a work based upon the Work, or upon the Work and other + pre-existing works, such as a translation, adaptation, derivative work, + arrangement of music or other alterations of a literary or artistic work, or + phonogram or performance and includes cinematographic adaptations or any + other form in which the Work may be recast, transformed, or adapted + including in any form recognizably derived from the original, except that a + work that constitutes a Collection will not be considered an Adaptation for + the purpose of this License. For the avoidance of doubt, where the Work is a + musical work, performance or phonogram, the synchronization of the Work in + timed-relation with a moving image ("synching") will be considered an + Adaptation for the purpose of this License. + + 2. "Collection" means a collection of literary or artistic works, such as + encyclopedias and anthologies, or performances, phonograms or broadcasts, or + other works or subject matter other than works listed in Section 1(f) below, + which, by reason of the selection and arrangement of their contents, + constitute intellectual creations, in which the Work is included in its + entirety in unmodified form along with one or more other contributions, + each constituting separate and independent works in themselves, which + together are assembled into a collective whole. A work that constitutes a + Collection will not be considered an Adaptation (as defined below) for the + purposes of this License. + + 3. "Creative Commons Compatible License" means a license that is listed at + http://creativecommons.org/compatiblelicenses that has been approved by + Creative Commons as being essentially equivalent to this License, including, + at a minimum, because that license: (i) contains terms that have the same + purpose, meaning and effect as the License Elements of this License; and, + (ii) explicitly permits the relicensing of adaptations of works made + available under that license under this License or a Creative Commons + jurisdiction license with the same License Elements as this License. + + 4. "Distribute" means to make available to the public the original and + copies of the Work or Adaptation, as appropriate, through sale or other + transfer of ownership. + + 5. "License Elements" means the following high-level license attributes + as selected by Licensor and indicated in the title of this License: + Attribution, ShareAlike. + + 6. "Licensor" means the individual, individuals, entity or entities that + offer(s) the Work under the terms of this License. + + 7. "Original Author" means, in the case of a literary or artistic work, the + individual, individuals, entity or entities who created the Work or if no + individual or entity can be identified, the publisher; and in addition + (i) in the case of a performance the actors, singers, musicians, dancers, + and other persons who act, sing, deliver, declaim, play in, interpret or + otherwise perform literary or artistic works or expressions of folklore; + (ii) in the case of a phonogram the producer being the person or legal + entity who first fixes the sounds of a performance or other sounds; and, + (iii) in the case of broadcasts, the organization that transmits the + broadcast. + + 8. "Work" means the literary and/or artistic work offered under the terms + of this License including without limitation any production in the literary, + scientific and artistic domain, whatever may be the mode or form of its + expression including digital form, such as a book, pamphlet and other + writing; a lecture, address, sermon or other work of the same nature; a + dramatic or dramatico-musical work; a choreographic work or entertainment + in dumb show; a musical composition with or without words; a cinematographic + work to which are assimilated works expressed by a process analogous to + cinematography; a work of drawing, painting, architecture, sculpture, + engraving or lithography; a photographic work to which are assimilated works + expressed by a process analogous to photography; a work of applied art; + an illustration, map, plan, sketch or three-dimensional work relative to + geography, topography, architecture or science; a performance; a broadcast; + a phonogram; a compilation of data to the extent it is protected as a + copyrightable work; or a work performed by a variety or circus performer + to the extent it is not otherwise considered a literary or artistic work. + + 9. "You" means an individual or entity exercising rights under this License + who has not previously violated the terms of this License with respect to + the Work, or who has received express permission from the Licensor to + exercise rights under this License despite a previous violation. + + 10. "Publicly Perform" means to perform public recitations of the Work and + to communicate to the public those public recitations, by any means or + process, including by wire or wireless means or public digital performances; + to make available to the public Works in such a way that members of the + public may access these Works from a place and at a place individually + chosen by them; to perform the Work to the public by any means or process + and the communication to the public of the performances of the Work, + including by public digital performance; to broadcast and rebroadcast the + Work by any means including signs, sounds or images. + + 11. "Reproduce" means to make copies of the Work by any means including + without limitation by sound or visual recordings and the right of fixation + and reproducing fixations of the Work, including storage of a protected + performance or phonogram in digital form or other electronic medium. + + 2. Fair Dealing Rights. Nothing in this License is intended to reduce, + limit, or restrict any uses free from copyright or rights arising from + limitations or exceptions that are provided for in connection with the + copyright protection under copyright law or other applicable laws. + + 3. License Grant. Subject to the terms and conditions of this License, + Licensor hereby grants You a worldwide, royalty-free, non-exclusive, + perpetual (for the duration of the applicable copyright) license to + exercise the rights in the Work as stated below: + + 1. to Reproduce the Work, to incorporate the Work into one or more + Collections, and to Reproduce the Work as incorporated in the Collections; + + 2. to create and Reproduce Adaptations provided that any such Adaptation, + including any translation in any medium, takes reasonable steps to clearly + label, demarcate or otherwise identify that changes were made to the + original Work. For example, a translation could be marked "The original work + was translated from English to Spanish," or a modification could indicate + "The original work has been modified."; + + 3. to Distribute and Publicly Perform the Work including as incorporated in + Collections; and, + + 4. to Distribute and Publicly Perform Adaptations. + 5. For the avoidance of doubt: + 1. Non-waivable Compulsory License Schemes. In those jurisdictions in + which the right to collect royalties through any statutory or compulsory + licensing scheme cannot be waived, the Licensor reserves the exclusive right + to collect such royalties for any exercise by You of the rights granted + under this License; + 2. Waivable Compulsory License Schemes. In those jurisdictions in + which the right to collect royalties through any statutory or compulsory + licensing scheme can be waived, the Licensor waives the exclusive right to + collect such royalties for any exercise by You of the rights granted under + this License; and, + 3. Voluntary License Schemes. The Licensor waives the right to collect + royalties, whether individually or, in the event that the Licensor is a + member of a collecting society that administers voluntary licensing schemes, + via that society, from any exercise by You of the rights granted under this + License. + + The above rights may be exercised in all media and formats whether now known + or hereafter devised. The above rights include the right to make such + modifications as are technically necessary to exercise the rights in other + media and formats. Subject to Section 8(f), all rights not expressly granted + by Licensor are hereby reserved. + + 4. Restrictions. The license granted in Section 3 above is expressly made + subject to and limited by the following restrictions: + + 1. You may Distribute or Publicly Perform the Work only under the terms of + this License. You must include a copy of, or the Uniform Resource Identifier + (URI) for, this License with every copy of the Work You Distribute or + Publicly Perform. You may not offer or impose any terms on the Work that + restrict the terms of this License or the ability of the recipient of the + Work to exercise the rights granted to that recipient under the terms + of the License. You may not sublicense the Work. You must keep intact all + notices that refer to this License and to the disclaimer of warranties with + every copy of the Work You Distribute or Publicly Perform. When You + Distribute or Publicly Perform the Work, You may not impose any effective + technological measures on the Work that restrict the ability of a recipient + of the Work from You to exercise the rights granted to that recipient under + the terms of the License. This Section 4(a) applies to the Work as + incorporated in a Collection, but this does not require the Collection + apart from the Work itself to be made subject to the terms of this License. + If You create a Collection, upon notice from any Licensor You must, to the + extent practicable, remove from the Collection any credit as required by + Section 4(c), as requested. If You create an Adaptation, upon notice from + any Licensor You must, to the extent practicable, remove from the Adaptation + any credit as required by Section 4(c), as requested. + + 2. You may Distribute or Publicly Perform an Adaptation only under the terms + of: + (i) this License; + (ii) a later version of this License with the same License Elements as this + License; + (iii) a Creative Commons jurisdiction license (either this or a later + license version) that contains the same License Elements as this License + (e.g., Attribution-ShareAlike 3.0 US)); + (iv) a Creative Commons Compatible License. If you license the Adaptation + under one of the licenses mentioned in (iv), you must comply with the terms + of that license. If you license the Adaptation under the terms of any of + the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), + you must comply with the terms of the Applicable License generally and the + following provisions: + (I) You must include a copy of, or the URI for, the Applicable License with + every copy of each Adaptation You Distribute or Publicly Perform; + (II) You may not offer or impose any terms on the Adaptation that restrict + the terms of the Applicable License or the ability of the recipient of the + Adaptation to exercise the rights granted to that recipient under the terms + of the Applicable License; + (III) You must keep intact all notices that refer to the Applicable License + and to the disclaimer of warranties with every copy of the Work as included + in the Adaptation You Distribute or Publicly Perform; + (IV) when You Distribute or Publicly Perform the Adaptation, You may not + impose any effective technological measures on the Adaptation that restrict + the ability of a recipient of the Adaptation from You to exercise the + rights granted to that recipient under the terms of the Applicable License. + This Section 4(b) applies to the Adaptation as incorporated in a + Collection, but this does not require the Collection apart from the + Adaptation itself to be made subject to the terms of the Applicable License. + + 3. If You Distribute, or Publicly Perform the Work or any Adaptations or + Collections, You must, unless a request has been made pursuant to Section + 4(a), keep intact all copyright notices for the Work and provide, + reasonable to the medium or means You are utilizing: + (i) the name of the Original Author (or pseudonym, if applicable) if + supplied, and/or if the Original Author and/or Licensor designate another + party or parties (e.g., a sponsor institute, publishing entity, journal) + for attribution ("Attribution Parties") in Licensor's copyright notice, + terms of service or by other reasonable means, the name of such party or + parties; + (ii) the title of the Work if supplied; + (iii) to the extent reasonably practicable, the URI, if any, that Licensor + specifies to be associated with the Work, unless such URI does not refer to + the copyright notice or licensing information for the Work; and + (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit + identifying the use of the Work in the Adaptation (e.g., "French translation + of the Work by Original Author," or "Screenplay based on original Work by + Original Author"). The credit required by this Section 4(c) may be + implemented in any reasonable manner; provided, however, that in the case + of a Adaptation or Collection, at a minimum such credit will appear, if a + credit for all contributing authors of the Adaptation or Collection + appears, then as part of these credits and in a manner at least as prominent + as the credits for the other contributing authors. For the avoidance of + doubt, You may only use the credit required by this Section for the purpose + of attribution in the manner set out above and, by exercising Your rights + under this License, You may not implicitly or explicitly assert or imply + any connection with, sponsorship or endorsement by the Original Author, + Licensor and/or Attribution Parties, as appropriate, of You or Your use of + the Work, without the separate, express prior written permission of the + Original Author, Licensor and/or Attribution Parties. + + 4. Except as otherwise agreed in writing by the Licensor or as may be + otherwise permitted by applicable law, if You Reproduce, Distribute or + Publicly Perform the Work either by itself or as part of any Adaptations + or Collections, You must not distort, mutilate, modify or take other + derogatory action in relation to the Work which would be prejudicial to the + Original Author's honor or reputation. Licensor agrees that in those + jurisdictions (e.g. Japan), in which any exercise of the right granted in + Section 3(b) of this License (the right to make Adaptations) would be + deemed to be a distortion, mutilation, modification or other derogatory + action prejudicial to the Original Author's honor and reputation, the + Licensor will waive or not assert, as appropriate, this Section, to the + fullest extent permitted by the applicable national law, to enable You to + reasonably exercise Your right under Section 3(b) of this License (right + to make Adaptations) but not otherwise. + + 5. Representations, Warranties and Disclaimer + + UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR + OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY + KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, + INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, + FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT + OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER + OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF + IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. + + 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE + LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR + ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES + ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS + BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + + 7. Termination + + 1. This License and the rights granted hereunder will terminate + automatically upon any breach by You of the terms of this License. + Individuals or entities who have received Adaptations or Collections from + You under this License, however, will not have their licenses terminated + provided such individuals or entities remain in full compliance with those + licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of + this License. + + 2. Subject to the above terms and conditions, the license granted here is + perpetual (for the duration of the applicable copyright in the Work). + Notwithstanding the above, Licensor reserves the right to release the Work + under different license terms or to stop distributing the Work at any time; + provided, however that any such election will not serve to withdraw this + License (or any other license that has been, or is required to be, granted + under the terms of this License), and this License will continue in full + force and effect unless terminated as stated above. + + 8. Miscellaneous + + 1. Each time You Distribute or Publicly Perform the Work or a Collection, + the Licensor offers to the recipient a license to the Work on the same + terms and conditions as the license granted to You under this License. + + 2. Each time You Distribute or Publicly Perform an Adaptation, Licensor + offers to the recipient a license to the original Work on the same terms + and conditions as the license granted to You under this License. + + 3. If any provision of this License is invalid or unenforceable under + applicable law, it shall not affect the validity or enforceability of the + remainder of the terms of this License, and without further action by the + parties to this agreement, such provision shall be reformed to the minimum + extent necessary to make such provision valid and enforceable. + + 4. No term or provision of this License shall be deemed waived and no + breach consented to unless such waiver or consent shall be in writing and + signed by the party to be charged with such waiver or consent. + + 5. This License constitutes the entire agreement between the parties with + respect to the Work licensed here. There are no understandings, agreements + or representations with respect to the Work not specified here. Licensor + shall not be bound by any additional provisions that may appear in any + communication from You. This License may not be modified without the mutual + written agreement of the Licensor and You. + + 6. The rights granted under, and the subject matter referenced, in this + License were drafted utilizing the terminology of the Berne Convention + for the Protection of Literary and Artistic Works (as amended on September + 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, + the WIPO Performances and Phonograms Treaty of 1996 and the Universal + Copyright Convention (as revised on July 24, 1971). These rights and subject + matter take effect in the relevant jurisdiction in which the License terms + are sought to be enforced according to the corresponding provisions of the + implementation of those treaty provisions in the applicable national law. + If the standard suite of rights granted under applicable copyright law + includes additional rights not granted under this License, such additional + rights are deemed to be included in the License; this License is not + intended to restrict the license of any rights under applicable law. + + Creative Commons Notice + + Creative Commons is not a party to this License, and makes no warranty + whatsoever in connection with the Work. Creative Commons will not be liable + to You or any party on any legal theory for any damages whatsoever, + including without limitation any general, special, incidental or + consequential damages arising in connection to this license. Notwithstanding + the foregoing two (2) sentences, if Creative Commons has expressly + identified itself as the Licensor hereunder, it shall have all rights and + obligations of Licensor. + + Except for the limited purpose of indicating to the public that the Work + is licensed under the CCPL, Creative Commons does not authorize the use by + either party of the trademark "Creative Commons" or any related trademark + or logo of Creative Commons without the prior written consent of Creative + Commons. Any permitted use will be in compliance with Creative Commons' + then-current trademark usage guidelines, as may be published on its website + or otherwise made available upon request from time to time. For the + avoidance of doubt, this trademark restriction does not form part of the + License. --- awn-extras-applets-0.2.6.orig/debian/libawn-extras0.install +++ awn-extras-applets-0.2.6/debian/libawn-extras0.install @@ -0,0 +1 @@ +usr/lib/libawn-extras.so.* --- awn-extras-applets-0.2.6.orig/debian/awn-applets-python-extras.install +++ awn-extras-applets-0.2.6/debian/awn-applets-python-extras.install @@ -0,0 +1,24 @@ +usr/share/awn/applets/python-test/ +usr/share/awn/applets/tsclient-app/ +usr/share/awn/applets/mimenu/*.py +usr/share/awn/applets/mimenu/icons/*.svg +usr/share/awn/applets/PyClock/ +usr/share/awn/applets/digitalClock/ +usr/share/awn/applets/media-icon-back/*.py +usr/share/awn/applets/media-icon-back/icons/*.svg +usr/share/awn/applets/media-icon-next/*.py +usr/share/awn/applets/media-icon-next/icons/*.svg +usr/share/awn/applets/media-icon-play/*.py +usr/share/awn/applets/media-icon-play/icons/*.svg +usr/share/awn/applets/python-test.desktop +usr/share/awn/applets/tsclient-app.desktop +usr/share/awn/applets/mimenu.desktop +usr/share/awn/applets/PyClock.desktop +usr/share/awn/applets/digitalClock.desktop +usr/share/awn/applets/media-icon-back.desktop +usr/share/awn/applets/media-icon-next.desktop +usr/share/awn/applets/media-icon-play.desktop +#usr/share/awn/applets/awn-pandora/ +#usr/share/awn/applets/awn-pandora.desktop +#usr/share/awn/applets/comic/ +#usr/share/awn/applets/comic.desktop --- awn-extras-applets-0.2.6.orig/debian/awn-applets-c-extras.install +++ awn-extras-applets-0.2.6/debian/awn-applets-c-extras.install @@ -0,0 +1,19 @@ +usr/lib/awn/applets/wobblyzini/*.so +usr/lib/awn/applets/cairo_main_menu_classic/*.so +usr/lib/awn/applets/trasher/*.so +usr/lib/awn/applets/filebrowser/*.so +usr/lib/awn/applets/main-menu/*.so +usr/lib/awn/applets/switcher/*.so +usr/share/awn/applets/wobblyzini.desktop +usr/share/awn/applets/cairo_main_menu_classic.desktop +usr/share/awn/applets/trasher.desktop +usr/share/awn/applets/filebrowser.desktop +usr/share/awn/applets/main-menu.desktop +usr/share/awn/applets/switcher.desktop +usr/lib/awn/applets/wobblyzini/icons/wobblyzini.png usr/share/awn/applets/icons/ +usr/share/avant-window-navigator/applets/icons/filebrowser.svg usr/share/awn/applets/icons/ +#usr/lib/awn/applets/notification-area/*.so +#usr/share/awn/applets/notification-area.desktop +#usr/share/avant-window-navigator/applets/icons/notification.svg usr/share/awn/applets/icons/ +etc/gconf/schemas/filebrowser.schemas +etc/gconf/schemas/switcher.schemas --- awn-extras-applets-0.2.6.orig/debian/awn-applets-python-core.links +++ awn-extras-applets-0.2.6/debian/awn-applets-python-core.links @@ -0,0 +1,3 @@ +usr/share/awn/applets/stacks/icons/stacks-full.svg usr/share/awn/applets/stacks/stacks-full.svg +usr/share/awn/applets/stacks/icons/stacks-drop.svg usr/share/awn/applets/stacks/stacks-drop.svg +usr/share/icons/gnome/32x32/places/folder.png usr/share/awn/applets/file-browser-launcher/folder.png --- awn-extras-applets-0.2.6.orig/debian/compat +++ awn-extras-applets-0.2.6/debian/compat @@ -0,0 +1 @@ +5 --- awn-extras-applets-0.2.6.orig/debian/pycompat +++ awn-extras-applets-0.2.6/debian/pycompat @@ -0,0 +1 @@ +2 --- awn-extras-applets-0.2.6.orig/debian/awn-applets-c-core.install +++ awn-extras-applets-0.2.6/debian/awn-applets-c-core.install @@ -0,0 +1,26 @@ +usr/lib/awn/applets/separator/*.so +usr/lib/awn/applets/awnsystemmonitor/*.so +usr/lib/awn/applets/awnnotificationdaemon/*.so +usr/lib/awn/applets/awnterm/*.so +usr/lib/awn/applets/places/*.so +usr/lib/awn/applets/plugger/*.so +usr/lib/awn/applets/trash/*.so +usr/lib/awn/applets/trash/trashapplet.glade usr/share/awn/applets/trash/ +usr/lib/awn/applets/cairo_main_menu/*.so +usr/lib/awn/applets/shinyswitcher/*.so +usr/share/awn/applets/separator.desktop +usr/share/awn/applets/awnsystemmonitor.desktop +usr/share/awn/applets/awnnotificationdaemon.desktop +usr/share/awn/applets/awnterm.desktop +usr/share/awn/applets/places.desktop +usr/share/awn/applets/plugger.desktop +usr/share/awn/applets/trash.desktop +usr/share/awn/applets/cairo_main_menu.desktop +usr/share/awn/applets/shinyswitcher.desktop +usr/share/avant-window-navigator/applets/icons/separator.svg usr/share/awn/applets/icons/ +etc/gconf/schemas/awn-notification-daemon.schemas +etc/gconf/schemas/awnsystemmonitor.schemas +etc/gconf/schemas/awn-terminal.schemas +etc/gconf/schemas/places.schemas +etc/gconf/schemas/shinyswitcher.schemas +etc/gconf/schemas/trash.schemas --- awn-extras-applets-0.2.6.orig/debian/libawn-extras-dev.install +++ awn-extras-applets-0.2.6/debian/libawn-extras-dev.install @@ -0,0 +1,2 @@ +usr/include/libawn-extras/*.h +usr/lib/libawn-extras.so --- awn-extras-applets-0.2.6.orig/debian/awn-applets-python-core.install +++ awn-extras-applets-0.2.6/debian/awn-applets-python-core.install @@ -0,0 +1,35 @@ +usr/share/awn/applets/arss/*.py +usr/share/awn/applets/arss/Core/*.png +usr/share/awn/applets/arss/Core/*.svg +usr/share/awn/applets/arss/Core/*.py +usr/share/awn/applets/arss/Core/feedlist-default +usr/share/awn/applets/battery-applet/*.py +usr/share/awn/applets/battery-applet/icons/*.svg +usr/share/awn/applets/calendar/ +usr/share/awn/applets/file-browser-launcher/ +usr/share/awn/applets/lastfm/ +usr/share/awn/applets/mail/ +usr/share/awn/applets/media-control/*.png +usr/share/awn/applets/media-control/*.py +usr/share/awn/applets/media-control/icons/*.svg +usr/share/awn/applets/mount-applet/*.py +usr/share/awn/applets/mount-applet/icons/*.png +usr/share/awn/applets/quit-applet/*.py +usr/share/awn/applets/quit-applet/icons/*.svg +usr/share/awn/applets/showdesktop/ +usr/share/awn/applets/stacks/ +usr/share/awn/applets/volume-control/ +usr/share/awn/applets/weather/ +usr/share/awn/applets/arss.desktop +usr/share/awn/applets/battery-applet.desktop +usr/share/awn/applets/calendar.desktop +usr/share/awn/applets/file-browser-launcher.desktop +usr/share/awn/applets/lastfm.desktop +usr/share/awn/applets/mail.desktop +usr/share/awn/applets/media-control.desktop +usr/share/awn/applets/mount-applet.desktop +usr/share/awn/applets/quit-applet.desktop +usr/share/awn/applets/showdesktop.desktop +usr/share/awn/applets/stacks.desktop +usr/share/awn/applets/volume-control.desktop +usr/share/awn/applets/weather.desktop --- awn-extras-applets-0.2.6.orig/debian/python-awnlib.install +++ awn-extras-applets-0.2.6/debian/python-awnlib.install @@ -0,0 +1 @@ +usr/lib/python2.*/site-packages/awn/extras/AWNLib.py --- awn-extras-applets-0.2.6.orig/debian/control +++ awn-extras-applets-0.2.6/debian/control @@ -0,0 +1,192 @@ +Source: awn-extras-applets +Section: gnome +Priority: optional +Maintainer: Julien Lavergne +Build-Depends: debhelper (>= 5), + cdbs, + intltool, + libgnome-menu-dev, + libgconf2-dev, + libgnome-desktop-dev, + librsvg2-dev, + libgtop2-dev, + libawn-dev (>= 0.2.4), + libwnck-dev, + libsexy-dev, + libnotify-dev, + libvte-dev, + python-central (>= 0.6.0), + python-dev, + python-gtk2-dev, + python-cairo-dev, + python-elementtree, + libtrackerclient-dev, + awn-manager (>= 0.2.6) +Standards-Version: 3.8.0 +XS-Python-Version: >= 2.4 +Homepage: https://launchpad.net/awn-extras + +Package: awn-applets-c-core +Section: gnome +Architecture: any +Depends: libawn-extras0 (= ${binary:Version}), + ${shlibs:Depends}, + ${misc:Depends}, + avant-window-navigator +Recommends: awn-manager (>= 0.2.6-3), + gconf-editor, + awn-applets-python-core +Description: A collection of applets for avant-window-navigator + Awn-extras-applets is a collection of applets for avant-window-navigator. It + provides some extensions to the bar and some new features (like + applets in the gnome-panel). + . + This package provides the core applets written in C: + * awn-notification-daemon: Libnotify notification daemon implementation. + * awn-system-monitor: Display CPU activity and system stats on click. + * awnterm: A pop-up terminal that lives in AWN. + * cairo_main_menu: Displays a list of all the applications on your + computer in a standard menu format. + * plugger: Displays mounted volumes and allows you to browse them. + * separator: Display a white line to separate applets. + * shinyswitcher: A workspace switcher supporting compiz and other WMs. + * trash: A trash applet, like the one from gnome-panel. + +Package: awn-applets-c-extras +Section: gnome +Architecture: any +Depends: libawn-extras0 (= ${binary:Version}), + ${shlibs:Depends}, + ${misc:Depends}, + avant-window-navigator +Recommends: awn-manager (>= 0.2.6-3) +Description: A collection of applets for avant-window-navigator + Awn-extras-applets is a collection of applets for avant-window-navigator. It + provides some extensions to the bar and some new features (like + applets in the gnome-panel). + . + This package contains extras applets written in C: + * cairo_main_menu_classic: Displays a list of all the applications on your + computer in a standard menu format - older version. + * filebrowser: Displays the contents of a directory and allows you to + navigate folders. + * main-menu: Display a list of all the applications on your computer. + * places: Displays shortcuts in buttons. + * switcher: Display all the viewport and enable to switch to them by clicking + on it. Like the gnome-panel switcher. + * trasher: Like the trash applet, but uses stacks to allow you to preview + your trash. + * wobblyzini: Displays a simple animation. + +Package: awn-applets-python-core +Section: gnome +Architecture: all +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${python:Depends}, + avant-window-navigator, + python-awn, + python-awnlib, + gnome-icon-theme +Recommends: awn-manager (>= 0.2.6-3), + python-alsaaudio, + python-feedparser, + python-gst0.10, + acpi +XB-Python-Version: ${python:Versions} +Description: A collection of applets for avant-window-navigator + Awn-extras-applets is a collection of applets for avant-window-navigator. It + provides some extensions to the bar and some new features (like + applets in the gnome-panel). + . + This package provides the core Python applets: + * arss: A Python feed launcher. + * battery-applet: This applet displays your computers current power status. + * calendar: Displays a clock and calendar on the bar, and integrates with + several external calendar applications to display appointments. + * file-browser-launcher: Launches the user's file manager or opens bookmarks. + * lastfm: Stream any of the Last.Fm radios. + * mail: The Mail Applet lets you check your mail from AWN. + * media-control: This applet displays album art in a awn dialog while + allowing you to control your favorite media players. + * mount-applet: Displays mounts from /etc/fstab and allows one to + mount/unmount them. + * quit-applet: A simple gnome-quit launcher. + * showdesktop: Hides/shows all of the windows of the current viewport, + similar to the showdesktop icon of gnome-panel. + * stack: Provides a convenient location to place commonly used files. + * volume-control: A fancy volume changing applet that works much like the + gnome-panel version. + * weather: This applet downloads and displays the current weather conditions + and weather forecast from weather.com. + +Package: awn-applets-python-extras +Section: gnome +Architecture: all +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${python:Depends}, + avant-window-navigator, + python-awn, +Recommends: awn-manager (>= 0.2.6-3), + python-gnome2-desktop, + tsclient +XB-Python-Version: ${python:Versions} +Description: A collection of applets for avant-window-navigator + Awn-extras-applets is a collection of applets for avant-window-navigator. It + provides some extensions to the bar and some new features (like + applets in the gnome-panel). + * digitalClock: A digital clock and calendar applet. + * media-icon-applet: This applet allows you to add media icons like play, + pause, and next/back to your awn bar, and control a list of media players. + * mimenu: Another applet for the Menu. + * PyClock: A lightweight clock applet. + * python-test: An example applet. + * tsclient-app: Lets you browser your terminal services RDP shares. + +Package: libawn-extras0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: A library for avant-window-navigator's applets + This library is used by the applets of avant-window-navigator. It provides + functions to easily create new applets. + +Package: libawn-extras-dev +Section: libdevel +Architecture: any +Depends: libawn-extras0 (= ${binary:Version}), + ${shlibs:Depends}, + ${misc:Depends}, + libawn-dev, + libgtk2.0-dev, + libglib2.0-dev +Description: library for avant-window-navigator's applets - development files + This package provides the include files and static library for the + libawn-extras library functions. + +Package: python-awn-extras +Section: python +Architecture: any +Depends: libawn-extras0 (= ${binary:Version}), + ${shlibs:Depends}, + ${misc:Depends}, + ${python:Depends} +Provides: ${python:Provides} +Description: Python bindings for avant-window-navigator's applets + This packages provides Python bindings to create and use Python applets with + functions of libawn-extras. It also include AWNLib, a collection of + functions to simplify the creation of applets with Python. + +Package: python-awnlib +Section: python +Architecture: any +Depends: ${python:Depends}, + python-awn-extras, + python-gtk2, + python-gobject +XB-Python-Version: ${python:Versions} +Description: Python utilities for avant-window-navigator's applets + This packages provides AWNLib, a collection of functions to simplify the + creation of applets with Python. --- awn-extras-applets-0.2.6.orig/debian/changelog +++ awn-extras-applets-0.2.6/debian/changelog @@ -0,0 +1,77 @@ +awn-extras-applets (0.2.6-4) unstable; urgency=low + + * debian/control + - Recommend acpi package for battery-applet. + - Add depends on gnome-icon-theme for the file-browser-launcher link. + * debian/awn-applets-python-core.links + - Add links for stacks to fix error in loading images. + - Add link for file-browser-launcher to point to icon of a folder. + * debian/awn-applets-python-core.install + - Install missing feedlist-default in arss applet. + * debian/awn-applets-c-*.install + - Install schemas files (Closes: #477367, #477371). + * debian/patches/ + - 93-bzr-show-desktop-title.patch: from upstream, fix show-desktop applet on + mouse over. + - 94_shinyswitcher_string_to_color.patch: from upstream, fix + awn_cairo_string_to_color crash for shinyswitcher. + - 95_weather_correct_url.patch: from upstream, update URL to fetch the data + for the weather applet. + - 96_shinyswitcher_cairo_set_operator.patch : From upstream, fix + cairo_set_operator() crash. + - 101_places_string_to_color.patch: fix awn_cairo_string_to_color crash for + shinyswitcher. + - 102_fbl_trash_location.patch: fix location of Trash in file browser + launcher applet. + - 103-fix-schemas-generation.patch: Generate schemas files at build time. + - 104_tsclient_create_home.patch: create ~/.tsclient to avoid applet to + crash. + - 105_mimenu_missing_bookmark.patch: don't crash Main Menu applet if there is + no bookmark. + - 106_fbl_missing_bookmark.patch: don't crash file-browser-launcher applet + if there is no bookmark. + + -- Julien Lavergne Wed, 15 Oct 2008 21:52:42 +0200 + +awn-extras-applets (0.2.6-3) unstable; urgency=low + + * debian/control + - Bump to 3.8.0 Standards-Version (no change needed). + - Bump Build-Depends of libawn-dev to (>= 0.2.6) + * debian/patches/11-volume-channel-missing.patch + - Fix volume applet when current channel disappear (Closes: #491118). + Thanks Jean-Michel Philippe for the patch. + * debian/copyright + - Remove the complete Apache Licence and link instead to + /usr/share/common-licenses/Apache-2.0. + - Reformat the complete licence to reduce the lines under 80 characters. + + -- Julien Lavergne Mon, 15 Sep 2008 22:57:18 +0200 + +awn-extras-applets (0.2.6-2) unstable; urgency=medium + + * Rebuild for python2.5 transition (Closes: #477264) + * debian/patches/10-implicit-pointer-conversion.patch + Avoid possible FTBFS and segfault on some architectures. Thanks Dann + Frazier for the patch (Closes: #477181) + + -- Julien Lavergne Thu, 24 Apr 2008 19:46:11 +0200 + +awn-extras-applets (0.2.6-1) unstable; urgency=low + + * Initial upload (Closes: #468098) + * debian/patches: + - 00-Install-in-share.patch: Install python applets in /usr/share. + - 01_lastfm_fix_try-finally_block.patch: Fix block to work with python 2.4. + - 02_define_new_path_for_stack_dependency.patch: Add /usr/share as a + location of stack applet. + - 03_fix_shebang.patch: Fix all shebang. + - 90_bzr_convert_filebrowser_to_awnclient.patch: From bzr, convert + filebrowser to the new configuration system. + - 91_bzr_change_pandora_url.patch: Use new URL for pandora applet. + - 92_bzr_fix_location_for_comic.patch: From bzr, use /tmp/ instead of + home directory. + * Applets comic, pandora, notification-area are not installed because of + stability issues. + + -- Julien Lavergne Tue, 05 Feb 2008 01:19:17 +0100 --- awn-extras-applets-0.2.6.orig/debian/awn-applets-c-core.links +++ awn-extras-applets-0.2.6/debian/awn-applets-c-core.links @@ -0,0 +1 @@ +usr/share/awn/applets/trash/trashapplet.glade usr/lib/awn/applets/trash/trashapplet.glade --- awn-extras-applets-0.2.6.orig/debian/python-awn-extras.install +++ awn-extras-applets-0.2.6/debian/python-awn-extras.install @@ -0,0 +1,3 @@ +usr/lib/python2.*/site-packages/awn/extras/_extras.so +usr/lib/python2.*/site-packages/awn/extras/__init__.py +usr/share/avant-window-navigator/defs/awn_extras.defs --- awn-extras-applets-0.2.6.orig/debian/patches/90_bzr_convert_filebrowser_to_awnclient.patch +++ awn-extras-applets-0.2.6/debian/patches/90_bzr_convert_filebrowser_to_awnclient.patch @@ -0,0 +1,507 @@ +=== modified file 'src/filebrowser/filebrowser-applet.c' +--- src/filebrowser/filebrowser-applet.c 2007-11-01 00:03:16 +0000 ++++ src/filebrowser/filebrowser-applet.c 2008-03-01 01:57:30 +0000 +@@ -420,7 +420,7 @@ + FileBrowserApplet *applet = g_object_new( FILEBROWSER_TYPE_APPLET, NULL ); + applet->awn_applet = awn_applet; + +- filebrowser_gconf_init( AWN_APPLET( awn_applet ) ); ++ filebrowser_gconf_init( AWN_APPLET( awn_applet ), uid ); + filebrowser_applet_set_icon( applet, NULL ); + + applet->filebrowser = filebrowser_dialog_new( applet ); + +=== modified file 'src/filebrowser/filebrowser-gconf.c' +--- src/filebrowser/filebrowser-gconf.c 2008-01-13 23:05:09 +0000 ++++ src/filebrowser/filebrowser-gconf.c 2008-03-01 01:57:30 +0000 +@@ -18,167 +18,200 @@ + */ + + #include +-#include + #include ++#include + #include + #include +-#include + + #include + + #include "filebrowser-gconf.h" + #include "filebrowser-defines.h" + +-static GConfClient *client = NULL; ++static AwnConfigClient *client = NULL; + static AwnApplet *applet = NULL; + + /** + * Initializes the GConf stuff + */ + void filebrowser_gconf_init( +- AwnApplet * awn_applet ) { ++ AwnApplet * awn_applet, gchar * uid ) { + + if ( !client ) { +- client = gconf_client_get_default( ); ++ client = awn_config_client_new_for_applet("filebrowser",uid); + } + if ( !applet ) { + applet = awn_applet; + } +- +- awn_applet_add_preferences( awn_applet, "/schemas/apps/awn-filebrowser/prefs", NULL ); + } + + /** + * Should we be creative and composite the applet icon + */ +-gboolean filebrowser_gconf_is_composite_applet_icon( +-) { +- ++gboolean filebrowser_gconf_is_composite_applet_icon() { + gboolean iscomp; +- GConfValue *value = awn_applet_gconf_get_value( applet, +- FILEBROWSER_GCONFKEY_COMPOSITE_APPLET_ICON, +- NULL ); +- +- if ( value ) { +- iscomp = awn_applet_gconf_get_bool( applet, FILEBROWSER_GCONFKEY_COMPOSITE_APPLET_ICON, NULL ); +- } else { +- iscomp = FILEBROWSER_DEFAULT_COMPOSITE_APPLET_ICON; +- awn_applet_gconf_set_bool( applet, +- FILEBROWSER_GCONFKEY_COMPOSITE_APPLET_ICON, +- FILEBROWSER_DEFAULT_COMPOSITE_APPLET_ICON, NULL ); +- } +- ++ ++ AwnConfigValueType value = awn_config_client_get_value_type(client, ++ AWN_CONFIG_CLIENT_DEFAULT_GROUP, ++ FILEBROWSER_GCONFKEY_COMPOSITE_APPLET_ICON, ++ NULL); ++ ++ if (value!=AWN_CONFIG_VALUE_TYPE_NULL) ++ { ++ iscomp = awn_config_client_get_bool( client, ++ AWN_CONFIG_CLIENT_DEFAULT_GROUP, ++ FILEBROWSER_GCONFKEY_COMPOSITE_APPLET_ICON, ++ NULL); ++ } ++ else ++ { ++ iscomp = FILEBROWSER_DEFAULT_COMPOSITE_APPLET_ICON; ++ awn_config_client_set_bool( client, ++ AWN_CONFIG_CLIENT_DEFAULT_GROUP, ++ FILEBROWSER_GCONFKEY_COMPOSITE_APPLET_ICON, ++ iscomp, NULL ); ++ } + return iscomp; + } + + gboolean filebrowser_gconf_is_browsing(){ + gboolean browsing; +- GConfValue *value = awn_applet_gconf_get_value( applet, +- FILEBROWSER_GCONFKEY_ENABLE_BROWSING, +- NULL ); +- +- if ( value ) { +- browsing = awn_applet_gconf_get_bool( applet, FILEBROWSER_GCONFKEY_ENABLE_BROWSING, NULL ); +- } else { ++ AwnConfigValueType value = awn_config_client_get_value_type(client, ++ AWN_CONFIG_CLIENT_DEFAULT_GROUP, ++ FILEBROWSER_GCONFKEY_ENABLE_BROWSING, ++ NULL); ++ if (value!=AWN_CONFIG_VALUE_TYPE_NULL) ++ { ++ browsing = awn_config_client_get_bool( client, AWN_CONFIG_CLIENT_DEFAULT_GROUP, ++ FILEBROWSER_GCONFKEY_ENABLE_BROWSING, ++ NULL ); ++ } ++ else ++ { + browsing = FILEBROWSER_DEFAULT_ENABLE_BROWSING; +- awn_applet_gconf_set_bool( applet, +- FILEBROWSER_GCONFKEY_ENABLE_BROWSING, +- FILEBROWSER_DEFAULT_ENABLE_BROWSING, NULL ); ++ awn_config_client_set_bool( client, ++ AWN_CONFIG_CLIENT_DEFAULT_GROUP, ++ FILEBROWSER_GCONFKEY_ENABLE_BROWSING, ++ browsing, NULL ); + } +- ++ + return browsing; + } + + gboolean filebrowser_gconf_show_files(){ + + gboolean show; +- GConfValue *value = awn_applet_gconf_get_value( applet, +- FILEBROWSER_GCONFKEY_SHOW_FILES, +- NULL ); +- +- if ( value ) { +- show = awn_applet_gconf_get_bool( applet, FILEBROWSER_GCONFKEY_SHOW_FILES, NULL ); +- } else { ++ ++ AwnConfigValueType value = awn_config_client_get_value_type(client, ++ AWN_CONFIG_CLIENT_DEFAULT_GROUP, ++ FILEBROWSER_GCONFKEY_SHOW_FILES, ++ NULL); ++ if (value!=AWN_CONFIG_VALUE_TYPE_NULL) ++ { ++ show = awn_config_client_get_bool(client, AWN_CONFIG_CLIENT_DEFAULT_GROUP, ++ FILEBROWSER_GCONFKEY_SHOW_FILES, ++ NULL ); ++ } ++ else ++ { + show = FILEBROWSER_DEFAULT_SHOW_FILES; +- awn_applet_gconf_set_bool( applet, +- FILEBROWSER_GCONFKEY_SHOW_FILES, +- FILEBROWSER_DEFAULT_SHOW_FILES, NULL ); ++ awn_config_client_set_bool( client, ++ AWN_CONFIG_CLIENT_DEFAULT_GROUP, ++ FILEBROWSER_GCONFKEY_SHOW_FILES, ++ show, NULL ); + } +- ++ + return show; + } + + gboolean filebrowser_gconf_show_hidden_files(){ + + gboolean show; +- GConfValue *value = awn_applet_gconf_get_value( applet, +- FILEBROWSER_GCONFKEY_SHOW_HIDDEN_FILES, +- NULL ); +- +- if ( value ) { +- show = awn_applet_gconf_get_bool( applet, FILEBROWSER_GCONFKEY_SHOW_HIDDEN_FILES, NULL ); +- } else { ++ AwnConfigValueType value = awn_config_client_get_value_type(client, ++ AWN_CONFIG_CLIENT_DEFAULT_GROUP, ++ FILEBROWSER_GCONFKEY_SHOW_HIDDEN_FILES, ++ NULL); ++ if (value!=AWN_CONFIG_VALUE_TYPE_NULL) ++ { ++ show = awn_config_client_get_bool(client, AWN_CONFIG_CLIENT_DEFAULT_GROUP, ++ FILEBROWSER_GCONFKEY_SHOW_HIDDEN_FILES, ++ NULL ); ++ } ++ else ++ { + show = FILEBROWSER_DEFAULT_SHOW_HIDDEN_FILES; +- awn_applet_gconf_set_bool( applet, +- FILEBROWSER_GCONFKEY_SHOW_HIDDEN_FILES, +- FILEBROWSER_DEFAULT_SHOW_HIDDEN_FILES, NULL ); ++ awn_config_client_set_bool( client, ++ AWN_CONFIG_CLIENT_DEFAULT_GROUP, ++ FILEBROWSER_GCONFKEY_SHOW_HIDDEN_FILES, ++ show, NULL ); + } +- + return show; + } + + gboolean filebrowser_gconf_show_folders(){ + + gboolean show; +- GConfValue *value = awn_applet_gconf_get_value( applet, +- FILEBROWSER_GCONFKEY_SHOW_FOLDERS, +- NULL ); +- +- if ( value ) { +- show = awn_applet_gconf_get_bool( applet, FILEBROWSER_GCONFKEY_SHOW_FOLDERS, NULL ); +- } else { ++ AwnConfigValueType value = awn_config_client_get_value_type(client, ++ AWN_CONFIG_CLIENT_DEFAULT_GROUP, ++ FILEBROWSER_GCONFKEY_SHOW_FOLDERS, ++ NULL); ++ if (value!=AWN_CONFIG_VALUE_TYPE_NULL) ++ { ++ show = awn_config_client_get_bool(client,AWN_CONFIG_CLIENT_DEFAULT_GROUP, ++ FILEBROWSER_GCONFKEY_SHOW_FOLDERS, ++ NULL ); ++ } ++ else ++ { + show = FILEBROWSER_DEFAULT_SHOW_FOLDERS; +- awn_applet_gconf_set_bool( applet, +- FILEBROWSER_GCONFKEY_SHOW_FOLDERS, +- FILEBROWSER_DEFAULT_SHOW_FOLDERS, NULL ); ++ awn_config_client_set_bool( client, ++ AWN_CONFIG_CLIENT_DEFAULT_GROUP, ++ FILEBROWSER_GCONFKEY_SHOW_FOLDERS, ++ show, NULL ); + } +- + return show; + } + + gboolean filebrowser_gconf_show_desktop_items(){ + + gboolean show; +- GConfValue *value = awn_applet_gconf_get_value( applet, +- FILEBROWSER_GCONFKEY_SHOW_DESKTOP_ITEMS, +- NULL ); +- +- if ( value ) { +- show = awn_applet_gconf_get_bool( applet, FILEBROWSER_GCONFKEY_SHOW_DESKTOP_ITEMS, NULL ); +- } else { +- show = FILEBROWSER_DEFAULT_SHOW_DESKTOP_ITEMS; +- awn_applet_gconf_set_bool( applet, ++ AwnConfigValueType value = awn_config_client_get_value_type(client, ++ AWN_CONFIG_CLIENT_DEFAULT_GROUP, + FILEBROWSER_GCONFKEY_SHOW_DESKTOP_ITEMS, +- FILEBROWSER_DEFAULT_SHOW_DESKTOP_ITEMS, NULL ); +- } +- ++ NULL); ++ if (value!=AWN_CONFIG_VALUE_TYPE_NULL) ++ { ++ ++ show = awn_config_client_get_bool(client,AWN_CONFIG_CLIENT_DEFAULT_GROUP, ++ FILEBROWSER_GCONFKEY_SHOW_DESKTOP_ITEMS, ++ NULL ); ++ } ++ else ++ { ++ show = FILEBROWSER_DEFAULT_SHOW_DESKTOP_ITEMS; ++ awn_config_client_set_bool( client, ++ AWN_CONFIG_CLIENT_DEFAULT_GROUP, ++ FILEBROWSER_GCONFKEY_SHOW_DESKTOP_ITEMS, ++ show, NULL ); ++ } + return show; + } + + /** + * What is the backend folder of this applet (and is it set)? + */ +-gchar *filebrowser_gconf_get_backend_folder( +-) { +- +- gchar *folder = awn_applet_gconf_get_string( applet, +- FILEBROWSER_GCONFKEY_BACKEND_FOLDER, +- NULL ); +- if ( !folder ) { ++gchar *filebrowser_gconf_get_backend_folder() { ++ gchar *folder = NULL; ++ folder = awn_config_client_get_string(client,AWN_CONFIG_CLIENT_DEFAULT_GROUP, ++ FILEBROWSER_GCONFKEY_BACKEND_FOLDER, ++ NULL ); ++ if ( !folder || (strlen(folder)==0) ) ++ { ++ g_free(folder); + folder = g_strdup_printf( "/home/%s", g_get_user_name( ) ); + filebrowser_gconf_set_backend_folder( folder ); + } +- ++ printf("folder = %s\n",folder); + return folder; + } + +@@ -186,17 +219,19 @@ + * What is the default drag action? + */ + gchar *filebrowser_gconf_get_default_drag_action() { +- +- gchar *action = awn_applet_gconf_get_string( applet, +- FILEBROWSER_GCONFKEY_DEFAULT_DRAG_ACTION, +- NULL ); +- +- if ( !action ) { +- awn_applet_gconf_set_string( applet, +- FILEBROWSER_GCONFKEY_DEFAULT_DRAG_ACTION, FILEBROWSER_DEFAULT_DEFAULT_DRAG_ACTION, NULL ); +- action = FILEBROWSER_DEFAULT_DEFAULT_DRAG_ACTION; ++ gchar *action = NULL; ++ action = awn_config_client_get_string(client,AWN_CONFIG_CLIENT_DEFAULT_GROUP, ++ FILEBROWSER_GCONFKEY_DEFAULT_DRAG_ACTION, ++ NULL ); ++ if (!action) ++ { ++ action = g_strdup(FILEBROWSER_DEFAULT_DEFAULT_DRAG_ACTION DRAG_ACTION_LINK); ++ awn_config_client_set_string( client, ++ AWN_CONFIG_CLIENT_DEFAULT_GROUP, ++ FILEBROWSER_GCONFKEY_DEFAULT_DRAG_ACTION, ++ action, NULL ); ++ + } +- + return action; + } + +@@ -205,8 +240,11 @@ + */ + void filebrowser_gconf_set_backend_folder( + const gchar * folder ) { +- +- awn_applet_gconf_set_string( applet, FILEBROWSER_GCONFKEY_BACKEND_FOLDER, folder, NULL ); ++ ++ awn_config_client_set_string (client, ++ AWN_CONFIG_CLIENT_DEFAULT_GROUP, ++ FILEBROWSER_GCONFKEY_BACKEND_FOLDER, ++ folder, NULL ); + } + + /** +@@ -214,17 +252,19 @@ + */ + gchar *filebrowser_gconf_get_applet_icon( + ) { +- +- gchar *icon = awn_applet_gconf_get_string( applet, +- FILEBROWSER_GCONFKEY_APPLET_ICON, +- NULL ); +- +- if ( !icon ) { +- awn_applet_gconf_set_string( applet, +- FILEBROWSER_GCONFKEY_APPLET_ICON, FILEBROWSER_DEFAULT_APPLET_ICON, NULL ); +- icon = FILEBROWSER_DEFAULT_APPLET_ICON; ++ gchar *icon= NULL; ++ icon = awn_config_client_get_string(client,AWN_CONFIG_CLIENT_DEFAULT_GROUP, ++ FILEBROWSER_GCONFKEY_APPLET_ICON, ++ NULL ); ++ if (!icon) ++ { ++ icon = g_strdup(FILEBROWSER_DEFAULT_APPLET_ICON); ++ awn_config_client_set_string(client, ++ AWN_CONFIG_CLIENT_DEFAULT_GROUP, ++ FILEBROWSER_GCONFKEY_APPLET_ICON, ++ icon, NULL ); ++ + } +- + return icon; + } + +@@ -233,41 +273,77 @@ + */ + guint filebrowser_gconf_get_icon_size( + ) { +- +- guint icon_size = awn_applet_gconf_get_int( applet, +- FILEBROWSER_GCONFKEY_ICON_SIZE, NULL ); +- +- if ( !( icon_size > 0 ) ) { +- awn_applet_gconf_set_int( applet, FILEBROWSER_GCONFKEY_ICON_SIZE, FILEBROWSER_DEFAULT_ICON_SIZE, NULL ); ++ guint icon_size; ++ AwnConfigValueType value = awn_config_client_get_value_type(client, ++ AWN_CONFIG_CLIENT_DEFAULT_GROUP, ++ FILEBROWSER_GCONFKEY_ICON_SIZE, ++ NULL); ++ if (value!=AWN_CONFIG_VALUE_TYPE_NULL) ++ { ++ icon_size = awn_config_client_get_int(client, AWN_CONFIG_CLIENT_DEFAULT_GROUP, ++ FILEBROWSER_GCONFKEY_ICON_SIZE, ++ NULL ); ++ } ++ else ++ { + icon_size = FILEBROWSER_DEFAULT_ICON_SIZE; ++ awn_config_client_set_int( client, ++ AWN_CONFIG_CLIENT_DEFAULT_GROUP, ++ FILEBROWSER_GCONFKEY_ICON_SIZE, ++ icon_size, NULL ); + } +- ++ + return icon_size; + } + + guint filebrowser_gconf_get_max_rows(){ +- +- guint rows = awn_applet_gconf_get_int( applet, +- FILEBROWSER_GCONFKEY_MAX_ROWS, NULL ); +- +- if ( !( rows > 0 ) ) { +- awn_applet_gconf_set_int( applet, FILEBROWSER_GCONFKEY_MAX_ROWS, FILEBROWSER_DEFAULT_MAX_ROWS, NULL ); ++ guint rows; ++ AwnConfigValueType value = awn_config_client_get_value_type(client, ++ AWN_CONFIG_CLIENT_DEFAULT_GROUP, ++ FILEBROWSER_GCONFKEY_MAX_ROWS, ++ NULL); ++ if (value!=AWN_CONFIG_VALUE_TYPE_NULL) ++ { ++ ++ rows = awn_config_client_get_int(client,AWN_CONFIG_CLIENT_DEFAULT_GROUP, ++ FILEBROWSER_GCONFKEY_MAX_ROWS, ++ NULL ); ++ } ++ else ++ { + rows = FILEBROWSER_DEFAULT_MAX_ROWS; ++ awn_config_client_set_int( client, ++ AWN_CONFIG_CLIENT_DEFAULT_GROUP, ++ FILEBROWSER_GCONFKEY_MAX_ROWS, ++ rows, NULL ); + } +- ++ printf("rows = %d\n",rows); + return rows; ++ + } + + guint filebrowser_gconf_get_max_cols(){ +- +- guint cols = awn_applet_gconf_get_int( applet, +- FILEBROWSER_GCONFKEY_MAX_COLS, NULL ); +- +- if ( !( cols > 0 ) ) { +- awn_applet_gconf_set_int( applet, FILEBROWSER_GCONFKEY_MAX_COLS, FILEBROWSER_DEFAULT_MAX_COLS, NULL ); +- cols = FILEBROWSER_DEFAULT_MAX_COLS; ++ guint cols; ++ AwnConfigValueType value = awn_config_client_get_value_type(client, ++ AWN_CONFIG_CLIENT_DEFAULT_GROUP, ++ FILEBROWSER_GCONFKEY_MAX_COLS, ++ NULL); ++ if (value!=AWN_CONFIG_VALUE_TYPE_NULL) ++ { ++ cols = awn_config_client_get_int(client, AWN_CONFIG_CLIENT_DEFAULT_GROUP, ++ FILEBROWSER_GCONFKEY_MAX_COLS, ++ NULL ); + } +- ++ else ++ { ++ printf("BOOGER\n"); ++ cols = FILEBROWSER_DEFAULT_MAX_COLS; ++ awn_config_client_set_int( client, ++ AWN_CONFIG_CLIENT_DEFAULT_GROUP, ++ FILEBROWSER_GCONFKEY_MAX_COLS, ++ cols, NULL ); ++ } ++ printf("cols = %d\n",cols); + return cols; + } + + +=== modified file 'src/filebrowser/filebrowser-gconf.h' +--- src/filebrowser/filebrowser-gconf.h 2007-10-16 22:08:36 +0000 ++++ src/filebrowser/filebrowser-gconf.h 2008-03-01 01:57:30 +0000 +@@ -23,7 +23,7 @@ + #include + #include + +-void filebrowser_gconf_init( AwnApplet * applet ); ++void filebrowser_gconf_init( AwnApplet * applet, gchar * uid ); + + gboolean filebrowser_gconf_is_composite_applet_icon(); + gboolean filebrowser_gconf_is_browsing(); + +=== modified file 'src/filebrowser/filebrowser.schema-ini' +--- src/filebrowser/filebrowser.schema-ini 2008-02-01 21:40:12 +0000 ++++ src/filebrowser/filebrowser.schema-ini 2008-03-01 01:57:30 +0000 +@@ -31,8 +31,8 @@ + default = TRUE + description = If true, the applet icon is a composite of the 3 last added files + [DEFAULT/backend_folder] +-type = bool +-default = TRUE ++type = string ++default = + description = The absolute path to a folder to use as a backend + [DEFAULT/icon_size] + type = int + --- awn-extras-applets-0.2.6.orig/debian/patches/104_tsclient_create_home.patch +++ awn-extras-applets-0.2.6/debian/patches/104_tsclient_create_home.patch @@ -0,0 +1,16 @@ +diff -Nur -x '*.orig' -x '*~' awn-extras-applets-0.2.6/src/tsclient-applet/tsclient_app.py awn-extras-applets-0.2.6.new/src/tsclient-applet/tsclient_app.py +--- awn-extras-applets-0.2.6/src/tsclient-applet/tsclient_app.py 2008-02-19 01:32:16.000000000 +0100 ++++ awn-extras-applets-0.2.6.new/src/tsclient-applet/tsclient_app.py 2008-10-15 03:00:45.000000000 +0200 +@@ -29,7 +29,11 @@ + self.dialog.connect ("focus-out-event", self.dialog_focus_out) + #a=dircache.listdir('/home/david/.tsclient') + home = os.path.expanduser('~') +- a=os.listdir(home + '/.tsclient') ++ try: ++ a=os.listdir(home + '/.tsclient') ++ except OSError: ++ os.mkdir(home + '/.tsclient') ++ a=os.listdir(home + '/.tsclient') + self.rootPath = home + "/.tsclient/" + for item in a: + (shortname, extension) = os.path.splitext(item) --- awn-extras-applets-0.2.6.orig/debian/patches/92_bzr_fix_location_for_comic.patch +++ awn-extras-applets-0.2.6/debian/patches/92_bzr_fix_location_for_comic.patch @@ -0,0 +1,13 @@ +diff -ur awn-extras-applets-0.2.6.orig/src/comic/comicdialog.py awn-extras-applets-0.2.6/src/comic/comicdialog.py +--- awn-extras-applets-0.2.6.orig/src/comic/comicdialog.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/comic/comicdialog.py 2008-03-15 18:35:47.000000000 +0100 +@@ -31,7 +30,7 @@ + self.connect("expose_event", self.expose) + + def expose(self,widget,event): +- icon_name = './dilbert.gif' ++ icon_name = '/tmp/dilbert.gif' + icon = gdk.pixbuf_new_from_file(icon_name) + dim = [icon.get_width(),icon.get_height()] + self.set_size_request(dim[0], dim[1]) +Seulement dans awn-extras-applets-0.2.6/src/comic: comicdialog.py~ --- awn-extras-applets-0.2.6.orig/debian/patches/96_shinyswitcher_cairo_set_operator.patch +++ awn-extras-applets-0.2.6/debian/patches/96_shinyswitcher_cairo_set_operator.patch @@ -0,0 +1,157 @@ +diff -Nur -x '*.orig' -x '*~' awn-extras-applets-0.2.6/src/shiny-switcher/shinyswitcherapplet.c awn-extras-applets-0.2.6.new/src/shiny-switcher/shinyswitcherapplet.c +--- awn-extras-applets-0.2.6/src/shiny-switcher/shinyswitcherapplet.c 2008-10-15 18:56:02.000000000 +0200 ++++ awn-extras-applets-0.2.6.new/src/shiny-switcher/shinyswitcherapplet.c 2008-10-15 19:09:58.000000000 +0200 +@@ -154,14 +154,28 @@ + + double vp_vscale(Shiny_switcher *shinyswitcher) + { +- return (double)wnck_screen_get_height(shinyswitcher->wnck_screen )/(double)wnck_workspace_get_height(wnck_screen_get_active_workspace(shinyswitcher->wnck_screen) ); +- ++ static double cached = 1; ++ double result = cached; ++ WnckWorkspace * space = wnck_screen_get_active_workspace(shinyswitcher->wnck_screen); ++ if (space) ++ { ++ result = (double)wnck_screen_get_height(shinyswitcher->wnck_screen) / (double)wnck_workspace_get_height(space); ++ cached = result; ++ } ++ return result; + } + + double vp_hscale(Shiny_switcher *shinyswitcher) + { +- return (double)wnck_screen_get_width(shinyswitcher->wnck_screen )/(double)wnck_workspace_get_width(wnck_screen_get_active_workspace(shinyswitcher->wnck_screen) ); +- ++ static double cached = 1; ++ double result = cached; ++ WnckWorkspace * space = wnck_screen_get_active_workspace(shinyswitcher->wnck_screen); ++ if (space) ++ { ++ result = (double)wnck_screen_get_width(shinyswitcher->wnck_screen) / (double)wnck_workspace_get_width(space); ++ cached = result; ++ } ++ return result; + } + + +@@ -185,6 +199,9 @@ + shinyswitcher->mini_work_width=shinyswitcher->mini_work_height*shinyswitcher->applet_scale*scr_ratio* + (double)wnck_ws_width/(double)wnck_scr_width*vp_vscale(shinyswitcher); + shinyswitcher->width=shinyswitcher->mini_work_width*shinyswitcher->cols; ++ g_assert(shinyswitcher->mini_work_height); ++ g_assert(shinyswitcher->mini_work_width); ++ g_assert(shinyswitcher->width); + } + + +@@ -209,6 +226,10 @@ + + gulong wallpaper_xid=wnck_screen_get_background_pixmap(shinyswitcher->wnck_screen); + GdkPixmap* wallpaper=gdk_pixmap_foreign_new (wallpaper_xid); ++ if (!wallpaper) ++ { ++ return; ++ } + gdk_drawable_set_colormap(wallpaper,shinyswitcher->rgb_cmap); + + shinyswitcher->wallpaper_inactive=gdk_pixmap_new(NULL,shinyswitcher->mini_work_width*vp_hscale(shinyswitcher),shinyswitcher->mini_work_height*vp_vscale(shinyswitcher),32); //FIXME +@@ -216,28 +237,34 @@ + gtk_widget_set_app_paintable(widget,TRUE); + gdk_drawable_set_colormap(shinyswitcher->wallpaper_inactive,shinyswitcher->rgba_cmap); + cairo_t * destcr=gdk_cairo_create(shinyswitcher->wallpaper_inactive); +- cairo_set_operator (destcr, CAIRO_OPERATOR_CLEAR); ++ if (destcr) ++ { ++ cairo_set_operator(destcr, CAIRO_OPERATOR_CLEAR); + cairo_paint(destcr); +- gdk_drawable_get_size(wallpaper,&w,&h); +- cairo_scale(destcr,shinyswitcher->mini_work_width/(double)w*vp_hscale(shinyswitcher),shinyswitcher->mini_work_height/(double)h*vp_vscale(shinyswitcher)); +- gdk_cairo_set_source_pixmap(destcr,wallpaper,0, 0); +- cairo_set_operator (destcr, CAIRO_OPERATOR_OVER); +- cairo_paint_with_alpha(destcr,shinyswitcher->wallpaper_alpha_inactive); +- gtk_widget_destroy(widget); ++ gdk_drawable_get_size(wallpaper, &w, &h); ++ cairo_scale(destcr, shinyswitcher->mini_work_width / (double)w*vp_hscale(shinyswitcher), shinyswitcher->mini_work_height / (double)h*vp_vscale(shinyswitcher)); ++ gdk_cairo_set_source_pixmap(destcr, wallpaper, 0, 0); ++ cairo_set_operator(destcr, CAIRO_OPERATOR_OVER); ++ cairo_paint_with_alpha(destcr, shinyswitcher->wallpaper_alpha_inactive); ++ } ++ gtk_widget_destroy(widget); + + shinyswitcher->wallpaper_active=gdk_pixmap_new(NULL,shinyswitcher->mini_work_width*vp_hscale(shinyswitcher),shinyswitcher->mini_work_height*vp_vscale(shinyswitcher),32); //FIXME + widget=gtk_image_new_from_pixmap(shinyswitcher->wallpaper_active,NULL); + gtk_widget_set_app_paintable(widget,TRUE); + gdk_drawable_set_colormap(shinyswitcher->wallpaper_active,shinyswitcher->rgba_cmap); + destcr=gdk_cairo_create(shinyswitcher->wallpaper_active); +- cairo_set_operator (destcr, CAIRO_OPERATOR_CLEAR); ++ if (destcr) ++ { ++ cairo_set_operator(destcr, CAIRO_OPERATOR_CLEAR); + cairo_paint(destcr); +- cairo_scale(destcr,shinyswitcher->mini_work_width/(double)w*vp_hscale(shinyswitcher),shinyswitcher->mini_work_height/(double)h*vp_vscale(shinyswitcher)); +- gdk_cairo_set_source_pixmap(destcr,wallpaper,0, 0); +- cairo_set_operator (destcr, CAIRO_OPERATOR_OVER); +- cairo_paint_with_alpha(destcr,shinyswitcher->wallpaper_alpha_active); +- gtk_widget_destroy(widget); +- cairo_destroy(destcr); ++ cairo_scale(destcr, shinyswitcher->mini_work_width / (double)w*vp_hscale(shinyswitcher), shinyswitcher->mini_work_height / (double)h*vp_vscale(shinyswitcher)); ++ gdk_cairo_set_source_pixmap(destcr, wallpaper, 0, 0); ++ cairo_set_operator(destcr, CAIRO_OPERATOR_OVER); ++ cairo_paint_with_alpha(destcr, shinyswitcher->wallpaper_alpha_active); ++ cairo_destroy(destcr); ++ } ++ gtk_widget_destroy(widget); + } + + +@@ -257,28 +284,34 @@ + widget=gtk_image_new_from_pixmap(shinyswitcher->wallpaper_inactive,NULL); + gtk_widget_set_app_paintable(widget,TRUE); + cr=gdk_cairo_create(shinyswitcher->wallpaper_inactive); +- cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR); +- cairo_paint(cr); +- cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); +- cairo_set_source_rgba (cr,shinyswitcher->desktop_colour.red, shinyswitcher->desktop_colour.green, +- shinyswitcher->desktop_colour.blue, shinyswitcher->desktop_colour.alpha); +- cairo_paint_with_alpha(cr,shinyswitcher->wallpaper_alpha_inactive); +- gtk_widget_destroy(widget); +- cairo_destroy(cr); ++ if (cr) ++ { ++ cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR); ++ cairo_paint(cr); ++ cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE); ++ cairo_set_source_rgba(cr, shinyswitcher->desktop_colour.red, shinyswitcher->desktop_colour.green, ++ shinyswitcher->desktop_colour.blue, shinyswitcher->desktop_colour.alpha); ++ cairo_paint_with_alpha(cr, shinyswitcher->wallpaper_alpha_inactive); ++ gtk_widget_destroy(widget); ++ cairo_destroy(cr); ++ } + + shinyswitcher->wallpaper_active=gdk_pixmap_new(NULL,shinyswitcher->mini_work_width*vp_hscale(shinyswitcher),shinyswitcher->mini_work_height*vp_vscale(shinyswitcher),32); //FIXME + gdk_drawable_set_colormap(shinyswitcher->wallpaper_active,shinyswitcher->rgba_cmap); + widget=gtk_image_new_from_pixmap(shinyswitcher->wallpaper_active,NULL); + gtk_widget_set_app_paintable(widget,TRUE); + cr=gdk_cairo_create(shinyswitcher->wallpaper_active); +- cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR); +- cairo_paint(cr); +- cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); +- cairo_set_source_rgba (cr,shinyswitcher->desktop_colour.red, shinyswitcher->desktop_colour.green, +- shinyswitcher->desktop_colour.blue, shinyswitcher->desktop_colour.alpha); +- cairo_paint_with_alpha(cr,shinyswitcher->wallpaper_alpha_active); +- gtk_widget_destroy(widget); +- cairo_destroy(cr); ++ if (cr) ++ { ++ cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR); ++ cairo_paint(cr); ++ cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE); ++ cairo_set_source_rgba(cr, shinyswitcher->desktop_colour.red, shinyswitcher->desktop_colour.green, ++ shinyswitcher->desktop_colour.blue, shinyswitcher->desktop_colour.alpha); ++ cairo_paint_with_alpha(cr, shinyswitcher->wallpaper_alpha_active); ++ cairo_destroy(cr); ++ } ++ gtk_widget_destroy(widget); + + } + } --- awn-extras-applets-0.2.6.orig/debian/patches/03_fix_shebang.patch +++ awn-extras-applets-0.2.6/debian/patches/03_fix_shebang.patch @@ -0,0 +1,653 @@ +diff -ur awn-extras-applets-0.2.6.orig/src/arss/Core/filechooser_rss.py awn-extras-applets-0.2.6/src/arss/Core/filechooser_rss.py +--- awn-extras-applets-0.2.6.orig/src/arss/Core/filechooser_rss.py 2008-03-15 17:12:05.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/arss/Core/filechooser_rss.py 2008-03-15 17:34:51.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + + # example filechooser.py + +Seulement dans awn-extras-applets-0.2.6/src/arss/Core: filechooser_rss.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/arss/Core/handle_rss.py awn-extras-applets-0.2.6/src/arss/Core/handle_rss.py +--- awn-extras-applets-0.2.6.orig/src/arss/Core/handle_rss.py 2008-03-15 17:12:05.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/arss/Core/handle_rss.py 2008-03-15 17:36:13.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + + # Copyright (c) 2007 Randal Barlow + # +Seulement dans awn-extras-applets-0.2.6/src/arss/Core: handle_rss.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/arss/rss_awn.py awn-extras-applets-0.2.6/src/arss/rss_awn.py +--- awn-extras-applets-0.2.6.orig/src/arss/rss_awn.py 2008-03-15 17:12:05.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/arss/rss_awn.py 2008-03-15 17:57:38.000000000 +0100 +@@ -1,4 +1,4 @@ +-# !/usr/bin/python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + + # Copyright (c) 2007 Randal Barlow +Seulement dans awn-extras-applets-0.2.6/src/arss: rss_awn.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/calendarlogin.py awn-extras-applets-0.2.6/src/calendar/calendarlogin.py +--- awn-extras-applets-0.2.6.orig/src/calendar/calendarlogin.py 2008-03-15 17:12:05.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/calendarlogin.py 2008-03-15 17:36:35.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + # -*- coding: iso-8859-15 -*- + # + # Copyright (c) 2007 Mike (mosburger) Desjardins +Seulement dans awn-extras-applets-0.2.6/src/calendar: calendarlogin.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/calendarprefs.py awn-extras-applets-0.2.6/src/calendar/calendarprefs.py +--- awn-extras-applets-0.2.6.orig/src/calendar/calendarprefs.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/calendarprefs.py 2008-03-15 17:36:53.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + # -*- coding: iso-8859-15 -*- + # + # Copyright (c) 2007 Mike (mosburger) Desjardins +Seulement dans awn-extras-applets-0.2.6/src/calendar: calendarprefs.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/calthread.py awn-extras-applets-0.2.6/src/calendar/calthread.py +--- awn-extras-applets-0.2.6.orig/src/calendar/calthread.py 2008-03-15 17:12:05.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/calthread.py 2008-03-15 17:37:29.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + # -*- coding: iso-8859-15 -*- + # + # Copyright (c) 2007 Mike (mosburger) Desjardins +Seulement dans awn-extras-applets-0.2.6/src/calendar: calthread.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/evocal.py awn-extras-applets-0.2.6/src/calendar/evocal.py +--- awn-extras-applets-0.2.6.orig/src/calendar/evocal.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/evocal.py 2008-03-15 17:37:10.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + # -*- coding: iso-8859-15 -*- + # + # Copyright (c) 2007 Mike (mosburger) Desjardins +Seulement dans awn-extras-applets-0.2.6/src/calendar: evocal.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/google/atom/__init__.py awn-extras-applets-0.2.6/src/calendar/google/atom/__init__.py +--- awn-extras-applets-0.2.6.orig/src/calendar/google/atom/__init__.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/google/atom/__init__.py 2008-03-15 17:37:55.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + # + # Copyright (C) 2006 Google Inc. + # +Seulement dans awn-extras-applets-0.2.6/src/calendar/google/atom: __init__.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/google/atom/service.py awn-extras-applets-0.2.6/src/calendar/google/atom/service.py +--- awn-extras-applets-0.2.6.orig/src/calendar/google/atom/service.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/google/atom/service.py 2008-03-15 17:38:42.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + # + # Copyright (C) 2006 Google Inc. + # +Seulement dans awn-extras-applets-0.2.6/src/calendar/google/atom: service.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/apps/__init__.py awn-extras-applets-0.2.6/src/calendar/google/gdata/apps/__init__.py +--- awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/apps/__init__.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/google/gdata/apps/__init__.py 2008-03-15 17:39:40.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + # + # Copyright (C) 2007 SIOS Technology, Inc. + # +Seulement dans awn-extras-applets-0.2.6/src/calendar/google/gdata/apps: __init__.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/apps/service.py awn-extras-applets-0.2.6/src/calendar/google/gdata/apps/service.py +--- awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/apps/service.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/google/gdata/apps/service.py 2008-03-15 17:39:54.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + # + # Copyright (C) 2007 SIOS Technology, Inc. + # +Seulement dans awn-extras-applets-0.2.6/src/calendar/google/gdata/apps: service.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/base/__init__.py awn-extras-applets-0.2.6/src/calendar/google/gdata/base/__init__.py +--- awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/base/__init__.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/google/gdata/base/__init__.py 2008-03-15 17:40:17.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + # + # Copyright (C) 2006 Google Inc. + # +Seulement dans awn-extras-applets-0.2.6/src/calendar/google/gdata/base: __init__.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/base/service.py awn-extras-applets-0.2.6/src/calendar/google/gdata/base/service.py +--- awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/base/service.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/google/gdata/base/service.py 2008-03-15 17:40:26.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + # + # Copyright (C) 2006 Google Inc. + # +Seulement dans awn-extras-applets-0.2.6/src/calendar/google/gdata/base: service.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/calendar/__init__.py awn-extras-applets-0.2.6/src/calendar/google/gdata/calendar/__init__.py +--- awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/calendar/__init__.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/google/gdata/calendar/__init__.py 2008-03-15 17:40:45.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + # + # Copyright (C) 2006 Google Inc. + # +Seulement dans awn-extras-applets-0.2.6/src/calendar/google/gdata/calendar: __init__.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/calendar/service.py awn-extras-applets-0.2.6/src/calendar/google/gdata/calendar/service.py +--- awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/calendar/service.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/google/gdata/calendar/service.py 2008-03-15 17:40:53.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + # + # Copyright (C) 2006 Google Inc. + # +Seulement dans awn-extras-applets-0.2.6/src/calendar/google/gdata/calendar: service.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/docs/__init__.py awn-extras-applets-0.2.6/src/calendar/google/gdata/docs/__init__.py +--- awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/docs/__init__.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/google/gdata/docs/__init__.py 2008-03-15 17:41:12.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + # + # Copyright (C) 2006 Google Inc. + # +Seulement dans awn-extras-applets-0.2.6/src/calendar/google/gdata/docs: __init__.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/docs/service.py awn-extras-applets-0.2.6/src/calendar/google/gdata/docs/service.py +--- awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/docs/service.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/google/gdata/docs/service.py 2008-03-15 17:41:21.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + # + # Copyright (C) 2006 Google Inc. + # +Seulement dans awn-extras-applets-0.2.6/src/calendar/google/gdata/docs: service.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/__init__.py awn-extras-applets-0.2.6/src/calendar/google/gdata/__init__.py +--- awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/__init__.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/google/gdata/__init__.py 2008-03-15 17:38:18.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + # + # Copyright (C) 2006 Google Inc. + # +Seulement dans awn-extras-applets-0.2.6/src/calendar/google/gdata: __init__.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/service.py awn-extras-applets-0.2.6/src/calendar/google/gdata/service.py +--- awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/service.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/google/gdata/service.py 2008-03-15 17:41:46.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + # + # Copyright (C) 2006 Google Inc. + # +Seulement dans awn-extras-applets-0.2.6/src/calendar/google/gdata: service.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/spreadsheet/__init__.py awn-extras-applets-0.2.6/src/calendar/google/gdata/spreadsheet/__init__.py +--- awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/spreadsheet/__init__.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/google/gdata/spreadsheet/__init__.py 2008-03-15 17:42:15.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + # + # Copyright (C) 2007 Google Inc. + # +Seulement dans awn-extras-applets-0.2.6/src/calendar/google/gdata/spreadsheet: __init__.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/spreadsheet/service.py awn-extras-applets-0.2.6/src/calendar/google/gdata/spreadsheet/service.py +--- awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/spreadsheet/service.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/google/gdata/spreadsheet/service.py 2008-03-15 17:42:38.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + # + # Copyright (C) 2007 Google Inc. + # +Seulement dans awn-extras-applets-0.2.6/src/calendar/google/gdata/spreadsheet: service.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/test_data.py awn-extras-applets-0.2.6/src/calendar/google/gdata/test_data.py +--- awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/test_data.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/google/gdata/test_data.py 2008-03-15 18:09:17.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + # + # Copyright (C) 2006 Google Inc. + # +Seulement dans awn-extras-applets-0.2.6/src/calendar/google/gdata: test_data.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/googlecal.py awn-extras-applets-0.2.6/src/calendar/googlecal.py +--- awn-extras-applets-0.2.6.orig/src/calendar/googlecal.py 2008-03-15 17:12:05.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/googlecal.py 2008-03-15 17:44:02.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + # -*- coding: iso-8859-15 -*- + # + # Copyright (c) 2007 Mike (mosburger) Desjardins +Seulement dans awn-extras-applets-0.2.6/src/calendar: googlecal.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/icscal.py awn-extras-applets-0.2.6/src/calendar/icscal.py +--- awn-extras-applets-0.2.6.orig/src/calendar/icscal.py 2008-03-15 17:12:05.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/icscal.py 2008-03-15 17:44:16.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + # -*- coding: iso-8859-15 -*- + # + # Copyright (c) 2007 Mike (mosburger) Desjardins +Seulement dans awn-extras-applets-0.2.6/src/calendar: icscal.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/owacal.py awn-extras-applets-0.2.6/src/calendar/owacal.py +--- awn-extras-applets-0.2.6.orig/src/calendar/owacal.py 2008-03-15 17:12:05.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/owacal.py 2008-03-15 17:44:30.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + # -*- coding: iso-8859-15 -*- + # + # Copyright (c) 2007 Mike (mosburger) Desjardins +Seulement dans awn-extras-applets-0.2.6/src/calendar: owacal.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/sevensegled.py awn-extras-applets-0.2.6/src/calendar/sevensegled.py +--- awn-extras-applets-0.2.6.orig/src/calendar/sevensegled.py 2008-03-15 17:12:05.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/sevensegled.py 2008-03-15 17:44:59.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + # -*- coding: iso-8859-15 -*- + # + # Copyright (c) 2007 Mike (mosburger) Desjardins +Seulement dans awn-extras-applets-0.2.6/src/calendar: sevensegled.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/comic/comicdialog.py awn-extras-applets-0.2.6/src/comic/comicdialog.py +--- awn-extras-applets-0.2.6.orig/src/comic/comicdialog.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/comic/comicdialog.py 2008-03-15 17:45:22.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + # -*- coding: iso-8859-15 -*- + # + # This program is free software; you can redistribute it and/or modify +Seulement dans awn-extras-applets-0.2.6/src/comic: comicdialog.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/comic/getborn.py awn-extras-applets-0.2.6/src/comic/getborn.py +--- awn-extras-applets-0.2.6.orig/src/comic/getborn.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/comic/getborn.py 2008-03-15 17:45:34.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License version 2 as +Seulement dans awn-extras-applets-0.2.6/src/comic: getborn.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/comic/getdilbert.py awn-extras-applets-0.2.6/src/comic/getdilbert.py +--- awn-extras-applets-0.2.6.orig/src/comic/getdilbert.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/comic/getdilbert.py 2008-03-15 17:45:52.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License version 2 as +Seulement dans awn-extras-applets-0.2.6/src/comic: getdilbert.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/comic/getpcnp.py awn-extras-applets-0.2.6/src/comic/getpcnp.py +--- awn-extras-applets-0.2.6.orig/src/comic/getpcnp.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/comic/getpcnp.py 2008-03-15 17:46:16.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License version 2 as +Seulement dans awn-extras-applets-0.2.6/src/comic: getpcnp.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/comic/getpeanuts.py awn-extras-applets-0.2.6/src/comic/getpeanuts.py +--- awn-extras-applets-0.2.6.orig/src/comic/getpeanuts.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/comic/getpeanuts.py 2008-03-15 17:46:26.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License version 2 as +Seulement dans awn-extras-applets-0.2.6/src/comic: getpeanuts.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/comic/getwiz.py awn-extras-applets-0.2.6/src/comic/getwiz.py +--- awn-extras-applets-0.2.6.orig/src/comic/getwiz.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/comic/getwiz.py 2008-03-15 17:46:45.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License version 2 as +Seulement dans awn-extras-applets-0.2.6/src/comic: getwiz.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/comic/getxkcd.py awn-extras-applets-0.2.6/src/comic/getxkcd.py +--- awn-extras-applets-0.2.6.orig/src/comic/getxkcd.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/comic/getxkcd.py 2008-03-15 17:47:00.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License version 2 as +Seulement dans awn-extras-applets-0.2.6/src/comic: getxkcd.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/file-browser-launcher/about.py awn-extras-applets-0.2.6/src/file-browser-launcher/about.py +--- awn-extras-applets-0.2.6.orig/src/file-browser-launcher/about.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/file-browser-launcher/about.py 2008-03-15 17:47:28.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # -*- coding: utf-8 -*- + # + # Copyright (c) 2008 sharkbaitbobby +Seulement dans awn-extras-applets-0.2.6/src/file-browser-launcher: about.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/file-browser-launcher/file-browser-launcher.py awn-extras-applets-0.2.6/src/file-browser-launcher/file-browser-launcher.py +--- awn-extras-applets-0.2.6.orig/src/file-browser-launcher/file-browser-launcher.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/file-browser-launcher/file-browser-launcher.py 2008-03-15 17:48:04.000000000 +0100 +@@ -1,4 +1,3 @@ +-#! /usr/bin/python + # -*- coding: utf-8 -*- + # + # Copyright (c) 2008 sharkbaitbobby +Seulement dans awn-extras-applets-0.2.6/src/file-browser-launcher: file-browser-launcher.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/file-browser-launcher/gconfwrapper.py awn-extras-applets-0.2.6/src/file-browser-launcher/gconfwrapper.py +--- awn-extras-applets-0.2.6.orig/src/file-browser-launcher/gconfwrapper.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/file-browser-launcher/gconfwrapper.py 2008-03-15 17:48:34.000000000 +0100 +@@ -1,4 +1,3 @@ +-#! /usr/bin/env python + # -*- coding:utf-8 -*- + # + # Copyright (c) 2008 sharkbaitbobby +Seulement dans awn-extras-applets-0.2.6/src/file-browser-launcher: gconfwrapper.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/file-browser-launcher/prefs.py awn-extras-applets-0.2.6/src/file-browser-launcher/prefs.py +--- awn-extras-applets-0.2.6.orig/src/file-browser-launcher/prefs.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/file-browser-launcher/prefs.py 2008-03-15 17:48:50.000000000 +0100 +@@ -1,4 +1,3 @@ +-#! /usr/bin/env python + # -*- coding: utf-8 -*- + # + # Copyright (c) 2008 sharkbaitbobby +Seulement dans awn-extras-applets-0.2.6/src/file-browser-launcher: prefs.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/lastfm/httpclient.py awn-extras-applets-0.2.6/src/lastfm/httpclient.py +--- awn-extras-applets-0.2.6.orig/src/lastfm/httpclient.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/lastfm/httpclient.py 2008-03-15 17:49:16.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + + # Copyright (c) 2007 Tomas Kramar (kramar.tomas@gmail.com), Jonathan Rauprich (joni@noplu.de) + # +Seulement dans awn-extras-applets-0.2.6/src/lastfm: httpclient.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/lastfm/imageproducer.py awn-extras-applets-0.2.6/src/lastfm/imageproducer.py +--- awn-extras-applets-0.2.6.orig/src/lastfm/imageproducer.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/lastfm/imageproducer.py 2008-03-15 17:49:33.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + + # Copyright (c) 2007 Tomas Kramar (kramar.tomas@gmail.com), Jonathan Rauprich (joni@noplu.de) + # +Seulement dans awn-extras-applets-0.2.6/src/lastfm: imageproducer.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/lastfm/lastfmconfig.py awn-extras-applets-0.2.6/src/lastfm/lastfmconfig.py +--- awn-extras-applets-0.2.6.orig/src/lastfm/lastfmconfig.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/lastfm/lastfmconfig.py 2008-03-15 17:50:10.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + + # Copyright (c) 2007 Tomas Kramar (kramar.tomas@gmail.com), Jonathan Rauprich (joni@noplu.de) + # +Seulement dans awn-extras-applets-0.2.6/src/lastfm: lastfmconfig.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/lastfm/lastfmexception.py awn-extras-applets-0.2.6/src/lastfm/lastfmexception.py +--- awn-extras-applets-0.2.6.orig/src/lastfm/lastfmexception.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/lastfm/lastfmexception.py 2008-03-15 17:50:58.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + + # Copyright (c) 2007 Tomas Kramar (kramar.tomas@gmail.com), Jonathan Rauprich (joni@noplu.de) + # +Seulement dans awn-extras-applets-0.2.6/src/lastfm: lastfmexception.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/lastfm/lastfmpreferences.py awn-extras-applets-0.2.6/src/lastfm/lastfmpreferences.py +--- awn-extras-applets-0.2.6.orig/src/lastfm/lastfmpreferences.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/lastfm/lastfmpreferences.py 2008-03-15 17:51:13.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + + # Copyright (c) 2007 Tomas Kramar (kramar.tomas@gmail.com), Jonathan Rauprich (joni@noplu.de) + # +Seulement dans awn-extras-applets-0.2.6/src/lastfm: lastfmpreferences.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/lastfm/lastfm.py awn-extras-applets-0.2.6/src/lastfm/lastfm.py +--- awn-extras-applets-0.2.6.orig/src/lastfm/lastfm.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/lastfm/lastfm.py 2008-03-15 17:49:51.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + + # Copyright (c) 2007 Tomas Kramar (kramar.tomas@gmail.com), Jonathan Rauprich (joni@noplu.de) + # +Seulement dans awn-extras-applets-0.2.6/src/lastfm: lastfm.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/libawn-extras/bindings/python/AWNLib.py awn-extras-applets-0.2.6/src/libawn-extras/bindings/python/AWNLib.py +--- awn-extras-applets-0.2.6.orig/src/libawn-extras/bindings/python/AWNLib.py 2008-03-15 17:12:05.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/libawn-extras/bindings/python/AWNLib.py 2008-03-15 17:35:41.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + # + # AWN Applet Library + # +Seulement dans awn-extras-applets-0.2.6/src/libawn-extras/bindings/python: AWNLib.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/media-control/mediacontrol.py awn-extras-applets-0.2.6/src/media-control/mediacontrol.py +--- awn-extras-applets-0.2.6.orig/src/media-control/mediacontrol.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/media-control/mediacontrol.py 2008-03-15 17:57:20.000000000 +0100 +@@ -1,4 +1,4 @@ +-# !/usr/bin/python ++#!/usr/bin/python + + # Copyright (c) 2007 Randal Barlow + # +Seulement dans awn-extras-applets-0.2.6/src/media-control: mediacontrol.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/media-icon-back/medialogoback.py awn-extras-applets-0.2.6/src/media-icon-back/medialogoback.py +--- awn-extras-applets-0.2.6.orig/src/media-icon-back/medialogoback.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/media-icon-back/medialogoback.py 2008-03-15 17:32:30.000000000 +0100 +@@ -1,4 +1,4 @@ +-# !/usr/bin/python ++#!/usr/bin/python + + # Copyright (c) 2007 Randal Barlow + # +Seulement dans awn-extras-applets-0.2.6/src/media-icon-back: medialogoback.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/media-icon-next/medialogonext.py awn-extras-applets-0.2.6/src/media-icon-next/medialogonext.py +--- awn-extras-applets-0.2.6.orig/src/media-icon-next/medialogonext.py 2008-03-15 17:12:05.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/media-icon-next/medialogonext.py 2008-03-15 17:33:18.000000000 +0100 +@@ -1,4 +1,4 @@ +-# !/usr/bin/python ++#!/usr/bin/python + + # Copyright (c) 2007 Randal Barlow + # +Seulement dans awn-extras-applets-0.2.6/src/media-icon-next: medialogonext.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/media-icon-play/medialogoplay.py awn-extras-applets-0.2.6/src/media-icon-play/medialogoplay.py +--- awn-extras-applets-0.2.6.orig/src/media-icon-play/medialogoplay.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/media-icon-play/medialogoplay.py 2008-03-15 17:32:57.000000000 +0100 +@@ -1,4 +1,4 @@ +-# !/usr/bin/python ++#!/usr/bin/python + + # Copyright (c) 2007 Randal Barlow + # +Seulement dans awn-extras-applets-0.2.6/src/media-icon-play: medialogoplay.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/MiMenu/mimenu.py awn-extras-applets-0.2.6/src/MiMenu/mimenu.py +--- awn-extras-applets-0.2.6.orig/src/MiMenu/mimenu.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/MiMenu/mimenu.py 2008-03-15 17:33:42.000000000 +0100 +@@ -1,4 +1,4 @@ +-# !/usr/bin/python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + + # Copyright (c) 2007 Randal Barlow +Seulement dans awn-extras-applets-0.2.6/src/MiMenu: mimenu.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/showdesktop/showdesktop.py awn-extras-applets-0.2.6/src/showdesktop/showdesktop.py +--- awn-extras-applets-0.2.6.orig/src/showdesktop/showdesktop.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/showdesktop/showdesktop.py 2008-03-15 17:58:31.000000000 +0100 +@@ -1,3 +1,4 @@ ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # vim: ts=4 + ### +Seulement dans awn-extras-applets-0.2.6/src/showdesktop: showdesktop.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/stacks/stacks_backend_file.py awn-extras-applets-0.2.6/src/stacks/stacks_backend_file.py +--- awn-extras-applets-0.2.6.orig/src/stacks/stacks_backend_file.py 2008-03-15 17:12:05.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/stacks/stacks_backend_file.py 2008-03-15 17:52:23.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + + # Copyright (c) 2007 Timon ter Braak + # +Seulement dans awn-extras-applets-0.2.6/src/stacks: stacks_backend_file.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/stacks/stacks_backend_folder.py awn-extras-applets-0.2.6/src/stacks/stacks_backend_folder.py +--- awn-extras-applets-0.2.6.orig/src/stacks/stacks_backend_folder.py 2008-03-15 17:12:05.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/stacks/stacks_backend_folder.py 2008-03-15 17:52:36.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + + # Copyright (c) 2007 Randal Barlow + # +Seulement dans awn-extras-applets-0.2.6/src/stacks: stacks_backend_folder.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/stacks/stacks_backend_plugger.py awn-extras-applets-0.2.6/src/stacks/stacks_backend_plugger.py +--- awn-extras-applets-0.2.6.orig/src/stacks/stacks_backend_plugger.py 2008-03-15 17:12:05.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/stacks/stacks_backend_plugger.py 2008-03-15 17:52:48.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + + # Copyright (c) 2007 Timon ter Braak + # +Seulement dans awn-extras-applets-0.2.6/src/stacks: stacks_backend_plugger.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/stacks/stacks_backend.py awn-extras-applets-0.2.6/src/stacks/stacks_backend.py +--- awn-extras-applets-0.2.6.orig/src/stacks/stacks_backend.py 2008-03-15 17:12:05.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/stacks/stacks_backend.py 2008-03-15 17:51:49.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + + # Copyright (c) 2007 Timon ter Braak + # +Seulement dans awn-extras-applets-0.2.6/src/stacks: stacks_backend.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/stacks/stacks_backend_trasher.py awn-extras-applets-0.2.6/src/stacks/stacks_backend_trasher.py +--- awn-extras-applets-0.2.6.orig/src/stacks/stacks_backend_trasher.py 2008-03-15 17:12:05.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/stacks/stacks_backend_trasher.py 2008-03-15 17:53:07.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + + # Copyright (c) 2007 Timon ter Braak + # +Seulement dans awn-extras-applets-0.2.6/src/stacks: stacks_backend_trasher.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/stacks/stacks_config.py awn-extras-applets-0.2.6/src/stacks/stacks_config.py +--- awn-extras-applets-0.2.6.orig/src/stacks/stacks_config.py 2008-03-15 17:12:05.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/stacks/stacks_config.py 2008-03-15 17:53:23.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + import sys + import gobject + import gtk +Seulement dans awn-extras-applets-0.2.6/src/stacks: stacks_config.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/stacks/stacks_glade.py awn-extras-applets-0.2.6/src/stacks/stacks_glade.py +--- awn-extras-applets-0.2.6.orig/src/stacks/stacks_glade.py 2008-03-15 17:12:05.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/stacks/stacks_glade.py 2008-03-15 17:53:38.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + + # Copyright (c) 2007 Timon ter Braak + # +Seulement dans awn-extras-applets-0.2.6/src/stacks: stacks_glade.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/stacks/stacks_gui_curved.py awn-extras-applets-0.2.6/src/stacks/stacks_gui_curved.py +--- awn-extras-applets-0.2.6.orig/src/stacks/stacks_gui_curved.py 2008-03-15 17:12:05.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/stacks/stacks_gui_curved.py 2008-03-15 17:53:51.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + + # stacks_gui_curved version 0.2 + # Copyright (c) 2007 SilentStorm aka Wim Wauters +Seulement dans awn-extras-applets-0.2.6/src/stacks: stacks_gui_curved.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/stacks/stacks_gui_dialog.py awn-extras-applets-0.2.6/src/stacks/stacks_gui_dialog.py +--- awn-extras-applets-0.2.6.orig/src/stacks/stacks_gui_dialog.py 2008-03-15 17:12:05.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/stacks/stacks_gui_dialog.py 2008-03-15 17:54:02.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + + # Copyright (c) 2007 Randal Barlow + # +Seulement dans awn-extras-applets-0.2.6/src/stacks: stacks_gui_dialog.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/stacks/stacks_gui_trasher.py awn-extras-applets-0.2.6/src/stacks/stacks_gui_trasher.py +--- awn-extras-applets-0.2.6.orig/src/stacks/stacks_gui_trasher.py 2008-03-15 17:12:05.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/stacks/stacks_gui_trasher.py 2008-03-15 17:54:27.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + + # Copyright (c) 2007 Randal Barlow + # +Seulement dans awn-extras-applets-0.2.6/src/stacks: stacks_gui_trasher.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/stacks/stacks_icons.py awn-extras-applets-0.2.6/src/stacks/stacks_icons.py +--- awn-extras-applets-0.2.6.orig/src/stacks/stacks_icons.py 2008-03-15 17:12:05.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/stacks/stacks_icons.py 2008-03-15 17:54:43.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + + # Copyright (c) 2007 Timon ter Braak + # +Seulement dans awn-extras-applets-0.2.6/src/stacks: stacks_icons.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/stacks/stacks_launcher.py awn-extras-applets-0.2.6/src/stacks/stacks_launcher.py +--- awn-extras-applets-0.2.6.orig/src/stacks/stacks_launcher.py 2008-03-15 17:12:05.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/stacks/stacks_launcher.py 2008-03-15 17:54:53.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + + # Copyright (c) 2007 Timon ter Braak + # +Seulement dans awn-extras-applets-0.2.6/src/stacks: stacks_launcher.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/stacks/stacks_vfs.py awn-extras-applets-0.2.6/src/stacks/stacks_vfs.py +--- awn-extras-applets-0.2.6.orig/src/stacks/stacks_vfs.py 2008-03-15 17:12:05.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/stacks/stacks_vfs.py 2008-03-15 17:55:03.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + + # Copyright (c) 2007 Timon ter Braak + # +Seulement dans awn-extras-applets-0.2.6/src/stacks: stacks_vfs.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/volume-control/volume-control.py awn-extras-applets-0.2.6/src/volume-control/volume-control.py +--- awn-extras-applets-0.2.6.orig/src/volume-control/volume-control.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/volume-control/volume-control.py 2008-03-15 17:59:01.000000000 +0100 +@@ -1,3 +1,4 @@ ++#!/usr/bin/python + """ + -------------------------------------------------------------------------------- + This program is free software; you can redistribute it and/or modify +@@ -28,7 +29,6 @@ + Pavel Panchekha + """ + +-#!/usr/bin/python + import sys, os + import gobject + import gtk +Seulement dans awn-extras-applets-0.2.6/src/volume-control: volume-control.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/weather/override.py awn-extras-applets-0.2.6/src/weather/override.py +--- awn-extras-applets-0.2.6.orig/src/weather/override.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/weather/override.py 2008-03-15 18:09:39.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + #Copyright 2007 Isaac J. + import sys, os + import gobject +Seulement dans awn-extras-applets-0.2.6/src/weather: override.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/weather/weatherconfig.py awn-extras-applets-0.2.6/src/weather/weatherconfig.py +--- awn-extras-applets-0.2.6.orig/src/weather/weatherconfig.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/weather/weatherconfig.py 2008-03-15 17:56:03.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + # -*- coding: iso-8859-15 -*- + # + # Copyright (c) 2007 Mike (mosburger) Desjardins +Seulement dans awn-extras-applets-0.2.6/src/weather: weatherconfig.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/weather/weathercurved.py awn-extras-applets-0.2.6/src/weather/weathercurved.py +--- awn-extras-applets-0.2.6.orig/src/weather/weathercurved.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/weather/weathercurved.py 2008-03-15 17:55:39.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + # -*- coding: iso-8859-15 -*- + # + # Copyright (c) 2007 Mike (mosburger) Desjardins +Seulement dans awn-extras-applets-0.2.6/src/weather: weathercurved.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/weather/weatherdialog.py awn-extras-applets-0.2.6/src/weather/weatherdialog.py +--- awn-extras-applets-0.2.6.orig/src/weather/weatherdialog.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/weather/weatherdialog.py 2008-03-15 17:56:11.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + # -*- coding: iso-8859-15 -*- + # + # Copyright (c) 2007 Mike (mosburger) Desjardins +Seulement dans awn-extras-applets-0.2.6/src/weather: weatherdialog.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/weather/weathericons.py awn-extras-applets-0.2.6/src/weather/weathericons.py +--- awn-extras-applets-0.2.6.orig/src/weather/weathericons.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/weather/weathericons.py 2008-03-15 17:56:29.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + # -*- coding: iso-8859-15 -*- + # + # Copyright (c) 2007 Mike (mosburger) Desjardins +Seulement dans awn-extras-applets-0.2.6/src/weather: weathericons.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/weather/weathermap.py awn-extras-applets-0.2.6/src/weather/weathermap.py +--- awn-extras-applets-0.2.6.orig/src/weather/weathermap.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/weather/weathermap.py 2008-03-15 17:56:36.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + # -*- coding: iso-8859-15 -*- + # + # Copyright (c) 2007 Mike (mosburger) Desjardins +Seulement dans awn-extras-applets-0.2.6/src/weather: weathermap.py~ +diff -ur awn-extras-applets-0.2.6.orig/src/weather/weathertext.py awn-extras-applets-0.2.6/src/weather/weathertext.py +--- awn-extras-applets-0.2.6.orig/src/weather/weathertext.py 2008-03-15 17:12:04.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/weather/weathertext.py 2008-03-15 17:56:44.000000000 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + # -*- coding: iso-8859-15 -*- + # + # Copyright (c) 2007 Mike (mosburger) Desjardins +Seulement dans awn-extras-applets-0.2.6/src/weather: weathertext.py~ --- awn-extras-applets-0.2.6.orig/debian/patches/93-bzr-show-desktop-title.patch +++ awn-extras-applets-0.2.6/debian/patches/93-bzr-show-desktop-title.patch @@ -0,0 +1,34 @@ +=== modified file 'src/showdesktop/showdesktop.py' +--- src/showdesktop/showdesktop.py 2008-09-15 20:49:22 +0000 ++++ src/showdesktop/showdesktop.py 2008-09-18 22:45:04 +0000 +@@ -46,19 +46,23 @@ + if height != icon.get_height(): + icon = icon.scale_simple(height,height,gtk.gdk.INTERP_BILINEAR) + self.set_icon(icon) ++ self.title = awn.awn_title_get_default () ++ self.dialog = awn.AppletDialog (self) + self.connect ("button-press-event", self.__on_button_press) +- self.connect("enter-notify-event", self.__enter_notify) +- self.connect("leave-notify-event", self.__leave_notify) +- ++ self.connect ("enter-notify-event", self.enter_notify) ++ self.connect ("leave-notify-event", self.leave_notify) ++ + def __on_button_press(self,widget, event): + screen = wnck.screen_get_default() + screen.toggle_showing_desktop(not screen.get_showing_desktop()) + +- def __enter_notify(self, widget, event): +- self.title.show(self, "Test python applet") ++ def enter_notify (self, widget, event): ++ self.title.show (self, "Show Desktop") ++ # print "show title" + +- def __leave_notify(self, widget, event): ++ def leave_notify (self, widget, event): + self.title.hide (self) ++ # print "hide title" + + if __name__ == '__main__': + awn.init (sys.argv[1:]) + --- awn-extras-applets-0.2.6.orig/debian/patches/94_shinyswitcher_string_to_color.patch +++ awn-extras-applets-0.2.6/debian/patches/94_shinyswitcher_string_to_color.patch @@ -0,0 +1,22 @@ +diff -Nur -x '*.orig' -x '*~' awn-extras-applets-0.2.6/src/shiny-switcher/shinyswitcherapplet.c awn-extras-applets-0.2.6.new/src/shiny-switcher/shinyswitcherapplet.c +--- awn-extras-applets-0.2.6/src/shiny-switcher/shinyswitcherapplet.c 2008-02-14 17:49:53.000000000 +0100 ++++ awn-extras-applets-0.2.6.new/src/shiny-switcher/shinyswitcherapplet.c 2008-10-14 21:49:24.000000000 +0200 +@@ -83,8 +83,16 @@ + static void config_get_color (AwnConfigClient *client, const gchar *key, AwnColor *color) + { + gchar *value = awn_config_client_get_string (client, AWN_CONFIG_CLIENT_DEFAULT_GROUP, key, NULL); +- awn_cairo_string_to_color (value, color); +- g_free (value); ++ if (value) ++ { ++ awn_cairo_string_to_color (value, color); ++ g_free (value); ++ } ++ else ++ { ++ g_warning("Failed to read config key: %s\n",key); ++ awn_cairo_string_to_color ("000000", color); ++ } + } + + void init_config(Shiny_switcher *shinyswitcher) --- awn-extras-applets-0.2.6.orig/debian/patches/102_fbl_trash_location.patch +++ awn-extras-applets-0.2.6/debian/patches/102_fbl_trash_location.patch @@ -0,0 +1,12 @@ +diff -Nur -x '*.orig' -x '*~' awn-extras-applets-0.2.6/src/file-browser-launcher/file-browser-launcher.py awn-extras-applets-0.2.6.new/src/file-browser-launcher/file-browser-launcher.py +--- awn-extras-applets-0.2.6/src/file-browser-launcher/file-browser-launcher.py 2008-10-14 22:46:07.000000000 +0200 ++++ awn-extras-applets-0.2.6.new/src/file-browser-launcher/file-browser-launcher.py 2008-10-14 22:47:43.000000000 +0200 +@@ -149,7 +149,7 @@ + self.dvd_paths = [] + + #Get whether the trash is empty or not +- if len(os.listdir(os.path.expanduser('~/.Trash'))) > 2: ++ if len(os.listdir(os.path.expanduser('~/.local/share/Trash/files'))) > 2: + self.trash_full = True + else: + self.trash_full = False --- awn-extras-applets-0.2.6.orig/debian/patches/106_fbl_missing_bookmark.patch +++ awn-extras-applets-0.2.6/debian/patches/106_fbl_missing_bookmark.patch @@ -0,0 +1,19 @@ +diff -Nur -x '*.orig' -x '*~' awn-extras-applets-0.2.6/src/file-browser-launcher/file-browser-launcher.py awn-extras-applets-0.2.6.new/src/file-browser-launcher/file-browser-launcher.py +--- awn-extras-applets-0.2.6/src/file-browser-launcher/file-browser-launcher.py 2008-10-15 22:29:46.000000000 +0200 ++++ awn-extras-applets-0.2.6.new/src/file-browser-launcher/file-browser-launcher.py 2008-10-15 22:32:15.000000000 +0200 +@@ -138,9 +138,12 @@ + self.fstab2 = open('/etc/fstab','r') + self.fstab = self.fstab2.readlines() + self.fstab2.close() +- self.bmarks2 = open(os.path.expanduser('~/.gtk-bookmarks')) +- self.bmarks = self.bmarks2.readlines() +- self.bmarks2.close() ++ if os.path.exists(os.path.expanduser('~/.gtk-bookmarks')): ++ self.bmarks2 = open(os.path.expanduser('~/.gtk-bookmarks')) ++ self.bmarks = self.bmarks2.readlines() ++ self.bmarks2.close() ++ else: ++ self.bmarks = [] + self.paths = [] + self.paths_fstab = [] + self.nfs_smb_paths = [] --- awn-extras-applets-0.2.6.orig/debian/patches/103-fix-schemas-generation.patch +++ awn-extras-applets-0.2.6/debian/patches/103-fix-schemas-generation.patch @@ -0,0 +1,72 @@ +diff -Nur -x '*.orig' -x '*~' awn-extras-applets-0.2.6/Makefile.schemas awn-extras-applets-0.2.6.new/Makefile.schemas +--- awn-extras-applets-0.2.6/Makefile.schemas 2008-02-14 17:49:53.000000000 +0100 ++++ awn-extras-applets-0.2.6.new/Makefile.schemas 2008-10-15 00:10:28.000000000 +0200 +@@ -10,7 +10,7 @@ + + if DESKTOP_AGNOSTIC + $(schemas_FILE).in: $(APPLET_SCHEMA) +- $(AWN_BINDIR)/awn-schema-to-gconf $< $@ "$(APPLET_NAME)" ++ awn-schema-to-gconf $< $@ "$(APPLET_NAME)" + endif + + @INTLTOOL_SCHEMAS_RULE@ +diff -Nur -x '*.orig' -x '*~' awn-extras-applets-0.2.6/src/filebrowser/Makefile.in awn-extras-applets-0.2.6.new/src/filebrowser/Makefile.in +--- awn-extras-applets-0.2.6/src/filebrowser/Makefile.in 2008-10-15 00:03:45.000000000 +0200 ++++ awn-extras-applets-0.2.6.new/src/filebrowser/Makefile.in 2008-10-15 00:06:33.000000000 +0200 +@@ -720,7 +720,7 @@ + @INTLTOOL_DESKTOP_RULE@ + + @DESKTOP_AGNOSTIC_TRUE@@GCONF_SCHEMAS_TRUE@$(schemas_FILE).in: $(APPLET_SCHEMA) +-@DESKTOP_AGNOSTIC_TRUE@@GCONF_SCHEMAS_TRUE@ $(AWN_BINDIR)/awn-schema-to-gconf $< $@ "$(APPLET_NAME)" ++@DESKTOP_AGNOSTIC_TRUE@@GCONF_SCHEMAS_TRUE@ awn-schema-to-gconf $< $@ "$(APPLET_NAME)" + + @GCONF_SCHEMAS_TRUE@@INTLTOOL_SCHEMAS_RULE@ + +diff -Nur -x '*.orig' -x '*~' awn-extras-applets-0.2.6/src/places/Makefile.in awn-extras-applets-0.2.6.new/src/places/Makefile.in +--- awn-extras-applets-0.2.6/src/places/Makefile.in 2008-10-15 00:03:45.000000000 +0200 ++++ awn-extras-applets-0.2.6.new/src/places/Makefile.in 2008-10-15 00:07:29.000000000 +0200 +@@ -698,7 +698,7 @@ + @INTLTOOL_DESKTOP_RULE@ + + @DESKTOP_AGNOSTIC_TRUE@@GCONF_SCHEMAS_TRUE@$(schemas_FILE).in: $(APPLET_SCHEMA) +-@DESKTOP_AGNOSTIC_TRUE@@GCONF_SCHEMAS_TRUE@ $(AWN_BINDIR)/awn-schema-to-gconf $< $@ "$(APPLET_NAME)" ++@DESKTOP_AGNOSTIC_TRUE@@GCONF_SCHEMAS_TRUE@ awn-schema-to-gconf $< $@ "$(APPLET_NAME)" + + @GCONF_SCHEMAS_TRUE@@INTLTOOL_SCHEMAS_RULE@ + +diff -Nur -x '*.orig' -x '*~' awn-extras-applets-0.2.6/src/shiny-switcher/Makefile.in awn-extras-applets-0.2.6.new/src/shiny-switcher/Makefile.in +--- awn-extras-applets-0.2.6/src/shiny-switcher/Makefile.in 2008-10-15 00:03:45.000000000 +0200 ++++ awn-extras-applets-0.2.6.new/src/shiny-switcher/Makefile.in 2008-10-15 00:08:04.000000000 +0200 +@@ -705,7 +705,7 @@ + @INTLTOOL_DESKTOP_RULE@ + + @DESKTOP_AGNOSTIC_TRUE@@GCONF_SCHEMAS_TRUE@$(schemas_FILE).in: $(APPLET_SCHEMA) +-@DESKTOP_AGNOSTIC_TRUE@@GCONF_SCHEMAS_TRUE@ $(AWN_BINDIR)/awn-schema-to-gconf $< $@ "$(APPLET_NAME)" ++@DESKTOP_AGNOSTIC_TRUE@@GCONF_SCHEMAS_TRUE@ awn-schema-to-gconf $< $@ "$(APPLET_NAME)" + + @GCONF_SCHEMAS_TRUE@@INTLTOOL_SCHEMAS_RULE@ + +diff -Nur -x '*.orig' -x '*~' awn-extras-applets-0.2.6/src/switcher/Makefile.in awn-extras-applets-0.2.6.new/src/switcher/Makefile.in +--- awn-extras-applets-0.2.6/src/switcher/Makefile.in 2008-10-15 00:03:45.000000000 +0200 ++++ awn-extras-applets-0.2.6.new/src/switcher/Makefile.in 2008-10-15 00:09:19.000000000 +0200 +@@ -699,7 +699,7 @@ + @INTLTOOL_DESKTOP_RULE@ + + @DESKTOP_AGNOSTIC_TRUE@@GCONF_SCHEMAS_TRUE@$(schemas_FILE).in: $(APPLET_SCHEMA) +-@DESKTOP_AGNOSTIC_TRUE@@GCONF_SCHEMAS_TRUE@ $(AWN_BINDIR)/awn-schema-to-gconf $< $@ "$(APPLET_NAME)" ++@DESKTOP_AGNOSTIC_TRUE@@GCONF_SCHEMAS_TRUE@ awn-schema-to-gconf $< $@ "$(APPLET_NAME)" + + @GCONF_SCHEMAS_TRUE@@INTLTOOL_SCHEMAS_RULE@ + +diff -Nur -x '*.orig' -x '*~' awn-extras-applets-0.2.6/src/trash/Makefile.in awn-extras-applets-0.2.6.new/src/trash/Makefile.in +--- awn-extras-applets-0.2.6/src/trash/Makefile.in 2008-10-15 00:03:45.000000000 +0200 ++++ awn-extras-applets-0.2.6.new/src/trash/Makefile.in 2008-10-15 00:08:47.000000000 +0200 +@@ -737,7 +737,7 @@ + @INTLTOOL_DESKTOP_RULE@ + + @DESKTOP_AGNOSTIC_TRUE@@GCONF_SCHEMAS_TRUE@$(schemas_FILE).in: $(APPLET_SCHEMA) +-@DESKTOP_AGNOSTIC_TRUE@@GCONF_SCHEMAS_TRUE@ $(AWN_BINDIR)/awn-schema-to-gconf $< $@ "$(APPLET_NAME)" ++@DESKTOP_AGNOSTIC_TRUE@@GCONF_SCHEMAS_TRUE@ awn-schema-to-gconf $< $@ "$(APPLET_NAME)" + + @GCONF_SCHEMAS_TRUE@@INTLTOOL_SCHEMAS_RULE@ + --- awn-extras-applets-0.2.6.orig/debian/patches/11-volume-channel-missing.patch +++ awn-extras-applets-0.2.6/debian/patches/11-volume-channel-missing.patch @@ -0,0 +1,15 @@ +=== modified file 'src/volume-control/volume-control.py' +--- src/volume-control/volume-control.py 2008-09-15 20:49:22 +0000 ++++ src/volume-control/volume-control.py 2008-09-15 20:53:58 +0000 +@@ -209,6 +209,10 @@ + return self.channel + + def getVolume(self): ++ try: ++ return alsaaudio.Mixer(self.channel).getvolume()[0] ++ except: ++ self.setChannel() + return alsaaudio.Mixer(self.channel).getvolume()[0] + + def setVolume(self, value): + --- awn-extras-applets-0.2.6.orig/debian/patches/02_define_new_path_for_stack_dependency.patch +++ awn-extras-applets-0.2.6/debian/patches/02_define_new_path_for_stack_dependency.patch @@ -0,0 +1,52 @@ +diff -ur awn-extras-applets-0.2.6.orig/src/plugger/applet.c awn-extras-applets-0.2.6/src/plugger/applet.c +--- awn-extras-applets-0.2.6.orig/src/plugger/applet.c 2008-03-14 21:39:30.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/plugger/applet.c 2008-03-14 21:47:53.000000000 +0100 +@@ -36,6 +36,7 @@ + + #define STACKS_APPLET "/usr/lib/awn/applets/stacks.desktop" + #define STACKS_APPLET_LOCAL "/usr/local/lib/awn/applets/stacks.desktop" ++#define STACKS_APPLET_SHARE "/usr/share/awn/applets/stacks.desktop" + + typedef struct { + AwnApplet *applet; +@@ -229,10 +230,12 @@ + desktop_path = STACKS_APPLET; + }else if(gnome_vfs_uri_exists(gnome_vfs_uri_new(STACKS_APPLET_LOCAL))){ + desktop_path = STACKS_APPLET_LOCAL; ++ }else if(gnome_vfs_uri_exists(gnome_vfs_uri_new(STACKS_APPLET_SHARE))){ ++ desktop_path = STACKS_APPLET_SHARE; + }else{ + g_print("!! Stacks Plugger Error: dependency on Stacks Applet not met:\n \ + !! Could not find stacks.desktop file at:\n \ +- !! %s or %s\n", STACKS_APPLET, STACKS_APPLET_LOCAL); ++ !! %s or %s\n", STACKS_APPLET, STACKS_APPLET_LOCAL, STACKS_APPLET_SHARE); + } + + // Create a box that will hold the stacks applets +Seulement dans awn-extras-applets-0.2.6/src/plugger: applet.c~ +diff -ur awn-extras-applets-0.2.6.orig/src/trasher/applet.c awn-extras-applets-0.2.6/src/trasher/applet.c +--- awn-extras-applets-0.2.6.orig/src/trasher/applet.c 2008-03-14 21:39:30.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/trasher/applet.c 2008-03-14 21:52:22.000000000 +0100 +@@ -35,6 +35,7 @@ + + #define STACKS_APPLET "/usr/lib/awn/applets/stacks.desktop" + #define STACKS_APPLET_LOCAL "/usr/local/lib/awn/applets/stacks.desktop" ++#define STACKS_APPLET_SHARE "/usr/share/awn/applets/stacks.desktop" + + typedef struct { + AwnApplet *applet; +@@ -120,10 +121,12 @@ + desktop_path = STACKS_APPLET; + }else if(gnome_vfs_uri_exists(gnome_vfs_uri_new(STACKS_APPLET_LOCAL))){ + desktop_path = STACKS_APPLET_LOCAL; ++ }else if(gnome_vfs_uri_exists(gnome_vfs_uri_new(STACKS_APPLET_SHARE))){ ++ desktop_path = STACKS_APPLET_SHARE; + }else{ + g_print("!! Stacks Trasher Error: dependency on Stacks Applet not met:\n \ + !! Could not find stacks.desktop file at:\n \ +- !! %s or %s\n", STACKS_APPLET, STACKS_APPLET_LOCAL); ++ !! %s or %s\n", STACKS_APPLET, STACKS_APPLET_LOCAL, STACKS_APPLET_SHARE); + } + + // Create a box that will hold the stacks applets +Seulement dans awn-extras-applets-0.2.6/src/trasher: applet.c~ --- awn-extras-applets-0.2.6.orig/debian/patches/10-implicit-pointer-conversion.patch +++ awn-extras-applets-0.2.6/debian/patches/10-implicit-pointer-conversion.patch @@ -0,0 +1,75 @@ +diff -urpN awn-extras-applets-0.2.6.orig/src/affinity/aff-start.c awn-extras-applets-0.2.6/src/affinity/aff-start.c +--- awn-extras-applets-0.2.6.orig/src/affinity/aff-start.c 2008-02-14 09:49:53.000000000 -0700 ++++ awn-extras-applets-0.2.6/src/affinity/aff-start.c 2008-04-20 23:22:01.000000000 -0600 +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + + #include "aff-start.h" + +diff -urpN awn-extras-applets-0.2.6.orig/src/affinity/aff-utils.c awn-extras-applets-0.2.6/src/affinity/aff-utils.c +--- awn-extras-applets-0.2.6.orig/src/affinity/aff-utils.c 2008-02-14 09:49:53.000000000 -0700 ++++ awn-extras-applets-0.2.6/src/affinity/aff-utils.c 2008-04-21 09:52:48.000000000 -0600 +@@ -32,6 +32,7 @@ + #ifdef LIBAWN_USE_GNOME + #include + #include ++#include + #else + #include "egg-pixbuf-thumbnail.h" + #ifdef LIBAWN_USE_XFCE +diff -urpN awn-extras-applets-0.2.6.orig/src/awnterm/applet.c awn-extras-applets-0.2.6/src/awnterm/applet.c +--- awn-extras-applets-0.2.6.orig/src/awnterm/applet.c 2008-02-14 09:49:01.000000000 -0700 ++++ awn-extras-applets-0.2.6/src/awnterm/applet.c 2008-04-21 09:59:20.000000000 -0600 +@@ -21,6 +21,7 @@ + + #include + #include ++#include + #include + #include + +diff -urpN awn-extras-applets-0.2.6.orig/src/cairo-menu/backend-gnome.c awn-extras-applets-0.2.6/src/cairo-menu/backend-gnome.c +--- awn-extras-applets-0.2.6.orig/src/cairo-menu/backend-gnome.c 2008-02-14 09:49:53.000000000 -0700 ++++ awn-extras-applets-0.2.6/src/cairo-menu/backend-gnome.c 2008-04-20 23:22:01.000000000 -0600 +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + + #include "menu_list_item.h" + +diff -urpN awn-extras-applets-0.2.6.orig/src/cairo-menu/render.h awn-extras-applets-0.2.6/src/cairo-menu/render.h +--- awn-extras-applets-0.2.6.orig/src/cairo-menu/render.h 2008-02-14 09:49:01.000000000 -0700 ++++ awn-extras-applets-0.2.6/src/cairo-menu/render.h 2008-04-21 09:56:28.000000000 -0600 +@@ -33,4 +33,6 @@ void hide_search(void); + void measure_width(Menu_list_item * menu_item,int * max_width); + gboolean _hide_all_windows(gpointer null); + ++GtkWidget * build_menu_widget(Menu_item_color * mic, char * text,GdkPixbuf *pbuf,GdkPixbuf *pover,int max_width); ++ + #endif +diff -urpN awn-extras-applets-0.2.6.orig/src/cairo-menu-classic/backend-gnome.c awn-extras-applets-0.2.6/src/cairo-menu-classic/backend-gnome.c +--- awn-extras-applets-0.2.6.orig/src/cairo-menu-classic/backend-gnome.c 2008-02-14 09:49:53.000000000 -0700 ++++ awn-extras-applets-0.2.6/src/cairo-menu-classic/backend-gnome.c 2008-04-20 23:22:01.000000000 -0600 +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + + #include "menu_list_item.h" + +--- awn-extras-applets-0.2.6.orig/src/cairo-menu/menu.h 2008-02-14 09:49:53.000000000 -0700 ++++ awn-extras-applets-0.2.6/src/cairo-menu/menu.h 2008-04-21 10:13:22.000000000 -0600 +@@ -58,6 +58,7 @@ + void fixed_move(GtkWidget *widget,gint x,gint y); + void fixed_put(GtkWidget *widget,gint x,gint y); + void hide_all_menus(void); ++GtkWidget * menu_new(GtkWidget * parent_menu); + + #endif + --- awn-extras-applets-0.2.6.orig/debian/patches/91_bzr_change_pandora_url.patch +++ awn-extras-applets-0.2.6/debian/patches/91_bzr_change_pandora_url.patch @@ -0,0 +1,22 @@ +=== modified file 'src/pandora/awn-pandora.py' +--- src/pandora/awn-pandora.py 2008-01-26 21:59:57 +0000 ++++ src/pandora/awn-pandora.py 2008-03-03 03:33:18 +0000 +@@ -26,7 +26,7 @@ + pad = gtk.Alignment() + pad.add(self.moz) + self.moz.set_size_request(640, 535) +- self.moz.load_url('http://www.pandora.com/radio/tuner_8_2_0_2_pandora.swf') ++ self.moz.load_url('https://www.pandora.com:443/radio/tuner_8_3_0_0_pandora.swf') + pad.show_all() + self.dialog.add(pad) + +@@ -41,7 +41,7 @@ + print "show dialog" + + def dialog_focus_out (self, widget, event): +- #self.moz.load_url('https://www.pandora.com/radio/tuner_8_2_0_1_pandora.swf') ++ #self.moz.load_url('https://www.pandora.com:443/radio/tuner_8_3_0_0_pandora.swf') + self.dialog.hide () + print "hide dialog" + + --- awn-extras-applets-0.2.6.orig/debian/patches/95_weather_correct_url.patch +++ awn-extras-applets-0.2.6/debian/patches/95_weather_correct_url.patch @@ -0,0 +1,22 @@ +=== modified file 'src/weather/weather.py' +diff -Nur -x '*.orig' -x '*~' awn-extras-applets-0.2.6/src/weather/weather.py awn-extras-applets-0.2.6.new/src/weather/weather.py +--- awn-extras-applets-0.2.6/src/weather/weather.py 2008-02-14 17:49:03.000000000 +0100 ++++ awn-extras-applets-0.2.6.new/src/weather/weather.py 2008-10-15 02:15:06.000000000 +0200 +@@ -315,7 +315,7 @@ + + + def get_conditions(self): +- url = 'http://xoap.weather.com/weather/local/' + self.location_code + '?cc=*&prod=xoap&par=1048871467&key=12daac2f3a67cb39' ++ url = 'http://xoap.weather.com/weather/local/' + self.location_code + '?cc=*&prod=xoap&par=1048871467&key=12daac2f3a67cb39&link=xoap' + if self.units == "Metric": + url = url + '&unit=m' + try: +@@ -371,7 +371,7 @@ + + + def get_forecast(self): +- url = 'http://xoap.weather.com/weather/local/' + self.location_code + '?dayf=5&prod=xoap&par=1048871467&key=12daac2f3a67cb39' ++ url = 'http://xoap.weather.com/weather/local/' + self.location_code + '?dayf=5&prod=xoap&par=1048871467&key=12daac2f3a67cb39&link=xoap' + if self.units == "Metric": + url = url + '&unit=m' + try: --- awn-extras-applets-0.2.6.orig/debian/patches/01_lastfm_fix_try-finally_block.patch +++ awn-extras-applets-0.2.6/debian/patches/01_lastfm_fix_try-finally_block.patch @@ -0,0 +1,14 @@ +diff -ur awn-extras-applets-0.2.6.orig/src/lastfm/lastfmpreferences.py awn-extras-applets-0.2.6/src/lastfm/lastfmpreferences.py +--- awn-extras-applets-0.2.6.orig/src/lastfm/lastfmpreferences.py 2008-03-14 20:57:40.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/lastfm/lastfmpreferences.py 2008-03-14 21:37:16.000000000 +0100 +@@ -146,8 +146,7 @@ + self.labelw.set_text("Invalid username/password. Try again.") + except lastfmexception.LastFmException: + self.labelw.set_text("Network Connection error: unable to contact Last.Fm") +- +- finally: ++ else: + #reload the config no matter if we are connected or not - it will at least change the icon + self.applet.reload_config() + +Seulement dans awn-extras-applets-0.2.6/src/lastfm: lastfmpreferences.py~ --- awn-extras-applets-0.2.6.orig/debian/patches/00-Install-in-share.patch +++ awn-extras-applets-0.2.6/debian/patches/00-Install-in-share.patch @@ -0,0 +1,11103 @@ +diff -ur awn-extras-applets-0.2.6.orig/aclocal.m4 awn-extras-applets-0.2.6/aclocal.m4 +--- awn-extras-applets-0.2.6.orig/aclocal.m4 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/aclocal.m4 2008-03-19 01:03:09.000000000 +0100 +@@ -1,7 +1,7 @@ +-# generated automatically by aclocal 1.10 -*- Autoconf -*- ++# generated automatically by aclocal 1.10.1 -*- Autoconf -*- + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +-# 2005, 2006 Free Software Foundation, Inc. ++# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This file 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. +@@ -11,10 +11,13 @@ + # even the implied warranty of MERCHANTABILITY or FITNESS FOR A + # PARTICULAR PURPOSE. + +-m4_if(m4_PACKAGE_VERSION, [2.61],, +-[m4_fatal([this file was generated for autoconf 2.61. +-You have another version of autoconf. If you want to use that, +-you should regenerate the build system entirely.], [63])]) ++m4_ifndef([AC_AUTOCONF_VERSION], ++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl ++m4_if(AC_AUTOCONF_VERSION, [2.61],, ++[m4_warning([this file was generated for autoconf 2.61. ++You have another version of autoconf. It may work, but is not guaranteed to. ++If you have problems, you may need to regenerate the build system entirely. ++To do so, use the procedure documented by the package, typically `autoreconf'.])]) + + dnl AM_GCONF_SOURCE_2 + dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas +@@ -159,8 +162,7 @@ + #----------------- + glib_DEFUN([GLIB_WITH_NLS], + dnl NLS is obligatory +- [AC_REQUIRE([AC_CANONICAL_HOST])dnl +- USE_NLS=yes ++ [USE_NLS=yes + AC_SUBST(USE_NLS) + + gt_cv_have_gettext=no +@@ -556,6 +558,20 @@ + AC_SUBST(INTLTOOL_SERVICE_RULE) + AC_SUBST(INTLTOOL_POLICY_RULE) + ++# Check the gettext tools to make sure they are GNU ++AC_PATH_PROG(XGETTEXT, xgettext) ++AC_PATH_PROG(MSGMERGE, msgmerge) ++AC_PATH_PROG(MSGFMT, msgfmt) ++if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then ++ AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) ++fi ++xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" ++mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" ++mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" ++if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then ++ AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) ++fi ++ + # Use the tools built into the package, not the ones that are installed. + AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract') + AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge') +@@ -690,7 +706,7 @@ + + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + +-# serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL ++# serial 52 Debian 1.5.26-1 AC_PROG_LIBTOOL + + + # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +@@ -778,7 +794,6 @@ + AC_REQUIRE([AC_OBJEXT])dnl + AC_REQUIRE([AC_EXEEXT])dnl + dnl +- + AC_LIBTOOL_SYS_MAX_CMD_LEN + AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE + AC_LIBTOOL_OBJDIR +@@ -880,6 +895,8 @@ + ;; + esac + ++_LT_REQUIRED_DARWIN_CHECKS ++ + AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) + AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], + enable_win32_dll=yes, enable_win32_dll=no) +@@ -959,9 +976,80 @@ + echo "$lt_simple_link_test_code" >conftest.$ac_ext + eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_linker_boilerplate=`cat conftest.err` +-$rm conftest* ++$rm -r conftest* + ])# _LT_LINKER_BOILERPLATE + ++# _LT_REQUIRED_DARWIN_CHECKS ++# -------------------------- ++# Check for some things on darwin ++AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ ++ case $host_os in ++ rhapsody* | darwin*) ++ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) ++ AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) ++ ++ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], ++ [lt_cv_apple_cc_single_mod=no ++ if test -z "${LT_MULTI_MODULE}"; then ++ # By default we will add the -single_module flag. You can override ++ # by either setting the environment variable LT_MULTI_MODULE ++ # non-empty at configure time, or by adding -multi_module to the ++ # link flags. ++ echo "int foo(void){return 1;}" > conftest.c ++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ ++ -dynamiclib ${wl}-single_module conftest.c ++ if test -f libconftest.dylib; then ++ lt_cv_apple_cc_single_mod=yes ++ rm -rf libconftest.dylib* ++ fi ++ rm conftest.c ++ fi]) ++ AC_CACHE_CHECK([for -exported_symbols_list linker flag], ++ [lt_cv_ld_exported_symbols_list], ++ [lt_cv_ld_exported_symbols_list=no ++ save_LDFLAGS=$LDFLAGS ++ echo "_main" > conftest.sym ++ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], ++ [lt_cv_ld_exported_symbols_list=yes], ++ [lt_cv_ld_exported_symbols_list=no]) ++ LDFLAGS="$save_LDFLAGS" ++ ]) ++ case $host_os in ++ rhapsody* | darwin1.[[0123]]) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; ++ darwin1.*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ darwin*) ++ # if running on 10.5 or later, the deployment target defaults ++ # to the OS version, if on x86, and 10.4, the deployment ++ # target defaults to 10.4. Don't you love it? ++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in ++ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ 10.[[012]]*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ 10.*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ esac ++ ;; ++ esac ++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then ++ _lt_dar_single_mod='$single_module' ++ fi ++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then ++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' ++ else ++ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" ++ fi ++ if test "$DSYMUTIL" != ":"; then ++ _lt_dsymutil="~$DSYMUTIL \$lib || :" ++ else ++ _lt_dsymutil= ++ fi ++ ;; ++ esac ++]) + + # _LT_AC_SYS_LIBPATH_AIX + # ---------------------- +@@ -1286,7 +1374,11 @@ + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; +- *) LD="${LD-ld} -64" ;; ++ *) ++ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then ++ LD="${LD-ld} -64" ++ fi ++ ;; + esac + ;; + esac +@@ -1379,7 +1471,7 @@ + $2=yes + fi + fi +- $rm conftest* ++ $rm -r conftest* + LDFLAGS="$save_LDFLAGS" + ]) + +@@ -1650,7 +1742,7 @@ + AC_CHECK_FUNC([shl_load], + [lt_cv_dlopen="shl_load"], + [AC_CHECK_LIB([dld], [shl_load], +- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], ++ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], + [AC_CHECK_FUNC([dlopen], + [lt_cv_dlopen="dlopen"], + [AC_CHECK_LIB([dl], [dlopen], +@@ -1658,7 +1750,7 @@ + [AC_CHECK_LIB([svld], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], + [AC_CHECK_LIB([dld], [dld_link], +- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) ++ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) + ]) + ]) + ]) +@@ -1975,7 +2067,7 @@ + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +-aix4* | aix5*) ++aix[[4-9]]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -2508,6 +2600,13 @@ + AC_MSG_RESULT([$dynamic_linker]) + test "$dynamic_linker" = no && can_build_shared=no + ++AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec], ++[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) ++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], ++[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) ++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++ + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" + if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +@@ -3007,7 +3106,7 @@ + # whether `pass_all' will *always* work, you probably want this one. + + case $host_os in +-aix4* | aix5*) ++aix[[4-9]]*) + lt_cv_deplibs_check_method=pass_all + ;; + +@@ -3443,7 +3542,7 @@ + fi + ;; + +-aix4* | aix5*) ++aix[[4-9]]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi +@@ -3500,6 +3599,7 @@ + _LT_AC_TAGVAR(predeps, $1)= + _LT_AC_TAGVAR(postdeps, $1)= + _LT_AC_TAGVAR(compiler_lib_search_path, $1)= ++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= + + # Source file extension for C++ test sources. + ac_ext=cpp +@@ -3609,7 +3709,7 @@ + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; +- aix4* | aix5*) ++ aix[[4-9]]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. +@@ -3622,7 +3722,7 @@ + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. +- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) ++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) + for ld_flag in $LDFLAGS; do + case $ld_flag in + *-brtl*) +@@ -3768,51 +3868,23 @@ + fi + ;; + darwin* | rhapsody*) +- case $host_os in +- rhapsody* | darwin1.[[012]]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' +- ;; +- *) # Darwin 1.3 on +- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +- else +- case ${MACOSX_DEPLOYMENT_TARGET} in +- 10.[[012]]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +- ;; +- 10.*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' +- ;; +- esac +- fi +- ;; +- esac + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_automatic, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- +- if test "$GXX" = yes ; then +- lt_int_apple_cc_single_mod=no ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" ++ if test "$GXX" = yes ; then + output_verbose_link_cmd='echo' +- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then +- lt_int_apple_cc_single_mod=yes ++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ if test "$lt_cv_apple_cc_single_mod" != "yes"; then ++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" + fi +- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- fi +- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- else +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- fi +- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + case $cc_basename in + xlc*) +@@ -4063,7 +4135,7 @@ + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + ;; +- pgCC*) ++ pgCC* | pgcpp*) + # Portland Group C++ compiler + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' +@@ -4498,7 +4570,8 @@ + # compiler output when linking a shared library. + # Parse the compiler output and extract the necessary + # objects, libraries and library flags. +-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ ++AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP], ++[AC_REQUIRE([LT_AC_PROG_SED])dnl + dnl we can't use the lt_simple_compile_test_code here, + dnl because it contains code intended for an executable, + dnl not a library. It's possible we should let each +@@ -4623,6 +4696,11 @@ + + $rm -f confest.$objext + ++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= ++if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then ++ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` ++fi ++ + # PORTME: override above test on systems where it is broken + ifelse([$1],[CXX], + [case $host_os in +@@ -4679,7 +4757,6 @@ + ;; + esac + ]) +- + case " $_LT_AC_TAGVAR(postdeps, $1) " in + *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; + esac +@@ -4764,7 +4841,7 @@ + postinstall_cmds='$RANLIB $lib' + fi + ;; +-aix4* | aix5*) ++aix[[4-9]]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi +@@ -4941,6 +5018,7 @@ + _LT_AC_TAGVAR(predeps, $1) \ + _LT_AC_TAGVAR(postdeps, $1) \ + _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ ++ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \ + _LT_AC_TAGVAR(archive_cmds, $1) \ + _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ + _LT_AC_TAGVAR(postinstall_cmds, $1) \ +@@ -5003,7 +5081,7 @@ + # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) + # NOTE: Changes made to this file will be lost: look at ltmain.sh. + # +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 + # Free Software Foundation, Inc. + # + # This file is part of GNU Libtool: +@@ -5240,6 +5318,10 @@ + # shared library. + postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) + ++# The directories searched by this compiler when creating a shared ++# library ++compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1) ++ + # The library search path used internally by the compiler when linking + # a shared library. + compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) +@@ -5589,7 +5671,7 @@ + echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD + cat conftest.$ac_ext >&5 + fi +- rm -f conftest* conftst* ++ rm -rf conftest* conftst* + + # Do not use the global_symbol_pipe unless it works. + if test "$pipe_works" = yes; then +@@ -5646,7 +5728,8 @@ + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ++ m4_if([$1], [GCJ], [], ++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + darwin* | rhapsody*) + # PIC is the default on this platform +@@ -5683,7 +5766,7 @@ + esac + else + case $host_os in +- aix4* | aix5*) ++ aix[[4-9]]*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor +@@ -5779,7 +5862,7 @@ + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; +- pgCC*) ++ pgCC* | pgcpp*) + # Portland Group C++ compiler. + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' +@@ -5930,7 +6013,8 @@ + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ++ m4_if([$1], [GCJ], [], ++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + + darwin* | rhapsody*) +@@ -6000,7 +6084,8 @@ + mingw* | cygwin* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ++ m4_if([$1], [GCJ], [], ++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + + hpux9* | hpux10* | hpux11*) +@@ -6137,7 +6222,7 @@ + # + if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then + AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], +- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), ++ _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1), + [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], + [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in + "" | " "*) ;; +@@ -6161,7 +6246,7 @@ + # + wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" + AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], +- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), ++ _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1), + $lt_tmp_static_flag, + [], + [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) +@@ -6177,7 +6262,7 @@ + ifelse([$1],[CXX],[ + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + case $host_os in +- aix4* | aix5*) ++ aix[[4-9]]*) + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + if $NM -V 2>&1 | grep 'GNU' > /dev/null; then +@@ -6199,6 +6284,7 @@ + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; + esac ++ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + ],[ + runpath_var= + _LT_AC_TAGVAR(allow_undefined_flag, $1)= +@@ -6229,12 +6315,14 @@ + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. +- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" ++ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. ++ # Exclude shared library initialization/finalization symbols. ++dnl Note also adjust exclude_expsyms for C++ above. + extract_expsyms_cmds= + # Just being paranoid about ensuring that cc_basename is set. + _LT_CC_BASENAME([$compiler]) +@@ -6284,7 +6372,7 @@ + + # See if GNU ld supports shared libraries. + case $host_os in +- aix3* | aix4* | aix5*) ++ aix[[3-9]]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + _LT_AC_TAGVAR(ld_shlibs, $1)=no +@@ -6504,7 +6592,7 @@ + fi + ;; + +- aix4* | aix5*) ++ aix[[4-9]]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. +@@ -6524,7 +6612,7 @@ + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. +- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) ++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes +@@ -6684,11 +6772,10 @@ + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + if test "$GCC" = yes ; then + output_verbose_link_cmd='echo' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + else + case $cc_basename in + xlc*) +@@ -7427,7 +7514,7 @@ + fi[]dnl + ])# PKG_CHECK_MODULES + +-# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. ++# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -7442,7 +7529,7 @@ + [am__api_version='1.10' + dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to + dnl require some minimum version. Point them to the right macro. +-m4_if([$1], [1.10], [], ++m4_if([$1], [1.10.1], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl + ]) + +@@ -7458,8 +7545,10 @@ + # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. + # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. + AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +-[AM_AUTOMAKE_VERSION([1.10])dnl +-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) ++[AM_AUTOMAKE_VERSION([1.10.1])dnl ++m4_ifndef([AC_AUTOCONF_VERSION], ++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl ++_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) + + # AM_AUX_DIR_EXPAND -*- Autoconf -*- + +@@ -7731,7 +7820,7 @@ + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. +- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue +@@ -7791,13 +7880,13 @@ + # Do all the work for Automake. -*- Autoconf -*- + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +-# 2005, 2006 Free Software Foundation, Inc. ++# 2005, 2006, 2008 Free Software Foundation, Inc. + # + # This file 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. + +-# serial 12 ++# serial 13 + + # This macro actually does too much. Some checks are only needed if + # your package does certain things. But this isn't really a big deal. +@@ -7902,16 +7991,17 @@ + # our stamp files there. + AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], + [# Compute $1's index in $config_headers. ++_am_arg=$1 + _am_stamp_count=1 + for _am_header in $config_headers :; do + case $_am_header in +- $1 | $1:* ) ++ $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac + done +-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) ++echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + + # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. + # +@@ -8212,7 +8302,7 @@ + + # _AM_SUBST_NOTMAKE(VARIABLE) + # --------------------------- +-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. ++# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. + # This macro is traced by Automake. + AC_DEFUN([_AM_SUBST_NOTMAKE]) + +diff -ur awn-extras-applets-0.2.6.orig/config.guess awn-extras-applets-0.2.6/config.guess +--- awn-extras-applets-0.2.6.orig/config.guess 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/config.guess 2008-02-17 21:10:30.000000000 +0100 +@@ -1,10 +1,10 @@ + #! /bin/sh + # Attempt to guess a canonical system name. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +-# Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ++# Free Software Foundation, Inc. + +-timestamp='2007-03-06' ++timestamp='2008-01-23' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +@@ -56,8 +56,8 @@ + GNU config.guess ($timestamp) + + Originally written by Per Bothner. +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +-Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, ++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -330,7 +330,7 @@ + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; +- i86pc:SunOS:5.*:*) ++ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:6*:*) +@@ -532,7 +532,7 @@ + echo rs6000-ibm-aix3.2 + fi + exit ;; +- *:AIX:*:[45]) ++ *:AIX:*:[456]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 +@@ -793,12 +793,15 @@ + exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in +- x86) ++ x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; ++ IA64) ++ echo ia64-unknown-interix${UNAME_RELEASE} ++ exit ;; + esac ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks +@@ -833,7 +836,14 @@ + echo ${UNAME_MACHINE}-pc-minix + exit ;; + arm*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ eval $set_cc_for_build ++ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_EABI__ ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ else ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ fi + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +@@ -954,8 +964,8 @@ + x86_64:Linux:*:*) + echo x86_64-unknown-linux-gnu + exit ;; +- xtensa:Linux:*:*) +- echo xtensa-unknown-linux-gnu ++ xtensa*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + i*86:Linux:*:*) + # The BFD linker knows what the default object file format is, so +@@ -1474,9 +1484,9 @@ + the operating system you are using. It is advised that you + download the most up to date version of the config scripts from + +- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + and +- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + + If the version you run ($0) is already up to date, please + send the following data and any information you think might be +diff -ur awn-extras-applets-0.2.6.orig/config.sub awn-extras-applets-0.2.6/config.sub +--- awn-extras-applets-0.2.6.orig/config.sub 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/config.sub 2008-02-17 21:10:30.000000000 +0100 +@@ -1,10 +1,10 @@ + #! /bin/sh + # Configuration validation subroutine script. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +-# Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ++# Free Software Foundation, Inc. + +-timestamp='2007-01-18' ++timestamp='2008-01-16' + + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software +@@ -72,8 +72,8 @@ + version="\ + GNU config.sub ($timestamp) + +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +-Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, ++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -369,10 +369,14 @@ + | v850-* | v850e-* | vax-* \ + | we32k-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ +- | xstormy16-* | xtensa-* \ ++ | xstormy16-* | xtensa*-* \ + | ymp-* \ + | z8k-*) + ;; ++ # Recognize the basic CPU types without company name, with glob match. ++ xtensa*) ++ basic_machine=$basic_machine-unknown ++ ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. + 386bsd) +@@ -443,6 +447,14 @@ + basic_machine=ns32k-sequent + os=-dynix + ;; ++ blackfin) ++ basic_machine=bfin-unknown ++ os=-linux ++ ;; ++ blackfin-*) ++ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; + c90) + basic_machine=c90-cray + os=-unicos +@@ -475,8 +487,8 @@ + basic_machine=craynv-cray + os=-unicosmp + ;; +- cr16c) +- basic_machine=cr16c-unknown ++ cr16) ++ basic_machine=cr16-unknown + os=-elf + ;; + crds | unos) +@@ -668,6 +680,14 @@ + basic_machine=m68k-isi + os=-sysv + ;; ++ m68knommu) ++ basic_machine=m68k-unknown ++ os=-linux ++ ;; ++ m68knommu-*) ++ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; + m88k-omron*) + basic_machine=m88k-omron + ;; +@@ -683,6 +703,10 @@ + basic_machine=i386-pc + os=-mingw32 + ;; ++ mingw32ce) ++ basic_machine=arm-unknown ++ os=-mingw32ce ++ ;; + miniframe) + basic_machine=m68000-convergent + ;; +@@ -809,6 +833,14 @@ + basic_machine=i860-intel + os=-osf + ;; ++ parisc) ++ basic_machine=hppa-unknown ++ os=-linux ++ ;; ++ parisc-*) ++ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; + pbd) + basic_machine=sparc-tti + ;; +@@ -1017,6 +1049,10 @@ + basic_machine=tic6x-unknown + os=-coff + ;; ++ tile*) ++ basic_machine=tile-unknown ++ os=-linux-gnu ++ ;; + tx39) + basic_machine=mipstx39-unknown + ;; +diff -ur awn-extras-applets-0.2.6.orig/configure awn-extras-applets-0.2.6/configure +--- awn-extras-applets-0.2.6.orig/configure 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/configure 2008-03-19 01:03:13.000000000 +0100 +@@ -861,6 +861,8 @@ + ECHO + AR + RANLIB ++DSYMUTIL ++NMEDIT + CXX + CXXFLAGS + ac_ct_CXX +@@ -893,6 +895,9 @@ + INTLTOOL_THEME_RULE + INTLTOOL_SERVICE_RULE + INTLTOOL_POLICY_RULE ++XGETTEXT ++MSGMERGE ++MSGFMT + INTLTOOL_EXTRACT + INTLTOOL_MERGE + INTLTOOL_UPDATE +@@ -900,10 +905,8 @@ + ALL_LINGUAS + DATADIRNAME + USE_NLS +-MSGFMT + MSGFMT_OPTS + GMSGFMT +-XGETTEXT + CATALOGS + CATOBJEXT + GMOFILES +@@ -5692,7 +5695,7 @@ + # whether `pass_all' will *always* work, you probably want this one. + + case $host_os in +-aix4* | aix5*) ++aix[4-9]*) + lt_cv_deplibs_check_method=pass_all + ;; + +@@ -5907,7 +5910,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 5910 "configure"' > conftest.$ac_ext ++ echo '#line 5913 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -6079,7 +6082,11 @@ + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; +- *) LD="${LD-ld} -64" ;; ++ *) ++ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then ++ LD="${LD-ld} -64" ++ fi ++ ;; + esac + ;; + esac +@@ -7271,7 +7278,6 @@ + + + # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! +- + # find the maximum length of command line arguments + { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 + echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } +@@ -7586,7 +7592,7 @@ + echo "$progname: failed program was:" >&5 + cat conftest.$ac_ext >&5 + fi +- rm -f conftest* conftst* ++ rm -rf conftest* conftst* + + # Do not use the global_symbol_pipe unless it works. + if test "$pipe_works" = yes; then +@@ -8146,6 +8152,318 @@ + ;; + esac + ++ ++ case $host_os in ++ rhapsody* | darwin*) ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. ++set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_DSYMUTIL+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$DSYMUTIL"; then ++ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++DSYMUTIL=$ac_cv_prog_DSYMUTIL ++if test -n "$DSYMUTIL"; then ++ { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 ++echo "${ECHO_T}$DSYMUTIL" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_DSYMUTIL"; then ++ ac_ct_DSYMUTIL=$DSYMUTIL ++ # Extract the first word of "dsymutil", so it can be a program name with args. ++set dummy dsymutil; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_DSYMUTIL"; then ++ ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL ++if test -n "$ac_ct_DSYMUTIL"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 ++echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ if test "x$ac_ct_DSYMUTIL" = x; then ++ DSYMUTIL=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ DSYMUTIL=$ac_ct_DSYMUTIL ++ fi ++else ++ DSYMUTIL="$ac_cv_prog_DSYMUTIL" ++fi ++ ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. ++set dummy ${ac_tool_prefix}nmedit; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_NMEDIT+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$NMEDIT"; then ++ ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++NMEDIT=$ac_cv_prog_NMEDIT ++if test -n "$NMEDIT"; then ++ { echo "$as_me:$LINENO: result: $NMEDIT" >&5 ++echo "${ECHO_T}$NMEDIT" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_NMEDIT"; then ++ ac_ct_NMEDIT=$NMEDIT ++ # Extract the first word of "nmedit", so it can be a program name with args. ++set dummy nmedit; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_NMEDIT"; then ++ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_NMEDIT="nmedit" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT ++if test -n "$ac_ct_NMEDIT"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 ++echo "${ECHO_T}$ac_ct_NMEDIT" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ if test "x$ac_ct_NMEDIT" = x; then ++ NMEDIT=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ NMEDIT=$ac_ct_NMEDIT ++ fi ++else ++ NMEDIT="$ac_cv_prog_NMEDIT" ++fi ++ ++ ++ { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 ++echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; } ++if test "${lt_cv_apple_cc_single_mod+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_apple_cc_single_mod=no ++ if test -z "${LT_MULTI_MODULE}"; then ++ # By default we will add the -single_module flag. You can override ++ # by either setting the environment variable LT_MULTI_MODULE ++ # non-empty at configure time, or by adding -multi_module to the ++ # link flags. ++ echo "int foo(void){return 1;}" > conftest.c ++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ ++ -dynamiclib ${wl}-single_module conftest.c ++ if test -f libconftest.dylib; then ++ lt_cv_apple_cc_single_mod=yes ++ rm -rf libconftest.dylib* ++ fi ++ rm conftest.c ++ fi ++fi ++{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 ++echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; } ++ { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 ++echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; } ++if test "${lt_cv_ld_exported_symbols_list+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_ld_exported_symbols_list=no ++ save_LDFLAGS=$LDFLAGS ++ echo "_main" > conftest.sym ++ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then ++ lt_cv_ld_exported_symbols_list=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ lt_cv_ld_exported_symbols_list=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++ LDFLAGS="$save_LDFLAGS" ++ ++fi ++{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 ++echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; } ++ case $host_os in ++ rhapsody* | darwin1.[0123]) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; ++ darwin1.*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ darwin*) ++ # if running on 10.5 or later, the deployment target defaults ++ # to the OS version, if on x86, and 10.4, the deployment ++ # target defaults to 10.4. Don't you love it? ++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in ++ 10.0,*86*-darwin8*|10.0,*-darwin[91]*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ 10.[012]*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ 10.*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ esac ++ ;; ++ esac ++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then ++ _lt_dar_single_mod='$single_module' ++ fi ++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then ++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' ++ else ++ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" ++ fi ++ if test "$DSYMUTIL" != ":"; then ++ _lt_dsymutil="~$DSYMUTIL \$lib || :" ++ else ++ _lt_dsymutil= ++ fi ++ ;; ++ esac ++ ++ + enable_dlopen=no + enable_win32_dll=no + +@@ -8211,7 +8529,7 @@ + echo "$lt_simple_link_test_code" >conftest.$ac_ext + eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_linker_boilerplate=`cat conftest.err` +-$rm conftest* ++$rm -r conftest* + + + +@@ -8239,11 +8557,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8242: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8560: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:8246: \$? = $ac_status" >&5 ++ echo "$as_me:8564: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -8513,10 +8831,10 @@ + + { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 + echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } +-if test "${lt_prog_compiler_pic_works+set}" = set; then ++if test "${lt_cv_prog_compiler_pic_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- lt_prog_compiler_pic_works=no ++ lt_cv_prog_compiler_pic_works=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" +@@ -8529,27 +8847,27 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8532: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8850: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:8536: \$? = $ac_status" >&5 ++ echo "$as_me:8854: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then +- lt_prog_compiler_pic_works=yes ++ lt_cv_prog_compiler_pic_works=yes + fi + fi + $rm conftest* + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; } + +-if test x"$lt_prog_compiler_pic_works" = xyes; then ++if test x"$lt_cv_prog_compiler_pic_works" = xyes; then + case $lt_prog_compiler_pic in + "" | " "*) ;; + *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; +@@ -8576,10 +8894,10 @@ + wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" + { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 + echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } +-if test "${lt_prog_compiler_static_works+set}" = set; then ++if test "${lt_cv_prog_compiler_static_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- lt_prog_compiler_static_works=no ++ lt_cv_prog_compiler_static_works=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$lt_simple_link_test_code" > conftest.$ac_ext +@@ -8592,20 +8910,20 @@ + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then +- lt_prog_compiler_static_works=yes ++ lt_cv_prog_compiler_static_works=yes + fi + else +- lt_prog_compiler_static_works=yes ++ lt_cv_prog_compiler_static_works=yes + fi + fi +- $rm conftest* ++ $rm -r conftest* + LDFLAGS="$save_LDFLAGS" + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 +-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; } + +-if test x"$lt_prog_compiler_static_works" = xyes; then ++if test x"$lt_cv_prog_compiler_static_works" = xyes; then + : + else + lt_prog_compiler_static= +@@ -8633,11 +8951,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8636: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8954: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:8640: \$? = $ac_status" >&5 ++ echo "$as_me:8958: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -8717,12 +9035,13 @@ + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. +- exclude_expsyms="_GLOBAL_OFFSET_TABLE_" ++ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. ++ # Exclude shared library initialization/finalization symbols. + extract_expsyms_cmds= + # Just being paranoid about ensuring that cc_basename is set. + for cc_temp in $compiler""; do +@@ -8781,7 +9100,7 @@ + + # See if GNU ld supports shared libraries. + case $host_os in +- aix3* | aix4* | aix5*) ++ aix[3-9]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs=no +@@ -9001,7 +9320,7 @@ + fi + ;; + +- aix4* | aix5*) ++ aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. +@@ -9021,7 +9340,7 @@ + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. +- case $host_os in aix4.[23]|aix4.[23].*|aix5*) ++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes +@@ -9293,11 +9612,10 @@ + link_all_deplibs=yes + if test "$GCC" = yes ; then + output_verbose_link_cmd='echo' +- archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + else + case $cc_basename in + xlc*) +@@ -9817,7 +10135,7 @@ + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +-aix4* | aix5*) ++aix[4-9]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -10351,6 +10669,21 @@ + echo "${ECHO_T}$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + ++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" ++fi ++ ++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" ++fi ++ ++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++ + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" + if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +@@ -10670,7 +11003,7 @@ + { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 + echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } + if test $ac_cv_lib_dld_shl_load = yes; then +- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" ++ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" + else + { echo "$as_me:$LINENO: checking for dlopen" >&5 + echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } +@@ -10946,7 +11279,7 @@ + { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 + echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } + if test $ac_cv_lib_dld_dld_link = yes; then +- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" ++ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" + fi + + +@@ -10995,7 +11328,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext <conftest.$ac_ext + eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_linker_boilerplate=`cat conftest.err` +-$rm conftest* ++$rm -r conftest* + + + # Allow CC to be a program name with arguments. +@@ -12066,7 +12405,7 @@ + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; +- aix4* | aix5*) ++ aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. +@@ -12079,7 +12418,7 @@ + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. +- case $host_os in aix4.[23]|aix4.[23].*|aix5*) ++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) + for ld_flag in $LDFLAGS; do + case $ld_flag in + *-brtl*) +@@ -12337,51 +12676,23 @@ + fi + ;; + darwin* | rhapsody*) +- case $host_os in +- rhapsody* | darwin1.[012]) +- allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress' +- ;; +- *) # Darwin 1.3 on +- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then +- allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +- else +- case ${MACOSX_DEPLOYMENT_TARGET} in +- 10.[012]) +- allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +- ;; +- 10.*) +- allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup' +- ;; +- esac +- fi +- ;; +- esac + archive_cmds_need_lc_CXX=no + hardcode_direct_CXX=no + hardcode_automatic_CXX=yes + hardcode_shlibpath_var_CXX=unsupported + whole_archive_flag_spec_CXX='' + link_all_deplibs_CXX=yes +- +- if test "$GXX" = yes ; then +- lt_int_apple_cc_single_mod=no ++ allow_undefined_flag_CXX="$_lt_dar_allow_undefined" ++ if test "$GXX" = yes ; then + output_verbose_link_cmd='echo' +- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then +- lt_int_apple_cc_single_mod=yes ++ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ if test "$lt_cv_apple_cc_single_mod" != "yes"; then ++ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" ++ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" + fi +- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then +- archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- else +- archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- fi +- module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then +- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- else +- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- fi +- module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + case $cc_basename in + xlc*) +@@ -12632,7 +12943,7 @@ + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + ;; +- pgCC*) ++ pgCC* | pgcpp*) + # Portland Group C++ compiler + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' +@@ -13039,7 +13350,6 @@ + GCC_CXX="$GXX" + LD_CXX="$LD" + +- + cat > conftest.$ac_ext <&5 + echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } +-if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then ++if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- lt_prog_compiler_pic_works_CXX=no ++ lt_cv_prog_compiler_pic_works_CXX=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" +@@ -13515,27 +13829,27 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:13518: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13832: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:13522: \$? = $ac_status" >&5 ++ echo "$as_me:13836: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then +- lt_prog_compiler_pic_works_CXX=yes ++ lt_cv_prog_compiler_pic_works_CXX=yes + fi + fi + $rm conftest* + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; } + +-if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then ++if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then + case $lt_prog_compiler_pic_CXX in + "" | " "*) ;; + *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; +@@ -13562,10 +13876,10 @@ + wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" + { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 + echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } +-if test "${lt_prog_compiler_static_works_CXX+set}" = set; then ++if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- lt_prog_compiler_static_works_CXX=no ++ lt_cv_prog_compiler_static_works_CXX=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$lt_simple_link_test_code" > conftest.$ac_ext +@@ -13578,20 +13892,20 @@ + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then +- lt_prog_compiler_static_works_CXX=yes ++ lt_cv_prog_compiler_static_works_CXX=yes + fi + else +- lt_prog_compiler_static_works_CXX=yes ++ lt_cv_prog_compiler_static_works_CXX=yes + fi + fi +- $rm conftest* ++ $rm -r conftest* + LDFLAGS="$save_LDFLAGS" + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 +-echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; } + +-if test x"$lt_prog_compiler_static_works_CXX" = xyes; then ++if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then + : + else + lt_prog_compiler_static_CXX= +@@ -13619,11 +13933,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:13622: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13936: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:13626: \$? = $ac_status" >&5 ++ echo "$as_me:13940: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -13676,7 +13990,7 @@ + + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + case $host_os in +- aix4* | aix5*) ++ aix[4-9]*) + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + if $NM -V 2>&1 | grep 'GNU' > /dev/null; then +@@ -13698,6 +14012,7 @@ + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; + esac ++ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' + + { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 + echo "${ECHO_T}$ld_shlibs_CXX" >&6; } +@@ -13799,7 +14114,7 @@ + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +-aix4* | aix5*) ++aix[4-9]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -14332,6 +14647,21 @@ + echo "${ECHO_T}$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + ++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" ++fi ++ ++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" ++fi ++ ++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++ + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" + if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +@@ -14415,6 +14745,7 @@ + predeps_CXX \ + postdeps_CXX \ + compiler_lib_search_path_CXX \ ++ compiler_lib_search_dirs_CXX \ + archive_cmds_CXX \ + archive_expsym_cmds_CXX \ + postinstall_cmds_CXX \ +@@ -14663,6 +14994,10 @@ + # shared library. + postdeps=$lt_postdeps_CXX + ++# The directories searched by this compiler when creating a shared ++# library ++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX ++ + # The library search path used internally by the compiler when linking + # a shared library. + compiler_lib_search_path=$lt_compiler_lib_search_path_CXX +@@ -14877,7 +15212,7 @@ + echo "$lt_simple_link_test_code" >conftest.$ac_ext + eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_linker_boilerplate=`cat conftest.err` +-$rm conftest* ++$rm -r conftest* + + + # Allow CC to be a program name with arguments. +@@ -14915,7 +15250,7 @@ + postinstall_cmds='$RANLIB $lib' + fi + ;; +-aix4* | aix5*) ++aix[4-9]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi +@@ -15180,10 +15515,10 @@ + + { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 + echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } +-if test "${lt_prog_compiler_pic_works_F77+set}" = set; then ++if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- lt_prog_compiler_pic_works_F77=no ++ lt_cv_prog_compiler_pic_works_F77=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic_F77" +@@ -15196,27 +15531,27 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15199: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15534: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:15203: \$? = $ac_status" >&5 ++ echo "$as_me:15538: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then +- lt_prog_compiler_pic_works_F77=yes ++ lt_cv_prog_compiler_pic_works_F77=yes + fi + fi + $rm conftest* + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; } + +-if test x"$lt_prog_compiler_pic_works_F77" = xyes; then ++if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then + case $lt_prog_compiler_pic_F77 in + "" | " "*) ;; + *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;; +@@ -15243,10 +15578,10 @@ + wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" + { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 + echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } +-if test "${lt_prog_compiler_static_works_F77+set}" = set; then ++if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- lt_prog_compiler_static_works_F77=no ++ lt_cv_prog_compiler_static_works_F77=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$lt_simple_link_test_code" > conftest.$ac_ext +@@ -15259,20 +15594,20 @@ + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then +- lt_prog_compiler_static_works_F77=yes ++ lt_cv_prog_compiler_static_works_F77=yes + fi + else +- lt_prog_compiler_static_works_F77=yes ++ lt_cv_prog_compiler_static_works_F77=yes + fi + fi +- $rm conftest* ++ $rm -r conftest* + LDFLAGS="$save_LDFLAGS" + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 +-echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; } + +-if test x"$lt_prog_compiler_static_works_F77" = xyes; then ++if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then + : + else + lt_prog_compiler_static_F77= +@@ -15300,11 +15635,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15303: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15638: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:15307: \$? = $ac_status" >&5 ++ echo "$as_me:15642: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -15384,12 +15719,13 @@ + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. +- exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_" ++ exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. ++ # Exclude shared library initialization/finalization symbols. + extract_expsyms_cmds= + # Just being paranoid about ensuring that cc_basename is set. + for cc_temp in $compiler""; do +@@ -15448,7 +15784,7 @@ + + # See if GNU ld supports shared libraries. + case $host_os in +- aix3* | aix4* | aix5*) ++ aix[3-9]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs_F77=no +@@ -15668,7 +16004,7 @@ + fi + ;; + +- aix4* | aix5*) ++ aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. +@@ -15688,7 +16024,7 @@ + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. +- case $host_os in aix4.[23]|aix4.[23].*|aix5*) ++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes +@@ -15940,11 +16276,10 @@ + link_all_deplibs_F77=yes + if test "$GCC" = yes ; then + output_verbose_link_cmd='echo' +- archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + else + case $cc_basename in + xlc*) +@@ -16413,7 +16748,7 @@ + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +-aix4* | aix5*) ++aix[4-9]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -16946,6 +17281,21 @@ + echo "${ECHO_T}$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + ++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" ++fi ++ ++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" ++fi ++ ++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++ + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" + if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +@@ -17029,6 +17379,7 @@ + predeps_F77 \ + postdeps_F77 \ + compiler_lib_search_path_F77 \ ++ compiler_lib_search_dirs_F77 \ + archive_cmds_F77 \ + archive_expsym_cmds_F77 \ + postinstall_cmds_F77 \ +@@ -17277,6 +17628,10 @@ + # shared library. + postdeps=$lt_postdeps_F77 + ++# The directories searched by this compiler when creating a shared ++# library ++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77 ++ + # The library search path used internally by the compiler when linking + # a shared library. + compiler_lib_search_path=$lt_compiler_lib_search_path_F77 +@@ -17451,7 +17806,7 @@ + echo "$lt_simple_link_test_code" >conftest.$ac_ext + eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_linker_boilerplate=`cat conftest.err` +-$rm conftest* ++$rm -r conftest* + + + # Allow CC to be a program name with arguments. +@@ -17500,11 +17855,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:17503: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17858: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:17507: \$? = $ac_status" >&5 ++ echo "$as_me:17862: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -17564,7 +17919,7 @@ + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries +- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' ++ + ;; + + darwin* | rhapsody*) +@@ -17634,7 +17989,7 @@ + mingw* | cygwin* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). +- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' ++ + ;; + + hpux9* | hpux10* | hpux11*) +@@ -17774,10 +18129,10 @@ + + { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 + echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } +-if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then ++if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- lt_prog_compiler_pic_works_GCJ=no ++ lt_cv_prog_compiler_pic_works_GCJ=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic_GCJ" +@@ -17790,27 +18145,27 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:17793: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:18148: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:17797: \$? = $ac_status" >&5 ++ echo "$as_me:18152: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then +- lt_prog_compiler_pic_works_GCJ=yes ++ lt_cv_prog_compiler_pic_works_GCJ=yes + fi + fi + $rm conftest* + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; } + +-if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then ++if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then + case $lt_prog_compiler_pic_GCJ in + "" | " "*) ;; + *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;; +@@ -17837,10 +18192,10 @@ + wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" + { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 + echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } +-if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then ++if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- lt_prog_compiler_static_works_GCJ=no ++ lt_cv_prog_compiler_static_works_GCJ=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$lt_simple_link_test_code" > conftest.$ac_ext +@@ -17853,20 +18208,20 @@ + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then +- lt_prog_compiler_static_works_GCJ=yes ++ lt_cv_prog_compiler_static_works_GCJ=yes + fi + else +- lt_prog_compiler_static_works_GCJ=yes ++ lt_cv_prog_compiler_static_works_GCJ=yes + fi + fi +- $rm conftest* ++ $rm -r conftest* + LDFLAGS="$save_LDFLAGS" + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 +-echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; } + +-if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then ++if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then + : + else + lt_prog_compiler_static_GCJ= +@@ -17894,11 +18249,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:17897: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:18252: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:17901: \$? = $ac_status" >&5 ++ echo "$as_me:18256: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -17978,12 +18333,13 @@ + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. +- exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_" ++ exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. ++ # Exclude shared library initialization/finalization symbols. + extract_expsyms_cmds= + # Just being paranoid about ensuring that cc_basename is set. + for cc_temp in $compiler""; do +@@ -18042,7 +18398,7 @@ + + # See if GNU ld supports shared libraries. + case $host_os in +- aix3* | aix4* | aix5*) ++ aix[3-9]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs_GCJ=no +@@ -18262,7 +18618,7 @@ + fi + ;; + +- aix4* | aix5*) ++ aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. +@@ -18282,7 +18638,7 @@ + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. +- case $host_os in aix4.[23]|aix4.[23].*|aix5*) ++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes +@@ -18554,11 +18910,10 @@ + link_all_deplibs_GCJ=yes + if test "$GCC" = yes ; then + output_verbose_link_cmd='echo' +- archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + else + case $cc_basename in + xlc*) +@@ -19027,7 +19382,7 @@ + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +-aix4* | aix5*) ++aix[4-9]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -19560,6 +19915,21 @@ + echo "${ECHO_T}$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + ++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" ++fi ++ ++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" ++fi ++ ++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++ + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" + if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +@@ -19643,6 +20013,7 @@ + predeps_GCJ \ + postdeps_GCJ \ + compiler_lib_search_path_GCJ \ ++ compiler_lib_search_dirs_GCJ \ + archive_cmds_GCJ \ + archive_expsym_cmds_GCJ \ + postinstall_cmds_GCJ \ +@@ -19891,6 +20262,10 @@ + # shared library. + postdeps=$lt_postdeps_GCJ + ++# The directories searched by this compiler when creating a shared ++# library ++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ ++ + # The library search path used internally by the compiler when linking + # a shared library. + compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ +@@ -20064,7 +20439,7 @@ + echo "$lt_simple_link_test_code" >conftest.$ac_ext + eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_linker_boilerplate=`cat conftest.err` +-$rm conftest* ++$rm -r conftest* + + + # Allow CC to be a program name with arguments. +@@ -20124,6 +20499,7 @@ + predeps_RC \ + postdeps_RC \ + compiler_lib_search_path_RC \ ++ compiler_lib_search_dirs_RC \ + archive_cmds_RC \ + archive_expsym_cmds_RC \ + postinstall_cmds_RC \ +@@ -20372,6 +20748,10 @@ + # shared library. + postdeps=$lt_postdeps_RC + ++# The directories searched by this compiler when creating a shared ++# library ++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC ++ + # The library search path used internally by the compiler when linking + # a shared library. + compiler_lib_search_path=$lt_compiler_lib_search_path_RC +@@ -20684,6 +21064,141 @@ + + + ++# Check the gettext tools to make sure they are GNU ++# Extract the first word of "xgettext", so it can be a program name with args. ++set dummy xgettext; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_path_XGETTEXT+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $XGETTEXT in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++XGETTEXT=$ac_cv_path_XGETTEXT ++if test -n "$XGETTEXT"; then ++ { echo "$as_me:$LINENO: result: $XGETTEXT" >&5 ++echo "${ECHO_T}$XGETTEXT" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++# Extract the first word of "msgmerge", so it can be a program name with args. ++set dummy msgmerge; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_path_MSGMERGE+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $MSGMERGE in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++MSGMERGE=$ac_cv_path_MSGMERGE ++if test -n "$MSGMERGE"; then ++ { echo "$as_me:$LINENO: result: $MSGMERGE" >&5 ++echo "${ECHO_T}$MSGMERGE" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++# Extract the first word of "msgfmt", so it can be a program name with args. ++set dummy msgfmt; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_path_MSGFMT+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $MSGFMT in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++MSGFMT=$ac_cv_path_MSGFMT ++if test -n "$MSGFMT"; then ++ { echo "$as_me:$LINENO: result: $MSGFMT" >&5 ++echo "${ECHO_T}$MSGFMT" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then ++ { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 ++echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" ++mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" ++mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" ++if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then ++ { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 ++echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ + # Use the tools built into the package, not the ones that are installed. + INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract' + +@@ -21109,7 +21624,7 @@ + + fi + fi +- USE_NLS=yes ++ USE_NLS=yes + + + gt_cv_have_gettext=no +@@ -27757,9 +28272,9 @@ + ECHO!$ECHO$ac_delim + AR!$AR$ac_delim + RANLIB!$RANLIB$ac_delim ++DSYMUTIL!$DSYMUTIL$ac_delim ++NMEDIT!$NMEDIT$ac_delim + CXX!$CXX$ac_delim +-CXXFLAGS!$CXXFLAGS$ac_delim +-ac_ct_CXX!$ac_ct_CXX$ac_delim + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +@@ -27801,6 +28316,8 @@ + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF ++CXXFLAGS!$CXXFLAGS$ac_delim ++ac_ct_CXX!$ac_ct_CXX$ac_delim + CXXDEPMODE!$CXXDEPMODE$ac_delim + am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim + am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim +@@ -27830,6 +28347,9 @@ + INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim + INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim + INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim ++XGETTEXT!$XGETTEXT$ac_delim ++MSGMERGE!$MSGMERGE$ac_delim ++MSGFMT!$MSGFMT$ac_delim + INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim + INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim + INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim +@@ -27837,10 +28357,8 @@ + ALL_LINGUAS!$ALL_LINGUAS$ac_delim + DATADIRNAME!$DATADIRNAME$ac_delim + USE_NLS!$USE_NLS$ac_delim +-MSGFMT!$MSGFMT$ac_delim + MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim + GMSGFMT!$GMSGFMT$ac_delim +-XGETTEXT!$XGETTEXT$ac_delim + CATALOGS!$CATALOGS$ac_delim + CATOBJEXT!$CATOBJEXT$ac_delim + GMOFILES!$GMOFILES$ac_delim +@@ -27895,9 +28413,6 @@ + GNOME_DESKTOP_LIBS!$GNOME_DESKTOP_LIBS$ac_delim + GNOME_VFS_CFLAGS!$GNOME_VFS_CFLAGS$ac_delim + GNOME_VFS_LIBS!$GNOME_VFS_LIBS$ac_delim +-RSVG_CFLAGS!$RSVG_CFLAGS$ac_delim +-RSVG_LIBS!$RSVG_LIBS$ac_delim +-GNOME_MENU_CFLAGS!$GNOME_MENU_CFLAGS$ac_delim + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +@@ -27939,6 +28454,9 @@ + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF ++RSVG_CFLAGS!$RSVG_CFLAGS$ac_delim ++RSVG_LIBS!$RSVG_LIBS$ac_delim ++GNOME_MENU_CFLAGS!$GNOME_MENU_CFLAGS$ac_delim + GNOME_MENU_LIBS!$GNOME_MENU_LIBS$ac_delim + GTOP_CFLAGS!$GTOP_CFLAGS$ac_delim + GTOP_LIBS!$GTOP_LIBS$ac_delim +@@ -27991,7 +28509,7 @@ + LTLIBOBJS!$LTLIBOBJS$ac_delim + _ACEOF + +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 50; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 53; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +@@ -28392,21 +28910,22 @@ + fi + rm -f "$tmp/out12" + # Compute $ac_file's index in $config_headers. ++_am_arg=$ac_file + _am_stamp_count=1 + for _am_header in $config_headers :; do + case $_am_header in +- $ac_file | $ac_file:* ) ++ $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac + done +-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || +-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X$ac_file : 'X\(//\)[^/]' \| \ +- X$ac_file : 'X\(//\)$' \| \ +- X$ac_file : 'X\(/\)' \| . 2>/dev/null || +-echo X$ac_file | ++echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || ++$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$_am_arg" : 'X\(//\)[^/]' \| \ ++ X"$_am_arg" : 'X\(//\)$' \| \ ++ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || ++echo X"$_am_arg" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -28443,7 +28962,7 @@ + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. +- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || + $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ +diff -ur awn-extras-applets-0.2.6.orig/depcomp awn-extras-applets-0.2.6/depcomp +--- awn-extras-applets-0.2.6.orig/depcomp 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/depcomp 2008-03-19 01:03:14.000000000 +0100 +@@ -1,9 +1,9 @@ + #! /bin/sh + # depcomp - compile a program generating dependencies as side-effects + +-scriptversion=2006-10-15.18 ++scriptversion=2007-03-29.01 + +-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software ++# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software + # Foundation, Inc. + + # This program is free software; you can redistribute it and/or modify +@@ -215,34 +215,39 @@ + # current directory. Also, the AIX compiler puts `$object:' at the + # start of each line; $object doesn't have directory information. + # Version 6 uses the directory in both cases. +- stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` +- tmpdepfile="$stripped.u" ++ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` ++ test "x$dir" = "x$object" && dir= ++ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + if test "$libtool" = yes; then ++ tmpdepfile1=$dir$base.u ++ tmpdepfile2=$base.u ++ tmpdepfile3=$dir.libs/$base.u + "$@" -Wc,-M + else ++ tmpdepfile1=$dir$base.u ++ tmpdepfile2=$dir$base.u ++ tmpdepfile3=$dir$base.u + "$@" -M + fi + stat=$? + +- if test -f "$tmpdepfile"; then : +- else +- stripped=`echo "$stripped" | sed 's,^.*/,,'` +- tmpdepfile="$stripped.u" +- fi +- + if test $stat -eq 0; then : + else +- rm -f "$tmpdepfile" ++ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi + ++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" ++ do ++ test -f "$tmpdepfile" && break ++ done + if test -f "$tmpdepfile"; then +- outname="$stripped.o" + # Each line is of the form `foo.o: dependent.h'. + # Do two passes, one to just change these to + # `$object: dependent.h' and one to simply `dependent.h:'. +- sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" +- sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" ++ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" ++ # That's a tab and a space in the []. ++ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + else + # The sourcefile does not contain any dependencies, so just + # store a dummy comment line, to avoid errors with the Makefile +diff -ur awn-extras-applets-0.2.6.orig/install-sh awn-extras-applets-0.2.6/install-sh +--- awn-extras-applets-0.2.6.orig/install-sh 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/install-sh 2008-03-19 01:03:13.000000000 +0100 +@@ -1,7 +1,7 @@ + #!/bin/sh + # install - install a program, script, or datafile + +-scriptversion=2006-10-14.15 ++scriptversion=2006-12-25.00 + + # This originates from X11R5 (mit/util/scripts/install.sh), which was + # later released in X11R6 (xc/config/util/install.sh) with the +@@ -48,7 +48,7 @@ + # set DOITPROG to echo to test this script + + # Don't use :- since 4.3BSD and earlier shells don't like it. +-doit="${DOITPROG-}" ++doit=${DOITPROG-} + if test -z "$doit"; then + doit_exec=exec + else +@@ -58,34 +58,49 @@ + # Put in absolute file names if you don't have them in your path; + # or use environment vars. + +-mvprog="${MVPROG-mv}" +-cpprog="${CPPROG-cp}" +-chmodprog="${CHMODPROG-chmod}" +-chownprog="${CHOWNPROG-chown}" +-chgrpprog="${CHGRPPROG-chgrp}" +-stripprog="${STRIPPROG-strip}" +-rmprog="${RMPROG-rm}" +-mkdirprog="${MKDIRPROG-mkdir}" ++chgrpprog=${CHGRPPROG-chgrp} ++chmodprog=${CHMODPROG-chmod} ++chownprog=${CHOWNPROG-chown} ++cmpprog=${CMPPROG-cmp} ++cpprog=${CPPROG-cp} ++mkdirprog=${MKDIRPROG-mkdir} ++mvprog=${MVPROG-mv} ++rmprog=${RMPROG-rm} ++stripprog=${STRIPPROG-strip} ++ ++posix_glob='?' ++initialize_posix_glob=' ++ test "$posix_glob" != "?" || { ++ if (set -f) 2>/dev/null; then ++ posix_glob= ++ else ++ posix_glob=: ++ fi ++ } ++' + +-posix_glob= + posix_mkdir= + + # Desired mode of installed file. + mode=0755 + ++chgrpcmd= + chmodcmd=$chmodprog + chowncmd= +-chgrpcmd= +-stripcmd= ++mvcmd=$mvprog + rmcmd="$rmprog -f" +-mvcmd="$mvprog" ++stripcmd= ++ + src= + dst= + dir_arg= +-dstarg= ++dst_arg= ++ ++copy_on_change=false + no_target_directory= + +-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE ++usage="\ ++Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... +@@ -95,65 +110,55 @@ + In the 4th, create DIRECTORIES. + + Options: +--c (ignored) +--d create directories instead of installing files. +--g GROUP $chgrpprog installed files to GROUP. +--m MODE $chmodprog installed files to MODE. +--o USER $chownprog installed files to USER. +--s $stripprog installed files. +--t DIRECTORY install into DIRECTORY. +--T report an error if DSTFILE is a directory. +---help display this help and exit. +---version display version info and exit. ++ --help display this help and exit. ++ --version display version info and exit. ++ ++ -c (ignored) ++ -C install only if different (preserve the last data modification time) ++ -d create directories instead of installing files. ++ -g GROUP $chgrpprog installed files to GROUP. ++ -m MODE $chmodprog installed files to MODE. ++ -o USER $chownprog installed files to USER. ++ -s $stripprog installed files. ++ -t DIRECTORY install into DIRECTORY. ++ -T report an error if DSTFILE is a directory. + + Environment variables override the default commands: +- CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG ++ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG ++ RMPROG STRIPPROG + " + + while test $# -ne 0; do + case $1 in +- -c) shift +- continue;; ++ -c) ;; ++ ++ -C) copy_on_change=true;; + +- -d) dir_arg=true +- shift +- continue;; ++ -d) dir_arg=true;; + + -g) chgrpcmd="$chgrpprog $2" +- shift +- shift +- continue;; ++ shift;; + + --help) echo "$usage"; exit $?;; + + -m) mode=$2 +- shift +- shift + case $mode in + *' '* | *' '* | *' + '* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac +- continue;; ++ shift;; + + -o) chowncmd="$chownprog $2" +- shift +- shift +- continue;; +- +- -s) stripcmd=$stripprog +- shift +- continue;; +- +- -t) dstarg=$2 +- shift +- shift +- continue;; +- +- -T) no_target_directory=true +- shift +- continue;; ++ shift;; ++ ++ -s) stripcmd=$stripprog;; ++ ++ -t) dst_arg=$2 ++ shift;; ++ ++ -T) no_target_directory=true;; + + --version) echo "$0 $scriptversion"; exit $?;; + +@@ -165,21 +170,22 @@ + + *) break;; + esac ++ shift + done + +-if test $# -ne 0 && test -z "$dir_arg$dstarg"; then ++if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then + # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do +- if test -n "$dstarg"; then ++ if test -n "$dst_arg"; then + # $@ is not empty: it contains at least $arg. +- set fnord "$@" "$dstarg" ++ set fnord "$@" "$dst_arg" + shift # fnord + fi + shift # arg +- dstarg=$arg ++ dst_arg=$arg + done + fi + +@@ -224,7 +230,7 @@ + do + # Protect names starting with `-'. + case $src in +- -*) src=./$src ;; ++ -*) src=./$src;; + esac + + if test -n "$dir_arg"; then +@@ -242,22 +248,22 @@ + exit 1 + fi + +- if test -z "$dstarg"; then ++ if test -z "$dst_arg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + +- dst=$dstarg ++ dst=$dst_arg + # Protect names starting with `-'. + case $dst in +- -*) dst=./$dst ;; ++ -*) dst=./$dst;; + esac + + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then +- echo "$0: $dstarg: Is a directory" >&2 ++ echo "$0: $dst_arg: Is a directory" >&2 + exit 1 + fi + dstdir=$dst +@@ -378,26 +384,19 @@ + # directory the slow way, step by step, checking for races as we go. + + case $dstdir in +- /*) prefix=/ ;; +- -*) prefix=./ ;; +- *) prefix= ;; ++ /*) prefix='/';; ++ -*) prefix='./';; ++ *) prefix='';; + esac + +- case $posix_glob in +- '') +- if (set -f) 2>/dev/null; then +- posix_glob=true +- else +- posix_glob=false +- fi ;; +- esac ++ eval "$initialize_posix_glob" + + oIFS=$IFS + IFS=/ +- $posix_glob && set -f ++ $posix_glob set -f + set fnord $dstdir + shift +- $posix_glob && set +f ++ $posix_glob set +f + IFS=$oIFS + + prefixes= +@@ -459,41 +458,54 @@ + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # +- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ +- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ +- && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ +- && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && +- +- # Now rename the file to the real destination. +- { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \ +- || { +- # The rename failed, perhaps because mv can't rename something else +- # to itself, or perhaps because mv is so ancient that it does not +- # support -f. +- +- # Now remove or move aside any old file at destination location. +- # We try this two ways since rm can't unlink itself on some +- # systems and the destination file might be busy for other +- # reasons. In this case, the final cleanup might fail but the new +- # file should still install successfully. +- { +- if test -f "$dst"; then +- $doit $rmcmd -f "$dst" 2>/dev/null \ +- || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \ +- && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\ +- || { +- echo "$0: cannot unlink or rename $dst" >&2 +- (exit 1); exit 1 +- } +- else +- : +- fi +- } && +- +- # Now rename the file to the real destination. +- $doit $mvcmd "$dsttmp" "$dst" +- } +- } || exit 1 ++ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && ++ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && ++ { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && ++ { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && ++ ++ # If -C, don't bother to copy if it wouldn't change the file. ++ if $copy_on_change && ++ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && ++ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && ++ ++ eval "$initialize_posix_glob" && ++ $posix_glob set -f && ++ set X $old && old=:$2:$4:$5:$6 && ++ set X $new && new=:$2:$4:$5:$6 && ++ $posix_glob set +f && ++ ++ test "$old" = "$new" && ++ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 ++ then ++ rm -f "$dsttmp" ++ else ++ # Rename the file to the real destination. ++ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || ++ ++ # The rename failed, perhaps because mv can't rename something else ++ # to itself, or perhaps because mv is so ancient that it does not ++ # support -f. ++ { ++ # Now remove or move aside any old file at destination location. ++ # We try this two ways since rm can't unlink itself on some ++ # systems and the destination file might be busy for other ++ # reasons. In this case, the final cleanup might fail but the new ++ # file should still install successfully. ++ { ++ test ! -f "$dst" || ++ $doit $rmcmd -f "$dst" 2>/dev/null || ++ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && ++ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } ++ } || ++ { echo "$0: cannot unlink or rename $dst" >&2 ++ (exit 1); exit 1 ++ } ++ } && ++ ++ # Now rename the file to the real destination. ++ $doit $mvcmd "$dsttmp" "$dst" ++ } ++ fi || exit 1 + + trap '' 0 + fi +diff -ur awn-extras-applets-0.2.6.orig/intltool-extract.in awn-extras-applets-0.2.6/intltool-extract.in +--- awn-extras-applets-0.2.6.orig/intltool-extract.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/intltool-extract.in 2008-03-14 23:58:08.000000000 +0100 +@@ -32,7 +32,7 @@ + ## Release information + my $PROGRAM = "intltool-extract"; + my $PACKAGE = "intltool"; +-my $VERSION = "0.36.2"; ++my $VERSION = "0.37.1"; + + ## Loaded modules + use strict; +@@ -161,7 +161,8 @@ + --type=TYPE Specify the file type of FILENAME. Currently supports: + "gettext/glade", "gettext/ini", "gettext/keys" + "gettext/rfc822deb", "gettext/schemas", +- "gettext/scheme", "gettext/xml", "gettext/quoted" ++ "gettext/scheme", "gettext/xml", "gettext/quoted", ++ "gettext/quotedxml" + -l, --local Writes output into current working directory + (conflicts with --update) + --update Writes output into the same directory the source file +@@ -218,6 +219,7 @@ + &type_schemas if $gettext_type eq "schemas"; + &type_rfc822deb if $gettext_type eq "rfc822deb"; + &type_quoted if $gettext_type eq "quoted"; ++ &type_quotedxml if $gettext_type eq "quotedxml"; + } + + sub entity_decode_minimal +@@ -731,6 +733,18 @@ + } + } + ++sub type_quotedxml { ++ while ($input =~ /\"(([^\"]|\\\")*[^\\\"])\"/g) { ++ my $message = $1; ++ my $before = $`; ++ $message =~ s/\\\"/\"/g; ++ $message = entity_decode($message); ++ $before =~ s/[^\n]//g; ++ $messages{$message} = []; ++ $loc{$message} = length ($before) + 2; ++ } ++} ++ + sub type_glade { + ### For translatable Glade XML files ### + +diff -ur awn-extras-applets-0.2.6.orig/intltool-merge.in awn-extras-applets-0.2.6/intltool-merge.in +--- awn-extras-applets-0.2.6.orig/intltool-merge.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/intltool-merge.in 2008-03-14 23:58:08.000000000 +0100 +@@ -35,7 +35,7 @@ + ## Release information + my $PROGRAM = "intltool-merge"; + my $PACKAGE = "intltool"; +-my $VERSION = "0.36.2"; ++my $VERSION = "0.37.1"; + + ## Loaded modules + use strict; +@@ -61,6 +61,7 @@ + my $SCHEMAS_STYLE_ARG = 0; + my $RFC822DEB_STYLE_ARG = 0; + my $QUOTED_STYLE_ARG = 0; ++my $QUOTEDXML_STYLE_ARG = 0; + my $QUIET_ARG = 0; + my $PASS_THROUGH_ARG = 0; + my $UTF8_ARG = 0; +@@ -81,6 +82,7 @@ + "schemas-style|s" => \$SCHEMAS_STYLE_ARG, + "rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG, + "quoted-style" => \$QUOTED_STYLE_ARG, ++ "quotedxml-style" => \$QUOTEDXML_STYLE_ARG, + "pass-through|p" => \$PASS_THROUGH_ARG, + "utf8|u" => \$UTF8_ARG, + "multiple-output|m" => \$MULTIPLE_OUTPUT, +@@ -148,7 +150,7 @@ + &utf8_sanity_check; + &preparation; + &print_message; +- &keys_merge_translations; ++ &keys_merge_translations; + &finalize; + } + elsif ($DESKTOP_STYLE_ARG && @ARGV > 2) +@@ -174,12 +176,12 @@ + &rfc822deb_merge_translations; + &finalize; + } +-elsif ($QUOTED_STYLE_ARG && @ARGV > 2) ++elsif (($QUOTED_STYLE_ARG || $QUOTEDXML_STYLE_ARG) && @ARGV > 2) + { + &utf8_sanity_check; + &preparation; + &print_message; +- "ed_merge_translations; ++ "ed_merge_translations($QUOTEDXML_STYLE_ARG); + &finalize; + } + else +@@ -219,6 +221,7 @@ + -s, --schemas-style includes translations in the schemas style + -r, --rfc822deb-style includes translations in the RFC822 style + --quoted-style includes translations in the quoted string style ++ --quotedxml-style includes translations in the quoted xml string style + -x, --xml-style includes translations in the standard xml style + + Other options: +@@ -292,10 +295,9 @@ + { + next if /^#/; + +- if (/([-a-zA-Z_@.]+)\n/) ++ for my $lang (split) + { +- my $lang = $1; +- ++ chomp ($lang); + my $po_file = $PO_DIR . "/" . $lang . ".po"; + if (-e $po_file) { + $po_files_by_lang{$lang} = $po_file; +@@ -576,6 +578,7 @@ + return "&" if $_ == 38; + return "'" if $_ == 39; + return "<" if $_ == 60; ++ return ">" if $_ == 62; + return chr $_; + } + +@@ -1076,43 +1079,74 @@ + close OUTPUT; + print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG; + } +- } +- open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n"; +- binmode (OUTPUT) if $^O eq 'MSWin32'; +- my $tree = readXml($FILE); +- print_header($FILE, \*OUTPUT); +- parseTree(\*OUTPUT, $tree); +- close OUTPUT; +- print "CREATED $OUTFILE\n" unless $QUIET_ARG; ++ if ( ! -d "C" ) { ++ mkdir "C" or -d "C" or die "Cannot create subdirectory C: $!\n"; ++ } ++ open OUTPUT, ">C/$OUTFILE" or die "Cannot open C/$OUTFILE: $!\n"; ++ binmode (OUTPUT) if $^O eq 'MSWin32'; ++ my $tree = readXml($FILE); ++ print_header($FILE, \*OUTPUT); ++ parseTree(\*OUTPUT, $tree); ++ close OUTPUT; ++ print "CREATED C/$OUTFILE\n" unless $QUIET_ARG; ++ } else { ++ open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n"; ++ binmode (OUTPUT) if $^O eq 'MSWin32'; ++ my $tree = readXml($FILE); ++ print_header($FILE, \*OUTPUT); ++ parseTree(\*OUTPUT, $tree); ++ close OUTPUT; ++ print "CREATED $OUTFILE\n" unless $QUIET_ARG; ++ } + } + +-sub keys_merge_translations ++sub keys_merge_translation + { +- open INPUT, "<${FILE}" or die; +- open OUTPUT, ">${OUTFILE}" or die; ++ my ($lang) = @_; ++ ++ if ( ! -d $lang && $MULTIPLE_OUTPUT) ++ { ++ mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n"; ++ } ++ ++ open INPUT, "<${FILE}" or die "Cannot open ${FILE}: $!\n"; ++ open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n"; + binmode (OUTPUT) if $^O eq 'MSWin32'; + +- while () ++ while () + { +- if (s/^(\s*)_(\w+=(.*))/$1$2/) ++ if (s/^(\s*)_(\w+=(.*))/$1$2/) + { +- my $string = $3; ++ my $string = $3; + +- print OUTPUT; ++ if (!$MULTIPLE_OUTPUT) ++ { ++ print OUTPUT; + +- my $non_translated_line = $_; ++ my $non_translated_line = $_; + +- for my $lang (sort keys %po_files_by_lang) ++ for my $lang (sort keys %po_files_by_lang) ++ { ++ my $translation = $translations{$lang, $string}; ++ next if !$translation; ++ ++ $_ = $non_translated_line; ++ s/(\w+)=.*/[$lang]$1=$translation/; ++ print OUTPUT; ++ } ++ } ++ else + { +- my $translation = $translations{$lang, $string}; +- next if !$translation; ++ my $non_translated_line = $_; ++ my $translation = $translations{$lang, $string}; ++ $translation = $string if !$translation; + + $_ = $non_translated_line; +- s/(\w+)=.*/[$lang]$1=$translation/; ++ s/(\w+)=.*/$1=$translation/; + print OUTPUT; + } +- } +- else ++ } ++ else + { + print OUTPUT; + } +@@ -1120,6 +1154,24 @@ + + close OUTPUT; + close INPUT; ++ ++ print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG; ++} ++ ++sub keys_merge_translations ++{ ++ if ($MULTIPLE_OUTPUT) ++ { ++ for my $lang (sort keys %po_files_by_lang) ++ { ++ keys_merge_translation ($lang); ++ } ++ keys_merge_translation ("C"); ++ } ++ else ++ { ++ keys_merge_translation ("."); ++ } + } + + sub desktop_merge_translations +@@ -1415,19 +1467,22 @@ + + sub quoted_translation + { +- my ($lang, $string) = @_; ++ my ($xml_mode, $lang, $string) = @_; + ++ $string = entity_decode($string) if $xml_mode; + $string =~ s/\\\"/\"/g; + + my $translation = $translations{$lang, $string}; + $translation = $string if !$translation; +- ++ $translation = entity_encode($translation) if $xml_mode; + $translation =~ s/\"/\\\"/g; + return $translation + } + + sub quoted_merge_translations + { ++ my ($xml_mode) = @_; ++ + if (!$MULTIPLE_OUTPUT) { + print "Quoted only supports Multiple Output.\n"; + exit(1); +@@ -1442,7 +1497,7 @@ + binmode (OUTPUT) if $^O eq 'MSWin32'; + while () + { +- s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($lang, $1) . "\""/ge; ++ s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($xml_mode, $lang, $1) . "\""/ge; + print OUTPUT; + } + close OUTPUT; +diff -ur awn-extras-applets-0.2.6.orig/intltool-update.in awn-extras-applets-0.2.6/intltool-update.in +--- awn-extras-applets-0.2.6.orig/intltool-update.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/intltool-update.in 2008-03-14 23:58:08.000000000 +0100 +@@ -30,7 +30,7 @@ + + ## Release information + my $PROGRAM = "intltool-update"; +-my $VERSION = "0.36.2"; ++my $VERSION = "0.37.1"; + my $PACKAGE = "intltool"; + + ## Loaded modules +@@ -334,7 +334,7 @@ + push @buf_i18n_xml, "$File::Find::name" if /\.($xml_support)$/; + push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/; + push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/; +- }, "$SRCDIR/.."; ++ }, "$SRCDIR/.." if "$SRCDIR" ne "."; + + open POTFILES, $POTFILES_in or die "$PROGRAM: there's no POTFILES.in!\n"; + @buf_potfiles = grep !/^(#|\s*$)/, ; +@@ -434,8 +434,8 @@ + last; + } + +- ## N_ Q_ and _ are the three macros defined in gi8n.h +- if (/[NQ]?_ *\(QUOTEDTEXT/) ++ ## C_ N_ Q_ and _ are the macros defined in gi8n.h ++ if (/[CNQ]?_ *\(QUOTEDTEXT/) + { + if (defined isNotValidMissing (unpack("x3 A*", $file))) { + ## Remove the first 3 chars and add newline +@@ -777,7 +777,7 @@ + my $XGETTEXT_KEYWORDS = &FindPOTKeywords; + push @xgettext_argument, $XGETTEXT_KEYWORDS; + my $MSGID_BUGS_ADDRESS = &FindMakevarsBugAddress; +- push @xgettext_argument, "--msgid-bugs-address\=$MSGID_BUGS_ADDRESS" if $MSGID_BUGS_ADDRESS; ++ push @xgettext_argument, "--msgid-bugs-address\=\"$MSGID_BUGS_ADDRESS\"" if $MSGID_BUGS_ADDRESS; + push @xgettext_argument, "--from-code\=$encoding" if ($gettext_support_nonascii); + push @xgettext_argument, $XGETTEXT_ARGS if $XGETTEXT_ARGS; + my $xgettext_command = join ' ', @xgettext_argument; +@@ -1118,6 +1118,8 @@ + close IN; + } + ++ # unwrap lines split with a trailing \ ++ $make_source =~ s/\\ $ \n/ /mxg; + $keywords = $1 if $make_source =~ /^$varname[ ]*=\[?([^\n\]]+)/m; + + return $keywords; +diff -ur awn-extras-applets-0.2.6.orig/ltmain.sh awn-extras-applets-0.2.6/ltmain.sh +--- awn-extras-applets-0.2.6.orig/ltmain.sh 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/ltmain.sh 2008-02-02 14:06:18.000000000 +0100 +@@ -2,7 +2,7 @@ + # NOTE: Changing this file will not affect anything until you rerun configure. + # + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, +-# 2007 Free Software Foundation, Inc. ++# 2007, 2008 Free Software Foundation, Inc. + # Originally by Gordon Matzigkeit , 1996 + # + # This program is free software; you can redistribute it and/or modify +@@ -43,8 +43,8 @@ + + PROGRAM=ltmain.sh + PACKAGE=libtool +-VERSION="1.5.24 Debian 1.5.24-1ubuntu1" +-TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)" ++VERSION="1.5.26 Debian 1.5.26-1" ++TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)" + + # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +@@ -113,15 +113,21 @@ + # These must not be set unconditionally because not all systems understand + # e.g. LANG=C (notably SCO). + # We save the old values to restore during execute mode. +-for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES ++lt_env= ++for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES + do + eval "if test \"\${$lt_var+set}\" = set; then + save_$lt_var=\$$lt_var ++ lt_env=\"$lt_var=\$$lt_var \$lt_env\" + $lt_var=C + export $lt_var + fi" + done + ++if test -n "$lt_env"; then ++ lt_env="env $lt_env" ++fi ++ + # Make sure IFS has a sensible default + lt_nl=' + ' +@@ -485,7 +491,7 @@ + echo "\ + $PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP + +-Copyright (C) 2007 Free Software Foundation, Inc. ++Copyright (C) 2008 Free Software Foundation, Inc. + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + exit $? +@@ -788,6 +794,7 @@ + *.for) xform=for ;; + *.java) xform=java ;; + *.obj) xform=obj ;; ++ *.sx) xform=sx ;; + esac + + libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` +@@ -956,7 +963,7 @@ + $run $rm "$lobj" "$output_obj" + + $show "$command" +- if $run eval "$command"; then : ++ if $run eval $lt_env "$command"; then : + else + test -n "$output_obj" && $run $rm $removelist + exit $EXIT_FAILURE +@@ -1028,7 +1035,7 @@ + command="$command$suppress_output" + $run $rm "$obj" "$output_obj" + $show "$command" +- if $run eval "$command"; then : ++ if $run eval $lt_env "$command"; then : + else + $run $rm $removelist + exit $EXIT_FAILURE +@@ -1161,6 +1168,7 @@ + thread_safe=no + vinfo= + vinfo_number=no ++ single_module="${wl}-single_module" + + func_infer_tag $base_compile + +@@ -1646,6 +1654,11 @@ + continue + ;; + ++ -multi_module) ++ single_module="${wl}-multi_module" ++ continue ++ ;; ++ + -module) + module=yes + continue +@@ -2152,7 +2165,12 @@ + continue + fi + name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` +- for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do ++ if test "$linkmode" = lib; then ++ searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" ++ else ++ searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" ++ fi ++ for searchdir in $searchdirs; do + for search_ext in .la $std_shrext .so .a; do + # Search the libtool library + lib="$searchdir/lib${name}${search_ext}" +@@ -2948,12 +2966,18 @@ + # we do not want to link against static libs, + # but need to link against shared + eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` ++ eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names" ; then + for tmp in $deplibrary_names ; do + depdepl=$tmp + done +- if test -f "$path/$depdepl" ; then ++ if test -f "$deplibdir/$depdepl" ; then ++ depdepl="$deplibdir/$depdepl" ++ elif test -f "$path/$depdepl" ; then + depdepl="$path/$depdepl" ++ else ++ # Can't find it, oh well... ++ depdepl= + fi + # do not add paths which are already there + case " $newlib_search_path " in +@@ -3101,9 +3125,10 @@ + + case $linkmode in + oldlib) +- if test -n "$deplibs"; then +- $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 +- fi ++ case " $deplibs" in ++ *\ -l* | *\ -L*) ++ $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;; ++ esac + + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 +@@ -4245,9 +4270,10 @@ + ;; + + obj) +- if test -n "$deplibs"; then +- $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 +- fi ++ case " $deplibs" in ++ *\ -l* | *\ -L*) ++ $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;; ++ esac + + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2 +@@ -6486,7 +6512,7 @@ + fi + + # Restore saved environment variables +- for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES ++ for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES + do + eval "if test \"\${save_$lt_var+set}\" = set; then + $lt_var=\$save_$lt_var; export $lt_var +diff -ur awn-extras-applets-0.2.6.orig/Makefile.desktop-files awn-extras-applets-0.2.6/Makefile.desktop-files +--- awn-extras-applets-0.2.6.orig/Makefile.desktop-files 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/Makefile.desktop-files 2008-03-19 01:02:33.000000000 +0100 +@@ -2,7 +2,7 @@ + + icon_DATA = $(APPLET_ICONS) + +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + + desktop_DATA = $(APPLET_NAME).desktop + @INTLTOOL_DESKTOP_RULE@ +diff -ur awn-extras-applets-0.2.6.orig/Makefile.in awn-extras-applets-0.2.6/Makefile.in +--- awn-extras-applets-0.2.6.orig/Makefile.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/Makefile.in 2008-03-19 01:03:21.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -112,6 +112,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -195,6 +196,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -458,8 +461,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -484,8 +487,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -495,13 +498,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -572,6 +574,10 @@ + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + ++dist-lzma: distdir ++ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma ++ $(am__remove_distdir) ++ + dist-tarZ: distdir + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__remove_distdir) +@@ -598,6 +604,8 @@ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ + bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ ++ *.tar.lzma*) \ ++ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ +@@ -750,8 +758,8 @@ + .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am am--refresh check check-am clean clean-generic \ + clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ +- dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ +- distclean-generic distclean-hdr distclean-libtool \ ++ dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \ ++ distclean distclean-generic distclean-hdr distclean-libtool \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ +diff -ur awn-extras-applets-0.2.6.orig/Makefile.python-applet awn-extras-applets-0.2.6/Makefile.python-applet +--- awn-extras-applets-0.2.6.orig/Makefile.python-applet 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/Makefile.python-applet 2008-03-19 01:02:33.000000000 +0100 +@@ -2,7 +2,7 @@ + NULL = + include $(top_srcdir)/Makefile.desktop-files + +-appletdir = $(libdir)/awn/applets/$(APPLET_NAME) ++appletdir = $(datadir)/awn/applets/$(APPLET_NAME) + + install-exec-local: + test -d "$(DESTDIR)$(appletdir)" || mkdir -p "$(DESTDIR)$(appletdir)" +diff -ur awn-extras-applets-0.2.6.orig/po/Makefile.in.in awn-extras-applets-0.2.6/po/Makefile.in.in +--- awn-extras-applets-0.2.6.orig/po/Makefile.in.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/po/Makefile.in.in 2008-02-25 06:45:01.000000000 +0100 +@@ -1,10 +1,10 @@ + # Makefile for program source directory in GNU NLS utilities package. + # Copyright (C) 1995, 1996, 1997 by Ulrich Drepper ++# Copyright (C) 2004-2008 Rodney Dawes + # +-# This file file be copied and used freely without restrictions. It can +-# be used in projects which are not available under the GNU Public License ++# This file may be copied and used freely without restrictions. It may ++# be used in projects which are not available under a GNU Public License, + # but which still want to provide support for the GNU gettext functionality. +-# Please note that the actual code is *not* freely available. + # + # - Modified by Owen Taylor to use GETTEXT_PACKAGE + # instead of PACKAGE and to look for po2tbl in ./ not in intl/ +@@ -12,7 +12,7 @@ + # - Modified by jacob berkman to install + # Makefile.in.in and po2tbl.sed.in for use with glib-gettextize + # +-# - Modified by Rodney Dawes for use with intltool ++# - Modified by Rodney Dawes for use with intltool + # + # We have the following line for use by intltoolize: + # INTLTOOL_MAKEFILE +diff -ur awn-extras-applets-0.2.6.orig/src/affinity/affinity-preferences/Makefile.in awn-extras-applets-0.2.6/src/affinity/affinity-preferences/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/affinity/affinity-preferences/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/affinity/affinity-preferences/Makefile.in 2008-03-19 01:03:14.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -93,6 +93,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -176,6 +177,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +diff -ur awn-extras-applets-0.2.6.orig/src/affinity/data/16x16/Makefile.in awn-extras-applets-0.2.6/src/affinity/data/16x16/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/affinity/data/16x16/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/affinity/data/16x16/Makefile.in 2008-03-19 01:03:14.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -95,6 +95,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -178,6 +179,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +diff -ur awn-extras-applets-0.2.6.orig/src/affinity/data/22x22/Makefile.in awn-extras-applets-0.2.6/src/affinity/data/22x22/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/affinity/data/22x22/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/affinity/data/22x22/Makefile.in 2008-03-19 01:03:14.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -95,6 +95,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -178,6 +179,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +diff -ur awn-extras-applets-0.2.6.orig/src/affinity/data/24x24/Makefile.in awn-extras-applets-0.2.6/src/affinity/data/24x24/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/affinity/data/24x24/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/affinity/data/24x24/Makefile.in 2008-03-19 01:03:15.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -95,6 +95,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -178,6 +179,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +diff -ur awn-extras-applets-0.2.6.orig/src/affinity/data/48x48/Makefile.in awn-extras-applets-0.2.6/src/affinity/data/48x48/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/affinity/data/48x48/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/affinity/data/48x48/Makefile.in 2008-03-19 01:03:15.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -93,6 +93,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -176,6 +177,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +diff -ur awn-extras-applets-0.2.6.orig/src/affinity/data/actions/Makefile.in awn-extras-applets-0.2.6/src/affinity/data/actions/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/affinity/data/actions/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/affinity/data/actions/Makefile.in 2008-03-19 01:03:15.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -92,6 +92,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -175,6 +176,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +diff -ur awn-extras-applets-0.2.6.orig/src/affinity/data/Makefile.in awn-extras-applets-0.2.6/src/affinity/data/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/affinity/data/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/affinity/data/Makefile.in 2008-03-19 01:03:15.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -94,6 +94,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -177,6 +178,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -398,8 +401,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -424,8 +427,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -435,13 +438,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/affinity/data/scalable/Makefile.in awn-extras-applets-0.2.6/src/affinity/data/scalable/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/affinity/data/scalable/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/affinity/data/scalable/Makefile.in 2008-03-19 01:03:15.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -95,6 +95,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -178,6 +179,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +diff -ur awn-extras-applets-0.2.6.orig/src/affinity/Makefile.in awn-extras-applets-0.2.6/src/affinity/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/affinity/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/affinity/Makefile.in 2008-03-19 01:03:14.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -99,7 +99,7 @@ + affinity_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(affinity_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +@@ -166,6 +166,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -249,6 +250,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -366,7 +369,7 @@ + # vim: set ft=automake ts-8 sts=8 sw=8 : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = po/Makefile.in.in + CLEANFILES = $(desktop_DATA) +@@ -446,8 +449,8 @@ + @list='$(applet_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(appletdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(appletdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(appletdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(appletdir)/$$f"; \ + else :; fi; \ + done + +@@ -455,8 +458,8 @@ + @$(NORMAL_UNINSTALL) + @list='$(applet_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(appletdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(appletdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(appletdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(appletdir)/$$p"; \ + done + + clean-appletLTLIBRARIES: +@@ -630,8 +633,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -656,8 +659,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -667,13 +670,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/arss/arss.desktop.in.in awn-extras-applets-0.2.6/src/arss/arss.desktop.in.in +--- awn-extras-applets-0.2.6.orig/src/arss/arss.desktop.in.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/arss/arss.desktop.in.in 2008-03-19 01:02:33.000000000 +0100 +@@ -1,11 +1,10 @@ + [Desktop Entry] + Version=1.0 +-Encoding=UTF-8 + Name=aRSS + Type=Application + X-AWN-AppletType=Python + Comment=Watch your feeds +-Exec=@LIBDIR@/awn/applets/arss/rss_awn.py +-Icon=@LIBDIR@/awn/applets/arss/Core/feed-icon.svg ++Exec=arss/rss_awn.py ++Icon=arss/Core/feed-icon.svg + Name[en_US]=aRSS + X-AWN-AppletCategory=Network,News +diff -ur awn-extras-applets-0.2.6.orig/src/arss/Core/Makefile.am awn-extras-applets-0.2.6/src/arss/Core/Makefile.am +--- awn-extras-applets-0.2.6.orig/src/arss/Core/Makefile.am 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/arss/Core/Makefile.am 2008-03-19 01:02:33.000000000 +0100 +@@ -17,4 +17,4 @@ + simplenotify.py \ + $(NULL) + +-arssdir = $(libdir)/awn/applets/arss/Core ++arssdir = $(datadir)/awn/applets/arss/Core +diff -ur awn-extras-applets-0.2.6.orig/src/arss/Core/Makefile.in awn-extras-applets-0.2.6/src/arss/Core/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/arss/Core/Makefile.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/arss/Core/Makefile.in 2008-03-19 01:03:15.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -93,6 +93,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -176,6 +177,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -301,7 +304,7 @@ + simplenotify.py \ + $(NULL) + +-arssdir = $(libdir)/awn/applets/arss/Core ++arssdir = $(datadir)/awn/applets/arss/Core + all: all-am + + .SUFFIXES: +diff -ur awn-extras-applets-0.2.6.orig/src/arss/Makefile.in awn-extras-applets-0.2.6/src/arss/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/arss/Makefile.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/arss/Makefile.in 2008-03-19 01:03:15.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -112,6 +112,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -195,6 +196,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -308,11 +311,11 @@ + # vim: set ft=automake : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = $(APPLET_MAIN_FILE) + CLEANFILES = $(desktop_DATA) +-appletdir = $(libdir)/awn/applets/$(APPLET_NAME) ++appletdir = $(datadir)/awn/applets/$(APPLET_NAME) + dist_applet_DATA = \ + COPYING \ + README \ +@@ -485,8 +488,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -511,8 +514,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -522,13 +525,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/awn-notification-daemon/data/Makefile.in awn-extras-applets-0.2.6/src/awn-notification-daemon/data/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/awn-notification-daemon/data/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/awn-notification-daemon/data/Makefile.in 2008-03-19 01:03:15.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -92,6 +92,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -175,6 +176,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +diff -ur awn-extras-applets-0.2.6.orig/src/awn-notification-daemon/Makefile.in awn-extras-applets-0.2.6/src/awn-notification-daemon/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/awn-notification-daemon/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/awn-notification-daemon/Makefile.in 2008-03-19 01:03:15.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -95,6 +95,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -178,6 +179,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -405,8 +408,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -431,8 +434,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -442,13 +445,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/awn-notification-daemon/src/daemon/Makefile.in awn-extras-applets-0.2.6/src/awn-notification-daemon/src/daemon/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/awn-notification-daemon/src/daemon/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/awn-notification-daemon/src/daemon/Makefile.in 2008-03-19 01:03:15.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -70,7 +70,7 @@ + awnnotificationdaemon_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(awnnotificationdaemon_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +@@ -127,6 +127,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -210,6 +211,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -325,7 +328,7 @@ + # vim: set ft=automake ts-8 sts=8 sw=8 : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = notificationdaemon.xml + CLEANFILES = $(desktop_DATA) +@@ -400,8 +403,8 @@ + @list='$(applet_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(appletdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(appletdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(appletdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(appletdir)/$$f"; \ + else :; fi; \ + done + +@@ -409,8 +412,8 @@ + @$(NORMAL_UNINSTALL) + @list='$(applet_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(appletdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(appletdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(appletdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(appletdir)/$$p"; \ + done + + clean-appletLTLIBRARIES: +@@ -500,8 +503,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -513,8 +516,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -524,13 +527,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/awn-notification-daemon/src/Makefile.in awn-extras-applets-0.2.6/src/awn-notification-daemon/src/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/awn-notification-daemon/src/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/awn-notification-daemon/src/Makefile.in 2008-03-19 01:03:15.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -94,6 +94,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -177,6 +178,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -398,8 +401,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -424,8 +427,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -435,13 +438,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/awnsystemmonitor/awnsystemmonitor.desktop.in awn-extras-applets-0.2.6/src/awnsystemmonitor/awnsystemmonitor.desktop.in +--- awn-extras-applets-0.2.6.orig/src/awnsystemmonitor/awnsystemmonitor.desktop.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/awnsystemmonitor/awnsystemmonitor.desktop.in 2008-03-19 01:03:30.000000000 +0100 +@@ -3,6 +3,6 @@ + X-AWN-AppletType=C + Name=Awn System Monitor + Comment=Manage system activity +-Exec=/usr/local/lib/awn/applets/awnsystemmonitor/awnsystemmonitor.so ++Exec=/usr/lib/awn/applets/awnsystemmonitor/awnsystemmonitor.so + Icon=utilities-system-monitor + X-AWN-AppletCategory=System,Monitor +diff -ur awn-extras-applets-0.2.6.orig/src/awnsystemmonitor/Makefile.in awn-extras-applets-0.2.6/src/awnsystemmonitor/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/awnsystemmonitor/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/awnsystemmonitor/Makefile.in 2008-03-19 01:03:15.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -71,7 +71,7 @@ + awnsystemmonitor_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(awnsystemmonitor_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +@@ -129,6 +129,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -212,6 +213,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -324,7 +327,7 @@ + # vim: set ft=automake ts-8 sts=8 sw=8 : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = $(icon_DATA) $(desktop_DATA).in $(schemas_in_files) + CLEANFILES = $(desktop_DATA) +@@ -415,8 +418,8 @@ + @list='$(applet_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(appletdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(appletdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(appletdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(appletdir)/$$f"; \ + else :; fi; \ + done + +@@ -424,8 +427,8 @@ + @$(NORMAL_UNINSTALL) + @list='$(applet_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(appletdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(appletdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(appletdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(appletdir)/$$p"; \ + done + + clean-appletLTLIBRARIES: +@@ -541,8 +544,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -554,8 +557,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -565,13 +568,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/awnterm/Makefile.in awn-extras-applets-0.2.6/src/awnterm/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/awnterm/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/awnterm/Makefile.in 2008-03-19 01:03:15.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -69,7 +69,7 @@ + awnterm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(awnterm_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +@@ -127,6 +127,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -210,6 +211,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -322,7 +325,7 @@ + # vim: set ft=automake ts-8 sts=8 sw=8 : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = awn-terminal.schemas.in + CLEANFILES = $(desktop_DATA) +@@ -395,8 +398,8 @@ + @list='$(applet_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(appletdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(appletdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(appletdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(appletdir)/$$f"; \ + else :; fi; \ + done + +@@ -404,8 +407,8 @@ + @$(NORMAL_UNINSTALL) + @list='$(applet_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(appletdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(appletdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(appletdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(appletdir)/$$p"; \ + done + + clean-appletLTLIBRARIES: +@@ -512,8 +515,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -525,8 +528,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -536,13 +539,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/battery-applet/battery-applet.desktop.in.in awn-extras-applets-0.2.6/src/battery-applet/battery-applet.desktop.in.in +--- awn-extras-applets-0.2.6.orig/src/battery-applet/battery-applet.desktop.in.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/battery-applet/battery-applet.desktop.in.in 2008-03-19 01:02:33.000000000 +0100 +@@ -1,9 +1,8 @@ + [Desktop Entry] + Type=Application + X-AWN-AppletType=Python +-Encoding=UTF-8 + Name=Battery Applet + Comment=Watch battery state +-Exec=@LIBDIR@/awn/applets/battery-applet/battery-applet.py +-Icon=@LIBDIR@/awn/applets/battery-applet/icons/battery-charging-100.svg ++Exec=battery-applet/battery-applet.py ++Icon=battery-applet/icons/battery-charging-100.svg + X-AWN-AppletCategory=System,Monitor +diff -ur awn-extras-applets-0.2.6.orig/src/battery-applet/icons/Makefile.am awn-extras-applets-0.2.6/src/battery-applet/icons/Makefile.am +--- awn-extras-applets-0.2.6.orig/src/battery-applet/icons/Makefile.am 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/battery-applet/icons/Makefile.am 2008-03-19 01:02:33.000000000 +0100 +@@ -14,4 +14,4 @@ + COPYING \ + LGPL + +-batteryappletdir = $(libdir)/awn/applets/battery-applet/icons ++batteryappletdir = $(datadir)/awn/applets/battery-applet/icons +diff -ur awn-extras-applets-0.2.6.orig/src/battery-applet/icons/Makefile.in awn-extras-applets-0.2.6/src/battery-applet/icons/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/battery-applet/icons/Makefile.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/battery-applet/icons/Makefile.in 2008-03-19 01:03:16.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -93,6 +93,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -176,6 +177,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -298,7 +301,7 @@ + COPYING \ + LGPL + +-batteryappletdir = $(libdir)/awn/applets/battery-applet/icons ++batteryappletdir = $(datadir)/awn/applets/battery-applet/icons + all: all-am + + .SUFFIXES: +diff -ur awn-extras-applets-0.2.6.orig/src/battery-applet/Makefile.in awn-extras-applets-0.2.6/src/battery-applet/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/battery-applet/Makefile.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/battery-applet/Makefile.in 2008-03-19 01:03:15.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -112,6 +112,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -195,6 +196,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -308,11 +311,11 @@ + # vim: set ft=automake : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = $(APPLET_MAIN_FILE) + CLEANFILES = $(desktop_DATA) +-appletdir = $(libdir)/awn/applets/$(APPLET_NAME) ++appletdir = $(datadir)/awn/applets/$(APPLET_NAME) + dist_applet_DATA = \ + COPYING \ + $(NULL) +@@ -484,8 +487,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -510,8 +513,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -521,13 +524,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/cairo-menu/cairo_main_menu.desktop.in awn-extras-applets-0.2.6/src/cairo-menu/cairo_main_menu.desktop.in +--- awn-extras-applets-0.2.6.orig/src/cairo-menu/cairo_main_menu.desktop.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/cairo-menu/cairo_main_menu.desktop.in 2008-03-19 01:03:30.000000000 +0100 +@@ -3,6 +3,6 @@ + X-AWN-AppletType=C + Name=Cairo Main Menu + Comment=A Main Menu. +-Exec=/usr/local/lib/awn/applets/cairo_main_menu/cairo_main_menu.so ++Exec=/usr/lib/awn/applets/cairo_main_menu/cairo_main_menu.so + Icon=gnome-main-menu + X-AWN-AppletCategory=Utility +diff -ur awn-extras-applets-0.2.6.orig/src/cairo-menu/Makefile.in awn-extras-applets-0.2.6/src/cairo-menu/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/cairo-menu/Makefile.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/cairo-menu/Makefile.in 2008-03-19 01:03:16.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -69,7 +69,7 @@ + cairo_main_menu_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(cairo_main_menu_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +@@ -126,6 +126,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -209,6 +210,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -323,7 +326,7 @@ + # vim: set ft=automake ts-8 sts=8 sw=8 : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = \ + $(icon_DATA) \ +@@ -400,8 +403,8 @@ + @list='$(applet_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(appletdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(appletdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(appletdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(appletdir)/$$f"; \ + else :; fi; \ + done + +@@ -409,8 +412,8 @@ + @$(NORMAL_UNINSTALL) + @list='$(applet_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(appletdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(appletdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(appletdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(appletdir)/$$p"; \ + done + + clean-appletLTLIBRARIES: +@@ -502,8 +505,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -515,8 +518,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -526,13 +529,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/cairo-menu-classic/cairo_main_menu_classic.desktop.in awn-extras-applets-0.2.6/src/cairo-menu-classic/cairo_main_menu_classic.desktop.in +--- awn-extras-applets-0.2.6.orig/src/cairo-menu-classic/cairo_main_menu_classic.desktop.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/cairo-menu-classic/cairo_main_menu_classic.desktop.in 2008-03-19 01:03:30.000000000 +0100 +@@ -3,6 +3,6 @@ + X-AWN-AppletType=C + Name=Cairo Main Menu - Classic Version + Comment=A Main Menu. +-Exec=/usr/local/lib/awn/applets/cairo_main_menu_classic/cairo_main_menu_classic.so ++Exec=/usr/lib/awn/applets/cairo_main_menu_classic/cairo_main_menu_classic.so + Icon=gnome-main-menu + X-AWN-AppletCategory=Utility +diff -ur awn-extras-applets-0.2.6.orig/src/cairo-menu-classic/Makefile.in awn-extras-applets-0.2.6/src/cairo-menu-classic/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/cairo-menu-classic/Makefile.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/cairo-menu-classic/Makefile.in 2008-03-19 01:03:16.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -71,7 +71,7 @@ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(cairo_main_menu_classic_la_LDFLAGS) \ + $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +@@ -128,6 +128,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -211,6 +212,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -325,7 +328,7 @@ + # vim: set ft=automake ts-8 sts=8 sw=8 : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = \ + $(icon_DATA) \ +@@ -402,8 +405,8 @@ + @list='$(applet_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(appletdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(appletdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(appletdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(appletdir)/$$f"; \ + else :; fi; \ + done + +@@ -411,8 +414,8 @@ + @$(NORMAL_UNINSTALL) + @list='$(applet_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(appletdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(appletdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(appletdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(appletdir)/$$p"; \ + done + + clean-appletLTLIBRARIES: +@@ -504,8 +507,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -517,8 +520,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -528,13 +531,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/calendar.desktop.in.in awn-extras-applets-0.2.6/src/calendar/calendar.desktop.in.in +--- awn-extras-applets-0.2.6.orig/src/calendar/calendar.desktop.in.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/calendar.desktop.in.in 2008-03-19 01:02:33.000000000 +0100 +@@ -1,9 +1,8 @@ + [Desktop Entry] + Type=Application + X-AWN-AppletType=Python +-Encoding=UTF-8 + Name=Clock/Calendar Applet + Comment=Watch appointments on your dock +-Exec=@LIBDIR@/awn/applets/calendar/clockcal.py +-Icon=@LIBDIR@/awn/applets/calendar/images/icon.png ++Exec=calendar/clockcal.py ++Icon=calendar/images/icon.png + X-AWN-AppletCategory=Office,Calendar +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/google/atom/Makefile.am awn-extras-applets-0.2.6/src/calendar/google/atom/Makefile.am +--- awn-extras-applets-0.2.6.orig/src/calendar/google/atom/Makefile.am 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/google/atom/Makefile.am 2008-03-19 01:02:33.000000000 +0100 +@@ -2,4 +2,4 @@ + __init__.py \ + service.py + +-calendardir = $(libdir)/awn/applets/calendar/google/atom ++calendardir = $(datadir)/awn/applets/calendar/google/atom +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/google/atom/Makefile.in awn-extras-applets-0.2.6/src/calendar/google/atom/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/calendar/google/atom/Makefile.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/google/atom/Makefile.in 2008-03-19 01:03:16.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -93,6 +93,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -176,6 +177,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -286,7 +289,7 @@ + __init__.py \ + service.py + +-calendardir = $(libdir)/awn/applets/calendar/google/atom ++calendardir = $(datadir)/awn/applets/calendar/google/atom + all: all-am + + .SUFFIXES: +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/apps/Makefile.am awn-extras-applets-0.2.6/src/calendar/google/gdata/apps/Makefile.am +--- awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/apps/Makefile.am 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/google/gdata/apps/Makefile.am 2008-03-19 01:02:33.000000000 +0100 +@@ -2,4 +2,4 @@ + __init__.py \ + service.py + +-calendardir = $(libdir)/awn/applets/calendar/google/gdata/apps ++calendardir = $(datadir)/awn/applets/calendar/google/gdata/apps +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/apps/Makefile.in awn-extras-applets-0.2.6/src/calendar/google/gdata/apps/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/apps/Makefile.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/google/gdata/apps/Makefile.in 2008-03-19 01:03:16.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -93,6 +93,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -176,6 +177,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -286,7 +289,7 @@ + __init__.py \ + service.py + +-calendardir = $(libdir)/awn/applets/calendar/google/gdata/apps ++calendardir = $(datadir)/awn/applets/calendar/google/gdata/apps + all: all-am + + .SUFFIXES: +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/base/Makefile.am awn-extras-applets-0.2.6/src/calendar/google/gdata/base/Makefile.am +--- awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/base/Makefile.am 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/google/gdata/base/Makefile.am 2008-03-19 01:02:33.000000000 +0100 +@@ -2,4 +2,4 @@ + __init__.py \ + service.py + +-calendardir = $(libdir)/awn/applets/calendar/google/gdata/base ++calendardir = $(datadir)/awn/applets/calendar/google/gdata/base +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/base/Makefile.in awn-extras-applets-0.2.6/src/calendar/google/gdata/base/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/base/Makefile.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/google/gdata/base/Makefile.in 2008-03-19 01:03:16.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -93,6 +93,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -176,6 +177,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -286,7 +289,7 @@ + __init__.py \ + service.py + +-calendardir = $(libdir)/awn/applets/calendar/google/gdata/base ++calendardir = $(datadir)/awn/applets/calendar/google/gdata/base + all: all-am + + .SUFFIXES: +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/calendar/Makefile.am awn-extras-applets-0.2.6/src/calendar/google/gdata/calendar/Makefile.am +--- awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/calendar/Makefile.am 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/google/gdata/calendar/Makefile.am 2008-03-19 01:02:33.000000000 +0100 +@@ -2,4 +2,4 @@ + __init__.py \ + service.py + +-calendardir = $(libdir)/awn/applets/calendar/google/gdata/calendar ++calendardir = $(datadir)/awn/applets/calendar/google/gdata/calendar +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/calendar/Makefile.in awn-extras-applets-0.2.6/src/calendar/google/gdata/calendar/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/calendar/Makefile.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/google/gdata/calendar/Makefile.in 2008-03-19 01:03:16.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -93,6 +93,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -176,6 +177,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -286,7 +289,7 @@ + __init__.py \ + service.py + +-calendardir = $(libdir)/awn/applets/calendar/google/gdata/calendar ++calendardir = $(datadir)/awn/applets/calendar/google/gdata/calendar + all: all-am + + .SUFFIXES: +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/docs/Makefile.am awn-extras-applets-0.2.6/src/calendar/google/gdata/docs/Makefile.am +--- awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/docs/Makefile.am 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/google/gdata/docs/Makefile.am 2008-03-19 01:02:33.000000000 +0100 +@@ -2,4 +2,4 @@ + __init__.py \ + service.py + +-calendardir = $(libdir)/awn/applets/calendar/google/gdata/docs ++calendardir = $(datadir)/awn/applets/calendar/google/gdata/docs +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/docs/Makefile.in awn-extras-applets-0.2.6/src/calendar/google/gdata/docs/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/docs/Makefile.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/google/gdata/docs/Makefile.in 2008-03-19 01:03:16.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -93,6 +93,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -176,6 +177,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -286,7 +289,7 @@ + __init__.py \ + service.py + +-calendardir = $(libdir)/awn/applets/calendar/google/gdata/docs ++calendardir = $(datadir)/awn/applets/calendar/google/gdata/docs + all: all-am + + .SUFFIXES: +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/Makefile.am awn-extras-applets-0.2.6/src/calendar/google/gdata/Makefile.am +--- awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/Makefile.am 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/google/gdata/Makefile.am 2008-03-19 01:02:33.000000000 +0100 +@@ -10,4 +10,4 @@ + service.py \ + test_data.py + +-calendardir = $(libdir)/awn/applets/calendar/google/gdata ++calendardir = $(datadir)/awn/applets/calendar/google/gdata +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/Makefile.in awn-extras-applets-0.2.6/src/calendar/google/gdata/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/Makefile.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/google/gdata/Makefile.in 2008-03-19 01:03:16.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -105,6 +105,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -188,6 +189,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -306,7 +309,7 @@ + service.py \ + test_data.py + +-calendardir = $(libdir)/awn/applets/calendar/google/gdata ++calendardir = $(datadir)/awn/applets/calendar/google/gdata + all: all-recursive + + .SUFFIXES: +@@ -438,8 +441,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -464,8 +467,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -475,13 +478,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/spreadsheet/Makefile.am awn-extras-applets-0.2.6/src/calendar/google/gdata/spreadsheet/Makefile.am +--- awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/spreadsheet/Makefile.am 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/google/gdata/spreadsheet/Makefile.am 2008-03-19 01:02:33.000000000 +0100 +@@ -2,4 +2,4 @@ + __init__.py \ + service.py + +-calendardir = $(libdir)/awn/applets/calendar/google/gdata/spreadsheet ++calendardir = $(datadir)/awn/applets/calendar/google/gdata/spreadsheet +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/spreadsheet/Makefile.in awn-extras-applets-0.2.6/src/calendar/google/gdata/spreadsheet/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/calendar/google/gdata/spreadsheet/Makefile.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/google/gdata/spreadsheet/Makefile.in 2008-03-19 01:03:16.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -93,6 +93,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -176,6 +177,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -286,7 +289,7 @@ + __init__.py \ + service.py + +-calendardir = $(libdir)/awn/applets/calendar/google/gdata/spreadsheet ++calendardir = $(datadir)/awn/applets/calendar/google/gdata/spreadsheet + all: all-am + + .SUFFIXES: +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/google/Makefile.in awn-extras-applets-0.2.6/src/calendar/google/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/calendar/google/Makefile.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/google/Makefile.in 2008-03-19 01:03:16.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -94,6 +94,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -177,6 +178,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -398,8 +401,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -424,8 +427,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -435,13 +438,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/images/Makefile.am awn-extras-applets-0.2.6/src/calendar/images/Makefile.am +--- awn-extras-applets-0.2.6.orig/src/calendar/images/Makefile.am 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/images/Makefile.am 2008-03-19 01:02:33.000000000 +0100 +@@ -8,4 +8,4 @@ + icon.png \ + x.x + +-calendardir = $(libdir)/awn/applets/calendar/images ++calendardir = $(datadir)/awn/applets/calendar/images +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/images/Makefile.in awn-extras-applets-0.2.6/src/calendar/images/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/calendar/images/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/images/Makefile.in 2008-03-19 01:03:16.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -93,6 +93,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -176,6 +177,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -292,7 +295,7 @@ + icon.png \ + x.x + +-calendardir = $(libdir)/awn/applets/calendar/images ++calendardir = $(datadir)/awn/applets/calendar/images + all: all-am + + .SUFFIXES: +diff -ur awn-extras-applets-0.2.6.orig/src/calendar/Makefile.in awn-extras-applets-0.2.6/src/calendar/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/calendar/Makefile.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/calendar/Makefile.in 2008-03-19 01:03:16.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -112,6 +112,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -195,6 +196,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -308,11 +311,11 @@ + # vim: set ft=automake : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = $(APPLET_MAIN_FILE) + CLEANFILES = $(desktop_DATA) +-appletdir = $(libdir)/awn/applets/$(APPLET_NAME) ++appletdir = $(datadir)/awn/applets/$(APPLET_NAME) + dist_applet_DATA = \ + calendarlogin.py \ + calendarprefs.py \ +@@ -491,8 +494,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -517,8 +520,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -528,13 +531,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/comic/comic.desktop.in.in awn-extras-applets-0.2.6/src/comic/comic.desktop.in.in +--- awn-extras-applets-0.2.6.orig/src/comic/comic.desktop.in.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/comic/comic.desktop.in.in 2008-03-19 01:02:33.000000000 +0100 +@@ -1,11 +1,10 @@ + [Desktop Entry] + Version=1.0 +-Encoding=UTF-8 + Name=Dilbert Applet + Type=Application + X-AWN-AppletType=Python + Comment=Read Dilbert and other comics +-Exec=@LIBDIR@/awn/applets/comic/comic.py +-Icon=@LIBDIR@/awn/applets/comic/images/kmouth.png ++Exec=comic/comic.py ++Icon=comic/images/kmouth.png + Name[en]=Comic Applet + X-AWN-AppletCategory=Network,News,Amusement +diff -ur awn-extras-applets-0.2.6.orig/src/comic/images/Makefile.am awn-extras-applets-0.2.6/src/comic/images/Makefile.am +--- awn-extras-applets-0.2.6.orig/src/comic/images/Makefile.am 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/comic/images/Makefile.am 2008-03-19 01:02:33.000000000 +0100 +@@ -1,4 +1,4 @@ + dist_comic_DATA = \ + kmouth.png + +-comicdir = $(libdir)/awn/applets/comic/images ++comicdir = $(datadir)/awn/applets/comic/images +diff -ur awn-extras-applets-0.2.6.orig/src/comic/images/Makefile.in awn-extras-applets-0.2.6/src/comic/images/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/comic/images/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/comic/images/Makefile.in 2008-03-19 01:03:16.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -93,6 +93,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -176,6 +177,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -285,7 +288,7 @@ + dist_comic_DATA = \ + kmouth.png + +-comicdir = $(libdir)/awn/applets/comic/images ++comicdir = $(datadir)/awn/applets/comic/images + all: all-am + + .SUFFIXES: +diff -ur awn-extras-applets-0.2.6.orig/src/comic/Makefile.in awn-extras-applets-0.2.6/src/comic/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/comic/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/comic/Makefile.in 2008-03-19 01:03:16.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -112,6 +112,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -195,6 +196,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -308,11 +311,11 @@ + # vim: set ft=automake : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = $(APPLET_MAIN_FILE) + CLEANFILES = $(desktop_DATA) +-appletdir = $(libdir)/awn/applets/$(APPLET_NAME) ++appletdir = $(datadir)/awn/applets/$(APPLET_NAME) + dist_applet_DATA = \ + comicdialog.py \ + getborn.py \ +@@ -489,8 +492,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -515,8 +518,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -526,13 +529,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/digitalClock/digitalClock.desktop.in.in awn-extras-applets-0.2.6/src/digitalClock/digitalClock.desktop.in.in +--- awn-extras-applets-0.2.6.orig/src/digitalClock/digitalClock.desktop.in.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/digitalClock/digitalClock.desktop.in.in 2008-03-19 01:02:33.000000000 +0100 +@@ -1,9 +1,8 @@ + [Desktop Entry] + Type=Application + X-AWN-AppletType=Python +-Encoding=UTF-8 + Name=Digital Clock Applet + Comment=A clock and calendar in one. +-Exec=@LIBDIR@/awn/applets/digitalClock/digitalClock.py ++Exec=digitalClock/digitalClock.py + Icon=gnome-panel-clock + X-AWN-AppletCategory=Utility,Clock +diff -ur awn-extras-applets-0.2.6.orig/src/digitalClock/Makefile.in awn-extras-applets-0.2.6/src/digitalClock/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/digitalClock/Makefile.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/digitalClock/Makefile.in 2008-03-19 01:03:17.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -100,6 +100,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -183,6 +184,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -295,11 +298,11 @@ + # vim: set ft=automake : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = $(APPLET_MAIN_FILE) + CLEANFILES = $(desktop_DATA) +-appletdir = $(libdir)/awn/applets/$(APPLET_NAME) ++appletdir = $(datadir)/awn/applets/$(APPLET_NAME) + dist_applet_DATA = \ + dgClockPref.py \ + dgTime.py \ +diff -ur awn-extras-applets-0.2.6.orig/src/filebrowser/filebrowser.desktop.in.in awn-extras-applets-0.2.6/src/filebrowser/filebrowser.desktop.in.in +--- awn-extras-applets-0.2.6.orig/src/filebrowser/filebrowser.desktop.in.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/filebrowser/filebrowser.desktop.in.in 2008-03-19 01:02:33.000000000 +0100 +@@ -6,6 +6,6 @@ + X-AWN-AppletType=C + Comment=Browse the filesystem + Exec=@LIBDIR@/awn/applets/filebrowser/filebrowser.so +-Icon=@ICONDIR@/filebrowser.svg ++Icon=icons/filebrowser.svg + Name[en_US]=File Browser + X-AWN-AppletCategory=System,FileManager +diff -ur awn-extras-applets-0.2.6.orig/src/filebrowser/Makefile.in awn-extras-applets-0.2.6/src/filebrowser/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/filebrowser/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/filebrowser/Makefile.in 2008-03-19 01:03:17.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -74,7 +74,7 @@ + filebrowser_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(filebrowser_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +@@ -132,6 +132,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -215,6 +216,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -328,7 +331,7 @@ + # vim: set ft=automake ts-8 sts=8 sw=8 : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = filebrowser.schema-ini filebrowser.svg + CLEANFILES = $(desktop_DATA) +@@ -412,8 +415,8 @@ + @list='$(applet_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(appletdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(appletdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(appletdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(appletdir)/$$f"; \ + else :; fi; \ + done + +@@ -421,8 +424,8 @@ + @$(NORMAL_UNINSTALL) + @list='$(applet_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(appletdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(appletdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(appletdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(appletdir)/$$p"; \ + done + + clean-appletLTLIBRARIES: +@@ -532,8 +535,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -545,8 +548,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -556,13 +559,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/file-browser-launcher/file-browser-launcher.desktop.in.in awn-extras-applets-0.2.6/src/file-browser-launcher/file-browser-launcher.desktop.in.in +--- awn-extras-applets-0.2.6.orig/src/file-browser-launcher/file-browser-launcher.desktop.in.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/file-browser-launcher/file-browser-launcher.desktop.in.in 2008-03-19 01:02:33.000000000 +0100 +@@ -3,7 +3,7 @@ + X-AWN-AppletType=Python + Name=File Browser Launcher + Comment=A launcher for your file manager +-Exec=@LIBDIR@/awn/applets/file-browser-launcher/file-browser-launcher.py ++Exec=file-browser-launcher/file-browser-launcher.py + Icon=folder + X-Ubuntu-Gettext-Domain=awn-extras-applets + X-AWN-AppletCategory=Utility,FileTools +diff -ur awn-extras-applets-0.2.6.orig/src/file-browser-launcher/Makefile.in awn-extras-applets-0.2.6/src/file-browser-launcher/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/file-browser-launcher/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/file-browser-launcher/Makefile.in 2008-03-19 01:03:17.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -101,6 +101,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -184,6 +185,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -296,11 +299,11 @@ + # vim: set ft=automake : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = $(APPLET_MAIN_FILE) + CLEANFILES = $(desktop_DATA) +-appletdir = $(libdir)/awn/applets/$(APPLET_NAME) ++appletdir = $(datadir)/awn/applets/$(APPLET_NAME) + dist_applet_DATA = \ + about.py \ + file-browser-launcher.py \ +diff -ur awn-extras-applets-0.2.6.orig/src/lastfm/icons/Makefile.am awn-extras-applets-0.2.6/src/lastfm/icons/Makefile.am +--- awn-extras-applets-0.2.6.orig/src/lastfm/icons/Makefile.am 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/lastfm/icons/Makefile.am 2008-03-19 01:02:33.000000000 +0100 +@@ -17,5 +17,5 @@ + red.ico \ + white.ico + +-lastfmdir = $(libdir)/awn/applets/lastfm/icons ++lastfmdir = $(datadir)/awn/applets/lastfm/icons + +diff -ur awn-extras-applets-0.2.6.orig/src/lastfm/icons/Makefile.in awn-extras-applets-0.2.6/src/lastfm/icons/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/lastfm/icons/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/lastfm/icons/Makefile.in 2008-03-19 01:03:17.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -93,6 +93,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -176,6 +177,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -301,7 +304,7 @@ + red.ico \ + white.ico + +-lastfmdir = $(libdir)/awn/applets/lastfm/icons ++lastfmdir = $(datadir)/awn/applets/lastfm/icons + all: all-am + + .SUFFIXES: +diff -ur awn-extras-applets-0.2.6.orig/src/lastfm/lastfm.desktop.in.in awn-extras-applets-0.2.6/src/lastfm/lastfm.desktop.in.in +--- awn-extras-applets-0.2.6.orig/src/lastfm/lastfm.desktop.in.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/lastfm/lastfm.desktop.in.in 2008-03-19 01:02:33.000000000 +0100 +@@ -1,9 +1,8 @@ + [Desktop Entry] + Type=Application + X-AWN-AppletType=Python +-Encoding=UTF-8 + Name=Last.fm Player Applet + Comment=Last.fm Player for AWN +-Exec=@LIBDIR@/awn/applets/lastfm/lastfmapplet.py +-Icon=@LIBDIR@/awn/applets/lastfm/icons/lastfm_icon_small.png ++Exec=lastfm/lastfmapplet.py ++Icon=lastfm/icons/lastfm_icon_small.png + X-AWN-AppletCategory=AudioVideo,Audio,Network,Player +diff -ur awn-extras-applets-0.2.6.orig/src/lastfm/Makefile.in awn-extras-applets-0.2.6/src/lastfm/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/lastfm/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/lastfm/Makefile.in 2008-03-19 01:03:17.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -112,6 +112,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -195,6 +196,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -308,11 +311,11 @@ + # vim: set ft=automake : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = $(APPLET_MAIN_FILE) + CLEANFILES = $(desktop_DATA) +-appletdir = $(libdir)/awn/applets/$(APPLET_NAME) ++appletdir = $(datadir)/awn/applets/$(APPLET_NAME) + dist_applet_DATA = \ + httpclient.py \ + lastfm.py \ +@@ -489,8 +492,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -515,8 +518,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -526,13 +529,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/libawn-extras/bindings/Makefile.in awn-extras-applets-0.2.6/src/libawn-extras/bindings/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/libawn-extras/bindings/Makefile.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/libawn-extras/bindings/Makefile.in 2008-03-19 01:03:17.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -94,6 +94,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -177,6 +178,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -398,8 +401,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -424,8 +427,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -435,13 +438,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/libawn-extras/bindings/python/Makefile.in awn-extras-applets-0.2.6/src/libawn-extras/bindings/python/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/libawn-extras/bindings/python/Makefile.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/libawn-extras/bindings/python/Makefile.in 2008-03-19 01:03:17.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -68,7 +68,7 @@ + _extras_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(_extras_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +@@ -126,6 +126,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -209,6 +210,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -395,8 +398,8 @@ + @list='$(pyawn_extrasexec_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(pyawn_extrasexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pyawn_extrasexecdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(pyawn_extrasexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pyawn_extrasexecdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pyawn_extrasexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pyawn_extrasexecdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pyawn_extrasexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pyawn_extrasexecdir)/$$f"; \ + else :; fi; \ + done + +@@ -404,8 +407,8 @@ + @$(NORMAL_UNINSTALL) + @list='$(pyawn_extrasexec_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pyawn_extrasexecdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pyawn_extrasexecdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pyawn_extrasexecdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pyawn_extrasexecdir)/$$p"; \ + done + + clean-pyawn_extrasexecLTLIBRARIES: +@@ -505,8 +508,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -518,8 +521,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -529,13 +532,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/libawn-extras/Makefile.in awn-extras-applets-0.2.6/src/libawn-extras/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/libawn-extras/Makefile.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/libawn-extras/Makefile.in 2008-03-19 01:03:17.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -64,7 +64,7 @@ + libawn_extras_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libawn_extras_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +@@ -130,6 +130,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -213,6 +214,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -385,8 +388,8 @@ + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + else :; fi; \ + done + +@@ -394,8 +397,8 @@ + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ + done + + clean-libLTLIBRARIES: +@@ -539,8 +542,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -565,8 +568,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -576,13 +579,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/mail/mail.desktop.in.in awn-extras-applets-0.2.6/src/mail/mail.desktop.in.in +--- awn-extras-applets-0.2.6.orig/src/mail/mail.desktop.in.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/mail/mail.desktop.in.in 2008-03-19 01:02:33.000000000 +0100 +@@ -1,9 +1,8 @@ + [Desktop Entry] + Type=Application + X-AWN-AppletType=Python +-Encoding=UTF-8 + Name=Mail Applet + Comment=Check Your Email from AWN +-Exec=@LIBDIR@/awn/applets/mail/mail.py +-Icon=@LIBDIR@/awn/applets/mail/Themes/Tango/read.svg ++Exec=mail/mail.py ++Icon=mail/Themes/Tango/read.svg + X-AWN-AppletCategory=Network,Email +diff -ur awn-extras-applets-0.2.6.orig/src/mail/Makefile.in awn-extras-applets-0.2.6/src/mail/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/mail/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/mail/Makefile.in 2008-03-19 01:03:17.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -110,6 +110,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -193,6 +194,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -306,11 +309,11 @@ + # vim: set ft=automake : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = $(APPLET_MAIN_FILE) + CLEANFILES = $(desktop_DATA) +-appletdir = $(libdir)/awn/applets/$(APPLET_NAME) ++appletdir = $(datadir)/awn/applets/$(APPLET_NAME) + all: all-recursive + + .SUFFIXES: +@@ -461,8 +464,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -487,8 +490,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -498,13 +501,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/mail/Themes/GMail/Makefile.am awn-extras-applets-0.2.6/src/mail/Themes/GMail/Makefile.am +--- awn-extras-applets-0.2.6.orig/src/mail/Themes/GMail/Makefile.am 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/mail/Themes/GMail/Makefile.am 2008-03-19 01:02:33.000000000 +0100 +@@ -4,4 +4,4 @@ + read.svg \ + unread.svg + +-gmaildir = $(libdir)/awn/applets/mail/Themes/GMail ++gmaildir = $(datadir)/awn/applets/mail/Themes/GMail +diff -ur awn-extras-applets-0.2.6.orig/src/mail/Themes/GMail/Makefile.in awn-extras-applets-0.2.6/src/mail/Themes/GMail/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/mail/Themes/GMail/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/mail/Themes/GMail/Makefile.in 2008-03-19 01:03:17.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -93,6 +93,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -176,6 +177,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -288,7 +291,7 @@ + read.svg \ + unread.svg + +-gmaildir = $(libdir)/awn/applets/mail/Themes/GMail ++gmaildir = $(datadir)/awn/applets/mail/Themes/GMail + all: all-am + + .SUFFIXES: +diff -ur awn-extras-applets-0.2.6.orig/src/mail/Themes/Makefile.in awn-extras-applets-0.2.6/src/mail/Themes/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/mail/Themes/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/mail/Themes/Makefile.in 2008-03-19 01:03:17.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -94,6 +94,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -177,6 +178,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -401,8 +404,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -427,8 +430,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -438,13 +441,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/mail/Themes/Reserved/Makefile.am awn-extras-applets-0.2.6/src/mail/Themes/Reserved/Makefile.am +--- awn-extras-applets-0.2.6.orig/src/mail/Themes/Reserved/Makefile.am 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/mail/Themes/Reserved/Makefile.am 2008-03-19 01:02:33.000000000 +0100 +@@ -4,4 +4,4 @@ + read.svg \ + unread.svg + +-gmaildir = $(libdir)/awn/applets/mail/Themes/Reserved ++gmaildir = $(datadir)/awn/applets/mail/Themes/Reserved +diff -ur awn-extras-applets-0.2.6.orig/src/mail/Themes/Reserved/Makefile.in awn-extras-applets-0.2.6/src/mail/Themes/Reserved/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/mail/Themes/Reserved/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/mail/Themes/Reserved/Makefile.in 2008-03-19 01:03:17.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -93,6 +93,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -176,6 +177,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -288,7 +291,7 @@ + read.svg \ + unread.svg + +-gmaildir = $(libdir)/awn/applets/mail/Themes/Reserved ++gmaildir = $(datadir)/awn/applets/mail/Themes/Reserved + all: all-am + + .SUFFIXES: +diff -ur awn-extras-applets-0.2.6.orig/src/mail/Themes/Tango/Makefile.am awn-extras-applets-0.2.6/src/mail/Themes/Tango/Makefile.am +--- awn-extras-applets-0.2.6.orig/src/mail/Themes/Tango/Makefile.am 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/mail/Themes/Tango/Makefile.am 2008-03-19 01:02:33.000000000 +0100 +@@ -5,4 +5,4 @@ + unread.svg + + +-gmaildir = $(libdir)/awn/applets/mail/Themes/Tango ++gmaildir = $(datadir)/awn/applets/mail/Themes/Tango +diff -ur awn-extras-applets-0.2.6.orig/src/mail/Themes/Tango/Makefile.in awn-extras-applets-0.2.6/src/mail/Themes/Tango/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/mail/Themes/Tango/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/mail/Themes/Tango/Makefile.in 2008-03-19 01:03:17.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -93,6 +93,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -176,6 +177,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -288,7 +291,7 @@ + read.svg \ + unread.svg + +-gmaildir = $(libdir)/awn/applets/mail/Themes/Tango ++gmaildir = $(datadir)/awn/applets/mail/Themes/Tango + all: all-am + + .SUFFIXES: +diff -ur awn-extras-applets-0.2.6.orig/src/main-menu/main-menu.desktop.in awn-extras-applets-0.2.6/src/main-menu/main-menu.desktop.in +--- awn-extras-applets-0.2.6.orig/src/main-menu/main-menu.desktop.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/main-menu/main-menu.desktop.in 2008-03-19 01:03:31.000000000 +0100 +@@ -4,6 +4,6 @@ + Encoding=UTF-8 + Name=Awn Main Menu + Comment=A main menu for Awn +-Exec=/usr/local/lib/awn/applets/main-menu/main-menu.so ++Exec=/usr/lib/awn/applets/main-menu/main-menu.so + Icon=gnome-main-menu + X-AWN-AppletCategory=Utility +diff -ur awn-extras-applets-0.2.6.orig/src/main-menu/Makefile.in awn-extras-applets-0.2.6/src/main-menu/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/main-menu/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/main-menu/Makefile.in 2008-03-19 01:03:17.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -68,7 +68,7 @@ + main_menu_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(main_menu_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +@@ -125,6 +125,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -208,6 +209,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -320,7 +323,7 @@ + # vim: set ft=automake ts-8 sts=8 sw=8 : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = \ + $(icon_DATA) \ +@@ -386,8 +389,8 @@ + @list='$(applet_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(appletdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(appletdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(appletdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(appletdir)/$$f"; \ + else :; fi; \ + done + +@@ -395,8 +398,8 @@ + @$(NORMAL_UNINSTALL) + @list='$(applet_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(appletdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(appletdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(appletdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(appletdir)/$$p"; \ + done + + clean-appletLTLIBRARIES: +@@ -484,8 +487,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -497,8 +500,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -508,13 +511,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/Makefile.in awn-extras-applets-0.2.6/src/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/Makefile.in 2008-03-19 01:03:14.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -138,6 +138,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -221,6 +222,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -462,8 +465,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -488,8 +491,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -499,13 +502,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/media-control/icons/Makefile.am awn-extras-applets-0.2.6/src/media-control/icons/Makefile.am +--- awn-extras-applets-0.2.6.orig/src/media-control/icons/Makefile.am 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/media-control/icons/Makefile.am 2008-03-19 01:02:33.000000000 +0100 +@@ -3,4 +3,4 @@ + README \ + rhythmbox.svg + +-mediacontroldir = $(libdir)/awn/applets/media-control/icons ++mediacontroldir = $(datadir)/awn/applets/media-control/icons +diff -ur awn-extras-applets-0.2.6.orig/src/media-control/icons/Makefile.in awn-extras-applets-0.2.6/src/media-control/icons/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/media-control/icons/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/media-control/icons/Makefile.in 2008-03-19 01:03:18.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -93,6 +93,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -176,6 +177,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -287,7 +290,7 @@ + README \ + rhythmbox.svg + +-mediacontroldir = $(libdir)/awn/applets/media-control/icons ++mediacontroldir = $(datadir)/awn/applets/media-control/icons + all: all-am + + .SUFFIXES: +diff -ur awn-extras-applets-0.2.6.orig/src/media-control/Makefile.in awn-extras-applets-0.2.6/src/media-control/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/media-control/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/media-control/Makefile.in 2008-03-19 01:03:18.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -112,6 +112,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -195,6 +196,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -308,11 +311,11 @@ + # vim: set ft=automake : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = $(APPLET_MAIN_FILE) + CLEANFILES = $(desktop_DATA) +-appletdir = $(libdir)/awn/applets/$(APPLET_NAME) ++appletdir = $(datadir)/awn/applets/$(APPLET_NAME) + dist_applet_DATA = \ + mediaplayers.py \ + noArtIcon.png \ +@@ -486,8 +489,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -512,8 +515,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -523,13 +526,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/media-control/media-control.desktop.in.in awn-extras-applets-0.2.6/src/media-control/media-control.desktop.in.in +--- awn-extras-applets-0.2.6.orig/src/media-control/media-control.desktop.in.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/media-control/media-control.desktop.in.in 2008-03-19 01:02:33.000000000 +0100 +@@ -1,11 +1,10 @@ + [Desktop Entry] + Version=1.0 +-Encoding=UTF-8 + Name=Media Control + Type=Application + X-AWN-AppletType=Python + Comment=Control your music player +-Exec=@LIBDIR@/awn/applets/media-control/mediacontrol.py ++Exec=media-control/mediacontrol.py + Icon=multimedia-volume-control + Name[en_US]=Media Control + X-AWN-AppletCategory=AudioVideo,Audio,Player +diff -ur awn-extras-applets-0.2.6.orig/src/media-icon-back/icons/Makefile.am awn-extras-applets-0.2.6/src/media-icon-back/icons/Makefile.am +--- awn-extras-applets-0.2.6.orig/src/media-icon-back/icons/Makefile.am 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/media-icon-back/icons/Makefile.am 2008-03-19 01:02:33.000000000 +0100 +@@ -2,4 +2,4 @@ + backward.svg \ + COPYING + +-mediaiconbackdir = $(libdir)/awn/applets/media-icon-back/icons ++mediaiconbackdir = $(datadir)/awn/applets/media-icon-back/icons +diff -ur awn-extras-applets-0.2.6.orig/src/media-icon-back/icons/Makefile.in awn-extras-applets-0.2.6/src/media-icon-back/icons/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/media-icon-back/icons/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/media-icon-back/icons/Makefile.in 2008-03-19 01:03:18.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -93,6 +93,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -176,6 +177,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -286,7 +289,7 @@ + backward.svg \ + COPYING + +-mediaiconbackdir = $(libdir)/awn/applets/media-icon-back/icons ++mediaiconbackdir = $(datadir)/awn/applets/media-icon-back/icons + all: all-am + + .SUFFIXES: +diff -ur awn-extras-applets-0.2.6.orig/src/media-icon-back/Makefile.in awn-extras-applets-0.2.6/src/media-icon-back/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/media-icon-back/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/media-icon-back/Makefile.in 2008-03-19 01:03:18.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -112,6 +112,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -195,6 +196,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -308,11 +311,11 @@ + # vim: set ft=automake : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = $(APPLET_MAIN_FILE) + CLEANFILES = $(desktop_DATA) +-appletdir = $(libdir)/awn/applets/$(APPLET_NAME) ++appletdir = $(datadir)/awn/applets/$(APPLET_NAME) + dist_applet_DATA = \ + COPYING \ + mediaplayers.py \ +@@ -485,8 +488,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -511,8 +514,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -522,13 +525,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/media-icon-back/media-icon-back.desktop.in.in awn-extras-applets-0.2.6/src/media-icon-back/media-icon-back.desktop.in.in +--- awn-extras-applets-0.2.6.orig/src/media-icon-back/media-icon-back.desktop.in.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/media-icon-back/media-icon-back.desktop.in.in 2008-03-19 01:02:33.000000000 +0100 +@@ -1,11 +1,10 @@ + [Desktop Entry] + Version=1.0 +-Encoding=UTF-8 + Name=Media Icons Back + Type=Application + X-AWN-AppletType=Python + Comment=A media-control applet (Go Back) +-Exec=@LIBDIR@/awn/applets/media-icon-back/medialogoback.py +-Icon=@LIBDIR@/awn/applets/media-icon-back/icons/backward.svg ++Exec=media-icon-back/medialogoback.py ++Icon=media-icon-back/icons/backward.svg + Name[en_US]=Media Icons Back + X-AWN-AppletCategory=AudioVideo,Audio,Player +diff -ur awn-extras-applets-0.2.6.orig/src/media-icon-next/icons/Makefile.am awn-extras-applets-0.2.6/src/media-icon-next/icons/Makefile.am +--- awn-extras-applets-0.2.6.orig/src/media-icon-next/icons/Makefile.am 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/media-icon-next/icons/Makefile.am 2008-03-19 01:02:33.000000000 +0100 +@@ -2,4 +2,4 @@ + COPYING \ + forward.svg + +-mediaicondir = $(libdir)/awn/applets/media-icon-next/icons ++mediaicondir = $(datadir)/awn/applets/media-icon-next/icons +diff -ur awn-extras-applets-0.2.6.orig/src/media-icon-next/icons/Makefile.in awn-extras-applets-0.2.6/src/media-icon-next/icons/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/media-icon-next/icons/Makefile.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/media-icon-next/icons/Makefile.in 2008-03-19 01:03:18.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -93,6 +93,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -176,6 +177,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -286,7 +289,7 @@ + COPYING \ + forward.svg + +-mediaicondir = $(libdir)/awn/applets/media-icon-next/icons ++mediaicondir = $(datadir)/awn/applets/media-icon-next/icons + all: all-am + + .SUFFIXES: +diff -ur awn-extras-applets-0.2.6.orig/src/media-icon-next/Makefile.in awn-extras-applets-0.2.6/src/media-icon-next/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/media-icon-next/Makefile.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/media-icon-next/Makefile.in 2008-03-19 01:03:18.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -112,6 +112,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -195,6 +196,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -308,11 +311,11 @@ + # vim: set ft=automake : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = $(APPLET_MAIN_FILE) + CLEANFILES = $(desktop_DATA) +-appletdir = $(libdir)/awn/applets/$(APPLET_NAME) ++appletdir = $(datadir)/awn/applets/$(APPLET_NAME) + dist_applet_DATA = \ + COPYING \ + mediaplayers.py \ +@@ -485,8 +488,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -511,8 +514,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -522,13 +525,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/media-icon-next/media-icon-next.desktop.in.in awn-extras-applets-0.2.6/src/media-icon-next/media-icon-next.desktop.in.in +--- awn-extras-applets-0.2.6.orig/src/media-icon-next/media-icon-next.desktop.in.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/media-icon-next/media-icon-next.desktop.in.in 2008-03-19 01:02:33.000000000 +0100 +@@ -1,11 +1,10 @@ + [Desktop Entry] + Version=1.0 +-Encoding=UTF-8 + Name=Media Icons Next + Type=Application + X-AWN-AppletType=Python + Comment=A media-control applet (Go Next) +-Exec=@LIBDIR@/awn/applets/media-icon-next/medialogonext.py +-Icon=@LIBDIR@/awn/applets/media-icon-next/icons/forward.svg ++Exec=media-icon-next/medialogonext.py ++Icon=media-icon-next/icons/forward.svg + Name[en_US]=Media Icons Next + X-AWN-AppletCategory=AudioVideo,Audio,Player +diff -ur awn-extras-applets-0.2.6.orig/src/media-icon-play/icons/Makefile.am awn-extras-applets-0.2.6/src/media-icon-play/icons/Makefile.am +--- awn-extras-applets-0.2.6.orig/src/media-icon-play/icons/Makefile.am 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/media-icon-play/icons/Makefile.am 2008-03-19 01:02:33.000000000 +0100 +@@ -2,4 +2,4 @@ + COPYING \ + play.svg + +-mediaiconplaydir = $(libdir)/awn/applets/media-icon-play/icons ++mediaiconplaydir = $(datadir)/awn/applets/media-icon-play/icons +diff -ur awn-extras-applets-0.2.6.orig/src/media-icon-play/icons/Makefile.in awn-extras-applets-0.2.6/src/media-icon-play/icons/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/media-icon-play/icons/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/media-icon-play/icons/Makefile.in 2008-03-19 01:03:18.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -93,6 +93,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -176,6 +177,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -286,7 +289,7 @@ + COPYING \ + play.svg + +-mediaiconplaydir = $(libdir)/awn/applets/media-icon-play/icons ++mediaiconplaydir = $(datadir)/awn/applets/media-icon-play/icons + all: all-am + + .SUFFIXES: +diff -ur awn-extras-applets-0.2.6.orig/src/media-icon-play/Makefile.in awn-extras-applets-0.2.6/src/media-icon-play/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/media-icon-play/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/media-icon-play/Makefile.in 2008-03-19 01:03:18.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -112,6 +112,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -195,6 +196,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -308,11 +311,11 @@ + # vim: set ft=automake : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = $(APPLET_MAIN_FILE) + CLEANFILES = $(desktop_DATA) +-appletdir = $(libdir)/awn/applets/$(APPLET_NAME) ++appletdir = $(datadir)/awn/applets/$(APPLET_NAME) + dist_applet_DATA = \ + COPYING \ + mediaplayers.py \ +@@ -485,8 +488,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -511,8 +514,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -522,13 +525,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/media-icon-play/media-icon-play.desktop.in.in awn-extras-applets-0.2.6/src/media-icon-play/media-icon-play.desktop.in.in +--- awn-extras-applets-0.2.6.orig/src/media-icon-play/media-icon-play.desktop.in.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/media-icon-play/media-icon-play.desktop.in.in 2008-03-19 01:02:33.000000000 +0100 +@@ -1,11 +1,10 @@ + [Desktop Entry] + Version=1.0 +-Encoding=UTF-8 + Name=Media Icons Play + Type=Application + X-AWN-AppletType=Python + Comment=A media-control applet (Play) +-Exec=@LIBDIR@/awn/applets/media-icon-play/medialogoplay.py +-Icon=@LIBDIR@/awn/applets/media-icon-play/icons/play.svg ++Exec=media-icon-play/medialogoplay.py ++Icon=media-icon-play/icons/play.svg + Name[en_US]=Media Icons Play + X-AWN-AppletCategory=AudioVideo,Audio,Player +diff -ur awn-extras-applets-0.2.6.orig/src/MiMenu/icons/Makefile.am awn-extras-applets-0.2.6/src/MiMenu/icons/Makefile.am +--- awn-extras-applets-0.2.6.orig/src/MiMenu/icons/Makefile.am 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/MiMenu/icons/Makefile.am 2008-03-19 01:02:33.000000000 +0100 +@@ -1,4 +1,4 @@ + dist_applet_DATA = \ + icon.svg + +-appletdir = $(libdir)/awn/applets/mimenu/icons ++appletdir = $(datadir)/awn/applets/mimenu/icons +diff -ur awn-extras-applets-0.2.6.orig/src/MiMenu/icons/Makefile.in awn-extras-applets-0.2.6/src/MiMenu/icons/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/MiMenu/icons/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/MiMenu/icons/Makefile.in 2008-03-19 01:03:14.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -93,6 +93,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -176,6 +177,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -285,7 +288,7 @@ + dist_applet_DATA = \ + icon.svg + +-appletdir = $(libdir)/awn/applets/mimenu/icons ++appletdir = $(datadir)/awn/applets/mimenu/icons + all: all-am + + .SUFFIXES: +diff -ur awn-extras-applets-0.2.6.orig/src/MiMenu/Makefile.in awn-extras-applets-0.2.6/src/MiMenu/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/MiMenu/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/MiMenu/Makefile.in 2008-03-19 01:03:14.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -112,6 +112,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -195,6 +196,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -308,11 +311,11 @@ + # vim: set ft=automake : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = $(APPLET_MAIN_FILE) + CLEANFILES = $(desktop_DATA) +-appletdir = $(libdir)/awn/applets/$(APPLET_NAME) ++appletdir = $(datadir)/awn/applets/$(APPLET_NAME) + dist_applet_DATA = \ + COPYING \ + keyboard.py \ +@@ -487,8 +490,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -513,8 +516,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -524,13 +527,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/MiMenu/mimenu.desktop.in.in awn-extras-applets-0.2.6/src/MiMenu/mimenu.desktop.in.in +--- awn-extras-applets-0.2.6.orig/src/MiMenu/mimenu.desktop.in.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/MiMenu/mimenu.desktop.in.in 2008-03-19 01:02:33.000000000 +0100 +@@ -5,7 +5,7 @@ + Type=Application + X-AWN-AppletType=Python + Comment=A two-paned menu browser +-Exec=@LIBDIR@/awn/applets/mimenu/mimenu.py ++Exec=mimenu/mimenu.py + Icon=gtk-index + Name[en_US]=MiMenu + X-AWN-AppletCategory=Utility +diff -ur awn-extras-applets-0.2.6.orig/src/mount-applet/icons/Makefile.am awn-extras-applets-0.2.6/src/mount-applet/icons/Makefile.am +--- awn-extras-applets-0.2.6.orig/src/mount-applet/icons/Makefile.am 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/mount-applet/icons/Makefile.am 2008-03-19 01:02:33.000000000 +0100 +@@ -2,4 +2,4 @@ + mount-applet.png \ + AUTHORS + +-mountappletdir = $(libdir)/awn/applets/mount-applet/icons ++mountappletdir = $(datadir)/awn/applets/mount-applet/icons +diff -ur awn-extras-applets-0.2.6.orig/src/mount-applet/icons/Makefile.in awn-extras-applets-0.2.6/src/mount-applet/icons/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/mount-applet/icons/Makefile.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/mount-applet/icons/Makefile.in 2008-03-19 01:03:18.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -93,6 +93,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -176,6 +177,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -286,7 +289,7 @@ + mount-applet.png \ + AUTHORS + +-mountappletdir = $(libdir)/awn/applets/mount-applet/icons ++mountappletdir = $(datadir)/awn/applets/mount-applet/icons + all: all-am + + .SUFFIXES: +diff -ur awn-extras-applets-0.2.6.orig/src/mount-applet/Makefile.in awn-extras-applets-0.2.6/src/mount-applet/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/mount-applet/Makefile.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/mount-applet/Makefile.in 2008-03-19 01:03:18.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -112,6 +112,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -195,6 +196,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -308,11 +311,11 @@ + # vim: set ft=automake : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = $(APPLET_MAIN_FILE) + CLEANFILES = $(desktop_DATA) +-appletdir = $(libdir)/awn/applets/$(APPLET_NAME) ++appletdir = $(datadir)/awn/applets/$(APPLET_NAME) + dist_applet_DATA = \ + COPYING \ + $(NULL) +@@ -484,8 +487,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -510,8 +513,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -521,13 +524,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/mount-applet/mount-applet.desktop.in.in awn-extras-applets-0.2.6/src/mount-applet/mount-applet.desktop.in.in +--- awn-extras-applets-0.2.6.orig/src/mount-applet/mount-applet.desktop.in.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/mount-applet/mount-applet.desktop.in.in 2008-03-19 01:02:33.000000000 +0100 +@@ -1,11 +1,10 @@ + [Desktop Entry] + Version=1.0 +-Encoding=UTF-8 + Name=Mount Applet + Type=Application + X-AWN-AppletType=Python + Comment=An applet to (u)mount devices from /etc/fstab +-Exec=@LIBDIR@/awn/applets/mount-applet/mount-applet.py +-Icon=@LIBDIR@/awn/applets/mount-applet/icons/mount-applet.png ++Exec=mount-applet/mount-applet.py ++Icon=mount-applet/icons/mount-applet.png + Name[en_US]=Mount Applet + X-AWN-AppletCategory=System,Filesystem +diff -ur awn-extras-applets-0.2.6.orig/src/notification-area/Makefile.in awn-extras-applets-0.2.6/src/notification-area/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/notification-area/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/notification-area/Makefile.in 2008-03-19 01:03:18.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -69,7 +69,7 @@ + notification_area_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(notification_area_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +@@ -126,6 +126,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -209,6 +210,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -322,7 +325,7 @@ + # vim: set ft=automake ts-8 sts=8 sw=8 : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = \ + $(icon_DATA) \ +@@ -394,8 +397,8 @@ + @list='$(applet_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(appletdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(appletdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(appletdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(appletdir)/$$f"; \ + else :; fi; \ + done + +@@ -403,8 +406,8 @@ + @$(NORMAL_UNINSTALL) + @list='$(applet_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(appletdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(appletdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(appletdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(appletdir)/$$p"; \ + done + + clean-appletLTLIBRARIES: +@@ -494,8 +497,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -507,8 +510,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -518,13 +521,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/notification-area/notification-area.desktop.in awn-extras-applets-0.2.6/src/notification-area/notification-area.desktop.in +--- awn-extras-applets-0.2.6.orig/src/notification-area/notification-area.desktop.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/notification-area/notification-area.desktop.in 2008-03-19 01:03:32.000000000 +0100 +@@ -4,6 +4,6 @@ + Encoding=UTF-8 + Name=Notification Area + Comment=A Notification Area (systray) +-Exec=/usr/local/lib/awn/applets/notification-area/notification-area.so ++Exec=/usr/lib/awn/applets/notification-area/notification-area.so + Icon=/notification.svg + X-AWN-AppletCategory=System,Monitor +diff -ur awn-extras-applets-0.2.6.orig/src/pandora/awn-pandora.desktop.in.in awn-extras-applets-0.2.6/src/pandora/awn-pandora.desktop.in.in +--- awn-extras-applets-0.2.6.orig/src/pandora/awn-pandora.desktop.in.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/pandora/awn-pandora.desktop.in.in 2008-03-19 01:02:33.000000000 +0100 +@@ -4,7 +4,7 @@ + Type=Application + X-AWN-AppletType=Python + Comment=Listen to Pandora Internet Radio +-Exec=@LIBDIR@/awn/applets/awn-pandora/awn-pandora.py +-Icon=@LIBDIR@/awn/applets/awn-pandora/pandora.ico ++Exec=awn-pandora/awn-pandora.py ++Icon=awn-pandora/pandora.ico + Name[en_US]=Pandora Radio + X-AWN-AppletCategory=AudioVideo,Audio,Network,Player +diff -ur awn-extras-applets-0.2.6.orig/src/pandora/Makefile.in awn-extras-applets-0.2.6/src/pandora/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/pandora/Makefile.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/pandora/Makefile.in 2008-03-19 01:03:18.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -100,6 +100,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -183,6 +184,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -295,11 +298,11 @@ + # vim: set ft=automake : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = $(APPLET_MAIN_FILE) + CLEANFILES = $(desktop_DATA) +-appletdir = $(libdir)/awn/applets/$(APPLET_NAME) ++appletdir = $(datadir)/awn/applets/$(APPLET_NAME) + dist_applet_DATA = \ + pandora.ico \ + $(NULL) +diff -ur awn-extras-applets-0.2.6.orig/src/places/Makefile.in awn-extras-applets-0.2.6/src/places/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/places/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/places/Makefile.in 2008-03-19 01:03:18.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -71,7 +71,7 @@ + places_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(places_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +@@ -129,6 +129,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -212,6 +213,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -323,7 +326,7 @@ + # vim: set ft=automake ts-8 sts=8 sw=8 : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = places.schema-ini + CLEANFILES = $(desktop_DATA) +@@ -395,8 +398,8 @@ + @list='$(applet_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(appletdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(appletdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(appletdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(appletdir)/$$f"; \ + else :; fi; \ + done + +@@ -404,8 +407,8 @@ + @$(NORMAL_UNINSTALL) + @list='$(applet_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(appletdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(appletdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(appletdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(appletdir)/$$p"; \ + done + + clean-appletLTLIBRARIES: +@@ -510,8 +513,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -523,8 +526,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -534,13 +537,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/plugger/Makefile.in awn-extras-applets-0.2.6/src/plugger/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/plugger/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/plugger/Makefile.in 2008-03-19 01:03:18.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -68,7 +68,7 @@ + plugger_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(plugger_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +@@ -125,6 +125,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -208,6 +209,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -320,7 +323,7 @@ + # vim: set ft=automake ts-8 sts=8 sw=8 : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = \ + $(icon_DATA) \ +@@ -389,8 +392,8 @@ + @list='$(applet_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(appletdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(appletdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(appletdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(appletdir)/$$f"; \ + else :; fi; \ + done + +@@ -398,8 +401,8 @@ + @$(NORMAL_UNINSTALL) + @list='$(applet_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(appletdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(appletdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(appletdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(appletdir)/$$p"; \ + done + + clean-appletLTLIBRARIES: +@@ -487,8 +490,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -500,8 +503,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -511,13 +514,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/plugger/plugger.desktop.in awn-extras-applets-0.2.6/src/plugger/plugger.desktop.in +--- awn-extras-applets-0.2.6.orig/src/plugger/plugger.desktop.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/plugger/plugger.desktop.in 2008-03-19 01:03:32.000000000 +0100 +@@ -4,6 +4,6 @@ + Encoding=UTF-8 + Name=Stacks Plugger + Comment=Monitors removable media devices +-Exec=/usr/local/lib/awn/applets/plugger/plugger.so ++Exec=/usr/lib/awn/applets/plugger/plugger.so + Icon=drive-removable-media + X-AWN-AppletCategory=System,Filesystem +diff -ur awn-extras-applets-0.2.6.orig/src/PyClock/Makefile.in awn-extras-applets-0.2.6/src/PyClock/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/PyClock/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/PyClock/Makefile.in 2008-03-19 01:03:14.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -112,6 +112,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -195,6 +196,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -308,11 +311,11 @@ + # vim: set ft=automake : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = $(APPLET_MAIN_FILE) + CLEANFILES = $(desktop_DATA) +-appletdir = $(libdir)/awn/applets/$(APPLET_NAME) ++appletdir = $(datadir)/awn/applets/$(APPLET_NAME) + dist_applet_DATA = \ + PyClock.png \ + $(NULL) +@@ -484,8 +487,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -510,8 +513,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -521,13 +524,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/PyClock/PyClock.desktop.in.in awn-extras-applets-0.2.6/src/PyClock/PyClock.desktop.in.in +--- awn-extras-applets-0.2.6.orig/src/PyClock/PyClock.desktop.in.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/PyClock/PyClock.desktop.in.in 2008-03-19 01:02:33.000000000 +0100 +@@ -4,7 +4,7 @@ + Type=Application + X-AWN-AppletType=Python + Comment=A Simple Python Clock +-Exec=@LIBDIR@/awn/applets/PyClock/PyClock.py +-Icon=@LIBDIR@/awn/applets/PyClock/PyClock.png ++Exec=PyClock/PyClock.py ++Icon=PyClock/PyClock.png + Name[pt_BR]=PyClock + X-AWN-AppletCategory=Utility,Clock +diff -ur awn-extras-applets-0.2.6.orig/src/PyClock/Themes/Makefile.in awn-extras-applets-0.2.6/src/PyClock/Themes/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/PyClock/Themes/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/PyClock/Themes/Makefile.in 2008-03-19 01:03:14.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -94,6 +94,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -177,6 +178,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -402,8 +405,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -428,8 +431,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -439,13 +442,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/PyClock/Themes/Plain-Clock/Makefile.am awn-extras-applets-0.2.6/src/PyClock/Themes/Plain-Clock/Makefile.am +--- awn-extras-applets-0.2.6.orig/src/PyClock/Themes/Plain-Clock/Makefile.am 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/PyClock/Themes/Plain-Clock/Makefile.am 2008-03-19 01:02:33.000000000 +0100 +@@ -14,4 +14,4 @@ + clock-second-hand-shadow.svg + + +-pyclockdir = $(libdir)/awn/applets/PyClock/Themes/Plain-Clock ++pyclockdir = $(datadir)/awn/applets/PyClock/Themes/Plain-Clock +diff -ur awn-extras-applets-0.2.6.orig/src/PyClock/Themes/Plain-Clock/Makefile.in awn-extras-applets-0.2.6/src/PyClock/Themes/Plain-Clock/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/PyClock/Themes/Plain-Clock/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/PyClock/Themes/Plain-Clock/Makefile.in 2008-03-19 01:03:14.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -93,6 +93,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -176,6 +177,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -297,7 +300,7 @@ + clock-second-hand.svg \ + clock-second-hand-shadow.svg + +-pyclockdir = $(libdir)/awn/applets/PyClock/Themes/Plain-Clock ++pyclockdir = $(datadir)/awn/applets/PyClock/Themes/Plain-Clock + all: all-am + + .SUFFIXES: +diff -ur awn-extras-applets-0.2.6.orig/src/PyClock/Themes/SBB/Makefile.am awn-extras-applets-0.2.6/src/PyClock/Themes/SBB/Makefile.am +--- awn-extras-applets-0.2.6.orig/src/PyClock/Themes/SBB/Makefile.am 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/PyClock/Themes/SBB/Makefile.am 2008-03-19 01:02:33.000000000 +0100 +@@ -13,4 +13,4 @@ + clock-second-hand-shadow.svg + + +-pyclockdir = $(libdir)/awn/applets/PyClock/Themes/SBB ++pyclockdir = $(datadir)/awn/applets/PyClock/Themes/SBB +diff -ur awn-extras-applets-0.2.6.orig/src/PyClock/Themes/SBB/Makefile.in awn-extras-applets-0.2.6/src/PyClock/Themes/SBB/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/PyClock/Themes/SBB/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/PyClock/Themes/SBB/Makefile.in 2008-03-19 01:03:14.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -93,6 +93,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -176,6 +177,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -296,7 +299,7 @@ + clock-second-hand.svg \ + clock-second-hand-shadow.svg + +-pyclockdir = $(libdir)/awn/applets/PyClock/Themes/SBB ++pyclockdir = $(datadir)/awn/applets/PyClock/Themes/SBB + all: all-am + + .SUFFIXES: +diff -ur awn-extras-applets-0.2.6.orig/src/PyClock/Themes/Tango/Makefile.am awn-extras-applets-0.2.6/src/PyClock/Themes/Tango/Makefile.am +--- awn-extras-applets-0.2.6.orig/src/PyClock/Themes/Tango/Makefile.am 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/PyClock/Themes/Tango/Makefile.am 2008-03-19 01:02:33.000000000 +0100 +@@ -9,4 +9,4 @@ + clock-second-hand.svg + + +-pyclockdir = $(libdir)/awn/applets/PyClock/Themes/Tango ++pyclockdir = $(datadir)/awn/applets/PyClock/Themes/Tango +diff -ur awn-extras-applets-0.2.6.orig/src/PyClock/Themes/Tango/Makefile.in awn-extras-applets-0.2.6/src/PyClock/Themes/Tango/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/PyClock/Themes/Tango/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/PyClock/Themes/Tango/Makefile.in 2008-03-19 01:03:14.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -93,6 +93,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -176,6 +177,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -292,7 +295,7 @@ + clock-minute-hand.svg \ + clock-second-hand.svg + +-pyclockdir = $(libdir)/awn/applets/PyClock/Themes/Tango ++pyclockdir = $(datadir)/awn/applets/PyClock/Themes/Tango + all: all-am + + .SUFFIXES: +diff -ur awn-extras-applets-0.2.6.orig/src/python-test/Makefile.in awn-extras-applets-0.2.6/src/python-test/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/python-test/Makefile.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/python-test/Makefile.in 2008-03-19 01:03:19.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -98,6 +98,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -181,6 +182,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -293,11 +296,11 @@ + # vim: set ft=automake : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = $(APPLET_MAIN_FILE) + CLEANFILES = $(desktop_DATA) +-appletdir = $(libdir)/awn/applets/$(APPLET_NAME) ++appletdir = $(datadir)/awn/applets/$(APPLET_NAME) + all: all-am + + .SUFFIXES: +diff -ur awn-extras-applets-0.2.6.orig/src/python-test/python-test.desktop.in.in awn-extras-applets-0.2.6/src/python-test/python-test.desktop.in.in +--- awn-extras-applets-0.2.6.orig/src/python-test/python-test.desktop.in.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/python-test/python-test.desktop.in.in 2008-03-19 01:02:33.000000000 +0100 +@@ -4,6 +4,6 @@ + Encoding=UTF-8 + Name=Python Test Applet + Comment=A test python applet for demo purposes +-Exec=@LIBDIR@/awn/applets/python-test/python-test.py ++Exec=python-test/python-test.py + Icon=binary + X-AWN-AppletCategory=Development,Debugging +diff -ur awn-extras-applets-0.2.6.orig/src/quit-applet/icons/Makefile.am awn-extras-applets-0.2.6/src/quit-applet/icons/Makefile.am +--- awn-extras-applets-0.2.6.orig/src/quit-applet/icons/Makefile.am 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/quit-applet/icons/Makefile.am 2008-03-19 01:02:33.000000000 +0100 +@@ -3,4 +3,4 @@ + COPYING \ + LGPL + +-quitappletdir = $(libdir)/awn/applets/quit-applet/icons ++quitappletdir = $(datadir)/awn/applets/quit-applet/icons +diff -ur awn-extras-applets-0.2.6.orig/src/quit-applet/icons/Makefile.in awn-extras-applets-0.2.6/src/quit-applet/icons/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/quit-applet/icons/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/quit-applet/icons/Makefile.in 2008-03-19 01:03:19.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -93,6 +93,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -176,6 +177,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -287,7 +290,7 @@ + COPYING \ + LGPL + +-quitappletdir = $(libdir)/awn/applets/quit-applet/icons ++quitappletdir = $(datadir)/awn/applets/quit-applet/icons + all: all-am + + .SUFFIXES: +diff -ur awn-extras-applets-0.2.6.orig/src/quit-applet/Makefile.in awn-extras-applets-0.2.6/src/quit-applet/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/quit-applet/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/quit-applet/Makefile.in 2008-03-19 01:03:19.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -112,6 +112,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -195,6 +196,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -308,11 +311,11 @@ + # vim: set ft=automake : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = $(APPLET_MAIN_FILE) + CLEANFILES = $(desktop_DATA) +-appletdir = $(libdir)/awn/applets/$(APPLET_NAME) ++appletdir = $(datadir)/awn/applets/$(APPLET_NAME) + dist_applet_DATA = \ + COPYING \ + $(NULL) +@@ -484,8 +487,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -510,8 +513,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -521,13 +524,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/quit-applet/quit-applet.desktop.in.in awn-extras-applets-0.2.6/src/quit-applet/quit-applet.desktop.in.in +--- awn-extras-applets-0.2.6.orig/src/quit-applet/quit-applet.desktop.in.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/quit-applet/quit-applet.desktop.in.in 2008-03-19 01:02:33.000000000 +0100 +@@ -1,11 +1,10 @@ + [Desktop Entry] + Version=1.0 +-Encoding=UTF-8 + Name=Quit-Logoff applet + Type=Application + X-AWN-AppletType=Python + Comment=A applet to exit your session +-Exec=@LIBDIR@/awn/applets/quit-applet/quit-applet.py +-Icon=@LIBDIR@/awn/applets/quit-applet/icons/application-exit.svg ++Exec=quit-applet/quit-applet.py ++Icon=quit-applet/icons/application-exit.svg + Name[en_US]=Quit-Logoff applet + X-AWN-AppletCategory=System +diff -ur awn-extras-applets-0.2.6.orig/src/separator/Makefile.in awn-extras-applets-0.2.6/src/separator/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/separator/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/separator/Makefile.in 2008-03-19 01:03:19.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -68,7 +68,7 @@ + separator_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(separator_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +@@ -125,6 +125,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -208,6 +209,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -320,7 +323,7 @@ + # vim: set ft=automake ts-8 sts=8 sw=8 : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = \ + $(icon_DATA) \ +@@ -387,8 +390,8 @@ + @list='$(applet_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(appletdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(appletdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(appletdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(appletdir)/$$f"; \ + else :; fi; \ + done + +@@ -396,8 +399,8 @@ + @$(NORMAL_UNINSTALL) + @list='$(applet_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(appletdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(appletdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(appletdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(appletdir)/$$p"; \ + done + + clean-appletLTLIBRARIES: +@@ -485,8 +488,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -498,8 +501,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -509,13 +512,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/separator/separator.desktop.in awn-extras-applets-0.2.6/src/separator/separator.desktop.in +--- awn-extras-applets-0.2.6.orig/src/separator/separator.desktop.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/separator/separator.desktop.in 2008-03-19 01:03:32.000000000 +0100 +@@ -4,6 +4,6 @@ + Encoding=UTF-8 + Name=Separator + Comment=A simple separator. +-Exec=/usr/local/lib/awn/applets/separator/separator.so +-Icon=/separator.svg ++Exec=/usr/lib/awn/applets/separator/separator.so ++Icon=icons/separator.svg + X-AWN-AppletCategory=Utility,Core +diff -ur awn-extras-applets-0.2.6.orig/src/separator/separator.desktop.in.in awn-extras-applets-0.2.6/src/separator/separator.desktop.in.in +--- awn-extras-applets-0.2.6.orig/src/separator/separator.desktop.in.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/separator/separator.desktop.in.in 2008-03-19 01:02:33.000000000 +0100 +@@ -5,5 +5,5 @@ + Name=Separator + Comment=A simple separator. + Exec=@LIBDIR@/awn/applets/separator/separator.so +-Icon=@ICONDIR@/separator.svg ++Icon=icons/separator.svg + X-AWN-AppletCategory=Utility,Core +diff -ur awn-extras-applets-0.2.6.orig/src/shiny-switcher/Makefile.in awn-extras-applets-0.2.6/src/shiny-switcher/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/shiny-switcher/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/shiny-switcher/Makefile.in 2008-03-19 01:03:19.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -72,7 +72,7 @@ + shinyswitcher_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(shinyswitcher_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +@@ -130,6 +130,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -213,6 +214,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -327,7 +330,7 @@ + # vim: set ft=automake ts-8 sts=8 sw=8 : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = shinyswitcher.schema-ini + CLEANFILES = $(desktop_DATA) +@@ -401,8 +404,8 @@ + @list='$(applet_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(appletdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(appletdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(appletdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(appletdir)/$$f"; \ + else :; fi; \ + done + +@@ -410,8 +413,8 @@ + @$(NORMAL_UNINSTALL) + @list='$(applet_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(appletdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(appletdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(appletdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(appletdir)/$$p"; \ + done + + clean-appletLTLIBRARIES: +@@ -517,8 +520,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -530,8 +533,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -541,13 +544,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/showdesktop/Makefile.in awn-extras-applets-0.2.6/src/showdesktop/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/showdesktop/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/showdesktop/Makefile.in 2008-03-19 01:03:19.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -98,6 +98,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -181,6 +182,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -293,11 +296,11 @@ + # vim: set ft=automake : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = $(APPLET_MAIN_FILE) + CLEANFILES = $(desktop_DATA) +-appletdir = $(libdir)/awn/applets/$(APPLET_NAME) ++appletdir = $(datadir)/awn/applets/$(APPLET_NAME) + all: all-am + + .SUFFIXES: +diff -ur awn-extras-applets-0.2.6.orig/src/showdesktop/showdesktop.desktop.in.in awn-extras-applets-0.2.6/src/showdesktop/showdesktop.desktop.in.in +--- awn-extras-applets-0.2.6.orig/src/showdesktop/showdesktop.desktop.in.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/showdesktop/showdesktop.desktop.in.in 2008-03-19 01:02:33.000000000 +0100 +@@ -1,9 +1,8 @@ + [Desktop Entry] + Type=Application + X-AWN-AppletType=Python +-Encoding=UTF-8 + Name=Showdesktop Applet + Comment=Quickly hide all your windows +-Exec=@LIBDIR@/awn/applets/showdesktop/showdesktop.py ++Exec=showdesktop/showdesktop.py + Icon=desktop + X-AWN-AppletCategory=Utility +diff -ur awn-extras-applets-0.2.6.orig/src/stacks/icons/Makefile.am awn-extras-applets-0.2.6/src/stacks/icons/Makefile.am +--- awn-extras-applets-0.2.6.orig/src/stacks/icons/Makefile.am 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/stacks/icons/Makefile.am 2008-03-19 01:02:33.000000000 +0100 +@@ -2,4 +2,4 @@ + stacks-drop.svg \ + stacks-full.svg + +-stacksdir = $(libdir)/awn/applets/stacks/icons ++stacksdir = $(datadir)/awn/applets/stacks/icons +diff -ur awn-extras-applets-0.2.6.orig/src/stacks/icons/Makefile.in awn-extras-applets-0.2.6/src/stacks/icons/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/stacks/icons/Makefile.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/stacks/icons/Makefile.in 2008-03-19 01:03:19.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -93,6 +93,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -176,6 +177,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -286,7 +289,7 @@ + stacks-drop.svg \ + stacks-full.svg + +-stacksdir = $(libdir)/awn/applets/stacks/icons ++stacksdir = $(datadir)/awn/applets/stacks/icons + all: all-am + + .SUFFIXES: +diff -ur awn-extras-applets-0.2.6.orig/src/stacks/Makefile.in awn-extras-applets-0.2.6/src/stacks/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/stacks/Makefile.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/stacks/Makefile.in 2008-03-19 01:03:19.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -112,6 +112,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -195,6 +196,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -308,11 +311,11 @@ + # vim: set ft=automake : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = $(APPLET_MAIN_FILE) + CLEANFILES = $(desktop_DATA) +-appletdir = $(libdir)/awn/applets/$(APPLET_NAME) ++appletdir = $(datadir)/awn/applets/$(APPLET_NAME) + dist_applet_DATA = \ + stacks_preferences.glade \ + curved_stacks_preferences.glade \ +@@ -498,8 +501,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -524,8 +527,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -535,13 +538,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/stacks/stacks.desktop.in.in awn-extras-applets-0.2.6/src/stacks/stacks.desktop.in.in +--- awn-extras-applets-0.2.6.orig/src/stacks/stacks.desktop.in.in 2008-03-19 01:05:08.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/stacks/stacks.desktop.in.in 2008-03-19 01:02:33.000000000 +0100 +@@ -1,9 +1,8 @@ + [Desktop Entry] + Type=Application +-Encoding=UTF-8 + Name=Stacks Applet + Comment=Quick access to a file folder +-Exec=@LIBDIR@/awn/applets/stacks/stacks_applet.py +-Icon=@LIBDIR@/awn/applets/stacks/icons/stacks-drop.svg ++Exec=stacks/stacks_applet.py ++Icon=stacks/icons/stacks-drop.svg + X-AWN-AppletType=Python + X-AWN-AppletCategory=Utility,FileManager +diff -ur awn-extras-applets-0.2.6.orig/src/switcher/Makefile.in awn-extras-applets-0.2.6/src/switcher/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/switcher/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/switcher/Makefile.in 2008-03-19 01:03:19.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -71,7 +71,7 @@ + switcher_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(switcher_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +@@ -129,6 +129,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -212,6 +213,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -324,7 +327,7 @@ + # vim: set ft=automake ts-8 sts=8 sw=8 : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = switcher.schema-ini + CLEANFILES = $(desktop_DATA) +@@ -396,8 +399,8 @@ + @list='$(applet_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(appletdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(appletdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(appletdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(appletdir)/$$f"; \ + else :; fi; \ + done + +@@ -405,8 +408,8 @@ + @$(NORMAL_UNINSTALL) + @list='$(applet_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(appletdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(appletdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(appletdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(appletdir)/$$p"; \ + done + + clean-appletLTLIBRARIES: +@@ -511,8 +514,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -524,8 +527,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -535,13 +538,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/trash/Makefile.in awn-extras-applets-0.2.6/src/trash/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/trash/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/trash/Makefile.in 2008-03-19 01:03:19.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -72,7 +72,7 @@ + trash_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(trash_la_LDFLAGS) \ + $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +@@ -131,6 +131,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -214,6 +215,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -331,7 +334,7 @@ + # vim: set ft=automake ts-8 sts=8 sw=8 : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = trash.schema-ini trashapplet.glade + CLEANFILES = $(desktop_DATA) +@@ -412,8 +415,8 @@ + @list='$(applet_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(appletdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(appletdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(appletdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(appletdir)/$$f"; \ + else :; fi; \ + done + +@@ -421,8 +424,8 @@ + @$(NORMAL_UNINSTALL) + @list='$(applet_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(appletdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(appletdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(appletdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(appletdir)/$$p"; \ + done + + clean-appletLTLIBRARIES: +@@ -547,8 +550,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -560,8 +563,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -571,13 +574,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/trasher/Makefile.in awn-extras-applets-0.2.6/src/trasher/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/trasher/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/trasher/Makefile.in 2008-03-19 01:03:19.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -68,7 +68,7 @@ + trasher_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(trasher_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +@@ -125,6 +125,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -208,6 +209,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -320,7 +323,7 @@ + # vim: set ft=automake ts-8 sts=8 sw=8 : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = \ + $(icon_DATA) \ +@@ -389,8 +392,8 @@ + @list='$(applet_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(appletdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(appletdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(appletdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(appletdir)/$$f"; \ + else :; fi; \ + done + +@@ -398,8 +401,8 @@ + @$(NORMAL_UNINSTALL) + @list='$(applet_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(appletdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(appletdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(appletdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(appletdir)/$$p"; \ + done + + clean-appletLTLIBRARIES: +@@ -487,8 +490,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -500,8 +503,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -511,13 +514,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/trasher/trasher.desktop.in awn-extras-applets-0.2.6/src/trasher/trasher.desktop.in +--- awn-extras-applets-0.2.6.orig/src/trasher/trasher.desktop.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/trasher/trasher.desktop.in 2008-03-19 01:03:33.000000000 +0100 +@@ -4,6 +4,6 @@ + Encoding=UTF-8 + Name=Stacks Trasher + Comment=Trash applet in Stacks style +-Exec=/usr/local/lib/awn/applets/trasher/trasher.so ++Exec=/usr/lib/awn/applets/trasher/trasher.so + Icon=gnome-stock-trash + X-AWN-AppletCategory=Utility,FileManager +diff -ur awn-extras-applets-0.2.6.orig/src/tsclient-applet/icons/Makefile.am awn-extras-applets-0.2.6/src/tsclient-applet/icons/Makefile.am +--- awn-extras-applets-0.2.6.orig/src/tsclient-applet/icons/Makefile.am 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/tsclient-applet/icons/Makefile.am 2008-03-19 01:02:33.000000000 +0100 +@@ -1,4 +1,4 @@ + dist_tsclient_DATA = \ + Tsclient.svg + +-tsclientdir = $(libdir)/awn/applets/tsclient-app/icons ++tsclientdir = $(datadir)/awn/applets/tsclient-app/icons +diff -ur awn-extras-applets-0.2.6.orig/src/tsclient-applet/icons/Makefile.in awn-extras-applets-0.2.6/src/tsclient-applet/icons/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/tsclient-applet/icons/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/tsclient-applet/icons/Makefile.in 2008-03-19 01:03:19.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -93,6 +93,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -176,6 +177,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -285,7 +288,7 @@ + dist_tsclient_DATA = \ + Tsclient.svg + +-tsclientdir = $(libdir)/awn/applets/tsclient-app/icons ++tsclientdir = $(datadir)/awn/applets/tsclient-app/icons + all: all-am + + .SUFFIXES: +diff -ur awn-extras-applets-0.2.6.orig/src/tsclient-applet/Makefile.in awn-extras-applets-0.2.6/src/tsclient-applet/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/tsclient-applet/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/tsclient-applet/Makefile.in 2008-03-19 01:03:19.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -110,6 +110,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -193,6 +194,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -306,11 +309,11 @@ + # vim: set ft=automake : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = $(APPLET_MAIN_FILE) + CLEANFILES = $(desktop_DATA) +-appletdir = $(libdir)/awn/applets/$(APPLET_NAME) ++appletdir = $(datadir)/awn/applets/$(APPLET_NAME) + all: all-recursive + + .SUFFIXES: +@@ -461,8 +464,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -487,8 +490,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -498,13 +501,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/tsclient-applet/tsclient-app.desktop.in.in awn-extras-applets-0.2.6/src/tsclient-applet/tsclient-app.desktop.in.in +--- awn-extras-applets-0.2.6.orig/src/tsclient-applet/tsclient-app.desktop.in.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/tsclient-applet/tsclient-app.desktop.in.in 2008-03-19 01:02:33.000000000 +0100 +@@ -1,9 +1,8 @@ + [Desktop Entry] + Type=Application + X-AWN-AppletType=Python +-Encoding=UTF-8 + Name=TsClient Applet + Comment=Quick access to RDP files +-Exec=@LIBDIR@/awn/applets/tsclient-app/tsclient_app.py +-Icon=@LIBDIR@/awn/applets/tsclient-app/icons/Tsclient.svg ++Exec=tsclient-app/tsclient_app.py ++Icon=tsclient-app/icons/Tsclient.svg + X-AWN-AppletCategory=Utility,RemoteAccess +diff -ur awn-extras-applets-0.2.6.orig/src/volume-control/Makefile.in awn-extras-applets-0.2.6/src/volume-control/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/volume-control/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/volume-control/Makefile.in 2008-03-19 01:03:20.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -110,6 +110,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -193,6 +194,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -306,11 +309,11 @@ + # vim: set ft=automake : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = $(APPLET_MAIN_FILE) + CLEANFILES = $(desktop_DATA) +-appletdir = $(libdir)/awn/applets/$(APPLET_NAME) ++appletdir = $(datadir)/awn/applets/$(APPLET_NAME) + all: all-recursive + + .SUFFIXES: +@@ -461,8 +464,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -487,8 +490,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -498,13 +501,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/volume-control/Themes/Black/Makefile.am awn-extras-applets-0.2.6/src/volume-control/Themes/Black/Makefile.am +--- awn-extras-applets-0.2.6.orig/src/volume-control/Themes/Black/Makefile.am 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/volume-control/Themes/Black/Makefile.am 2008-03-19 01:02:33.000000000 +0100 +@@ -4,4 +4,4 @@ + audio-volume-medium.svg \ + audio-volume-muted.svg + +-volumecontroldir = $(libdir)/awn/applets/volume-control/Themes/Black ++volumecontroldir = $(datadir)/awn/applets/volume-control/Themes/Black +diff -ur awn-extras-applets-0.2.6.orig/src/volume-control/Themes/Black/Makefile.in awn-extras-applets-0.2.6/src/volume-control/Themes/Black/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/volume-control/Themes/Black/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/volume-control/Themes/Black/Makefile.in 2008-03-19 01:03:20.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -93,6 +93,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -176,6 +177,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -288,7 +291,7 @@ + audio-volume-medium.svg \ + audio-volume-muted.svg + +-volumecontroldir = $(libdir)/awn/applets/volume-control/Themes/Black ++volumecontroldir = $(datadir)/awn/applets/volume-control/Themes/Black + all: all-am + + .SUFFIXES: +diff -ur awn-extras-applets-0.2.6.orig/src/volume-control/Themes/Makefile.in awn-extras-applets-0.2.6/src/volume-control/Themes/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/volume-control/Themes/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/volume-control/Themes/Makefile.in 2008-03-19 01:03:20.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -94,6 +94,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -177,6 +178,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -402,8 +405,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -428,8 +431,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -439,13 +442,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/volume-control/Themes/Minimal/Makefile.am awn-extras-applets-0.2.6/src/volume-control/Themes/Minimal/Makefile.am +--- awn-extras-applets-0.2.6.orig/src/volume-control/Themes/Minimal/Makefile.am 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/volume-control/Themes/Minimal/Makefile.am 2008-03-19 01:02:33.000000000 +0100 +@@ -4,4 +4,4 @@ + audio-volume-medium.svg \ + audio-volume-muted.svg + +-volumecontroldir = $(libdir)/awn/applets/volume-control/Themes/Minimal ++volumecontroldir = $(datadir)/awn/applets/volume-control/Themes/Minimal +diff -ur awn-extras-applets-0.2.6.orig/src/volume-control/Themes/Minimal/Makefile.in awn-extras-applets-0.2.6/src/volume-control/Themes/Minimal/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/volume-control/Themes/Minimal/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/volume-control/Themes/Minimal/Makefile.in 2008-03-19 01:03:20.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -93,6 +93,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -176,6 +177,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -288,7 +291,7 @@ + audio-volume-medium.svg \ + audio-volume-muted.svg + +-volumecontroldir = $(libdir)/awn/applets/volume-control/Themes/Minimal ++volumecontroldir = $(datadir)/awn/applets/volume-control/Themes/Minimal + all: all-am + + .SUFFIXES: +diff -ur awn-extras-applets-0.2.6.orig/src/volume-control/Themes/Tango/Makefile.am awn-extras-applets-0.2.6/src/volume-control/Themes/Tango/Makefile.am +--- awn-extras-applets-0.2.6.orig/src/volume-control/Themes/Tango/Makefile.am 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/volume-control/Themes/Tango/Makefile.am 2008-03-19 01:02:33.000000000 +0100 +@@ -4,4 +4,4 @@ + audio-volume-medium.svg \ + audio-volume-muted.svg + +-volumecontroldir = $(libdir)/awn/applets/volume-control/Themes/Tango ++volumecontroldir = $(datadir)/awn/applets/volume-control/Themes/Tango +diff -ur awn-extras-applets-0.2.6.orig/src/volume-control/Themes/Tango/Makefile.in awn-extras-applets-0.2.6/src/volume-control/Themes/Tango/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/volume-control/Themes/Tango/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/volume-control/Themes/Tango/Makefile.in 2008-03-19 01:03:20.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -93,6 +93,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -176,6 +177,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -288,7 +291,7 @@ + audio-volume-medium.svg \ + audio-volume-muted.svg + +-volumecontroldir = $(libdir)/awn/applets/volume-control/Themes/Tango ++volumecontroldir = $(datadir)/awn/applets/volume-control/Themes/Tango + all: all-am + + .SUFFIXES: +diff -ur awn-extras-applets-0.2.6.orig/src/volume-control/volume-control.desktop.in.in awn-extras-applets-0.2.6/src/volume-control/volume-control.desktop.in.in +--- awn-extras-applets-0.2.6.orig/src/volume-control/volume-control.desktop.in.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/volume-control/volume-control.desktop.in.in 2008-03-19 01:02:33.000000000 +0100 +@@ -2,9 +2,8 @@ + Version=0.5 + Type=Application + X-AWN-AppletType=Python +-Encoding=UTF-8 + Name=Volume Control + Comment=Control your computer's volume +-Exec=@LIBDIR@/awn/applets/volume-control/volume-control.py ++Exec=volume-control/volume-control.py + Icon=gnome-reclevel + X-AWN-Applet-Category=Audio,Midi +diff -ur awn-extras-applets-0.2.6.orig/src/weather/images/Makefile.am awn-extras-applets-0.2.6/src/weather/images/Makefile.am +--- awn-extras-applets-0.2.6.orig/src/weather/images/Makefile.am 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/weather/images/Makefile.am 2008-03-19 01:02:33.000000000 +0100 +@@ -50,4 +50,4 @@ + twc-logo.png \ + na.png + +-weatherdir = $(libdir)/awn/applets/weather/images ++weatherdir = $(datadir)/awn/applets/weather/images +diff -ur awn-extras-applets-0.2.6.orig/src/weather/images/Makefile.in awn-extras-applets-0.2.6/src/weather/images/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/weather/images/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/weather/images/Makefile.in 2008-03-19 01:03:20.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -93,6 +93,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -176,6 +177,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -334,7 +337,7 @@ + twc-logo.png \ + na.png + +-weatherdir = $(libdir)/awn/applets/weather/images ++weatherdir = $(datadir)/awn/applets/weather/images + all: all-am + + .SUFFIXES: +diff -ur awn-extras-applets-0.2.6.orig/src/weather/locale/es/LC_MESSAGES/Makefile.am awn-extras-applets-0.2.6/src/weather/locale/es/LC_MESSAGES/Makefile.am +--- awn-extras-applets-0.2.6.orig/src/weather/locale/es/LC_MESSAGES/Makefile.am 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/weather/locale/es/LC_MESSAGES/Makefile.am 2008-03-19 01:02:33.000000000 +0100 +@@ -1,5 +1,5 @@ + dist_weather_DATA = \ + awn-weather-applet.mo + +-weatherdir = $(libdir)/awn/applets/weather/locale/es/LC_MESSAGES ++weatherdir = $(datadir)/awn/applets/weather/locale/es/LC_MESSAGES + +diff -ur awn-extras-applets-0.2.6.orig/src/weather/locale/es/LC_MESSAGES/Makefile.in awn-extras-applets-0.2.6/src/weather/locale/es/LC_MESSAGES/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/weather/locale/es/LC_MESSAGES/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/weather/locale/es/LC_MESSAGES/Makefile.in 2008-03-19 01:03:20.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -93,6 +93,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -176,6 +177,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -285,7 +288,7 @@ + dist_weather_DATA = \ + awn-weather-applet.mo + +-weatherdir = $(libdir)/awn/applets/weather/locale/es/LC_MESSAGES ++weatherdir = $(datadir)/awn/applets/weather/locale/es/LC_MESSAGES + all: all-am + + .SUFFIXES: +diff -ur awn-extras-applets-0.2.6.orig/src/weather/locale/es/Makefile.in awn-extras-applets-0.2.6/src/weather/locale/es/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/weather/locale/es/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/weather/locale/es/Makefile.in 2008-03-19 01:03:20.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -94,6 +94,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -177,6 +178,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -398,8 +401,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -424,8 +427,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -435,13 +438,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/weather/locale/fr/LC_MESSAGES/Makefile.am awn-extras-applets-0.2.6/src/weather/locale/fr/LC_MESSAGES/Makefile.am +--- awn-extras-applets-0.2.6.orig/src/weather/locale/fr/LC_MESSAGES/Makefile.am 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/weather/locale/fr/LC_MESSAGES/Makefile.am 2008-03-19 01:02:33.000000000 +0100 +@@ -1,5 +1,5 @@ + dist_weather_DATA = \ + awn-weather-applet.mo + +-weatherdir = $(libdir)/awn/applets/weather/locale/fr/LC_MESSAGES ++weatherdir = $(datadir)/awn/applets/weather/locale/fr/LC_MESSAGES + +diff -ur awn-extras-applets-0.2.6.orig/src/weather/locale/fr/LC_MESSAGES/Makefile.in awn-extras-applets-0.2.6/src/weather/locale/fr/LC_MESSAGES/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/weather/locale/fr/LC_MESSAGES/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/weather/locale/fr/LC_MESSAGES/Makefile.in 2008-03-19 01:03:20.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -93,6 +93,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -176,6 +177,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -285,7 +288,7 @@ + dist_weather_DATA = \ + awn-weather-applet.mo + +-weatherdir = $(libdir)/awn/applets/weather/locale/fr/LC_MESSAGES ++weatherdir = $(datadir)/awn/applets/weather/locale/fr/LC_MESSAGES + all: all-am + + .SUFFIXES: +diff -ur awn-extras-applets-0.2.6.orig/src/weather/locale/fr/Makefile.in awn-extras-applets-0.2.6/src/weather/locale/fr/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/weather/locale/fr/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/weather/locale/fr/Makefile.in 2008-03-19 01:03:20.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -94,6 +94,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -177,6 +178,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -398,8 +401,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -424,8 +427,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -435,13 +438,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/weather/locale/Makefile.in awn-extras-applets-0.2.6/src/weather/locale/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/weather/locale/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/weather/locale/Makefile.in 2008-03-19 01:03:20.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -94,6 +94,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -177,6 +178,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -404,8 +407,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -430,8 +433,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -441,13 +444,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/weather/locale/nb/LC_MESSAGES/Makefile.am awn-extras-applets-0.2.6/src/weather/locale/nb/LC_MESSAGES/Makefile.am +--- awn-extras-applets-0.2.6.orig/src/weather/locale/nb/LC_MESSAGES/Makefile.am 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/weather/locale/nb/LC_MESSAGES/Makefile.am 2008-03-19 01:02:33.000000000 +0100 +@@ -1,5 +1,5 @@ + dist_weather_DATA = \ + awn-weather-applet.mo + +-weatherdir = $(libdir)/awn/applets/weather/locale/nb/LC_MESSAGES ++weatherdir = $(datadir)/awn/applets/weather/locale/nb/LC_MESSAGES + +diff -ur awn-extras-applets-0.2.6.orig/src/weather/locale/nb/LC_MESSAGES/Makefile.in awn-extras-applets-0.2.6/src/weather/locale/nb/LC_MESSAGES/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/weather/locale/nb/LC_MESSAGES/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/weather/locale/nb/LC_MESSAGES/Makefile.in 2008-03-19 01:03:20.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -93,6 +93,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -176,6 +177,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -285,7 +288,7 @@ + dist_weather_DATA = \ + awn-weather-applet.mo + +-weatherdir = $(libdir)/awn/applets/weather/locale/nb/LC_MESSAGES ++weatherdir = $(datadir)/awn/applets/weather/locale/nb/LC_MESSAGES + all: all-am + + .SUFFIXES: +diff -ur awn-extras-applets-0.2.6.orig/src/weather/locale/nb/Makefile.in awn-extras-applets-0.2.6/src/weather/locale/nb/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/weather/locale/nb/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/weather/locale/nb/Makefile.in 2008-03-19 01:03:20.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -94,6 +94,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -177,6 +178,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -398,8 +401,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -424,8 +427,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -435,13 +438,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/weather/locale/nn/LC_MESSAGES/Makefile.am awn-extras-applets-0.2.6/src/weather/locale/nn/LC_MESSAGES/Makefile.am +--- awn-extras-applets-0.2.6.orig/src/weather/locale/nn/LC_MESSAGES/Makefile.am 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/weather/locale/nn/LC_MESSAGES/Makefile.am 2008-03-19 01:02:33.000000000 +0100 +@@ -1,5 +1,5 @@ + dist_weather_DATA = \ + awn-weather-applet.mo + +-weatherdir = $(libdir)/awn/applets/weather/locale/nn/LC_MESSAGES ++weatherdir = $(datadir)/awn/applets/weather/locale/nn/LC_MESSAGES + +diff -ur awn-extras-applets-0.2.6.orig/src/weather/locale/nn/LC_MESSAGES/Makefile.in awn-extras-applets-0.2.6/src/weather/locale/nn/LC_MESSAGES/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/weather/locale/nn/LC_MESSAGES/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/weather/locale/nn/LC_MESSAGES/Makefile.in 2008-03-19 01:03:20.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -93,6 +93,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -176,6 +177,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -285,7 +288,7 @@ + dist_weather_DATA = \ + awn-weather-applet.mo + +-weatherdir = $(libdir)/awn/applets/weather/locale/nn/LC_MESSAGES ++weatherdir = $(datadir)/awn/applets/weather/locale/nn/LC_MESSAGES + all: all-am + + .SUFFIXES: +diff -ur awn-extras-applets-0.2.6.orig/src/weather/locale/nn/Makefile.in awn-extras-applets-0.2.6/src/weather/locale/nn/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/weather/locale/nn/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/weather/locale/nn/Makefile.in 2008-03-19 01:03:20.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -94,6 +94,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -177,6 +178,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -398,8 +401,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -424,8 +427,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -435,13 +438,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/weather/locale/pt/LC_MESSAGES/Makefile.am awn-extras-applets-0.2.6/src/weather/locale/pt/LC_MESSAGES/Makefile.am +--- awn-extras-applets-0.2.6.orig/src/weather/locale/pt/LC_MESSAGES/Makefile.am 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/weather/locale/pt/LC_MESSAGES/Makefile.am 2008-03-19 01:02:33.000000000 +0100 +@@ -1,5 +1,5 @@ + dist_weather_DATA = \ + awn-weather-applet.mo + +-weatherdir = $(libdir)/awn/applets/weather/locale/pt/LC_MESSAGES ++weatherdir = $(datadir)/awn/applets/weather/locale/pt/LC_MESSAGES + +diff -ur awn-extras-applets-0.2.6.orig/src/weather/locale/pt/LC_MESSAGES/Makefile.in awn-extras-applets-0.2.6/src/weather/locale/pt/LC_MESSAGES/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/weather/locale/pt/LC_MESSAGES/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/weather/locale/pt/LC_MESSAGES/Makefile.in 2008-03-19 01:03:21.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -93,6 +93,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -176,6 +177,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -285,7 +288,7 @@ + dist_weather_DATA = \ + awn-weather-applet.mo + +-weatherdir = $(libdir)/awn/applets/weather/locale/pt/LC_MESSAGES ++weatherdir = $(datadir)/awn/applets/weather/locale/pt/LC_MESSAGES + all: all-am + + .SUFFIXES: +diff -ur awn-extras-applets-0.2.6.orig/src/weather/locale/pt/Makefile.in awn-extras-applets-0.2.6/src/weather/locale/pt/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/weather/locale/pt/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/weather/locale/pt/Makefile.in 2008-03-19 01:03:21.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -94,6 +94,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -177,6 +178,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -398,8 +401,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -424,8 +427,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -435,13 +438,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/weather/Makefile.in awn-extras-applets-0.2.6/src/weather/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/weather/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/weather/Makefile.in 2008-03-19 01:03:20.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -112,6 +112,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -195,6 +196,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -308,11 +311,11 @@ + # vim: set ft=automake : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = $(APPLET_MAIN_FILE) + CLEANFILES = $(desktop_DATA) +-appletdir = $(libdir)/awn/applets/$(APPLET_NAME) ++appletdir = $(datadir)/awn/applets/$(APPLET_NAME) + dist_applet_DATA = \ + messages.pot \ + weatherconfig.py \ +@@ -491,8 +494,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -517,8 +520,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -528,13 +531,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/weather/weather.desktop.in.in awn-extras-applets-0.2.6/src/weather/weather.desktop.in.in +--- awn-extras-applets-0.2.6.orig/src/weather/weather.desktop.in.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/weather/weather.desktop.in.in 2008-03-19 01:02:33.000000000 +0100 +@@ -1,9 +1,8 @@ + [Desktop Entry] + Type=Application + X-AWN-AppletType=Python +-Encoding=UTF-8 + Name=Weather Applet + Comment=Fetches the local weather. +-Exec=@LIBDIR@/awn/applets/weather/weather.py ++Exec=weather/weather.py + Icon=weather-clear + X-AWN-AppletCategory=Network,News +diff -ur awn-extras-applets-0.2.6.orig/src/wobblyzini/icons/Makefile.in awn-extras-applets-0.2.6/src/wobblyzini/icons/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/wobblyzini/icons/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/wobblyzini/icons/Makefile.in 2008-03-19 01:03:21.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -93,6 +93,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -176,6 +177,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +diff -ur awn-extras-applets-0.2.6.orig/src/wobblyzini/Makefile.in awn-extras-applets-0.2.6/src/wobblyzini/Makefile.in +--- awn-extras-applets-0.2.6.orig/src/wobblyzini/Makefile.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/wobblyzini/Makefile.in 2008-03-19 01:03:21.000000000 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 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. +@@ -69,7 +69,7 @@ + wobblyzini_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(wobblyzini_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +@@ -136,6 +136,7 @@ + DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -219,6 +220,8 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NMEDIT = @NMEDIT@ + NOTIFICATION_DAEMON_CFLAGS = @NOTIFICATION_DAEMON_CFLAGS@ + NOTIFICATION_DAEMON_LIBS = @NOTIFICATION_DAEMON_LIBS@ + OBJEXT = @OBJEXT@ +@@ -331,7 +334,7 @@ + # vim: set ft=automake ts-8 sts=8 sw=8 : + NULL = + icon_DATA = $(APPLET_ICONS) +-desktopdir = $(libdir)/awn/applets ++desktopdir = $(datadir)/awn/applets + desktop_DATA = $(APPLET_NAME).desktop + EXTRA_DIST = \ + $(icon_DATA) \ +@@ -400,8 +403,8 @@ + @list='$(applet_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(appletdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(appletdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(appletdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(appletLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(appletdir)/$$f"; \ + else :; fi; \ + done + +@@ -409,8 +412,8 @@ + @$(NORMAL_UNINSTALL) + @list='$(applet_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(appletdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(appletdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(appletdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(appletdir)/$$p"; \ + done + + clean-appletLTLIBRARIES: +@@ -569,8 +572,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -595,8 +598,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -606,13 +609,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +diff -ur awn-extras-applets-0.2.6.orig/src/wobblyzini/wobblyzini.desktop.in awn-extras-applets-0.2.6/src/wobblyzini/wobblyzini.desktop.in +--- awn-extras-applets-0.2.6.orig/src/wobblyzini/wobblyzini.desktop.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/wobblyzini/wobblyzini.desktop.in 2008-03-19 01:03:34.000000000 +0100 +@@ -4,6 +4,6 @@ + Encoding=UTF-8 + Name=Wobbly Zini + Comment=A simple test animation +-Exec=/usr/local/lib/awn/applets/wobblyzini/wobblyzini.so +-Icon=/usr/local/lib/awn/applets/wobblyzini/icons/wobblyzini.png ++Exec=/usr/lib/awn/applets/wobblyzini/wobblyzini.so ++Icon=icons/wobblyzini.png + X-AWN-AppletCategory=Game,Amusement +diff -ur awn-extras-applets-0.2.6.orig/src/wobblyzini/wobblyzini.desktop.in.in awn-extras-applets-0.2.6/src/wobblyzini/wobblyzini.desktop.in.in +--- awn-extras-applets-0.2.6.orig/src/wobblyzini/wobblyzini.desktop.in.in 2008-03-19 01:05:07.000000000 +0100 ++++ awn-extras-applets-0.2.6/src/wobblyzini/wobblyzini.desktop.in.in 2008-03-19 01:02:33.000000000 +0100 +@@ -5,5 +5,5 @@ + Name=Wobbly Zini + Comment=A simple test animation + Exec=@LIBDIR@/awn/applets/wobblyzini/wobblyzini.so +-Icon=@LIBDIR@/awn/applets/wobblyzini/icons/wobblyzini.png ++Icon=icons/wobblyzini.png + X-AWN-AppletCategory=Game,Amusement --- awn-extras-applets-0.2.6.orig/debian/patches/101_places_string_to_color.patch +++ awn-extras-applets-0.2.6/debian/patches/101_places_string_to_color.patch @@ -0,0 +1,41 @@ +diff -Nur -x '*.orig' -x '*~' awn-extras-applets-0.2.6/src/places/applet.c awn-extras-applets-0.2.6.new/src/places/applet.c +--- awn-extras-applets-0.2.6/src/places/applet.c 2008-02-19 01:32:16.000000000 +0100 ++++ awn-extras-applets-0.2.6.new/src/places/applet.c 2008-10-14 22:52:38.000000000 +0200 +@@ -187,8 +187,16 @@ + static void config_get_color (AwnConfigClient *client, const gchar *key, AwnColor *color) + { + gchar *value = awn_config_client_get_string (client, AWN_CONFIG_CLIENT_DEFAULT_GROUP, key, NULL); +- awn_cairo_string_to_color (value, color); +- g_free (value); ++ if (value) ++ { ++ awn_cairo_string_to_color (value, color); ++ g_free (value); ++ } ++ else ++ { ++ g_warning("Failed to read config key: %s\n",key); ++ awn_cairo_string_to_color ("000000", color); ++ } + } + #else + static void config_get_string (GConfClient *client, const gchar *key, gchar **str) +@@ -200,8 +208,16 @@ + static void config_get_color (GConfClient *client, const gchar *key, AwnColor *color) + { + GConfValue *value = gconf_client_get_string (client, key, NULL); +- awn_cairo_string_to_color (value, color); +- g_free (value); ++ if (value) ++ { ++ awn_cairo_string_to_color (value, color); ++ g_free (value); ++ } ++ else ++ { ++ g_warning("Failed to read config key: %s\n",key); ++ awn_cairo_string_to_color ("000000", color); ++ } + } + #endif + --- awn-extras-applets-0.2.6.orig/debian/patches/105_mimenu_missing_bookmark.patch +++ awn-extras-applets-0.2.6/debian/patches/105_mimenu_missing_bookmark.patch @@ -0,0 +1,15 @@ +diff -Nur -x '*.orig' -x '*~' awn-extras-applets-0.2.6/src/MiMenu/menus.py awn-extras-applets-0.2.6.new/src/MiMenu/menus.py +--- awn-extras-applets-0.2.6/src/MiMenu/menus.py 2008-02-14 17:49:00.000000000 +0100 ++++ awn-extras-applets-0.2.6.new/src/MiMenu/menus.py 2008-10-15 21:33:22.000000000 +0200 +@@ -19,7 +19,10 @@ + """ + model = gtk.ListStore(gtk.gdk.Pixbuf, gobject.TYPE_STRING) + book_loc = os.path.expanduser("~") + "/.gtk-bookmarks" +- bookmark_list = open(book_loc,"r") ++ if os.path.exists(book_loc): ++ bookmark_list = open(book_loc,"r") ++ else: ++ bookmark_list =[] + bookmarks = {} + model_list = [] + home = [theme.load_icon('user-home',24,0),"Home"]