--- exo-0.3.4.orig/debian/exo-unmount.1 +++ exo-0.3.4/debian/exo-unmount.1 @@ -0,0 +1,52 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. +.TH EXO-UNMOUNT "1" "January 2007" "exo-unmount 0.3.2" "User Commands" +.SH NAME +exo-unmount \- umount volumes based on their HAL UDIs or their device files +.SH DESCRIPTION +.SS "Usage:" +.IP +exo\-unmount [OPTION...] Xfce mount +.SS "Help Options:" +.TP +\-?, \fB\-\-help\fR +Show help options +.TP +\fB\-\-help\-all\fR +Show all help options +.TP +\fB\-\-help\-gtk\fR +Show GTK+ Options +.SS "Application Options:" +.TP +\fB\-e\fR, \fB\-\-eject\fR +Eject rather than mount +.TP +\fB\-u\fR, \fB\-\-unmount\fR +Unmount rather than mount +.TP +\fB\-h\fR, \fB\-\-hal\-udi\fR +Mount by HAL device UDI +.TP +\fB\-d\fR, \fB\-\-device\fR +Mount by device file +.TP +\fB\-n\fR, \fB\-\-no\-ui\fR +Don't show any dialogs +.TP +\fB\-v\fR, \fB\-\-version\fR +Print version information and exit +.TP +\fB\-\-display\fR=\fIDISPLAY\fR +X display to use +.SH AUTHOR +Written by Benedikt Meurer . +.PP +exo\-unmount comes with ABSOLUTELY NO WARRANTY, +You may redistribute copies of exo\-unmount under the terms of +the GNU Lesser General Public License which can be found in the +exo source package. +.PP +Please report bugs to . +.SH COPYRIGHT +Copyright \(co 2006-2007 + os-cillation e.K. All rights reserved. --- exo-0.3.4.orig/debian/python2.3-exo0.3.examples +++ exo-0.3.4/debian/python2.3-exo0.3.examples @@ -0,0 +1,4 @@ +python/examples/README +python/examples/ellipsizing.py +python/examples/toolbars.py +python/examples/toolbars.ui --- exo-0.3.4.orig/debian/compat +++ exo-0.3.4/debian/compat @@ -0,0 +1 @@ +4 --- exo-0.3.4.orig/debian/libexo-0.3-0.postinst +++ exo-0.3.4/debian/libexo-0.3-0.postinst @@ -0,0 +1,9 @@ +#!/bin/sh + +if [ "$1" = "configure" ]; then + # Get xfce-mcs-manager to reinit + #Hurd doesnt have pkill so we use another way + kill -s USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1|| true + +fi +#DEBHELPER# --- exo-0.3.4.orig/debian/libexo-0.3-dev.install +++ exo-0.3.4/debian/libexo-0.3-dev.install @@ -0,0 +1,5 @@ +usr/include/* +usr/lib/pkgconfig/* +usr/lib/lib*.a +usr/lib/lib*.so +usr/share/gtk-doc/html/exo/* --- exo-0.3.4.orig/debian/copyright +++ exo-0.3.4/debian/copyright @@ -0,0 +1,399 @@ +This package was debianized by Yves-Alexis Perez on +Tue, 19 Apr 2005 21:44:36 +0200. + +It was downloaded from http://www.os-cillation.com/ + +Upstream Author is Benedikt Meurer + +The exo-binding module is based on the GObject Binding Properties library +written by Victor Porton + +Parts of this library are based on code from libegg, Gtk+, the GNOME project +and the ROX Filer. + +This software is copyright (c) 2004-2007 by Benedikt Meurer, os-cillation. + +The documentation is released under the GNU Free Documentation License, version +1.1 or later, with no invariant sections, using the following statement: + + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.1 or + any later version published by the Free Software Foundation; with no + Invariant Sections, with no Front-Cover Texts, and with no Back-Cover + Texts. + +You are free to distribute this software under the terms of +the GNU General Public License. +On Debian systems, the complete text of the GNU General Public +License can be found in the file `/usr/share/common-licenses/GPL'. + +GFDL: +===== + + 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. --- exo-0.3.4.orig/debian/exo-eject.1 +++ exo-0.3.4/debian/exo-eject.1 @@ -0,0 +1,52 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. +.TH EXO-EJECT "1" "January 2007" "exo-eject 0.3.2" "User Commands" +.SH NAME +exo-eject \- eject volumes based on their HAL UDIs or their device files +.SH DESCRIPTION +.SS "Usage:" +.IP +exo\-eject [OPTION...] Xfce mount +.SS "Help Options:" +.TP +\-?, \fB\-\-help\fR +Show help options +.TP +\fB\-\-help\-all\fR +Show all help options +.TP +\fB\-\-help\-gtk\fR +Show GTK+ Options +.SS "Application Options:" +.TP +\fB\-e\fR, \fB\-\-eject\fR +Eject rather than mount +.TP +\fB\-u\fR, \fB\-\-unmount\fR +Unmount rather than mount +.TP +\fB\-h\fR, \fB\-\-hal\-udi\fR +Mount by HAL device UDI +.TP +\fB\-d\fR, \fB\-\-device\fR +Mount by device file +.TP +\fB\-n\fR, \fB\-\-no\-ui\fR +Don't show any dialogs +.TP +\fB\-v\fR, \fB\-\-version\fR +Print version information and exit +.TP +\fB\-\-display\fR=\fIDISPLAY\fR +X display to use +.SH AUTHOR +Written by Benedikt Meurer . +.PP +exo\-eject comes with ABSOLUTELY NO WARRANTY, +You may redistribute copies of exo\-eject under the terms of +the GNU Lesser General Public License which can be found in the +exo source package. +.PP +Please report bugs to . +.SH COPYRIGHT +Copyright \(co 2006-2007 + os-cillation e.K. All rights reserved. --- exo-0.3.4.orig/debian/libexo-0.3-0.shlibs +++ exo-0.3.4/debian/libexo-0.3-0.shlibs @@ -0,0 +1,2 @@ +libexo-0.3 0 libexo-0.3-0 (>= 0.3.4) +libexo-hal-0.3 0 libexo-0.3-0 (>= 0.3.4) --- exo-0.3.4.orig/debian/libexo-0.3-0.docs +++ exo-0.3.4/debian/libexo-0.3-0.docs @@ -0,0 +1,4 @@ +NEWS +README +TODO +THANKS --- exo-0.3.4.orig/debian/python2.3-exo0.3.install +++ exo-0.3.4/debian/python2.3-exo0.3.install @@ -0,0 +1,2 @@ +usr/lib/python*.*/site-packages/* +usr/share/pygtk/2.0/defs/* --- exo-0.3.4.orig/debian/README.Debian +++ exo-0.3.4/debian/README.Debian @@ -0,0 +1,8 @@ +exo for Debian +----------------- + +This version is an svn snapshot of exo, and thus can have lots of bugs. This +version is mandatory for Thunar, but xfmedia and xfce4-terminal should work +fine. Please report bugs if you encounter any problem. + + -- Yves-Alexis Perez , Tue, 06 Dec 2005 23:41:35 +0100 --- exo-0.3.4.orig/debian/python2.3-exo0.3.postinst +++ exo-0.3.4/debian/python2.3-exo0.3.postinst @@ -0,0 +1,33 @@ +#!/bin/bash -e +# +# Debian postinst script for Python x.y hierarchical modules +# Written by Gregor Hoffleit +# Extended by Matthias Klose +# Modified by Benedikt Meurer +# + +PACKAGE=`basename $0 | sed -e 's/\.[^.]*$//'` +PV=`dpkg --listfiles $PACKAGE | sed -n -e '/^\/usr\/lib\/python.*\//{ + s,/usr/lib/python\([0-9][0-9.]*\)/.*,\1,p + q +}'` + +case "$1" in + configure|abort-upgrade|abort-remove|abort-deconfigure) + # Get the priority of this packages pygtk.py module + pyver=`echo $PACKAGE|sed -ne 's/python\([0-9]\)\.\([0-9]\).*/\1\2/p'` + priority=$((100 + ${pyver:-0})) + + # Install the pygtk.py alternative + update-alternatives \ + --install /usr/lib/python$PV/site-packages/pyexo.py py${PV}exo.py \ + /usr/lib/python$PV/site-packages/pyexo.py.$PACKAGE $priority + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# --- exo-0.3.4.orig/debian/python2.3-exo0.3.prerm +++ exo-0.3.4/debian/python2.3-exo0.3.prerm @@ -0,0 +1,20 @@ +#!/bin/bash -e +# +# Debian prerm script for Python x.y hierarchical modules +# Written by Gregor Hoffleit +# Extended by Matthias Klose +# Modified by Benedikt Meurer +# + +PACKAGE=`basename $0 | sed -e 's/\.[^.]*$//'` +PV=`dpkg --listfiles $PACKAGE | sed -n -e '/^\/usr\/lib\/python.*\//{ + s,/usr/lib/python\([0-9][0-9.]*\)/.*,\1,p + q +}'` + +if [ "$1" != "upgrade" ]; then + update-alternatives --remove py${PV}exo.py \ + /usr/lib/python$PV/site-packages/pyexo.py.$PACKAGE +fi + +#DEBHELPER# --- exo-0.3.4.orig/debian/rules +++ exo-0.3.4/debian/rules @@ -0,0 +1,146 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +# determine current exo version +EXOVERS=$(shell sed -ne 's/^Package: libexo-\([0-9]\{1,\}\.[0-9]\{1,\}\)-[0-9]\{1,\}/\1/p' debian/control) + +# determine python version in use +#PYVERS=$(shell sed -ne 's/^Build-Depends:.*python\([0-9]\{1,\}\.[0-9]\{1,\}\)-dev.*/\1/p' debian/control) + +# determine library package name +LIBRARY_PKGNAME=$(shell sed -ne 's/^Package: \(libexo-[0-9]\{1,\}\.[0-9]\{1,\}-[0-9]\{1,\}\)/\1/p' debian/control) + +# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so +version=`ls exo/.libs/lib*.so.* | \ + awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` +major=`ls exo/.libs/lib*.so.* | \ + awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` + +config.status: configure + dh_testdir + # Add here commands to configure the package. + CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc --libexecdir=/usr/lib/libexo-0.3-0 --enable-final --disable-gtk-doc --disable-python + + +build: build-stamp +build-stamp: config.status + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + + # Add here commands to clean up after the build process. + [ ! -f Makefile ] || $(MAKE) distclean +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/tmp + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + + # rename the exo gtk-docs directory to avoid conflicting -dev + # packages + #(cd $(CURDIR)/debian/tmp/usr/share/gtk-doc/html \ + # && mv exo exo-$(EXOVERS)) + + # move the pyexo.py away, will be managed as an alternative + #-(cd $(CURDIR)/debian/tmp/usr/lib/python$(PYVERS)/site-packages \ + #&& mv pyexo.py pyexo.py.python$(PYVERS)-exo$(EXOVERS)) + + # delete unused static library + -rm -f $(CURDIR)/debian/tmp/usr/lib/python$(PYVERS)/site-packages/exo-$(EXOVERS)/_exo.a + + # delete the unneeded .a and .la files + rm -f debian/tmp/usr/lib/xfce4/mcs-plugins/*.a + rm -f debian/tmp/usr/lib/xfce4/mcs-plugins/*.la + rm -f debian/tmp/usr/lib/libexo-hal-0.3.la + rm -f debian/tmp/usr/lib/libexo-0.3.la + + # Debianise + sed -i -e 's/^WebBrowser=.*/WebBrowser=debian-sensible-browser/' \ + -e 's/TerminalEmulator=.*/TerminalEmulator=debian-x-terminal-emulator/' \ + debian/tmp/etc/xdg/xfce4/helpers.rc + + # delete all pre-compiled python files + #-find $(CURDIR)/debian/tmp -name '*.py[co]' -exec rm -f '{}' ';' + + chrpath -d -k debian/tmp/usr/bin/exo-csource \ + debian/tmp/usr/bin/exo-desktop-item-edit \ + debian/tmp/usr/bin/exo-open \ + debian/tmp/usr/bin/exo-mount \ + debian/tmp/usr/lib/libexo-0.3-0/exo-helper-0.3 \ + debian/tmp/usr/lib/libexo-0.3*.so.* \ + debian/tmp/usr/lib/libexo-hal-0.3*.so.* \ + debian/tmp/usr/lib/xfce4/mcs-plugins/* + + # Create a muttng helper from the mutt one + sed -e 's/utt/uttng/;s/Icon=muttng/Icon=mutt/' \ + debian/tmp/usr/share/xfce4/helpers/muttng.desktop + +# Build architecture-independent files here. +binary-indep: build install + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installman -p$(LIBRARY_PKGNAME) debian/exo-preferred-applications.1\ + debian/exo-desktop-item-edit.1 debian/exo-mount.1 \ + debian/exo-unmount.1 debian/exo-eject.1 + dh_installexamples + dh_install --list-missing --sourcedir=debian/tmp + dh_link + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs -p$(LIBRARY_PKGNAME) + #dh_python + dh_installdeb + dh_shlibdeps -L $(LIBRARY_PKGNAME) -l debian/$(LIBRARY_PKGNAME)/usr/lib + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- exo-0.3.4.orig/debian/changelog +++ exo-0.3.4/debian/changelog @@ -0,0 +1,190 @@ +exo (0.3.4-1~bpo40+1) etch-backports; urgency=low + + * rebuild for etch backports. + * debian/libexo-0.3-dev.install: ship exo gtk-doc again + * debian/dirs removed, useless. + + -- Yves-Alexis Perez Fri, 21 Dec 2007 00:19:17 +0100 + +exo (0.3.4-1) unstable; urgency=low + + [ Simon Huggins ] + * debian/control: Move fake Homepage field to a real one now dpkg + supports it. + * Add Vcs-* headers to debian/control + + [ Yves-Alexis Perez ] + * debian/control: bump build deps to Xfce 4.4.2 + * debian/rules: don't ignore all make errors at clean stage. + * new upstrem release. + + -- Yves-Alexis Perez Sun, 02 Dec 2007 15:04:47 +0100 + +exo (0.3.2-5) unstable; urgency=low + + (Simon Huggins) + * Use ${binary:Version} so we are binNMU safe. + + (Yves-Alexis Perez) + * debian/control: condition build-dep on libhal-storage-dev so package can + be built on hurd-i386. closes: #430858 + * debian/libexo-0.3-0.postinst: use kill -s so we don't have problem on hurd. + + -- Yves-Alexis Perez Mon, 17 Sep 2007 23:20:12 +0200 + +exo (0.3.2-4) unstable; urgency=low + + * Add muttng handler just like the mutt handler closes: #402824 + * Depend on liburi-perl for mailto: handling closes: #421662 + + -- Simon Huggins Tue, 22 May 2007 12:40:34 +0100 + +exo (0.3.2-3) unstable; urgency=low + + * Upload to unstable. + + -- Yves-Alexis Perez Sun, 15 Apr 2007 15:21:10 +0100 + +exo (0.3.2-2) experimental; urgency=low + + (Yves-Alexis Perez) + * debian/rules: + - don't ship unused .la files. + - ship manfiles for exo-(un|)mount and exo-eject. + * debian/libexo-0.3-0.install: ship pixmaps. + * debian/copyright: updated copyright holders and added documentation + license. + + (Emanuele Rocca) + * Meaningful whatis entries added to exo-mount(1), exo-umount(1) and + exo-eject(1). + + -- Yves-Alexis Perez Sun, 08 Apr 2007 15:30:01 +0200 + +exo (0.3.2-1) experimental; urgency=low + + * New upstream release. + * debian/control: + - updated build-deps against Xfce 4.4. + - added build-dep on libhal-storage-dev to enable volume management with + thunar-volman. + - added dep on libhal-storage-dev for libexo-0.3-dev. + + -- Yves-Alexis Perez Wed, 24 Jan 2007 23:59:38 +0100 + +exo (0.3.1.12rc2-1) unstable; urgency=low + + * New upstream release. + * debian/control: updated build-deps against Xfce 4.4RC2 (4.3.99.2). + + -- Yves-Alexis Perez Thu, 16 Nov 2006 15:09:11 +0100 + +exo (0.3.1.10rc1-1) unstable; urgency=low + + * New upstream release. + * debian/control: updated build-dep against Xfce 4.4RC1 (4.3.99.1). + * Preferred applications now appear in Settings Manager. Closes:#370404 + + -- Yves-Alexis Perez Sat, 23 Sep 2006 13:46:54 +0100 + +exo (0.3.1.8beta2-3) unstable; urgency=low + + * debian/rules: fix bashism. (thanks Mohammed Adnène Trojette) + + -- Yves-Alexis Perez Sun, 27 Aug 2006 15:48:10 +0100 + +exo (0.3.1.8beta2-2) unstable; urgency=low + + (Yves-Alexis Perez) + * debian/control: build-dep on xfce4-mcs-manager-dev to add preferred + applications to settings manager. + (Simon Huggins) + * Remove bogus rpaths. + + -- Yves-Alexis Perez Sat, 05 Aug 2006 17:50:09 +0100 + +exo (0.3.1.8beta2-1) unstable; urgency=low + + * New upstream release. + * debian/postinst: fixed install on hurd by not using pkill. + * debian/control: updated standards version to 3.7.2. + + -- Yves-Alexis Perez Sun, 9 Jul 2006 23:11:38 +0200 + +exo (0.3.1.6beta1-1) unstable; urgency=low + + (Yves-Alexis Perez) + * New upstream release + (Simon Huggins) + * Remove pointless .la files. + + -- Yves-Alexis Perez Wed, 03 May 2006 18:34:22 +0100 + +exo (0.3.1.4alpha2-r20235-1) unstable; urgency=low + + (Yves-Alexis Perez) + * New upstream (alpha2) release + * Add libexec directory in package + (Simon Huggins) + * Add exo-preferred-applications manpage + * Remove the unneeded .la and .a files for mcs-plugins + * Move the postinst to only fire for the lib package not the -dev package + as that's where the mcs-plugins are. + * Don't depend on gtk-doc-tools let upstream build the docs once. + * Move the libexecdir from /usr/libexec to /usr/lib/libexo-0.3-0 for + lintian. + * Add #DEBHELPER# to the postinst and only run makeshlibs on the lib + package. + * Make the exo-preferred-applications system default to + debian-sensible-browser and debian-x-terminal-emulator. + + -- Yves-Alexis Perez Sun, 12 Mar 2006 12:45:44 +0000 + +exo (0.3.1.2alpha-r19548-2) unstable; urgency=low + + * Fixed shlibs so packages gets the correct exo version + + -- Yves-Alexis Perez Sat, 28 Jan 2006 16:52:02 +0000 + +exo (0.3.1.2alpha-r19548-1) unstable; urgency=low + + * (Yves-Alexis Perez) + - New Upstream (alpha) release + + * (Jani Monoses) + - Do not directly Build-depend on libstartup-notification-dev as + libxfcegui4-dev already depends on it. + - Add myself to Uploaders list + + * (Simon Huggins) + - Install the docs in the library package not the -dev one. + - Install THANKS as well as the rest + + -- Yves-Alexis Perez Mon, 23 Jan 2006 19:16:34 +0000 + +exo (0.3.0svn+r18845-1) unstable; urgency=low + + * New Upstream (alpha) version + * Changed package name + * Added exo-csource manpage + + -- Yves-Alexis Perez Mon, 14 Nov 2005 19:34:31 +0100 + +exo (0.3.0-3) unstable; urgency=low + + * Updating control to match new debian policy version. + + -- Yves-Alexis Perez Wed, 22 Jun 2005 16:04:45 +0200 + +exo (0.3.0-2) unstable; urgency=low + + * Moving to unstable + + -- Emanuele Rocca Sat, 18 Jun 2005 17:49:09 +0200 + +exo (0.3.0-1) experimental; urgency=low + + * Initial Release (Closes: #308368). + + -- Yves-Alexis Perez Tue, 19 Apr 2005 21:44:36 +0200 + --- exo-0.3.4.orig/debian/exo-preferred-applications.1 +++ exo-0.3.4/debian/exo-preferred-applications.1 @@ -0,0 +1,16 @@ +.\" Copyright (C) 2005 Simon Huggins +.TH EXO-PREFERRED-APPLICATIONS "1" "September 2006" "exo 0.3.1.10rc1" "User Commands" +.SH NAME +exo-preferred-applications \- Xfce Preferred Applications Framework +.SH DESCRIPTION +.PP +This should never be run by the user but the interested user may find +/usr/share/xfce4/doc/C/exo-preferred-applications.html enlightening. + +.SH "REPORTING BUGS" +Report bugs to . +.SH COPYRIGHT +Copyright \(co 2005 Simon Huggins +.br +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. --- exo-0.3.4.orig/debian/exo-desktop-item-edit.1 +++ exo-0.3.4/debian/exo-desktop-item-edit.1 @@ -0,0 +1,70 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. +.TH EXO-DESKTOP-ITEM-EDIT "1" "September 2006" "exo-desktop-item-edit 0.3.1.10rc1" "User Commands" +.SH NAME +exo-desktop-item-edit \- Create icons on the desktop +.SH DESCRIPTION +.SS "Usage:" +.IP +exo\-desktop\-item\-edit [OPTION...] [FILE|FOLDER] +.SS "Help Options:" +.TP +\-?, \fB\-\-help\fR +Show help options +.TP +\fB\-\-help\-all\fR +Show all help options +.TP +\fB\-\-help\-gtk\fR +Show GTK+ Options +.SS "Application Options:" +.TP +\fB\-c\fR, \fB\-\-create\-new\fR +Create a new desktop file in the given directory +.TP +\fB\-t\fR, \fB\-\-type\fR +Type of desktop file to create (Application or Link) +.TP +\fB\-\-name\fR +Preset name when creating a desktop file +.TP +\fB\-\-comment\fR +Preset comment when creating a desktop file +.TP +\fB\-\-command\fR +Preset command when creating a launcher +.TP +\fB\-\-url\fR +Preset URL when creating a link +.TP +\fB\-\-icon\fR +Preset icon when creating a desktop file +.TP +\fB\-v\fR, \fB\-\-version\fR +Print version information and exit +.TP +\fB\-\-display\fR=\fIDISPLAY\fR +X display to use +.SH AUTHOR +Written by Benedikt Meurer . +.PP +exo\-desktop\-item\-edit comes with ABSOLUTELY NO WARRANTY, +You may redistribute copies of exo\-desktop\-item\-edit under the terms of +the GNU Lesser General Public License which can be found in the +exo source package. +.PP +Please report bugs to . +.SH COPYRIGHT +Copyright \(co 2005-2006 + os-cillation e.K. All rights reserved. +.SH "SEE ALSO" +The full documentation for +.B exo-desktop-item-edit +is maintained as a Texinfo manual. If the +.B info +and +.B exo-desktop-item-edit +programs are properly installed at your site, the command +.IP +.B info exo-desktop-item-edit +.PP +should give you access to the complete manual. --- exo-0.3.4.orig/debian/control +++ exo-0.3.4/debian/control @@ -0,0 +1,38 @@ +Source: exo +Priority: optional +Maintainer: Debian Xfce Maintainers +Uploaders: Emanuele Rocca , Simon Huggins , Rudy Godoy , Martin Loschwitz , Yves-Alexis Perez +Build-Depends: debhelper (>= 4.0.0), libxfcegui4-dev (>= 4.4.2), liburi-perl, xfce4-mcs-manager-dev, chrpath, libhal-storage-dev [!hurd-i386] +Standards-Version: 3.7.2 +Section: libs +Homepage: http://libexo.os-cillation.com/ +Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/exo/ +Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/exo/ + +Package: libexo-0.3-dev +Section: libdevel +Architecture: any +Depends: libexo-0.3-0 (= ${binary:Version}), libxfcegui4-dev (>= 4.4.2), libhal-storage-dev +Conflicts: libexo0.3-dev +Replaces: libexo0.3-dev +Description: Development files for libexo + This package contains the headers and the static library + for libexo-0.3-0. + +Package: libexo-0.3-0 +Conflicts: libexo0.3-0 +Replaces: libexo0.3-0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, liburi-perl +Description: Library with extensions for Xfce + libexo is a library for Xfce that contains a bunch of additional widgets and + a framework for editable toolbars (an improved version of the framework + present in GNOME), light-weight session management support, functions to + automatically synchronize object properties (based on GObject Binding + Properties) and several miscellaneous utility and helper functions for + application developers. + . + While Xfce ships with quite a few libraries that are primarily targeted at + desktop development, libexo is targeted at application development, with a + focus on applications for Xfce. --- exo-0.3.4.orig/debian/libexo-0.3-0.install +++ exo-0.3.4/debian/libexo-0.3-0.install @@ -0,0 +1,12 @@ +etc/ +usr/bin/* +usr/lib/libexo-0.3-0/* +usr/lib/lib*.so.* +usr/lib/xfce4/mcs-plugins/*.so +usr/libexec/* +usr/share/applications +usr/share/icons +usr/share/locale/*/*/*.mo +usr/share/man/* +usr/share/pixmaps +usr/share/xfce4 --- exo-0.3.4.orig/debian/exo-mount.1 +++ exo-0.3.4/debian/exo-mount.1 @@ -0,0 +1,52 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. +.TH EXO-MOUNT "1" "January 2007" "exo-mount 0.3.2" "User Commands" +.SH NAME +exo-mount \- mount volumes based on their HAL UDIs or their device files +.SH DESCRIPTION +.SS "Usage:" +.IP +exo\-mount [OPTION...] Xfce mount +.SS "Help Options:" +.TP +\-?, \fB\-\-help\fR +Show help options +.TP +\fB\-\-help\-all\fR +Show all help options +.TP +\fB\-\-help\-gtk\fR +Show GTK+ Options +.SS "Application Options:" +.TP +\fB\-e\fR, \fB\-\-eject\fR +Eject rather than mount +.TP +\fB\-u\fR, \fB\-\-unmount\fR +Unmount rather than mount +.TP +\fB\-h\fR, \fB\-\-hal\-udi\fR +Mount by HAL device UDI +.TP +\fB\-d\fR, \fB\-\-device\fR +Mount by device file +.TP +\fB\-n\fR, \fB\-\-no\-ui\fR +Don't show any dialogs +.TP +\fB\-v\fR, \fB\-\-version\fR +Print version information and exit +.TP +\fB\-\-display\fR=\fIDISPLAY\fR +X display to use +.SH AUTHOR +Written by Benedikt Meurer . +.PP +exo\-mount comes with ABSOLUTELY NO WARRANTY, +You may redistribute copies of exo\-mount under the terms of +the GNU Lesser General Public License which can be found in the +exo source package. +.PP +Please report bugs to . +.SH COPYRIGHT +Copyright \(co 2006-2007 + os-cillation e.K. All rights reserved. --- exo-0.3.4.orig/debian/watch +++ exo-0.3.4/debian/watch @@ -0,0 +1,3 @@ +version=3 +http://www.xfce.org/archive/xfce-(.*)/src/ \ + exo-(.*)\.tar\.bz2 --- exo-0.3.4.orig/config.guess +++ exo-0.3.4/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2007-01-15' +timestamp='2007-07-22' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -139,23 +139,6 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -if [ "${UNAME_SYSTEM}" = "Linux" ] ; then - eval $set_cc_for_build - cat << EOF > $dummy.c - #include - #ifdef __UCLIBC__ - # ifdef __UCLIBC_CONFIG_VERSION__ - LIBC=uclibc __UCLIBC_CONFIG_VERSION__ - # else - LIBC=uclibc - # endif - #else - LIBC=gnu - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'` -fi - # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -347,7 +330,7 @@ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; - i86pc:SunOS:5.*:*) + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) @@ -808,12 +791,15 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[3456]*) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T:Interix*:[3456]* | authenticamd:Interix*:[3456]*) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; @@ -847,28 +833,28 @@ echo ${UNAME_MACHINE}-pc-minix exit ;; arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo cris-axis-linux-${LIBC} + echo cris-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-${LIBC} + echo crisv32-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-${LIBC} + echo frv-unknown-linux-gnu exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; mips:Linux:*:*) eval $set_cc_for_build @@ -891,7 +877,7 @@ s: ::g p }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; mips64:Linux:*:*) eval $set_cc_for_build @@ -914,16 +900,16 @@ s: ::g p }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) - echo or32-unknown-linux-${LIBC} + echo or32-unknown-linux-gnu exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-${LIBC} + echo powerpc-unknown-linux-gnu exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-${LIBC} + echo powerpc64-unknown-linux-gnu exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -936,40 +922,40 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="gnulibc1" ; fi - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; - PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; - *) echo hppa-unknown-linux-${LIBC} ;; + PA7*) echo hppa1.1-unknown-linux-gnu ;; + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; esac exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-${LIBC} + echo hppa64-unknown-linux-gnu exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-${LIBC} + echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-${LIBC} + echo x86_64-unknown-linux-gnu exit ;; xtensa:Linux:*:*) - echo xtensa-unknown-linux-${LIBC} + echo xtensa-unknown-linux-gnu exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so @@ -984,22 +970,20 @@ p'` case "$ld_supported_targets" in elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}" + TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" ;; a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout" + echo "${UNAME_MACHINE}-pc-linux-gnuaout" exit ;; coff-i386) - echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff" + echo "${UNAME_MACHINE}-pc-linux-gnucoff" exit ;; "") # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld" + echo "${UNAME_MACHINE}-pc-linux-gnuoldld" exit ;; esac - # This should get integrated into the C code below, but now we hack - if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi # Determine whether the default compiler is a.out or elf eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c --- exo-0.3.4.orig/config.sub +++ exo-0.3.4/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2007-01-18' +timestamp='2007-06-28' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -244,7 +244,7 @@ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ | bfin \ | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx | dvp \ + | d10v | d30v | dlx | dsp16xx \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ @@ -277,7 +277,7 @@ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ | score \ - | sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ @@ -358,7 +358,7 @@ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]a*eb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ @@ -475,8 +475,8 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16c) - basic_machine=cr16c-unknown + cr16) + basic_machine=cr16-unknown os=-elf ;; crds | unos) @@ -683,6 +683,10 @@ basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -690,24 +694,6 @@ basic_machine=m68k-atari os=-mint ;; - mipsEE* | ee | ps2) - basic_machine=mips64r5900el-scei - case $os in - -linux*) - ;; - *) - os=-elf - ;; - esac - ;; - iop) - basic_machine=mipsel-scei - os=-irx - ;; - dvp) - basic_machine=dvp-scei - os=-elf - ;; mips3*-*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ;; @@ -1240,7 +1226,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -irx*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*)