--- icecc-monitor-1.1.orig/debian/README.Debian +++ icecc-monitor-1.1/debian/README.Debian @@ -0,0 +1,107 @@ +Debian kde-extras Team +---------------------- + +1. Contacts +----------- + +General help requests + mailing list + #debian-kde on irc + +Packaging queries + mailing list + #debian-qt-kde on irc + +Maintainers + mailing list + + +2. Subversion repository +------------------------ + +You can browse it only at: + +http://svn.debian.org/wsvn/pkg-kde/kde-extras/ + +To "checkout" the repository use these commands: + + $ svn co svn+ssh://${ALIOTH_USERNAME}@svn.debian.org/svn/pkg-kde/kde-extras + +Authorized SSH keys are controlled at https://alioth.debian.org/account/ + +The repository layout is: + +- packagename/ +    - trunk/ +    - branches/ +    - tags/ +        - 0.7.2-1/ +        - 0.7.2-2/ +        - 0.7.2-2ubuntu1/ +        - 0.7.2-2ubuntu2/ +        - 0.7.2-2ubuntu3/ +        - 0.8.0/ +        ... + +If only one version of the package is available at the time, development must +be made at trunk/ dir, copying the dir to tags/'pkg-version' each time a new +release is made. + +When, at some point, the need to have two different versions at the same time +arises (for example, if we need a version to be in unstable and a different one +to be in experimental), experimental development will be made in trunk/ and +if a new unstable package needs to be cooked, copying +tag/'latest_version_in_sid' to tag/'latest_version_in_sid'+1 will make the +trick. + +3. Using svn-buildpackage +-------------------------- + +Packages with an upstream tarball will require you to set the mergeWithUpstream +property first (from the package root) so that svn-buildpackage will look for +the .orig.tar.gz in the ../tarballs directory. + + % svn propset mergeWithUpstream 1 debian + +Please note that this only works for packages which have only the debian/ +directory committed. Consequently, you must use CDBS's simple-patchsys.mk or +dpatch to modify the upstream sources. + +After you have finished and committed your Debian patches via + + % svn commit [PACKAGE] + +as well as copying the orig.tar.gz to ../tarballs/ if necessary, you may build +your package with the following commands: + + % svn-buildpackage --svn-ignore-new -rfakeroot + +Please, don't commit tarballs/ or build-area/ directories to SVN. + +4. Tarballs and Build-area directories +------------------------------------ + +During pkg development before uploaded to debian the tarballs can be found at: + + http://pkg-kde.alioth.debian.org/kde-extra/orig.tar.gz/ + +You need to place those dirs in the parent directory of the one from which you're +running svn-buildpackage. Usually this means placing tarballs/ and build-area/ dirs +in 'pkgname'/ dir, at the same level as trunk/ + +If you want to compile inside one version in tags/ dir, you'll need to place those +dirs inside that dir. Of course the easiest and cleanest way of doing it is +by making a symlink of those dirs inside tags/ dir. + +5. Using svn-inject +------------------- + +To inject a new package into the Debian KDE Extras svn archive you should use svn-inject(1) +as follows: + + svn-inject -o .dsc svn+ssh://${ALIOTH_USERNAME}@svn.debian.org/svn/pkg-kde/kde-extras + +Type in your alioth password a few hundred times :-) and your package should be +uploaded to the archive. Note you will also need to manually copy the +package.orig.tar.gz to your tarballs directory. The -o option is important as +this ensures that we 'Only keep modified files under SVN control' --- icecc-monitor-1.1.orig/debian/changelog +++ icecc-monitor-1.1/debian/changelog @@ -0,0 +1,16 @@ +icecc-monitor (1.1-2) unstable; urgency=low + + * Include gcc4.3 patch from Martin. (Closes: #417227) + + -- Mark Purcell Fri, 27 Apr 2007 22:39:17 +1000 + +icecc-monitor (1.1-1) unstable; urgency=low + + * Initial Debian release (Closes: #388327) + * Merge Andre Woebbeking and Jonathan Riddell package + * KDE_3_5_BRANCH update (up to r583517) + * Fix typo license in kabout BSD->GPL_V2 + * Export kde_htmldir to fix doc installation path + + -- Fathi Boudra Mon, 11 Sep 2006 23:15:00 +0200 + --- icecc-monitor-1.1.orig/debian/control +++ icecc-monitor-1.1/debian/control @@ -0,0 +1,21 @@ +Source: icecc-monitor +Section: kde +Priority: optional +Maintainer: Debian KDE Extras Team +Uploaders: Fathi Boudra , Mark Purcell +Build-Depends: cdbs, debhelper (>= 5), automake1.9, kdelibs4-dev, libicecc-dev, + docbook2x +Standards-Version: 3.7.2 + +Package: icecc-monitor +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Suggests: icecc +Description: icecc monitor for KDE + icecc-monitor is an icecc (distributed compiler) monitor for KDE. It provides + a view on the distributed compile network, which jobs run where and details + about jobs and nodes (statistics and overview information). + . + See the 'icecc' package for more informations. + . + Homepage: http://en.opensuse.org/Icecream --- icecc-monitor-1.1.orig/debian/icemon.xml +++ icecc-monitor-1.1/debian/icemon.xml @@ -0,0 +1,113 @@ + + + + + + Jonathan + Riddell + jriddell@ubuntu.com + + + 2006 + Jonathan Riddell + + + + 2006-05-01 + + + + icemon + 1 + + + icemon + View your icecream compile cluster + + + + icemon --netname <name> + + + + + + + + + + DESCRIPTION + + icemon is a GUI to view an icecream compile cluster. + + + + OPTIONS + + + Options: + + + Icecream network name + + + + + + Generic options: + + + Show help about options + + + + Show Qt specific options + + + + Show KDE specific options + + + + Show all options + + + + Show author information + + + , + Show version information + + + + Show license information + + + + Indicates end of options + + + + + + + COPYRIGHT + + This manual page was written by Jonathan Riddell + jriddell@ubuntu.com for the + Kubuntu system (but may be used by others). + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU General Public License, + Version 2 or any later version published by the Free Software Foundation. + + + On Debian systems, the complete text of the GNU General Public + License can be found in + /usr/share/common-licenses/GPL. + + + --- icecc-monitor-1.1.orig/debian/rules +++ icecc-monitor-1.1/debian/rules @@ -0,0 +1,22 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +export kde_htmldir = /usr/share/doc/kde/HTML + +DEB_INSTALL_MANPAGES_icecc-monitor = icemon.1 + +build/icecc-monitor:: + /usr/bin/docbook2x-man debian/icemon.xml + +clean:: + rm -f icemon.1 + + +get-orig-source: + @@dh_testdir + @@[ -d ../tarballs/. ] + @@dpatch-get-origtargz ../tarballs + --- icecc-monitor-1.1.orig/debian/patches/01_icemon-kde3_branch_r583517.diff +++ icecc-monitor-1.1/debian/patches/01_icemon-kde3_branch_r583517.diff @@ -0,0 +1,453 @@ +diff -Nur icecc-monitor-1.1/icemon-kde3/COPYING icecc-monitor-1.1.new/icemon-kde3/COPYING +--- icecc-monitor-1.1/icemon-kde3/COPYING 1970-01-01 01:00:00.000000000 +0100 ++++ icecc-monitor-1.1.new/icemon-kde3/COPYING 2006-09-19 17:40:42.000000000 +0200 +@@ -0,0 +1,340 @@ ++ GNU GENERAL PUBLIC LICENSE ++ Version 2, June 1991 ++ ++ Copyright (C) 1989, 1991 Free Software Foundation, Inc. ++ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ Everyone is permitted to copy and distribute verbatim copies ++ of this license document, but changing it is not allowed. ++ ++ Preamble ++ ++ The licenses for most software are designed to take away your ++freedom to share and change it. By contrast, the GNU General Public ++License is intended to guarantee your freedom to share and change free ++software--to make sure the software is free for all its users. This ++General Public License applies to most of the Free Software ++Foundation's software and to any other program whose authors commit to ++using it. (Some other Free Software Foundation software is covered by ++the GNU Library General Public License instead.) You can apply it to ++your programs, too. ++ ++ When we speak of free software, we are referring to freedom, not ++price. Our General Public Licenses are designed to make sure that you ++have the freedom to distribute copies of free software (and charge for ++this service if you wish), that you receive source code or can get it ++if you want it, that you can change the software or use pieces of it ++in new free programs; and that you know you can do these things. ++ ++ To protect your rights, we need to make restrictions that forbid ++anyone to deny you these rights or to ask you to surrender the rights. ++These restrictions translate to certain responsibilities for you if you ++distribute copies of the software, or if you modify it. ++ ++ For example, if you distribute copies of such a program, whether ++gratis or for a fee, you must give the recipients all the rights that ++you have. You must make sure that they, too, receive or can get the ++source code. And you must show them these terms so they know their ++rights. ++ ++ We protect your rights with two steps: (1) copyright the software, and ++(2) offer you this license which gives you legal permission to copy, ++distribute and/or modify the software. ++ ++ Also, for each author's protection and ours, we want to make certain ++that everyone understands that there is no warranty for this free ++software. If the software is modified by someone else and passed on, we ++want its recipients to know that what they have is not the original, so ++that any problems introduced by others will not reflect on the original ++authors' reputations. ++ ++ Finally, any free program is threatened constantly by software ++patents. We wish to avoid the danger that redistributors of a free ++program will individually obtain patent licenses, in effect making the ++program proprietary. To prevent this, we have made it clear that any ++patent must be licensed for everyone's free use or not licensed at all. ++ ++ The precise terms and conditions for copying, distribution and ++modification follow. ++ ++ GNU GENERAL PUBLIC LICENSE ++ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION ++ ++ 0. This License applies to any program or other work which contains ++a notice placed by the copyright holder saying it may be distributed ++under the terms of this General Public License. The "Program", below, ++refers to any such program or work, and a "work based on the Program" ++means either the Program or any derivative work under copyright law: ++that is to say, a work containing the Program or a portion of it, ++either verbatim or with modifications and/or translated into another ++language. (Hereinafter, translation is included without limitation in ++the term "modification".) Each licensee is addressed as "you". ++ ++Activities other than copying, distribution and modification are not ++covered by this License; they are outside its scope. The act of ++running the Program is not restricted, and the output from the Program ++is covered only if its contents constitute a work based on the ++Program (independent of having been made by running the Program). ++Whether that is true depends on what the Program does. ++ ++ 1. You may copy and distribute verbatim copies of the Program's ++source code as you receive it, in any medium, provided that you ++conspicuously and appropriately publish on each copy an appropriate ++copyright notice and disclaimer of warranty; keep intact all the ++notices that refer to this License and to the absence of any warranty; ++and give any other recipients of the Program a copy of this License ++along with the Program. ++ ++You may charge a fee for the physical act of transferring a copy, and ++you may at your option offer warranty protection in exchange for a fee. ++ ++ 2. You may modify your copy or copies of the Program or any portion ++of it, thus forming a work based on the Program, and copy and ++distribute such modifications or work under the terms of Section 1 ++above, provided that you also meet all of these conditions: ++ ++ a) You must cause the modified files to carry prominent notices ++ stating that you changed the files and the date of any change. ++ ++ b) You must cause any work that you distribute or publish, that in ++ whole or in part contains or is derived from the Program or any ++ part thereof, to be licensed as a whole at no charge to all third ++ parties under the terms of this License. ++ ++ c) If the modified program normally reads commands interactively ++ when run, you must cause it, when started running for such ++ interactive use in the most ordinary way, to print or display an ++ announcement including an appropriate copyright notice and a ++ notice that there is no warranty (or else, saying that you provide ++ a warranty) and that users may redistribute the program under ++ these conditions, and telling the user how to view a copy of this ++ License. (Exception: if the Program itself is interactive but ++ does not normally print such an announcement, your work based on ++ the Program is not required to print an announcement.) ++ ++These requirements apply to the modified work as a whole. If ++identifiable sections of that work are not derived from the Program, ++and can be reasonably considered independent and separate works in ++themselves, then this License, and its terms, do not apply to those ++sections when you distribute them as separate works. But when you ++distribute the same sections as part of a whole which is a work based ++on the Program, the distribution of the whole must be on the terms of ++this License, whose permissions for other licensees extend to the ++entire whole, and thus to each and every part regardless of who wrote it. ++ ++Thus, it is not the intent of this section to claim rights or contest ++your rights to work written entirely by you; rather, the intent is to ++exercise the right to control the distribution of derivative or ++collective works based on the Program. ++ ++In addition, mere aggregation of another work not based on the Program ++with the Program (or with a work based on the Program) on a volume of ++a storage or distribution medium does not bring the other work under ++the scope of this License. ++ ++ 3. You may copy and distribute the Program (or a work based on it, ++under Section 2) in object code or executable form under the terms of ++Sections 1 and 2 above provided that you also do one of the following: ++ ++ a) Accompany it with the complete corresponding machine-readable ++ source code, which must be distributed under the terms of Sections ++ 1 and 2 above on a medium customarily used for software interchange; or, ++ ++ b) Accompany it with a written offer, valid for at least three ++ years, to give any third party, for a charge no more than your ++ cost of physically performing source distribution, a complete ++ machine-readable copy of the corresponding source code, to be ++ distributed under the terms of Sections 1 and 2 above on a medium ++ customarily used for software interchange; or, ++ ++ c) Accompany it with the information you received as to the offer ++ to distribute corresponding source code. (This alternative is ++ allowed only for noncommercial distribution and only if you ++ received the program in object code or executable form with such ++ an offer, in accord with Subsection b above.) ++ ++The source code for a work means the preferred form of the work for ++making modifications to it. For an executable work, complete source ++code means all the source code for all modules it contains, plus any ++associated interface definition files, plus the scripts used to ++control compilation and installation of the executable. However, as a ++special exception, the source code distributed need not include ++anything that is normally distributed (in either source or binary ++form) with the major components (compiler, kernel, and so on) of the ++operating system on which the executable runs, unless that component ++itself accompanies the executable. ++ ++If distribution of executable or object code is made by offering ++access to copy from a designated place, then offering equivalent ++access to copy the source code from the same place counts as ++distribution of the source code, even though third parties are not ++compelled to copy the source along with the object code. ++ ++ 4. You may not copy, modify, sublicense, or distribute the Program ++except as expressly provided under this License. Any attempt ++otherwise to copy, modify, sublicense or distribute the Program is ++void, and will automatically terminate your rights under this License. ++However, parties who have received copies, or rights, from you under ++this License will not have their licenses terminated so long as such ++parties remain in full compliance. ++ ++ 5. You are not required to accept this License, since you have not ++signed it. However, nothing else grants you permission to modify or ++distribute the Program or its derivative works. These actions are ++prohibited by law if you do not accept this License. Therefore, by ++modifying or distributing the Program (or any work based on the ++Program), you indicate your acceptance of this License to do so, and ++all its terms and conditions for copying, distributing or modifying ++the Program or works based on it. ++ ++ 6. Each time you redistribute the Program (or any work based on the ++Program), the recipient automatically receives a license from the ++original licensor to copy, distribute or modify the Program subject to ++these terms and conditions. You may not impose any further ++restrictions on the recipients' exercise of the rights granted herein. ++You are not responsible for enforcing compliance by third parties to ++this License. ++ ++ 7. If, as a consequence of a court judgment or allegation of patent ++infringement or for any other reason (not limited to patent issues), ++conditions are imposed on you (whether by court order, agreement or ++otherwise) that contradict the conditions of this License, they do not ++excuse you from the conditions of this License. If you cannot ++distribute so as to satisfy simultaneously your obligations under this ++License and any other pertinent obligations, then as a consequence you ++may not distribute the Program at all. For example, if a patent ++license would not permit royalty-free redistribution of the Program by ++all those who receive copies directly or indirectly through you, then ++the only way you could satisfy both it and this License would be to ++refrain entirely from distribution of the Program. ++ ++If any portion of this section is held invalid or unenforceable under ++any particular circumstance, the balance of the section is intended to ++apply and the section as a whole is intended to apply in other ++circumstances. ++ ++It is not the purpose of this section to induce you to infringe any ++patents or other property right claims or to contest validity of any ++such claims; this section has the sole purpose of protecting the ++integrity of the free software distribution system, which is ++implemented by public license practices. Many people have made ++generous contributions to the wide range of software distributed ++through that system in reliance on consistent application of that ++system; it is up to the author/donor to decide if he or she is willing ++to distribute software through any other system and a licensee cannot ++impose that choice. ++ ++This section is intended to make thoroughly clear what is believed to ++be a consequence of the rest of this License. ++ ++ 8. If the distribution and/or use of the Program is restricted in ++certain countries either by patents or by copyrighted interfaces, the ++original copyright holder who places the Program under this License ++may add an explicit geographical distribution limitation excluding ++those countries, so that distribution is permitted only in or among ++countries not thus excluded. In such case, this License incorporates ++the limitation as if written in the body of this License. ++ ++ 9. The Free Software Foundation may publish revised and/or new versions ++of the General Public License from time to time. Such new versions will ++be similar in spirit to the present version, but may differ in detail to ++address new problems or concerns. ++ ++Each version is given a distinguishing version number. If the Program ++specifies a version number of this License which applies to it and "any ++later version", you have the option of following the terms and conditions ++either of that version or of any later version published by the Free ++Software Foundation. If the Program does not specify a version number of ++this License, you may choose any version ever published by the Free Software ++Foundation. ++ ++ 10. If you wish to incorporate parts of the Program into other free ++programs whose distribution conditions are different, write to the author ++to ask for permission. For software which is copyrighted by the Free ++Software Foundation, write to the Free Software Foundation; we sometimes ++make exceptions for this. Our decision will be guided by the two goals ++of preserving the free status of all derivatives of our free software and ++of promoting the sharing and reuse of software generally. ++ ++ NO WARRANTY ++ ++ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY ++FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN ++OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES ++PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED ++OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ++MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS ++TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE ++PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, ++REPAIR OR CORRECTION. ++ ++ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING ++WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR ++REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, ++INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING ++OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED ++TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY ++YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER ++PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE ++POSSIBILITY OF SUCH DAMAGES. ++ ++ END OF TERMS AND CONDITIONS ++ ++ How to Apply These Terms to Your New Programs ++ ++ If you develop a new program, and you want it to be of the greatest ++possible use to the public, the best way to achieve this is to make it ++free software which everyone can redistribute and change under these terms. ++ ++ To do so, attach the following notices to the program. It is safest ++to attach them to the start of each source file to most effectively ++convey the exclusion of warranty; and each file should have at least ++the "copyright" line and a pointer to where the full notice is found. ++ ++ ++ Copyright (C) ++ ++ 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 of the License, 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 ++ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ ++ ++Also add information on how to contact you by electronic and paper mail. ++ ++If the program is interactive, make it output a short notice like this ++when it starts in an interactive mode: ++ ++ Gnomovision version 69, Copyright (C) year name of author ++ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. ++ This is free software, and you are welcome to redistribute it ++ under certain conditions; type `show c' for details. ++ ++The hypothetical commands `show w' and `show c' should show the appropriate ++parts of the General Public License. Of course, the commands you use may ++be called something other than `show w' and `show c'; they could even be ++mouse-clicks or menu items--whatever suits your program. ++ ++You should also get your employer (if you work as a programmer) or your ++school, if any, to sign a "copyright disclaimer" for the program, if ++necessary. Here is a sample; alter the names: ++ ++ Yoyodyne, Inc., hereby disclaims all copyright interest in the program ++ `Gnomovision' (which makes passes at compilers) written by James Hacker. ++ ++ , 1 April 1989 ++ Ty Coon, President of Vice ++ ++This General Public License does not permit incorporating your program into ++proprietary programs. If your program is a subroutine library, you may ++consider it more useful to permit linking proprietary applications with the ++library. If this is what you want to do, use the GNU Library General ++Public License instead of this License. +diff -Nur icecc-monitor-1.1/icemon-kde3/src/detailedhostview.cc icecc-monitor-1.1.new/icemon-kde3/src/detailedhostview.cc +--- icecc-monitor-1.1/icemon-kde3/src/detailedhostview.cc 2006-08-11 10:10:30.000000000 +0200 ++++ icecc-monitor-1.1.new/icemon-kde3/src/detailedhostview.cc 2006-09-19 17:40:42.000000000 +0200 +@@ -1,7 +1,7 @@ + /* + This file is part of Icecream. + +- Copyright (c) 2004 Andre Wöbbeking ++ Copyright (c) 2004-2006 Andre Wöbbeking + + 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 +@@ -82,6 +82,8 @@ + + connect(mHostListView, SIGNAL( nodeActivated( unsigned int ) ), + this, SLOT( slotNodeActivated() ) ); ++ ++ createKnownHosts(); + } + + +@@ -154,6 +156,21 @@ + } + + ++void DetailedHostView::createKnownHosts() ++{ ++ const HostInfoManager::HostMap& hosts(hostInfoManager()->hostMap()); ++ ++ for (HostInfoManager::HostMap::ConstIterator it( hosts.begin() ), ++ itEnd( hosts.end() ); ++ it != itEnd; ++it ) ++ { ++ const unsigned int hostid( (*it)->id() ); ++ ++ checkNode( hostid ); ++ } ++} ++ ++ + QWidget* DetailedHostView::widget() + { + return this; +diff -Nur icecc-monitor-1.1/icemon-kde3/src/detailedhostview.h icecc-monitor-1.1.new/icemon-kde3/src/detailedhostview.h +--- icecc-monitor-1.1/icemon-kde3/src/detailedhostview.h 2006-08-11 10:10:30.000000000 +0200 ++++ icecc-monitor-1.1.new/icemon-kde3/src/detailedhostview.h 2006-09-19 17:40:42.000000000 +0200 +@@ -1,7 +1,7 @@ + /* + This file is part of Icecream. + +- Copyright (c) 2004 Andre Wöbbeking ++ Copyright (c) 2004-2006 Andre Wöbbeking + + 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 +@@ -56,6 +56,8 @@ + + private: + ++ void createKnownHosts(); ++ + HostListView* mHostListView; + JobListView* mLocalJobsView; + JobListView* mRemoteJobsView; +diff -Nur icecc-monitor-1.1/icemon-kde3/src/hostlistview.cc icecc-monitor-1.1.new/icemon-kde3/src/hostlistview.cc +--- icecc-monitor-1.1/icemon-kde3/src/hostlistview.cc 2006-08-11 10:10:30.000000000 +0200 ++++ icecc-monitor-1.1.new/icemon-kde3/src/hostlistview.cc 2006-09-19 17:40:42.000000000 +0200 +@@ -1,7 +1,7 @@ + /* + This file is part of Icecream. + +- Copyright (c) 2004 Andre Wöbbeking ++ Copyright (c) 2004-2006 Andre Wöbbeking + + 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 +@@ -210,12 +210,19 @@ + void HostListView::checkNode( unsigned int hostid ) + { + const HostInfo* info = mHostInfoManager->find( hostid ); ++ if ( !info ) ++ return; + + ItemMap::iterator it = mItems.find( hostid ); + if ( it == mItems.end() ) +- mItems[hostid] = new HostListViewItem( this, *info ); ++ { ++ if ( !info->name().isEmpty() ) ++ mItems[hostid] = new HostListViewItem( this, *info ); ++ } + else ++ { + ( *it )->updateText( *info ); ++ } + mUpdateSortTimer.start( 0, true ); + } + +diff -Nur icecc-monitor-1.1/icemon-kde3/src/mon-kde.cc icecc-monitor-1.1.new/icemon-kde3/src/mon-kde.cc +--- icecc-monitor-1.1/icemon-kde3/src/mon-kde.cc 2006-09-11 22:40:47.000000000 +0200 ++++ icecc-monitor-1.1.new/icemon-kde3/src/mon-kde.cc 2006-09-19 17:40:42.000000000 +0200 +@@ -221,7 +221,7 @@ + int main( int argc, char **argv ) + { + KAboutData aboutData( rs_program_name, appName, version, description, +- KAboutData::License_BSD, copyright ); ++ KAboutData::License_GPL_V2, copyright ); + aboutData.addAuthor( "Frerich Raabe", 0, "raabe@kde.org" ); + aboutData.addAuthor( "Stephan Kulow", 0, "coolo@kde.org" ); + aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" ); --- icecc-monitor-1.1.orig/debian/patches/Bug#417227-GCC4.3.diff +++ icecc-monitor-1.1/debian/patches/Bug#417227-GCC4.3.diff @@ -0,0 +1,141 @@ +From tbm@cyrius.com Mon Apr 2 07:10:18 2007 +Return-path: +Envelope-to: debian@purcell.id.au +Delivery-date: Sun, 01 Apr 2007 22:15:03 +0100 +Received: from master.debian.org ([70.103.162.29]) + by bristol.purcell.id.au with esmtp (Exim 4.63) + (envelope-from ) + id 1HY7Nr-00016n-D7 + for debian@purcell.id.au; Sun, 01 Apr 2007 22:15:03 +0100 +Received: from alioth.debian.org ([217.196.43.134]) + by master.debian.org with esmtp (Exim 4.50) + id 1HY7Nj-0002L9-Bd + for debian@purcell.id.au; Sun, 01 Apr 2007 21:14:35 +0000 +Received: from localhost ([127.0.0.1] helo=alioth.debian.org) + by alioth.debian.org with esmtp (Exim 4.50) + id 1HY7Ni-0005jg-Ks + for msp@debian.org; Sun, 01 Apr 2007 21:14:34 +0000 +Received: from rietz.debian.org ([140.211.166.43]) + by alioth.debian.org with esmtp (Exim 4.50) id 1HY7Nc-0005ii-2h + for pkg-kde-extras@lists.alioth.debian.org; + Sun, 01 Apr 2007 21:14:33 +0000 +Received: from debbugs by rietz.debian.org with local (Exim 4.50) + id 1HY7LI-000696-Up; Sun, 01 Apr 2007 21:12:05 +0000 +X-Loop: owner@bugs.debian.org +Resent-From: Martin Michlmayr +Resent-To: debian-bugs-dist@lists.debian.org +Resent-CC: Debian KDE Extras Team +Resent-Date: Sun, 01 Apr 2007 21:12:01 +0000 +Resent-Message-ID: +X-Debian-PR-Message: report 417227 +X-Debian-PR-Package: icecc-monitor +X-Debian-PR-Keywords: patch +X-Debian-PR-Source: icecc-monitor +Received: via spool by submit@bugs.debian.org id=B.117546185121847 + (code B ref -1); Sun, 01 Apr 2007 21:12:01 +0000 +Received: (at submit) by bugs.debian.org; 1 Apr 2007 21:10:51 +0000 +Received: from sorrow.cyrius.com ([65.19.161.204]) + by rietz.debian.org with esmtp (Exim 4.50) id 1HY7K7-0005g1-17 + for submit@bugs.debian.org; Sun, 01 Apr 2007 21:10:51 +0000 +Received: by sorrow.cyrius.com (Postfix, from userid 10) + id 45F6664D3D; Sun, 1 Apr 2007 21:10:49 +0000 (UTC) +Received: by deprecation.cyrius.com (Postfix, from userid 1000) + id 2537554373; Sun, 1 Apr 2007 22:10:18 +0100 (BST) +Date: Sun, 1 Apr 2007 22:10:18 +0100 +From: Martin Michlmayr +To: submit@bugs.debian.org +Message-ID: <20070401211018.GJ29178@deprecation.cyrius.com> +References: +MIME-Version: 1.0 +Content-Type: text/plain; + charset=us-ascii +Content-Disposition: inline +In-Reply-To: +User-Agent: Mutt/1.5.13 (2006-08-11) +Delivered-To: submit@bugs.debian.org +Resent-Sender: Debian BTS +Resent-Date: Sun, 01 Apr 2007 21:12:04 +0000 +X-BeenThere: pkg-kde-extras@lists.alioth.debian.org +X-Mailman-Version: 2.1.5 +Precedence: list +Reply-To: Martin Michlmayr , + 417227@bugs.debian.org +List-Id: "List for the maintainers of stuff under pkd-kde/kde-extras." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +Sender: pkg-kde-extras-bounces+msp=debian.org@lists.alioth.debian.org +Errors-To: pkg-kde-extras-bounces+msp=debian.org@lists.alioth.debian.org +X-SA-Exim-Connect-IP: 70.103.162.29 +X-SA-Exim-Rcpt-To: debian@purcell.id.au +X-SA-Exim-Mail-From: pkg-kde-extras-bounces+msp=debian.org@lists.alioth.debian.org +X-Spam-Checker-Version: SpamAssassin 3.1.7-deb (2006-10-05) on debian +X-Spam-Level: +X-Spam-Status: No, score=-2.6 required=1.0 tests=AWL,BAYES_00, + UNPARSEABLE_RELAY autolearn=ham version=3.1.7-deb +X-Spam-Report: + * 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay + * lines + * -2.6 BAYES_00 BODY: Bayesian spam probability is 0 to 1% + * [score: 0.0000] + * -0.0 AWL AWL: From: address is in the auto white-list +Subject: [Pkg-kde-extras] Bug#417227: FTBFS with GCC 4.3: missing #includes +X-SA-Exim-Version: 4.2.1 (built Tue, 09 Jan 2007 17:23:22 +0000) +X-SA-Exim-Scanned: Yes (on bristol.purcell.id.au) +X-Length: 6097 +X-KMail-EncryptionState: +X-KMail-SignatureState: +X-KMail-MDN-Sent: +X-UID: 2339 +Status: R +X-Status: NC + +Package: icecc-monitor +Version: 1.1-1 +Usertags: ftbfs-gcc-4.3 +Tags: patch + +Your package fails to build with GCC 4.3. Version 4.3 has not been +released yet but I'm building with a snapshot in order to find errors +and give people an advance warning. In GCC 4.3, the C++ header +dependencies have been cleaned up. The advantage of this is that +programs will compile faster. The downside is that you actually +need to directly #include everything you use (but you really should +do this anyway, otherwise your program won't work with any compiler +other than GCC). Some background of this can be found at +http://gcc.gnu.org/PR28080 + +You can reproduce this problem with gcc-snapshot from unstable. + +> Automatic build of icecc-monitor_1.1-1 on coconut0 by sbuild/ia64 0.49 +... +> /usr/share/qt3/include/qcolor.h:64: warning: conversion to 'QRgb' from 'int' may alter its value +> monitor.cc: In member function 'void Monitor::slotCheckScheduler()': +> monitor.cc:86: error: 'getenv' was not declared in this scope + +--- icemon-kde3/src/monitor.cc~ 2007-04-01 21:03:11.000000000 +0000 ++++ icemon-kde3/src/monitor.cc 2007-04-01 21:03:17.000000000 +0000 +@@ -34,6 +34,7 @@ + #include + #include + ++#include + #include + + using namespace std; + +-- +Martin Michlmayr +http://www.cyrius.com/ + + +_______________________________________________ +pkg-kde-extras mailing list +pkg-kde-extras@lists.alioth.debian.org +http://lists.alioth.debian.org/mailman/listinfo/pkg-kde-extras + --- icecc-monitor-1.1.orig/debian/patches/06_disable_no_undefined.diff +++ icecc-monitor-1.1/debian/patches/06_disable_no_undefined.diff @@ -0,0 +1,18 @@ +--- a/admin/acinclude.m4.in ++++ b/admin/acinclude.m4.in +@@ -1689,15 +1689,6 @@ + KDE_USE_CLOSURE_TRUE="#" + KDE_USE_CLOSURE_FALSE="" + KDE_NO_UNDEFINED="" +- case $host in +- *-*-linux-gnu) +- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined], +- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined], +- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"], +- [KDE_NO_UNDEFINED=""])], +- [KDE_NO_UNDEFINED=""]) +- ;; +- esac + fi + AC_SUBST(KDE_USE_CLOSURE_TRUE) + AC_SUBST(KDE_USE_CLOSURE_FALSE) --- icecc-monitor-1.1.orig/debian/patches/05_pedantic-errors.diff +++ icecc-monitor-1.1/debian/patches/05_pedantic-errors.diff @@ -0,0 +1,12 @@ +--- a/admin/acinclude.m4.in ++++ b/admin/acinclude.m4.in +@@ -2144,9 +2144,6 @@ + save_CXXFLAGS="$CXXFLAGS" + kde_safe_LIBS="$LIBS" + LIBS="$LIBS $X_EXTRA_LIBS" +-if test "$GXX" = "yes"; then +-CXXFLAGS="$CXXFLAGS -pedantic-errors" +-fi + AC_TRY_COMPILE([ + $2 + ], --- icecc-monitor-1.1.orig/debian/patches/04_am_maintainer_mode.diff +++ icecc-monitor-1.1/debian/patches/04_am_maintainer_mode.diff @@ -0,0 +1,11 @@ +--- a/admin/configure.in.min ++++ b/admin/configure.in.min +@@ -38,6 +38,8 @@ + dnl Automake doc recommends to do this only here. (Janos) + AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs + ++AM_MAINTAINER_MODE ++ + KDE_SET_PREFIX + + dnl generate the config header --- icecc-monitor-1.1.orig/debian/compat +++ icecc-monitor-1.1/debian/compat @@ -0,0 +1 @@ +5 --- icecc-monitor-1.1.orig/debian/copyright +++ icecc-monitor-1.1/debian/copyright @@ -0,0 +1,445 @@ +This package was debianized by Fathi Boudra on +Mon, 11 Sep 2006 23:15:00 +0200. + +It was downloaded from ftp://ftp.suse.com/pub/projects/icecream + +Upstream Authors: + Frerich Raabe + Stephan Kulow + Cornelius Schumacher + +Copyright: + (C) 2003 Frerich Raabe + (C) 2003-2004 Stephan Kulow + (C) 2003-2004 Cornelius Schumacher + (C) 2004-2006 Andre Wöbbeking + +The icecc-monitor manpage is (C) 2006 Jonathan Riddell +and is licensed under the GPL, see below. + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The Debian packaging is (C) 2006, Fathi Boudra and +is licensed under the GPL, see above. + +The documentations provided with icecc-monitor is distributed under +the GNU Free Documentation License (FDL). They are considered free with +regards to the Debian Free Software Guidelines (DFSG) because they don't +contain any unmodifiable parts (invariant sections). The complete text of +the GNU Free Documentation License can be found below: + + GNU Free Documentation License + Version 1.2, November 2002 + + + Copyright (C) 2000,2001,2002 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + +0. PREAMBLE + +The purpose of this License is to make a manual, textbook, or other +functional and useful document "free" in the sense of freedom: to +assure everyone the effective freedom to copy and redistribute it, +with or without modifying it, either commercially or noncommercially. +Secondarily, this License preserves for the author and publisher a way +to get credit for their work, while not being considered responsible +for modifications made by others. + +This License is a kind of "copyleft", which means that derivative +works of the document must themselves be free in the same sense. It +complements the GNU General Public License, which is a copyleft +license designed for free software. + +We have designed this License in order to use it for manuals for free +software, because free software needs free documentation: a free +program should come with manuals providing the same freedoms that the +software does. But this License is not limited to software manuals; +it can be used for any textual work, regardless of subject matter or +whether it is published as a printed book. We recommend this License +principally for works whose purpose is instruction or reference. + + +1. APPLICABILITY AND DEFINITIONS + +This License applies to any manual or other work, in any medium, that +contains a notice placed by the copyright holder saying it can be +distributed under the terms of this License. Such a notice grants a +world-wide, royalty-free license, unlimited in duration, to use that +work under the conditions stated herein. The "Document", below, +refers to any such manual or work. Any member of the public is a +licensee, and is addressed as "you". You accept the license if you +copy, modify or distribute the work in a way requiring permission +under copyright law. + +A "Modified Version" of the Document means any work containing the +Document or a portion of it, either copied verbatim, or with +modifications and/or translated into another language. + +A "Secondary Section" is a named appendix or a front-matter section of +the Document that deals exclusively with the relationship of the +publishers or authors of the Document to the Document's overall subject +(or to related matters) and contains nothing that could fall directly +within that overall subject. (Thus, if the Document is in part a +textbook of mathematics, a Secondary Section may not explain any +mathematics.) The relationship could be a matter of historical +connection with the subject or with related matters, or of legal, +commercial, philosophical, ethical or political position regarding +them. + +The "Invariant Sections" are certain Secondary Sections whose titles +are designated, as being those of Invariant Sections, in the notice +that says that the Document is released under this License. If a +section does not fit the above definition of Secondary then it is not +allowed to be designated as Invariant. The Document may contain zero +Invariant Sections. If the Document does not identify any Invariant +Sections then there are none. + +The "Cover Texts" are certain short passages of text that are listed, +as Front-Cover Texts or Back-Cover Texts, in the notice that says that +the Document is released under this License. A Front-Cover Text may +be at most 5 words, and a Back-Cover Text may be at most 25 words. + +A "Transparent" copy of the Document means a machine-readable copy, +represented in a format whose specification is available to the +general public, that is suitable for revising the document +straightforwardly with generic text editors or (for images composed of +pixels) generic paint programs or (for drawings) some widely available +drawing editor, and that is suitable for input to text formatters or +for automatic translation to a variety of formats suitable for input +to text formatters. A copy made in an otherwise Transparent file +format whose markup, or absence of markup, has been arranged to thwart +or discourage subsequent modification by readers is not Transparent. +An image format is not Transparent if used for any substantial amount +of text. A copy that is not "Transparent" is called "Opaque". + +Examples of suitable formats for Transparent copies include plain +ASCII without markup, Texinfo input format, LaTeX input format, SGML +or XML using a publicly available DTD, and standard-conforming simple +HTML, PostScript or PDF designed for human modification. Examples of +transparent image formats include PNG, XCF and JPG. Opaque formats +include proprietary formats that can be read and edited only by +proprietary word processors, SGML or XML for which the DTD and/or +processing tools are not generally available, and the +machine-generated HTML, PostScript or PDF produced by some word +processors for output purposes only. + +The "Title Page" means, for a printed book, the title page itself, +plus such following pages as are needed to hold, legibly, the material +this License requires to appear in the title page. For works in +formats which do not have any title page as such, "Title Page" means +the text near the most prominent appearance of the work's title, +preceding the beginning of the body of the text. + +A section "Entitled XYZ" means a named subunit of the Document whose +title either is precisely XYZ or contains XYZ in parentheses following +text that translates XYZ in another language. (Here XYZ stands for a +specific section name mentioned below, such as "Acknowledgements", +"Dedications", "Endorsements", or "History".) To "Preserve the Title" +of such a section when you modify the Document means that it remains a +section "Entitled XYZ" according to this definition. + +The Document may include Warranty Disclaimers next to the notice which +states that this License applies to the Document. These Warranty +Disclaimers are considered to be included by reference in this +License, but only as regards disclaiming warranties: any other +implication that these Warranty Disclaimers may have is void and has +no effect on the meaning of this License. + + +2. VERBATIM COPYING + +You may copy and distribute the Document in any medium, either +commercially or noncommercially, provided that this License, the +copyright notices, and the license notice saying this License applies +to the Document are reproduced in all copies, and that you add no other +conditions whatsoever to those of this License. You may not use +technical measures to obstruct or control the reading or further +copying of the copies you make or distribute. However, you may accept +compensation in exchange for copies. If you distribute a large enough +number of copies you must also follow the conditions in section 3. + +You may also lend copies, under the same conditions stated above, and +you may publicly display copies. + + +3. COPYING IN QUANTITY + +If you publish printed copies (or copies in media that commonly have +printed covers) of the Document, numbering more than 100, and the +Document's license notice requires Cover Texts, you must enclose the +copies in covers that carry, clearly and legibly, all these Cover +Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on +the back cover. Both covers must also clearly and legibly identify +you as the publisher of these copies. The front cover must present +the full title with all words of the title equally prominent and +visible. You may add other material on the covers in addition. +Copying with changes limited to the covers, as long as they preserve +the title of the Document and satisfy these conditions, can be treated +as verbatim copying in other respects. + +If the required texts for either cover are too voluminous to fit +legibly, you should put the first ones listed (as many as fit +reasonably) on the actual cover, and continue the rest onto adjacent +pages. + +If you publish or distribute Opaque copies of the Document numbering +more than 100, you must either include a machine-readable Transparent +copy along with each Opaque copy, or state in or with each Opaque copy +a computer-network location from which the general network-using +public has access to download using public-standard network protocols +a complete Transparent copy of the Document, free of added material. +If you use the latter option, you must take reasonably prudent steps, +when you begin distribution of Opaque copies in quantity, to ensure +that this Transparent copy will remain thus accessible at the stated +location until at least one year after the last time you distribute an +Opaque copy (directly or through your agents or retailers) of that +edition to the public. + +It is requested, but not required, that you contact the authors of the +Document well before redistributing any large number of copies, to give +them a chance to provide you with an updated version of the Document. + + +4. MODIFICATIONS + +You may copy and distribute a Modified Version of the Document under +the conditions of sections 2 and 3 above, provided that you release +the Modified Version under precisely this License, with the Modified +Version filling the role of the Document, thus licensing distribution +and modification of the Modified Version to whoever possesses a copy +of it. In addition, you must do these things in the Modified Version: + +A. Use in the Title Page (and on the covers, if any) a title distinct + from that of the Document, and from those of previous versions + (which should, if there were any, be listed in the History section + of the Document). You may use the same title as a previous version + if the original publisher of that version gives permission. +B. List on the Title Page, as authors, one or more persons or entities + responsible for authorship of the modifications in the Modified + Version, together with at least five of the principal authors of the + Document (all of its principal authors, if it has fewer than five), + unless they release you from this requirement. +C. State on the Title page the name of the publisher of the + Modified Version, as the publisher. +D. Preserve all the copyright notices of the Document. +E. Add an appropriate copyright notice for your modifications + adjacent to the other copyright notices. +F. Include, immediately after the copyright notices, a license notice + giving the public permission to use the Modified Version under the + terms of this License, in the form shown in the Addendum below. +G. Preserve in that license notice the full lists of Invariant Sections + and required Cover Texts given in the Document's license notice. +H. Include an unaltered copy of this License. +I. Preserve the section Entitled "History", Preserve its Title, and add + to it an item stating at least the title, year, new authors, and + publisher of the Modified Version as given on the Title Page. If + there is no section Entitled "History" in the Document, create one + stating the title, year, authors, and publisher of the Document as + given on its Title Page, then add an item describing the Modified + Version as stated in the previous sentence. +J. Preserve the network location, if any, given in the Document for + public access to a Transparent copy of the Document, and likewise + the network locations given in the Document for previous versions + it was based on. These may be placed in the "History" section. + You may omit a network location for a work that was published at + least four years before the Document itself, or if the original + publisher of the version it refers to gives permission. +K. For any section Entitled "Acknowledgements" or "Dedications", + Preserve the Title of the section, and preserve in the section all + the substance and tone of each of the contributor acknowledgements + and/or dedications given therein. +L. Preserve all the Invariant Sections of the Document, + unaltered in their text and in their titles. Section numbers + or the equivalent are not considered part of the section titles. +M. Delete any section Entitled "Endorsements". Such a section + may not be included in the Modified Version. +N. Do not retitle any existing section to be Entitled "Endorsements" + or to conflict in title with any Invariant Section. +O. Preserve any Warranty Disclaimers. + +If the Modified Version includes new front-matter sections or +appendices that qualify as Secondary Sections and contain no material +copied from the Document, you may at your option designate some or all +of these sections as invariant. To do this, add their titles to the +list of Invariant Sections in the Modified Version's license notice. +These titles must be distinct from any other section titles. + +You may add a section Entitled "Endorsements", provided it contains +nothing but endorsements of your Modified Version by various +parties--for example, statements of peer review or that the text has +been approved by an organization as the authoritative definition of a +standard. + +You may add a passage of up to five words as a Front-Cover Text, and a +passage of up to 25 words as a Back-Cover Text, to the end of the list +of Cover Texts in the Modified Version. Only one passage of +Front-Cover Text and one of Back-Cover Text may be added by (or +through arrangements made by) any one entity. If the Document already +includes a cover text for the same cover, previously added by you or +by arrangement made by the same entity you are acting on behalf of, +you may not add another; but you may replace the old one, on explicit +permission from the previous publisher that added the old one. + +The author(s) and publisher(s) of the Document do not by this License +give permission to use their names for publicity for or to assert or +imply endorsement of any Modified Version. + + +5. COMBINING DOCUMENTS + +You may combine the Document with other documents released under this +License, under the terms defined in section 4 above for modified +versions, provided that you include in the combination all of the +Invariant Sections of all of the original documents, unmodified, and +list them all as Invariant Sections of your combined work in its +license notice, and that you preserve all their Warranty Disclaimers. + +The combined work need only contain one copy of this License, and +multiple identical Invariant Sections may be replaced with a single +copy. If there are multiple Invariant Sections with the same name but +different contents, make the title of each such section unique by +adding at the end of it, in parentheses, the name of the original +author or publisher of that section if known, or else a unique number. +Make the same adjustment to the section titles in the list of +Invariant Sections in the license notice of the combined work. + +In the combination, you must combine any sections Entitled "History" +in the various original documents, forming one section Entitled +"History"; likewise combine any sections Entitled "Acknowledgements", +and any sections Entitled "Dedications". You must delete all sections +Entitled "Endorsements". + + +6. COLLECTIONS OF DOCUMENTS + +You may make a collection consisting of the Document and other documents +released under this License, and replace the individual copies of this +License in the various documents with a single copy that is included in +the collection, provided that you follow the rules of this License for +verbatim copying of each of the documents in all other respects. + +You may extract a single document from such a collection, and distribute +it individually under this License, provided you insert a copy of this +License into the extracted document, and follow this License in all +other respects regarding verbatim copying of that document. + + +7. AGGREGATION WITH INDEPENDENT WORKS + +A compilation of the Document or its derivatives with other separate +and independent documents or works, in or on a volume of a storage or +distribution medium, is called an "aggregate" if the copyright +resulting from the compilation is not used to limit the legal rights +of the compilation's users beyond what the individual works permit. +When the Document is included in an aggregate, this License does not +apply to the other works in the aggregate which are not themselves +derivative works of the Document. + +If the Cover Text requirement of section 3 is applicable to these +copies of the Document, then if the Document is less than one half of +the entire aggregate, the Document's Cover Texts may be placed on +covers that bracket the Document within the aggregate, or the +electronic equivalent of covers if the Document is in electronic form. +Otherwise they must appear on printed covers that bracket the whole +aggregate. + + +8. TRANSLATION + +Translation is considered a kind of modification, so you may +distribute translations of the Document under the terms of section 4. +Replacing Invariant Sections with translations requires special +permission from their copyright holders, but you may include +translations of some or all Invariant Sections in addition to the +original versions of these Invariant Sections. You may include a +translation of this License, and all the license notices in the +Document, and any Warranty Disclaimers, provided that you also include +the original English version of this License and the original versions +of those notices and disclaimers. In case of a disagreement between +the translation and the original version of this License or a notice +or disclaimer, the original version will prevail. + +If a section in the Document is Entitled "Acknowledgements", +"Dedications", or "History", the requirement (section 4) to Preserve +its Title (section 1) will typically require changing the actual +title. + + +9. TERMINATION + +You may not copy, modify, sublicense, or distribute the Document except +as expressly provided for under this License. Any other attempt to +copy, modify, sublicense or distribute the Document is void, and will +automatically terminate your rights under this License. However, +parties who have received copies, or rights, from you under this +License will not have their licenses terminated so long as such +parties remain in full compliance. + + +10. FUTURE REVISIONS OF THIS LICENSE + +The Free Software Foundation may publish new, revised versions +of the GNU Free Documentation License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. See +http://www.gnu.org/copyleft/. + +Each version of the License is given a distinguishing version number. +If the Document specifies that a particular numbered version of this +License "or any later version" applies to it, you have the option of +following the terms and conditions either of that specified version or +of any later version that has been published (not as a draft) by the +Free Software Foundation. If the Document does not specify a version +number of this License, you may choose any version ever published (not +as a draft) by the Free Software Foundation. + + +ADDENDUM: How to use this License for your documents + +To use this License in a document you have written, include a copy of +the License in the document and put the following copyright and +license notices just after the title page: + + Copyright (c) YEAR YOUR NAME. + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.2 + or any later version published by the Free Software Foundation; + with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. + A copy of the license is included in the section entitled "GNU + Free Documentation License". + +If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts, +replace the "with...Texts." line with this: + + with the Invariant Sections being LIST THEIR TITLES, with the + Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST. + +If you have Invariant Sections without Cover Texts, or some other +combination of the three, merge those two alternatives to suit the +situation. + +If your document contains nontrivial examples of program code, we +recommend releasing these examples in parallel under your choice of +free software license, such as the GNU General Public License, +to permit their use in free software. +