rev 3916 - in kde-extras/guidance/trunk/debian: . patches
Fathi Boudra
fboudra-guest at costa.debian.org
Thu Jun 8 16:36:09 UTC 2006
Author: fboudra-guest
Date: 2006-06-08 16:36:06 +0000 (Thu, 08 Jun 2006)
New Revision: 3916
Added:
kde-extras/guidance/trunk/debian/patches/
kde-extras/guidance/trunk/debian/patches/10_branch_r542306.diff
kde-extras/guidance/trunk/debian/patches/11_password_expire.diff
kde-extras/guidance/trunk/debian/source.lintian-overrides
Modified:
kde-extras/guidance/trunk/debian/changelog
kde-extras/guidance/trunk/debian/control
kde-extras/guidance/trunk/debian/copyright
kde-extras/guidance/trunk/debian/kde-guidance.lintian-overrides
kde-extras/guidance/trunk/debian/postinst
kde-extras/guidance/trunk/debian/postrm
kde-extras/guidance/trunk/debian/rules
Log:
merged with ubuntu package for an upload on experimental
Modified: kde-extras/guidance/trunk/debian/changelog
===================================================================
--- kde-extras/guidance/trunk/debian/changelog 2006-06-08 12:56:48 UTC (rev 3915)
+++ kde-extras/guidance/trunk/debian/changelog 2006-06-08 16:36:06 UTC (rev 3916)
@@ -1,6 +1,204 @@
+kde-guidance (0.6.7-1) experimental; urgency=low
+
+ * Initial Debian release (Closes: #340144)
+ * Merged with Ubuntu
+ * Converted to cdbs
+ * Updated debian/copyright according to GFDL documentations
+ * Updated postinst and postrm with debhelper token
+ * Added source lintian override for indirect build dependency
+
+ -- Fathi Boudra <fboudra at free.fr> Thu, 8 Jun 2006 17:08:06 +0200
+
+kde-guidance (0.6.7-0ubuntu4) dapper; urgency=low
+
+ * Add kubuntu_02_passwordexpire.diff from branch,
+ set local passexpirewarn (not global variable of same name)
+ prevents UnboundLocalError, closes malone #47090
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Sun, 28 May 2006 14:34:10 +0100
+
+kde-guidance (0.6.7-0ubuntu3) dapper; urgency=low
+
+ * Change init number of displayconfig-hwprobe.py to 60,
+ in line with Ubuntu policy
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Fri, 26 May 2006 14:18:42 +0100
+
+kde-guidance (0.6.7-0ubuntu2) dapper; urgency=low
+
+ * Add kubuntu_01_branch.diff
+ - Adds Dutch Translations to .desktop files
+ - Fixes serviceconfig.py would sometimes fail on non-English systems.
+ (Closes Malone bug #43313).
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Fri, 19 May 2006 02:09:48 +0300
+
+kde-guidance (0.6.7-0ubuntu1) dapper; urgency=low
+
+ [ Simon Edwards ]
+ * Dutch translation added (Rinse de Vries)
+ * BUG: Displayconfig would fail if the monitor frequency settings in xorg.conf
+ contained extra spaces. (Malong bug #38692)
+ * BUG: Displayconfig would not add the lowest screen resolution available to
+ the modes list in the xorg.conf's Screen section/Display subsection.
+ * French translation added from Launchpad Rossetta.
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Sun, 14 May 2006 01:38:55 +0300
+
+kde-guidance (0.6.6-0ubuntu1) dapper; urgency=low
+
+ [ Simon Edwards ]
+ * BUG: Serviceconfig didn't correctly remove links in runlevel directories.
+ (Malone bug #39404)
+ * BUG: In Serviceconfig, toggling the "Start during boot" checkbox using the
+ context menu would fail. (Malone bug #34252)
+ * BUG: displayconfig-restore.py was would fail with "global name 'syslog'
+ undefined". (Malone bug #40683)
+ * BUG: Displayconfig had trouble picking a driver gfxcard model entry instead
+ of the detected default (e.g. VESA). (Malone bug #41127)
+ * BUG: Displayconfig would fail when writing out a xorg.conf that contained
+ non-ascii characters. (Malone bug #41474)
+ * Work around for an annoying bug in PyQt/PyKDE that causes the tools to
+ crash on exit if a dialog window has been used.
+ * BUG: The file paths used in displayconfig for checking for the proprietary
+ nvidia driver were wrong or out of date.
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Fri, 28 Apr 2006 14:18:26 +0100
+
+kde-guidance (0.6.5-0ubuntu2) dapper; urgency=low
+
+ * Add kubuntu_01_broken_script.diff comment out invalid python in
+ displayconfig script
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 26 Apr 2006 00:38:46 +0100
+
+kde-guidance (0.6.5-0ubuntu1) dapper; urgency=low
+
+ [ Simon Edwards ]
+ * BUG: services that have not been installed via apt would cause long loops
+ a lot of dpkg queries. Only query dpkg db once.
+ * BUG: Serviceconfig's Apply button doesn't work. It should actually be Close
+ (Malone #38582)
+ * BUG: Changing an user's password can change another password for a different
+ user (Malone bug #39444)
+ * BUG: Displayconfig would fail at startup on systems with an nVidia 7800 GTX.
+ (Malone bug #32915 for Rob Hughes)
+ * BUG: Serviceconfig would crash if the windows is closed quickly after
+ serviceconfig appears.
+ * BUG: userconfig would fail at startup if an entry in /etc/passwd refered to
+ a group that is not defined in /etc/group. (Malone bug #34311)
+ * BUG: Userconifg. Manually typing in or editing the list of secondary groups
+ for a user had no effect. (Malone bug #37212)
+ * BUG: Displayconfig fails to detect the presence of the proprietary ATI and
+ nVidia drivers. (The location of some of the driver files had been recently
+ changed).
+ * BUG: displayconfig-restore.py would calculated the needed DPI at login using
+ stale screen information which would sometimes result in the wrong DPI.
+ * BUG: Numerious small bugs and compatibility problems in mountconfig.
+ * BUG: When browsing for a SMB share, mountconfig now correctly catches the
+ authentication information entered by the user into the smaller popup from
+ kio.
+ * Displayconfig now assumes that dualhead/clone mode is supported if the
+ laptop-detect script detects a laptop.
+ * Displayconfig now uses the clone mode support in the i810 driver.
+ * Displayconfig now only offers resolutions that both monitors support when
+ using clone mode.
+ * Displayconfig now supports clone mode on any setup that also supports
+ xinerama.
+ * BUG: Mountconfig failed to take into account that the order of the
+ user/users, exec/noexc, suid/nosuid etc options in /etc/fstab is significant.
+ (thanks Christoph Wiesen)
+ * French translations added to the desktop files. (Anthony Mercatante)
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Thu, 20 Apr 2006 18:35:40 +0100
+
+kde-guidance (0.6.4-0ubuntu1) dapper; urgency=low
+
+ [ Simon Edwards ]
+ * BUG: All of the tools no longer write out config files under ~/.kde when
+ running as root. This should stop the annoying creation of config files
+ that can't be overwritten by the normal user.
+ * Userconfig is now by default not quite as tall. This should help stop
+ it from appearing too big in systemsettings.
+ * Displayconfig updated to also recognise late model nVidia chipsets.
+ * BUG: Displayconfig didn't support Clone mode for the proprietary nVidia
+ driver.
+ * BUG: The tools now correctly specify which translation catalogue to use for
+ translations.
+ * The screen images in the dualhead widget make better use of available widget
+ space.
+ * Displayconfig: The 40guidance-displayconfig_restore script which is used by
+ the Xsession script during login via KDM/xdm, has now been fixed to not stop
+ the login in case of failure.
+ * BUG: Displayconfig was getting confused by unknown graphics cards and
+ crashing. (Malone bug #32915)
+ * BUG: Displayconfig still can't handling unicode in xorg.conf. (Malone bug
+ #34437).
+ * BUG: Displayconfig is now more forgiving when xorg.conf contains characters
+ that are illegal with respect to the system character encoding. (Malone bug
+ #36590).
+ * BUG: Displayconfig would have trouble detecting hardware on the PCI bus on
+ big endian architectures. (raphink)
+ * BUG: Displayconfig did not correctly handle situations where the X RandR
+ extension is missing.
+ * BUG: Displayconfig would fail when loading some xorg.conf files containing
+ multiple graphics card specifications. (Malone bug #37275, patch applied)
+ * BUG: Userconfig didn't respect the entered UID when creating a account.
+ (Malone bug #37722).
+ * Displayconfig: Added 1280x960 modes (60 & 75Hz).
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Sun, 2 Apr 2006 21:46:15 +0100
+
+kde-guidance (0.6.3-0ubuntu1) dapper; urgency=low
+
+ [ Fathi Boudra ]
+ * Sync with Debian package (not yet in archives)
+
+ [ Simon Edwards ]
+ * BUG: userconfig and unixauthdb didn't respect the ownership of system files
+ when update /etc/passwd and friends. (Malone bug #26175).
+ * BUG: userconfig and unixauthdb would fail if /etc/passwd, /etc/groups or
+ /etc/shadow contained blank lines.
+ * BUG: displayconfig now does a better job of detecting graphics PCI devices
+ and handling non-detected graphics cards. Instead of crashing, "generic
+ VESA" is used when the type of card can't be found. (Malone bug #32915)
+ * The DPI that displayconfig-restore.py uses at login time can now be
+ controlled by adding a line to ~/.kde/share/config/displayconfigrc
+ in the [General] section. Add "dpi=xserver" to use the default DPI
+ from the X server, or "dpi=100" to use 100 DPI for example.
+ * BUG: Widescreen modes were missing in displayconfig.
+ * Displayconfig: Monitors can now be specified as being standard aspect ratio
+ or widescreen.
+ * BUG: Using the xresprobe command in displayconfig would crash some people's
+ machines. The much more safer ddcprobe command is now used.
+ (Malone bug #33943)
+ * BUG: A bug is displayconfig stopped monitor model detection. The xresprobe
+ command didn't actually return the eisa ID of the connected monitor.
+ ddcprobe does though (see above).
+ * BUG: Displayconfig. Changes to the monitor model or image format are
+ shown immediately on the "Size & Orientation" tab, even if the screen is
+ currently being used.
+ * BUG: When userconfig asks about whether the home directory should be created
+ when creating a new account, sometimes the wrong directory name was shown in
+ the dialog.
+ * BUG: Powerbook screen mode "1280x854" add to displayconfig. (Malone bug
+ #34383).
+ * BUG: Displayconfig would throw an exception if the current display didn't
+ support DPMS. (Malone bug #34316).
+ * BUG: Most utilities would fail if they came across UTF-8 or unicode
+ characters. (Malone bug #34194).
+ * BUG: Displayconfig wouldn't correctly detect the presence of installed
+ proprietary drivers. (OculusAquilae)
+ * BUG: Displayconfig had trouble handling BusID rows in xorg.conf. This would
+ cause the xorg.conf to be incorrectly read. (Tonio)
+ * Added some extra methods to ScanPCI.py to aid debugging.
+ * BUG: Displayconfig would not save the user's display settings when running
+ in kcontrol or systemsettings. (Malone bug #35257)
+
+ -- Fathi Boudra <fboudra at free.fr> Sun, 19 Mar 2006 17:39:48 +0100
+
kde-guidance (0.6.3-1) unstable; urgency=low
- * Initial Debian release Closes: #340144
* Merge with Ubuntu
* New upstream version
* Added displayconfig
Modified: kde-extras/guidance/trunk/debian/control
===================================================================
--- kde-extras/guidance/trunk/debian/control 2006-06-08 12:56:48 UTC (rev 3915)
+++ kde-extras/guidance/trunk/debian/control 2006-06-08 16:36:06 UTC (rev 3916)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Fathi Boudra <fboudra at free.fr>
Build-Depends: cdbs, debhelper (>= 5.0.0), chrpath, kdelibs4-dev, libpythonize0-dev, libtool, libxml2-utils, libxxf86vm-dev, pykdeextensions, pyqt-tools, python-kde3, python-sip4-dev
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
Package: kde-guidance
Architecture: any
Modified: kde-extras/guidance/trunk/debian/copyright
===================================================================
--- kde-extras/guidance/trunk/debian/copyright 2006-06-08 12:56:48 UTC (rev 3915)
+++ kde-extras/guidance/trunk/debian/copyright 2006-06-08 16:36:06 UTC (rev 3916)
@@ -26,3 +26,407 @@
On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.
+The documentations provided with kde-guidance 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.
+
Modified: kde-extras/guidance/trunk/debian/kde-guidance.lintian-overrides
===================================================================
--- kde-extras/guidance/trunk/debian/kde-guidance.lintian-overrides 2006-06-08 12:56:48 UTC (rev 3915)
+++ kde-extras/guidance/trunk/debian/kde-guidance.lintian-overrides 2006-06-08 16:36:06 UTC (rev 3916)
@@ -5,3 +5,6 @@
kde-guidance: init.d-script-does-not-implement-required-option /etc/init.d/displayconfig-hwprobe.py stop
kde-guidance: init.d-script-does-not-implement-required-option /etc/init.d/displayconfig-hwprobe.py restart
kde-guidance: init.d-script-does-not-implement-required-option /etc/init.d/displayconfig-hwprobe.py force-reload
+# false positive warnings from linitian
+kde-guidance: postinst-has-useless-call-to-ldconfig
+kde-guidance: postrm-has-useless-call-to-ldconfig
Added: kde-extras/guidance/trunk/debian/patches/10_branch_r542306.diff
===================================================================
--- kde-extras/guidance/trunk/debian/patches/10_branch_r542306.diff 2006-06-08 12:56:48 UTC (rev 3915)
+++ kde-extras/guidance/trunk/debian/patches/10_branch_r542306.diff 2006-06-08 16:36:06 UTC (rev 3916)
@@ -0,0 +1,106 @@
+diff -Nur guidance-0.6.7/ChangeLog guidance-0.6.7.new/ChangeLog
+--- guidance-0.6.7/ChangeLog 2006-05-13 18:46:50.000000000 +0200
++++ guidance-0.6.7.new/ChangeLog 2006-06-08 17:45:44.000000000 +0200
+@@ -1,3 +1,6 @@
++- BUG: serviceconfig.py would sometimes fail on non-English systems.
++ (Malone bug #43313).
++
+ * Saturday 13 May 2006 Simon Edwards <simon at simonzone.com>
+ - version 0.6.7
+ - Dutch translation added (Rinse de Vries)
+diff -Nur guidance-0.6.7/displayconfig/displayconfig.desktop guidance-0.6.7.new/displayconfig/displayconfig.desktop
+--- guidance-0.6.7/displayconfig/displayconfig.desktop 2006-04-27 07:59:39.000000000 +0200
++++ guidance-0.6.7.new/displayconfig/displayconfig.desktop 2006-06-08 17:47:28.000000000 +0200
+@@ -14,6 +14,7 @@
+ Name[ja]=ディスプレイ
+ Name[ka]=ჩვენება
+ Name[lt]=Ekranas
++Name[nl]=Beeldscherm
+ Name[pt]=Ecrã
+ Name[pt_BR]=Ecrã
+ Name[sk]=Zobraziť
+@@ -36,6 +37,7 @@
+ Comment[ja]=ディスプレイとモニタの設定
+ Comment[ka]=კონფიგურაციის ჩვენება და მონიტორიგნი
+ Comment[lt]=Ekrano ir monitoriaus konfigūravimas
++Comment[nl]=Configuratie van beeldscherm en grafische kaart
+ Comment[pt]=Configuração do Ecrã e Monitor
+ Comment[pt_BR]=Configuração do Ecrã e Monitor
+ Comment[sk]=Zobraziť a monitorovať konfiguráciu
+@@ -65,6 +67,7 @@
+ GenericName[gl]=Editor da Configurazón da Pantalla
+ GenericName[ka]=ეკრანის კონფიგურაციის რედაქტორი
+ GenericName[lt]=Ekrano konfigūracijos keitimas
++GenericName[nl]=Scherminstellingen bewerken
+ GenericName[pt]=Editor de Configuração do Ecrã
+ GenericName[pt_BR]=Editor de Configuração do Ecrã
+ GenericName[sk]=Editor konfigurácie obrazovky
+diff -Nur guidance-0.6.7/mountconfig/mountconfig.desktop guidance-0.6.7.new/mountconfig/mountconfig.desktop
+--- guidance-0.6.7/mountconfig/mountconfig.desktop 2006-04-17 18:45:50.000000000 +0200
++++ guidance-0.6.7.new/mountconfig/mountconfig.desktop 2006-06-08 17:46:24.000000000 +0200
+@@ -12,6 +12,7 @@
+ Name[gl]=Disco e Sistemas de Ficheiros
+ Name[ja]=ディスクとファイルシステム
+ Name[lt]=Diskai ir bylų sistemos
++Name[nl]=Schijven en bestandssystemen
+ Name[pt]=Disco e Sistemas de Ficheiros
+ Name[pt_BR]=Disco e Sistemas de Ficheiros
+ Name[sk]=Disk a súborové systémy
+@@ -33,6 +34,7 @@
+ Comment[fr]=Configuration des Disques et des Systèmes de Fichiers
+ Comment[ja]=ディスクとファイルシステムの設定
+ Comment[lt]=Diskai ir bylų sistemų konfigūravimas
++Comment[nl]=Schijven en bestandssystemen instellen
+ Comment[pt]=Configuração do Disco e Sistema de Ficheiros
+ Comment[pt_BR]=Configuração do Disco e Sistema de Ficheiros
+ Comment[sk]=Konfigurácia disku a súborového systému
+diff -Nur guidance-0.6.7/serviceconfig/serviceconfig.desktop guidance-0.6.7.new/serviceconfig/serviceconfig.desktop
+--- guidance-0.6.7/serviceconfig/serviceconfig.desktop 2006-04-17 18:45:50.000000000 +0200
++++ guidance-0.6.7.new/serviceconfig/serviceconfig.desktop 2006-06-08 17:44:45.000000000 +0200
+@@ -12,6 +12,7 @@
+ Name[gl]=Servizos do Sistema
+ Name[ja]=システムサービス
+ Name[lt]=Sistemos tarnybos
++Name[nl]=Systeemdiensten
+ Name[pt]=Serviços do Sistema
+ Name[pt_BR]=Serviços do Sistema
+ Name[sk]=Systémové služby
+@@ -33,6 +34,7 @@
+ Comment[gl]=Configurazón dos Servizos do Sistema
+ Comment[ja]=システムサービスの設定
+ Comment[lt]=Sistemos tarnybų konfigūravimas
++Comment[nl]=Systeemdiensten instellen
+ Comment[pt]=Configuração do Serviço do Sistema
+ Comment[pt_BR]=Configuração do Serviço do Sistema
+ Comment[sk]=Konfigurácia systémových služieb
+diff -Nur guidance-0.6.7/serviceconfig/serviceconfig.py guidance-0.6.7.new/serviceconfig/serviceconfig.py
+--- guidance-0.6.7/serviceconfig/serviceconfig.py 2006-05-13 18:47:36.000000000 +0200
++++ guidance-0.6.7.new/serviceconfig/serviceconfig.py 2006-06-08 17:43:47.000000000 +0200
+@@ -392,7 +392,7 @@
+ self.runlevels = []
+ self.gotStatus = False
+ self.statusable = False
+- self.status = str(i18n("not running"))
++ self.status = unicode(i18n("not running"))
+ self.startpriority = "50"
+ self.killpriority = "50"
+ self.getStatusFrom = "pidfile"
+diff -Nur guidance-0.6.7/userconfig/userconfig.desktop guidance-0.6.7.new/userconfig/userconfig.desktop
+--- guidance-0.6.7/userconfig/userconfig.desktop 2006-04-17 18:45:50.000000000 +0200
++++ guidance-0.6.7.new/userconfig/userconfig.desktop 2006-06-08 17:47:55.000000000 +0200
+@@ -12,6 +12,7 @@
+ Name[gl]=Usuários e Grupos
+ Name[ja]=ユーザとグループ
+ Name[lt]=Naudotojai ir grupės
++Name[nl]=Gebruikers en groepen
+ Name[pt]=Utilizadores e Grupos
+ Name[pt_BR]=Utilizadores e Grupos
+ Name[sk]=Užívatelia a skupiny
+@@ -33,6 +34,7 @@
+ Comment[gl]=Administrazón de Usuários e Grupos
+ Comment[ja]=ユーザとグループの管理
+ Comment[lt]=Naudotojų ir grupių administravimas
++Comment[nl]=Gebruikers en groepen beheren
+ Comment[pt]=Administração de Utilizadores e Grupos
+ Comment[pt_BR]=Administração de Utilizadores e Grupos
+ Comment[sk]=Administrácia užívateľov a skupín
Added: kde-extras/guidance/trunk/debian/patches/11_password_expire.diff
===================================================================
--- kde-extras/guidance/trunk/debian/patches/11_password_expire.diff 2006-06-08 12:56:48 UTC (rev 3915)
+++ kde-extras/guidance/trunk/debian/patches/11_password_expire.diff 2006-06-08 16:36:06 UTC (rev 3916)
@@ -0,0 +1,11 @@
+diff -Nur guidance-0.6.7/userconfig/unixauthdb.py guidance-0.6.7.new/userconfig/unixauthdb.py
+--- guidance-0.6.7/userconfig/unixauthdb.py 2006-04-05 22:43:59.000000000 +0200
++++ guidance-0.6.7.new/userconfig/unixauthdb.py 2006-06-08 17:50:16.000000000 +0200
+@@ -1040,6 +1040,7 @@
+
+ if self._passexpirewarn==None:
+ self._passexpirewarn = u""
++ passexpirewarn = u""
+ else:
+ passexpirewarn = unicode(self._passexpirewarn)
+
Modified: kde-extras/guidance/trunk/debian/postinst
===================================================================
--- kde-extras/guidance/trunk/debian/postinst 2006-06-08 12:56:48 UTC (rev 3915)
+++ kde-extras/guidance/trunk/debian/postinst 2006-06-08 16:36:06 UTC (rev 3916)
@@ -3,4 +3,9 @@
umask 022
set -e
-update-rc.d displayconfig-hwprobe.py start 37 S .
+update-rc.d displayconfig-hwprobe.py start 60 S .
+
+#DEBHELPER#
+
+exit 0
+
Modified: kde-extras/guidance/trunk/debian/postrm
===================================================================
--- kde-extras/guidance/trunk/debian/postrm 2006-06-08 12:56:48 UTC (rev 3915)
+++ kde-extras/guidance/trunk/debian/postrm 2006-06-08 16:36:06 UTC (rev 3916)
@@ -1,5 +1,7 @@
#!/bin/sh
+set -e
+
case "$1" in
remove)
;;
@@ -9,3 +11,7 @@
*)
;;
esac
+
+#DEBHELPER#
+
+exit 0
Modified: kde-extras/guidance/trunk/debian/rules
===================================================================
--- kde-extras/guidance/trunk/debian/rules 2006-06-08 12:56:48 UTC (rev 3915)
+++ kde-extras/guidance/trunk/debian/rules 2006-06-08 16:36:06 UTC (rev 3916)
@@ -1,10 +1,10 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/python-distutils.mk
DEB_INSTALL_MANPAGES_kde-guidance := debian/displayconfig.1 debian/mountconfig.1 debian/serviceconfig.1 debian/userconfig.1
-DEB_PYTHON_INSTALL_ARGS_kde-guidance = --prefix=/usr --root=$(CURDIR)/debian/kde-guidance
PYTHONVERS = 2.3
@@ -63,4 +63,5 @@
rm -f displayconfig/kcm_displayconfig.cpp
rm -f userconfig/kcm_userconfig.cpp
rm -f install_log.txt
+ rm -f po/*.gmo
Added: kde-extras/guidance/trunk/debian/source.lintian-overrides
===================================================================
--- kde-extras/guidance/trunk/debian/source.lintian-overrides 2006-06-08 12:56:48 UTC (rev 3915)
+++ kde-extras/guidance/trunk/debian/source.lintian-overrides 2006-06-08 16:36:06 UTC (rev 3916)
@@ -0,0 +1,2 @@
+# kde-guidance build-depends indirectly using python-kde3 and python-sip4-dev
+kde-guidance source: missing-build-dependency python | python-dev | python-all-dev
More information about the pkg-kde-commits
mailing list