rev 8669 - in kde-extras/kaffeine/trunk/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Sun Dec 30 17:31:03 UTC 2007
Author: fabo
Date: 2007-12-30 17:31:02 +0000 (Sun, 30 Dec 2007)
New Revision: 8669
Added:
kde-extras/kaffeine/trunk/debian/patches/98_buildprep.diff
kde-extras/kaffeine/trunk/debian/patches/series
Modified:
kde-extras/kaffeine/trunk/debian/changelog
kde-extras/kaffeine/trunk/debian/control
kde-extras/kaffeine/trunk/debian/copyright
kde-extras/kaffeine/trunk/debian/menu
kde-extras/kaffeine/trunk/debian/patches/02_autotools_update.diff
kde-extras/kaffeine/trunk/debian/patches/03_libtool_update.diff
kde-extras/kaffeine/trunk/debian/patches/10_proper_am_init_automake_usage.diff
kde-extras/kaffeine/trunk/debian/rules
Log:
* Remove Riku Voipio from Uploaders field.
* Update my e-mail address.
* Bump Standards-Version to 3.7.3.
* Use Homepage field.
* Update menu file to latest Debian menu policy.
* Switch to quilt patch system.
* Build with --as-needed linker flag.
* Update copyright file. Refer to common-licenses directory.
Modified: kde-extras/kaffeine/trunk/debian/changelog
===================================================================
--- kde-extras/kaffeine/trunk/debian/changelog 2007-12-30 11:58:53 UTC (rev 8668)
+++ kde-extras/kaffeine/trunk/debian/changelog 2007-12-30 17:31:02 UTC (rev 8669)
@@ -1,10 +1,18 @@
-kaffeine (0.8.5-2) UNRELEASED; urgency=low
+kaffeine (0.8.5-2) unstable; urgency=low
* Restrict dependency on hdparm only for linux architectures.
Thanks to Uwe Hermann and Petr Salinger (Closes: #438848)
* Add libxine1-x dependency. (Closes: #448084)
+ * Remove Riku Voipio from Uploaders field.
+ * Update my e-mail address.
+ * Bump Standards-Version to 3.7.3.
+ * Use Homepage field.
+ * Update menu file to latest Debian menu policy.
+ * Switch to quilt patch system.
+ * Build with --as-needed linker flag.
+ * Update copyright file. Refer to common-licenses directory.
- -- Fathi Boudra <fboudra at free.fr> Sat, 10 Nov 2007 10:40:33 +0100
+ -- Fathi Boudra <fabo at debian.org> Sun, 30 Dec 2007 17:44:40 +0100
kaffeine (0.8.5-1) unstable; urgency=low
Modified: kde-extras/kaffeine/trunk/debian/control
===================================================================
--- kde-extras/kaffeine/trunk/debian/control 2007-12-30 11:58:53 UTC (rev 8668)
+++ kde-extras/kaffeine/trunk/debian/control 2007-12-30 17:31:02 UTC (rev 8669)
@@ -2,17 +2,16 @@
Section: kde
Priority: optional
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
-Uploaders: Riku Voipio <riku.voipio at iki.fi>, Fathi Boudra <fabo at debian.org>,
- Mark Purcell <msp at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), automake1.9, kdelibs4-dev,
+Uploaders: Fathi Boudra <fabo at debian.org>, Mark Purcell <msp at debian.org>
+Build-Depends: cdbs, debhelper (>= 5), quilt, automake1.9, kdelibs4-dev,
libcdparanoia0-dev, libogg-dev, libxine-dev (>= 1.1.8), libxcb1-dev,
libxtst-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
+Homepage: http://kaffeine.sourceforge.net
Package: kaffeine
Architecture: any
-Depends: ${shlibs:Depends}, libxine1-ffmpeg, libxine1-x | libxine1 (<< 1.1.8-2),
- hdparm [linux-any]
+Depends: ${shlibs:Depends}, libxine1-ffmpeg, libxine1-x, hdparm [linux-any]
Conflicts: kaffeine-xine, kaffeine-gstreamer
Replaces: kaffeine-xine, kaffeine-gstreamer
Description: versatile media player for KDE
@@ -23,8 +22,6 @@
.
Kaffeine can keep track of multiple playlists simultaneously, and supports
autoloading of subtitles files for use while playing video.
- .
- Homepage: http://kaffeine.sourceforge.net
Package: kaffeine-dbg
Section: devel
Modified: kde-extras/kaffeine/trunk/debian/copyright
===================================================================
--- kde-extras/kaffeine/trunk/debian/copyright 2007-12-30 11:58:53 UTC (rev 8668)
+++ kde-extras/kaffeine/trunk/debian/copyright 2007-12-30 17:31:02 UTC (rev 8669)
@@ -133,404 +133,8 @@
The documentations provided with kaffeine 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:
+contain any unmodifiable parts (invariant sections).
- GNU Free Documentation License
- Version 1.2, November 2002
+On Debian systems, the complete text of the GNU Free Documentation
+License can be found in `/usr/share/common-licenses/GFDL'.
-
- 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/kaffeine/trunk/debian/menu
===================================================================
--- kde-extras/kaffeine/trunk/debian/menu 2007-12-30 11:58:53 UTC (rev 8668)
+++ kde-extras/kaffeine/trunk/debian/menu 2007-12-30 17:31:02 UTC (rev 8669)
@@ -1,6 +1,6 @@
?package(kaffeine):\
needs="X11"\
- section="Apps/Sound"\
+ section="Applications/Video"\
hints="KDE"\
title="Kaffeine"\
command="/usr/bin/kaffeine"\
Modified: kde-extras/kaffeine/trunk/debian/patches/02_autotools_update.diff
===================================================================
--- kde-extras/kaffeine/trunk/debian/patches/02_autotools_update.diff 2007-12-30 11:58:53 UTC (rev 8668)
+++ kde-extras/kaffeine/trunk/debian/patches/02_autotools_update.diff 2007-12-30 17:31:02 UTC (rev 8669)
@@ -1,304 +1,112 @@
-diff -Nrua a/admin/depcomp b/admin/depcomp
---- a/admin/depcomp 2007-06-03 15:55:41.000000000 +0200
-+++ b/admin/depcomp 2007-07-28 20:01:05.000000000 +0200
-@@ -1,9 +1,10 @@
- #! /bin/sh
- # depcomp - compile a program generating dependencies as side-effects
-
--scriptversion=2005-07-09.11
-+scriptversion=2006-10-15.18
-
--# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
-+# Foundation, Inc.
-
- # 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
-@@ -91,7 +92,20 @@
- ## gcc 3 implements dependency tracking that does exactly what
- ## we want. Yay! Note: for some reason libtool 1.4 doesn't like
- ## it if -MD -MP comes after the -MF stuff. Hmm.
-- "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
-+## the command line argument order; so add the flags where they
-+## appear in depend2.am. Note that the slowdown incurred here
-+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
-+ for arg
-+ do
-+ case $arg in
-+ -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
-+ *) set fnord "$@" "$arg" ;;
-+ esac
-+ shift # fnord
-+ shift # $arg
-+ done
-+ "$@"
- stat=$?
- if test $stat -eq 0; then :
- else
-@@ -276,6 +290,46 @@
- rm -f "$tmpdepfile"
- ;;
-
-+hp2)
-+ # The "hp" stanza above does not work with aCC (C++) and HP's ia64
-+ # compilers, which have integrated preprocessors. The correct option
-+ # to use with these is +Maked; it writes dependencies to a file named
-+ # 'foo.d', which lands next to the object file, wherever that
-+ # happens to be.
-+ # Much of this is similar to the tru64 case; see comments there.
-+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-+ test "x$dir" = "x$object" && dir=
-+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-+ if test "$libtool" = yes; then
-+ tmpdepfile1=$dir$base.d
-+ tmpdepfile2=$dir.libs/$base.d
-+ "$@" -Wc,+Maked
-+ else
-+ tmpdepfile1=$dir$base.d
-+ tmpdepfile2=$dir$base.d
-+ "$@" +Maked
-+ fi
-+ stat=$?
-+ if test $stat -eq 0; then :
-+ else
-+ rm -f "$tmpdepfile1" "$tmpdepfile2"
-+ exit $stat
-+ fi
-+
-+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
-+ do
-+ test -f "$tmpdepfile" && break
-+ done
-+ if test -f "$tmpdepfile"; then
-+ sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
-+ # Add `dependent.h:' lines.
-+ sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
-+ else
-+ echo "#dummy" > "$depfile"
-+ fi
-+ rm -f "$tmpdepfile" "$tmpdepfile2"
-+ ;;
-+
- tru64)
- # The Tru64 compiler uses -MD to generate dependencies as a side
- # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-@@ -288,13 +342,13 @@
-
- if test "$libtool" = yes; then
- # With Tru64 cc, shared objects can also be used to make a
-- # static library. This mecanism is used in libtool 1.4 series to
-+ # static library. This mechanism is used in libtool 1.4 series to
- # handle both shared and static libraries in a single compilation.
- # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
- #
- # With libtool 1.5 this exception was removed, and libtool now
- # generates 2 separate objects for the 2 libraries. These two
-- # compilations output dependencies in in $dir.libs/$base.o.d and
-+ # compilations output dependencies in $dir.libs/$base.o.d and
- # in $dir$base.o.d. We have to check for both files, because
- # one of the two compilations can be disabled. We should prefer
- # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-diff -Nrua a/admin/install-sh b/admin/install-sh
---- a/admin/install-sh 2007-06-03 15:55:41.000000000 +0200
-+++ b/admin/install-sh 2007-07-28 20:01:05.000000000 +0200
+--- a/admin/install-sh
++++ b/admin/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2005-11-07.23
-+scriptversion=2006-10-14.15
++scriptversion=2005-05-14.22
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
-@@ -39,15 +39,24 @@
- # when there is no Makefile.
- #
- # This script is compatible with the BSD install script, but was written
--# from scratch. It can only install one file at a time, a restriction
--# shared with many OS's install programs.
-+# from scratch.
-+
-+nl='
-+'
-+IFS=" "" $nl"
+@@ -58,21 +58,7 @@
+ rmprog="${RMPROG-rm}"
+ mkdirprog="${MKDIRPROG-mkdir}"
- # set DOITPROG to echo to test this script
-
- # Don't use :- since 4.3BSD and earlier shells don't like it.
- doit="${DOITPROG-}"
-+if test -z "$doit"; then
-+ doit_exec=exec
-+else
-+ doit_exec=$doit
-+fi
-
--# put in absolute paths if you don't have them in your path; or use env. vars.
-+# Put in absolute file names if you don't have them in your path;
-+# or use environment vars.
-
- mvprog="${MVPROG-mv}"
- cpprog="${CPPROG-cp}"
-@@ -61,17 +70,9 @@
- posix_glob=
- posix_mkdir=
-
+-posix_glob=
+-posix_mkdir=
+-
-# Symbolic mode for testing mkdir with directories.
-# It is the same as 755, but also tests that "u+" works.
-test_mode=u=rwx,g=rx,o=rx,u+wx
-
- # Desired mode of installed file.
- mode=0755
-
+-# Desired mode of installed file.
+-mode=0755
+-
-# Desired mode of newly created intermediate directories.
-# It is empty if not known yet.
-intermediate_mode=
-
- chmodcmd=$chmodprog
+-chmodcmd=$chmodprog
++chmodcmd="$chmodprog 0755"
chowncmd=
chgrpcmd=
-@@ -109,7 +110,7 @@
- CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
- "
+ stripcmd=
+@@ -125,7 +111,7 @@
--while test -n "$1"; do
-+while test $# -ne 0; do
- case $1 in
- -c) shift
- continue;;
-@@ -128,6 +129,12 @@
- -m) mode=$2
+ --help) echo "$usage"; exit $?;;
+
+- -m) mode=$2
++ -m) chmodcmd="$chmodprog $2"
shift
shift
-+ case $mode in
-+ *' '* | *' '* | *'
-+'* | *'*'* | *'?'* | *'['*)
-+ echo "$0: invalid mode: $mode" >&2
-+ exit 1;;
-+ esac
continue;;
-
- -o) chowncmd="$chownprog $2"
-@@ -150,25 +157,33 @@
-
- --version) echo "$0 $scriptversion"; exit $?;;
-
-- *) # When -d is used, all remaining arguments are directories to create.
-- # When -t is used, the destination is already specified.
-- test -n "$dir_arg$dstarg" && break
-- # Otherwise, the last argument is the destination. Remove it from $@.
-- for arg
-- do
-- if test -n "$dstarg"; then
-- # $@ is not empty: it contains at least $arg.
-- set fnord "$@" "$dstarg"
-- shift # fnord
-- fi
-- shift # arg
-- dstarg=$arg
-- done
-+ --) shift
- break;;
-+
-+ -*) echo "$0: invalid option: $1" >&2
-+ exit 1;;
-+
-+ *) break;;
- esac
- done
-
--if test -z "$1"; then
-+if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
-+ # When -d is used, all remaining arguments are directories to create.
-+ # When -t is used, the destination is already specified.
-+ # Otherwise, the last argument is the destination. Remove it from $@.
-+ for arg
-+ do
-+ if test -n "$dstarg"; then
-+ # $@ is not empty: it contains at least $arg.
-+ set fnord "$@" "$dstarg"
-+ shift # fnord
-+ fi
-+ shift # arg
-+ dstarg=$arg
-+ done
-+fi
-+
-+if test $# -eq 0; then
- if test -z "$dir_arg"; then
- echo "$0: no input file specified." >&2
- exit 1
-@@ -178,7 +193,32 @@
+@@ -178,8 +164,6 @@
exit 0
fi
-test -n "$dir_arg" || trap '(exit $?); exit' 1 2 13 15
-+if test -z "$dir_arg"; then
-+ trap '(exit $?); exit' 1 2 13 15
-+
-+ # Set umask so as not to create temps with too-generous modes.
-+ # However, 'strip' requires both read and write access to temps.
-+ case $mode in
-+ # Optimize common cases.
-+ *644) cp_umask=133;;
-+ *755) cp_umask=22;;
-+
-+ *[0-7])
-+ if test -z "$stripcmd"; then
-+ u_plus_rw=
-+ else
-+ u_plus_rw='% 200'
-+ fi
-+ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
-+ *)
-+ if test -z "$stripcmd"; then
-+ u_plus_rw=
-+ else
-+ u_plus_rw=,u+rw
-+ fi
-+ cp_umask=$mode$u_plus_rw;;
-+ esac
-+fi
-
+-
for src
do
-@@ -230,14 +270,25 @@
- expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$dst" : 'X\(//\)[^/]' \| \
- X"$dst" : 'X\(//\)$' \| \
+ # Protect names starting with `-'.
+@@ -189,11 +173,15 @@
+
+ if test -n "$dir_arg"; then
+ dst=$src
+- dstdir=$dst
+- test -d "$dstdir"
+- dstdir_status=$?
+- else
++ src=
+
++ if test -d "$dst"; then
++ mkdircmd=:
++ chmodcmd=
++ else
++ mkdircmd=$mkdirprog
++ fi
++ else
+ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+ # might cause directories to be created, which would be especially bad
+ # if $src (and thus $dsttmp) contains '*'.
+@@ -220,122 +208,53 @@
+ echo "$0: $dstarg: Is a directory" >&2
+ exit 1
+ fi
+- dstdir=$dst
+- dst=$dstdir/`basename "$src"`
+- dstdir_status=0
+- else
+- # Prefer dirname, but fall back on a substitute if dirname fails.
+- dstdir=`
+- (dirname "$dst") 2>/dev/null ||
+- expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+- X"$dst" : 'X\(//\)[^/]' \| \
+- X"$dst" : 'X\(//\)$' \| \
- X"$dst" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
-+ X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$dst" |
+- echo X"$dst" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'
- `
+- `
+-
+- test -d "$dstdir"
+- dstdir_status=$?
++ dst=$dst/`basename "$src"`
+ fi
+ fi
- test -d "$dstdir"
-@@ -250,51 +301,86 @@
- if test $dstdir_status != 0; then
- case $posix_mkdir in
- '')
+- obsolete_mkdir_used=false
++ # This sed command emulates the dirname command.
++ dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
+
+- if test $dstdir_status != 0; then
+- case $posix_mkdir in
+- '')
- posix_mkdir=false
- if $mkdirprog -m $test_mode -p -- / >/dev/null 2>&1; then
- posix_mkdir=true
@@ -307,36 +115,32 @@
- rmdir ./-m "$test_mode" ./-p ./-- 2>/dev/null
- fi ;;
- esac
--
++ # Make sure that the destination directory exists.
+
- if
- $posix_mkdir && {
-+ # Create intermediate dirs using mode 755 as modified by the umask.
-+ # This is like FreeBSD 'install' as of 1997-10-28.
-+ umask=`umask`
-+ case $stripcmd.$umask in
-+ # Optimize common cases.
-+ *[2367][2367]) mkdir_umask=$umask;;
-+ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
++ # Skip lots of stat calls in the usual case.
++ if test ! -d "$dstdir"; then
++ defaultIFS='
++ '
++ IFS="${IFS-$defaultIFS}"
+
-+ *[0-7])
-+ mkdir_umask=`expr $umask + 22 \
-+ - $umask % 100 % 40 + $umask % 20 \
-+ - $umask % 10 % 4 + $umask % 2
-+ `;;
-+ *) mkdir_umask=$umask,go-w;;
-+ esac
++ oIFS=$IFS
++ # Some sh's can't handle IFS=/ for some reason.
++ IFS='%'
++ set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
++ shift
++ IFS=$oIFS
- # With -d, create the new directory with the user-specified mode.
+- # With -d, create the new directory with the user-specified mode.
- # Otherwise, create it using the same intermediate mode that
- # mkdir -p would use when creating intermediate directories.
- # POSIX says that this mode is "$(umask -S),u+wx", so use that
- # if umask -S works.
-
-+ # Otherwise, rely on $mkdir_umask.
- if test -n "$dir_arg"; then
+- if test -n "$dir_arg"; then
- mkdir_mode=$mode
-+ mkdir_mode=-m$mode
- else
+- else
- case $intermediate_mode in
- '')
- if umask_S=`(umask -S) 2>/dev/null`; then
@@ -346,163 +150,156 @@
- fi ;;
- esac
- mkdir_mode=$intermediate_mode
-+ mkdir_mode=
- fi
-
+- fi
+-
- $mkdirprog -m "$mkdir_mode" -p -- "$dstdir"
- }
-+ posix_mkdir=false
-+ case $umask in
-+ *[123567][0-7][0-7])
-+ # POSIX mkdir -p sets u+wx bits regardless of umask, which
-+ # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-+ ;;
-+ *)
-+ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-+ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-+
-+ if (umask $mkdir_umask &&
-+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-+ then
-+ if test -z "$dir_arg" || {
-+ # Check for POSIX incompatibilities with -m.
-+ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-+ # other-writeable bit of parent directory when it shouldn't.
-+ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-+ ls_ld_tmpdir=`ls -ld "$tmpdir"`
-+ case $ls_ld_tmpdir in
-+ d????-?r-*) different_mode=700;;
-+ d????-?--*) different_mode=755;;
-+ *) false;;
-+ esac &&
-+ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-+ ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-+ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-+ }
-+ }
-+ then posix_mkdir=:
-+ fi
-+ rmdir "$tmpdir/d" "$tmpdir"
-+ else
-+ # Remove any dirs left behind by ancient mkdir implementations.
-+ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-+ fi
-+ trap '' 0;;
-+ esac;;
-+ esac
-+
-+ if
-+ $posix_mkdir && (
-+ umask $mkdir_umask &&
-+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-+ )
- then :
- else
+- then :
+- else
++ pathcomp=
- # mkdir does not conform to POSIX, or it failed possibly due to
- # a race condition. Create the directory the slow way, step by
- # step, checking for races as we go.
-+ # The umask is ridiculous, or mkdir does not conform to POSIX,
-+ # or it failed possibly due to a race condition. Create the
-+ # directory the slow way, step by step, checking for races as we go.
-
- case $dstdir in
+-
+- case $dstdir in
- /*) pathcomp=/ ;;
- -*) pathcomp=./ ;;
- *) pathcomp= ;;
-+ /*) prefix=/ ;;
-+ -*) prefix=./ ;;
-+ *) prefix= ;;
- esac
-
- case $posix_glob in
-@@ -314,19 +400,39 @@
- $posix_glob && set +f
- IFS=$oIFS
-
-+ prefixes=
-+
- for d
- do
+- esac
+-
+- case $posix_glob in
+- '')
+- if (set -f) 2>/dev/null; then
+- posix_glob=true
+- else
+- posix_glob=false
+- fi ;;
+- esac
+-
+- oIFS=$IFS
+- IFS=/
+- $posix_glob && set -f
+- set fnord $dstdir
++ while test $# -ne 0 ; do
++ pathcomp=$pathcomp$1
+ shift
+- $posix_glob && set +f
+- IFS=$oIFS
+-
+- for d
+- do
- test "x$d" = x && continue
-+ test -z "$d" && continue
-
+-
- pathcomp=$pathcomp$d
- if test ! -d "$pathcomp"; then
- $mkdirprog "$pathcomp"
- # Don't fail if two instances are running concurrently.
- test -d "$pathcomp" || exit 1
-+ prefix=$prefix$d
-+ if test -d "$prefix"; then
-+ prefixes=
-+ else
-+ if $posix_mkdir; then
-+ (umask=$mkdir_umask &&
-+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-+ # Don't fail if two instances are running concurrently.
-+ test -d "$prefix" || exit 1
-+ else
-+ case $prefix in
-+ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-+ *) qprefix=$prefix;;
-+ esac
-+ prefixes="$prefixes '$qprefix'"
-+ fi
- fi
+- fi
- pathcomp=$pathcomp/
-+ prefix=$prefix/
- done
+- done
- obsolete_mkdir_used=true
-+
-+ if test -n "$prefixes"; then
-+ # Don't fail if two instances are running concurrently.
-+ (umask $mkdir_umask &&
-+ eval "\$doit_exec \$mkdirprog $prefixes") ||
-+ test -d "$dstdir" || exit 1
-+ obsolete_mkdir_used=true
+- fi
++ if test ! -d "$pathcomp"; then
++ $mkdirprog "$pathcomp"
++ # mkdir can fail with a `File exist' error in case several
++ # install-sh are creating the directory concurrently. This
++ # is OK.
++ test -d "$pathcomp" || exit
+ fi
- fi
++ pathcomp=$pathcomp/
++ done
fi
-@@ -334,7 +440,7 @@
- { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
- { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
- { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+ if test -n "$dir_arg"; then
+- { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+- { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+- { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
- test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dst"; } || exit 1
-+ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
++ $doit $mkdircmd "$dst" \
++ && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
++ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
++ && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
++ && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
++
else
++ dstfile=`basename "$dst"`
# Make a couple of temp file names in the proper directory.
-@@ -345,7 +451,7 @@
+ dsttmp=$dstdir/_inst.$$_
+@@ -343,6 +262,7 @@
+
+ # Trap to clean up those temp files at exit.
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
++ trap '(exit $?); exit' 1 2 13 15
# Copy the file name to the temp name.
-- $doit $cpprog "$src" "$dsttmp" &&
-+ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
-
- # and set any options; do chmod last to preserve setuid bits.
- #
-@@ -356,7 +462,7 @@
+ $doit $cpprog "$src" "$dsttmp" &&
+@@ -356,10 +276,10 @@
{ test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
&& { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
&& { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
- && { test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dsttmp"; } &&
-+ && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
++ && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
# Now rename the file to the real destination.
- { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
-diff -Nrua a/admin/missing b/admin/missing
---- a/admin/missing 2007-06-03 15:55:41.000000000 +0200
-+++ b/admin/missing 2007-07-28 20:01:05.000000000 +0200
+- { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
++ { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+ || {
+ # The rename failed, perhaps because mv can't rename something else
+ # to itself, or perhaps because mv is so ancient that it does not
+@@ -371,12 +291,11 @@
+ # reasons. In this case, the final cleanup might fail but the new
+ # file should still install successfully.
+ {
+- if test -f "$dst"; then
+- $doit $rmcmd -f "$dst" 2>/dev/null \
+- || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
+- && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
++ if test -f "$dstdir/$dstfile"; then
++ $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
++ || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+ || {
+- echo "$0: cannot unlink or rename $dst" >&2
++ echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+ (exit 1); exit 1
+ }
+ else
+@@ -385,14 +304,17 @@
+ } &&
+
+ # Now rename the file to the real destination.
+- $doit $mvcmd "$dsttmp" "$dst"
++ $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+ }
+- } || exit 1
+-
+- trap '' 0
+- fi
++ }
++ fi || { (exit 1); exit 1; }
+ done
+
++# The final little trick to "correctly" pass the exit status to the exit trap.
++{
++ (exit 0); exit 0
++}
++
+ # Local variables:
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
+ # time-stamp-start: "scriptversion="
+--- a/admin/missing
++++ b/admin/missing
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2004-09-07.08
-+scriptversion=2006-05-10.23
++scriptversion=2005-06-08.21
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
-+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
@@ -517,33 +314,7 @@
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
-@@ -33,6 +33,8 @@
- fi
-
- run=:
-+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
- # In the cases where this matters, `missing' is being run in the
- # srcdir already.
-@@ -44,7 +46,7 @@
-
- msg="missing on your system"
-
--case "$1" in
-+case $1 in
- --run)
- # Try to run requested program, and just exit if it succeeds.
- run=
-@@ -77,6 +79,7 @@
- aclocal touch file \`aclocal.m4'
- autoconf touch file \`configure'
- autoheader touch file \`config.h.in'
-+ autom4te touch the output file, or create a stub one
- automake touch all \`Makefile.in' files
- bison create \`y.tab.[ch]', if possible, from existing .[ch]
- flex create \`lex.yy.c', if possible, from existing .c
-@@ -87,12 +90,12 @@
+@@ -87,12 +87,12 @@
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
Send bug reports to <bug-automake at gnu.org>."
@@ -558,134 +329,19 @@
;;
-*)
-@@ -106,7 +109,7 @@
- # Now exit if we have it, but it failed. Also exit now if we
- # don't have it and --version was passed (most likely to detect
- # the program).
--case "$1" in
-+case $1 in
- lex|yacc)
- # Not GNU programs, they don't have --version.
- ;;
-@@ -135,7 +138,7 @@
-
- # If it does not exist, or fails to run (possibly an outdated version),
- # try to emulate it.
--case "$1" in
-+case $1 in
- aclocal*)
- echo 1>&2 "\
- WARNING: \`$1' is $msg. You should only need it if
-@@ -164,7 +167,7 @@
- test -z "$files" && files="config.h"
- touch_files=
- for f in $files; do
-- case "$f" in
-+ case $f in
- *:*) touch_files="$touch_files "`echo "$f" |
- sed -e 's/^[^:]*://' -e 's/:.*//'`;;
- *) touch_files="$touch_files $f.in";;
-@@ -192,8 +195,8 @@
- You can get \`$1' as part of \`Autoconf' from any GNU
- archive site."
-
-- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
-+ file=`echo "$*" | sed -n "$sed_output"`
-+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
-@@ -214,25 +217,25 @@
- in order for those modifications to take effect. You can get
- \`Bison' from any GNU archive site."
- rm -f y.tab.c y.tab.h
-- if [ $# -ne 1 ]; then
-+ if test $# -ne 1; then
- eval LASTARG="\${$#}"
-- case "$LASTARG" in
-+ case $LASTARG in
- *.y)
- SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-- if [ -f "$SRCFILE" ]; then
-+ if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.c
- fi
- SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-- if [ -f "$SRCFILE" ]; then
-+ if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.h
- fi
- ;;
- esac
- fi
-- if [ ! -f y.tab.h ]; then
-+ if test ! -f y.tab.h; then
- echo >y.tab.h
- fi
-- if [ ! -f y.tab.c ]; then
-+ if test ! -f y.tab.c; then
- echo 'main() { return 0; }' >y.tab.c
- fi
- ;;
-@@ -244,18 +247,18 @@
- in order for those modifications to take effect. You can get
- \`Flex' from any GNU archive site."
- rm -f lex.yy.c
-- if [ $# -ne 1 ]; then
-+ if test $# -ne 1; then
- eval LASTARG="\${$#}"
-- case "$LASTARG" in
-+ case $LASTARG in
- *.l)
- SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-- if [ -f "$SRCFILE" ]; then
-+ if test -f "$SRCFILE"; then
- cp "$SRCFILE" lex.yy.c
- fi
- ;;
- esac
- fi
-- if [ ! -f lex.yy.c ]; then
-+ if test ! -f lex.yy.c; then
- echo 'main() { return 0; }' >lex.yy.c
- fi
- ;;
-@@ -267,11 +270,9 @@
- \`Help2man' package in order for those modifications to take
- effect. You can get \`Help2man' from any GNU archive site."
-
-- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-- if test -z "$file"; then
-- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-- fi
-- if [ -f "$file" ]; then
-+ file=`echo "$*" | sed -n "$sed_output"`
-+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-+ if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
-@@ -288,11 +289,24 @@
+@@ -288,11 +288,18 @@
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
-- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ # The file to touch is that specified with -o ...
-+ file=`echo "$*" | sed -n "$sed_output"`
-+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
if test -z "$file"; then
- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
- fi
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-+ file=`sed -n '
-+ /^@setfilename/{
-+ s/.* \([^ ]*\) *$/\1/
-+ p
-+ q
-+ }' $infile`
++ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+ fi
@@ -695,41 +351,3 @@
touch $file
;;
-@@ -310,13 +324,13 @@
- fi
- firstarg="$1"
- if shift; then
-- case "$firstarg" in
-+ case $firstarg in
- *o*)
- firstarg=`echo "$firstarg" | sed s/o//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
-- case "$firstarg" in
-+ case $firstarg in
- *h*)
- firstarg=`echo "$firstarg" | sed s/h//`
- tar "$firstarg" "$@" && exit 0
-diff -Nrua a/admin/mkinstalldirs b/admin/mkinstalldirs
---- a/admin/mkinstalldirs 2007-06-03 15:55:41.000000000 +0200
-+++ b/admin/mkinstalldirs 2007-07-28 20:01:05.000000000 +0200
-@@ -1,7 +1,7 @@
- #! /bin/sh
- # mkinstalldirs --- make directory hierarchy
-
--scriptversion=2005-06-29.22
-+scriptversion=2006-05-11.19
-
- # Original author: Noah Friedman <friedman at prep.ai.mit.edu>
- # Created: 1993-05-16
-@@ -11,6 +11,9 @@
- # bugs to <bug-automake at gnu.org> or send patches to
- # <automake-patches at gnu.org>.
-
-+nl='
-+'
-+IFS=" "" $nl"
- errstatus=0
- dirmode=
-
Modified: kde-extras/kaffeine/trunk/debian/patches/03_libtool_update.diff
===================================================================
--- kde-extras/kaffeine/trunk/debian/patches/03_libtool_update.diff 2007-12-30 11:58:53 UTC (rev 8668)
+++ kde-extras/kaffeine/trunk/debian/patches/03_libtool_update.diff 2007-12-30 17:31:02 UTC (rev 8669)
@@ -1,6 +1,5 @@
-diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
---- a/admin/libtool.m4.in 2007-06-03 15:55:41.000000000 +0200
-+++ b/admin/libtool.m4.in 2007-07-28 20:01:05.000000000 +0200
+--- a/admin/libtool.m4.in
++++ b/admin/libtool.m4.in
@@ -1,28 +1,13 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-## Copyright 1996, 1997, 1998, 1999, 2000, 2001
@@ -31,7 +30,7 @@
+## modifications, as long as this notice is preserved.
-# serial 47 AC_PROG_LIBTOOL
-+# serial 51 Debian 1.5.24-1 AC_PROG_LIBTOOL
++# serial 51 Debian 1.5.24-2 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -4345,9 +4344,8 @@
+AC_SUBST([SED])
AC_MSG_RESULT([$SED])
])
-diff -Nrua a/admin/ltmain.sh b/admin/ltmain.sh
---- a/admin/ltmain.sh 2007-06-03 15:55:41.000000000 +0200
-+++ b/admin/ltmain.sh 2007-07-28 20:01:05.000000000 +0200
+--- a/admin/ltmain.sh
++++ b/admin/ltmain.sh
@@ -1,8 +1,8 @@
# ltmain.sh - Provide generalized library-building support services.
# NOTE: Changing this file will not affect anything until you rerun configure.
@@ -4382,7 +4380,7 @@
+
+PROGRAM=ltmain.sh
+PACKAGE=libtool
-+VERSION="1.5.24 Debian 1.5.24-1"
++VERSION="1.5.24 Debian 1.5.24-2"
+TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
+
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
Modified: kde-extras/kaffeine/trunk/debian/patches/10_proper_am_init_automake_usage.diff
===================================================================
--- kde-extras/kaffeine/trunk/debian/patches/10_proper_am_init_automake_usage.diff 2007-12-30 11:58:53 UTC (rev 8668)
+++ kde-extras/kaffeine/trunk/debian/patches/10_proper_am_init_automake_usage.diff 2007-12-30 17:31:02 UTC (rev 8669)
@@ -1,6 +1,5 @@
-diff -Nur kaffeine-0.8.5/configure.in.in kaffeine-0.8.5.new/configure.in.in
---- kaffeine-0.8.5/configure.in.in 2007-04-13 16:54:53.000000000 +0200
-+++ kaffeine-0.8.5.new/configure.in.in 2007-07-18 21:47:04.000000000 +0200
+--- a/configure.in.in
++++ b/configure.in.in
@@ -1,4 +1,11 @@
#MIN_CONFIG(3.3)
+
Added: kde-extras/kaffeine/trunk/debian/patches/98_buildprep.diff
===================================================================
More information about the pkg-kde-commits
mailing list