--- xarchiver-0.4.6.orig/debian/changelog +++ xarchiver-0.4.6/debian/changelog @@ -0,0 +1,137 @@ +xarchiver (0.4.6-6ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/control: adhere to DebianMaintainerField + - debian/rules: keep the .tap file where it's supposed to be. + + -- Lionel Le Folgoc Sat, 08 Dec 2007 15:41:25 +0100 + +xarchiver (0.4.6-6) unstable; urgency=low + + * Adding deb mime types to desktop file (Closes: #454669). + + -- Daniel Baumann Fri, 7 Dec 2007 09:06:00 +0100 + +xarchiver (0.4.6-5ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - keep the .tap file where it's supposed to be + * debian/control: + - override Maintainer to MOTU since this package is now in universe + - use the Homepage: field. + + -- Lionel Le Folgoc Sat, 27 Oct 2007 14:25:52 +0200 + +xarchiver (0.4.6-5) unstable; urgency=low + + * Temporarily revert icon move (Closes: #441420). + + -- Daniel Baumann Sun, 30 Sep 2007 10:52:00 +0200 + +xarchiver (0.4.6-4) unstable; urgency=low + + * Corrected icon path (Closes: #409502). + + -- Daniel Baumann Wed, 15 Aug 2007 16:04:00 +0200 + +xarchiver (0.4.6-3ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/rules: do not move icons (LP #81555) + - keep the .tap file where it's supposed to be + - Updated Maintainer field. + + -- Lionel Le Folgoc Wed, 06 Jun 2007 15:10:37 +0200 + +xarchiver (0.4.6-3) unstable; urgency=low + + * Removed superfluous files in /usr/share/doc/xarchiver. + + -- Daniel Baumann Tue, 15 May 2007 14:37:00 +0200 + +xarchiver (0.4.6-2ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/rules: do not move icons (LP #81555) + - keep the .tap file where it's supposed to be + * Updated Maintainer field + + -- Gauvain Pocentek Tue, 15 May 2007 14:26:32 +0200 + +xarchiver (0.4.6-2) unstable; urgency=low + + * As a workaround, changed recommends to p7zip-full (Closes: #395231). + * Moving thunar archive plugin to the right place (Closes: #392722). + * Raised debhelper to version 5. + + -- Daniel Baumann Thu, 18 Jan 2007 10:41:00 +0100 + +xarchiver (0.4.6-1) unstable; urgency=low + + * New upstream release. + + -- Daniel Baumann Tue, 12 Dec 2006 15:03:00 +0100 + +xarchiver (0.4.6-0ubuntu2) feisty; urgency=low + + * debian/rules: do not move icons + Closes LP #81555 + + -- Gauvain Pocentek Sat, 27 Jan 2007 10:52:54 +0100 + +xarchiver (0.4.6-0ubuntu1) feisty; urgency=low + + * New upstream release + + -- Gauvain Pocentek Thu, 30 Nov 2006 16:47:34 +0100 + +xarchiver (0.4.4-0ubuntu1) feisty; urgency=low + + * New upstream release + * debian/docs: remove the FAQ file (deleted upstream) + + -- Gauvain Pocentek Thu, 23 Nov 2006 14:48:23 +0100 + +xarchiver (0.4.0-1) unstable; urgency=low + + * New upstream release: + - Fixes problem with thunar (Closes: #378845). + + -- Daniel Baumann Fri, 1 Sep 2006 14:07:00 +0200 + +xarchiver (0.3.9.2beta2-2) unstable; urgency=low + + * Added patch to fix name of the desktop icon (Closes: #378842). + + -- Daniel Baumann Wed, 19 Jul 2006 11:46:00 +0200 + +xarchiver (0.3.9.2beta2-1) unstable; urgency=low + + * New upstream release. + + -- Daniel Baumann Tue, 18 Jul 2006 19:43:00 +0200 + +xarchiver (0.3.3-2) unstable; urgency=low + + * New email address. + + -- Daniel Baumann Thu, 6 Jul 2006 10:32:00 +0200 + +xarchiver (0.3.3-1) unstable; urgency=low + + * New upstream release. + + -- Daniel Baumann Tue, 9 May 2006 09:59:00 -0500 + +xarchiver (0.3.2-1) unstable; urgency=low + + * New upstream release. + + -- Daniel Baumann Fri, 28 Apr 2006 11:10:00 +0100 + +xarchiver (0.3.1-1) unstable; urgency=low + + * Initial release (Closes: #344312). + * Added icon and manpage. + + -- Daniel Baumann Sun, 12 Mar 2006 09:45:00 +0100 --- xarchiver-0.4.6.orig/debian/watch +++ xarchiver-0.4.6/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/xarchiver/xarchiver-(.*)\.tar\.bz2 --- xarchiver-0.4.6.orig/debian/rules +++ xarchiver-0.4.6/debian/rules @@ -0,0 +1,93 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/dpatch/dpatch.make + +# 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 + +config.status: configure patch + dh_testdir + + # Configuring package + CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --libexecdir=\$${prefix}/lib + +build: build-stamp +build-stamp: config.status + dh_testdir + + # Building package + $(MAKE) + + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + + # Cleaning package + [ ! -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 + + # Installing package + $(MAKE) install DESTDIR=$(CURDIR)/debian/xarchiver + #mv debian/xarchiver/usr/share/pixmaps debian/xarchiver/usr/share/icons + + # Installing pixmap + install -D -m 644 debian/pixmap/xarchiver.xpm debian/xarchiver/usr/share/pixmaps/xarchiver.xpm + + # Removing double files + rm -f debian/xarchiver/usr/share/doc/xarchiver/AUTHORS + rm -f debian/xarchiver/usr/share/doc/xarchiver/COPYING + rm -f debian/xarchiver/usr/share/doc/xarchiver/NEWS + rm -f debian/xarchiver/usr/share/doc/xarchiver/README + rm -f debian/xarchiver/usr/share/doc/xarchiver/ChangeLog + +binary-indep: build install + +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_install + dh_installmenu + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- xarchiver-0.4.6.orig/debian/manpage/xarchiver.1 +++ xarchiver-0.4.6/debian/manpage/xarchiver.1 @@ -0,0 +1,28 @@ +XARCHIVER 1 "2005-12-27" "0.3" "frontent" + +.SH NAME +xarchiver \- GTK frontend for most used compression formats + +.SH SYNOPSIS +.B xarchiver + +.SH DESCRIPTION +.B xarchiver +is a Desktop Environment independent GTK+ 2 frontend for manipulating 7z, arj, +bzip2, gzip, rar, tar, zip, and RPM files. It allows you to create archives and +add, extract, and delete files from them. Password protected archives in the +arj, 7z, rar, and zip formats are supported. + +.SH OPTIONS +.B xarchiver +has no options. + +.SH SEE ALSO +.BR Website + + +.SH AUTHOR +xarchiver was written by Giuseppe Torelli . +.PP +This manual page was written by Daniel Baumann , for the +Debian project (but may be used by others). --- xarchiver-0.4.6.orig/debian/menu +++ xarchiver-0.4.6/debian/menu @@ -0,0 +1,3 @@ +?package(xarchiver):needs="X11" section="Apps/Tools"\ + title="Xarchiver" description="Frontend for most used compression formats"\ + command="/usr/bin/xarchiver" icon="/usr/share/pixmaps/xarchiver.xpm" --- xarchiver-0.4.6.orig/debian/manpages +++ xarchiver-0.4.6/debian/manpages @@ -0,0 +1 @@ +debian/manpage/* --- xarchiver-0.4.6.orig/debian/patches/01-desktop-icon.dpatch +++ xarchiver-0.4.6/debian/patches/01-desktop-icon.dpatch @@ -0,0 +1,19 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## 01-desktop-icon.dpatch by Daniel Baumann +## +## DP: Fixes name of the desktop icon file (Closes: #378842). + +@DPATCH@ + +diff -Naur xarchiver-0.3.9.2beta2.orig/xarchiver.desktop.in xarchiver-0.3.9.2beta2/xarchiver.desktop.in +--- xarchiver-0.3.9.2beta2.orig/xarchiver.desktop.in 2006-07-10 12:55:24.000000000 +0000 ++++ xarchiver-0.3.9.2beta2/xarchiver.desktop.in 2006-07-19 09:42:58.000000000 +0000 +@@ -5,7 +5,7 @@ + _Comment=A GTK+2 only archive manager + _GenericName=Archive manager + Exec=xarchiver +-Icon=xarchiver ++Icon=xarchiver.png + Terminal=false + Type=Application + X-MultipleArgs=false --- xarchiver-0.4.6.orig/debian/patches/03-mime-types.dpatch +++ xarchiver-0.4.6/debian/patches/03-mime-types.dpatch @@ -0,0 +1,16 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## 03-mime-types.dpatch by Daniel Baumann +## +## DP: Adds deb mime types in desktop file (Closes: #454669). + +@DPATCH@ + +diff -Naur xarchiver-0.4.6.orig/xarchiver.desktop.in xarchiver-0.4.6/xarchiver.desktop.in +--- xarchiver-0.4.6.orig/xarchiver.desktop.in 2006-11-06 12:40:33.000000000 +0000 ++++ xarchiver-0.4.6/xarchiver.desktop.in 2007-12-07 08:03:31.000000000 +0000 +@@ -11,4 +11,4 @@ + X-MultipleArgs=false + Categories=GTK;Archiving;Utility; + StartupNotify=true +-MimeType=application/x-arj;application/arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-gzip;application/x-rar;application/x-rar-compressed;application/x-tar;application/x-zip;application/x-zip-compressed;application/zip;multipart/x-zip;application/x-7z-compressed;application/x-compressed-tar;application/x-bzip2;application/x-bzip2-compressed-tar; ++MimeType=application/x-arj;application/arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-gzip;application/x-rar;application/x-rar-compressed;application/x-tar;application/x-zip;application/x-zip-compressed;application/zip;multipart/x-zip;application/x-7z-compressed;application/x-compressed-tar;application/x-bzip2;application/x-bzip2-compressed-tar;application/x-deb;application/deb --- xarchiver-0.4.6.orig/debian/patches/02-icon-path.dpatch +++ xarchiver-0.4.6/debian/patches/02-icon-path.dpatch @@ -0,0 +1,19 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## 02-icon-path.dpatch by Daniel Baumann +## +## DP: Corrects path of icons (Closes: #409502). + +@DPATCH@ + +diff -Naur xarchiver-0.4.6.orig/src/support.c xarchiver-0.4.6/src/support.c +--- xarchiver-0.4.6.orig/src/support.c 2006-11-27 07:26:29.000000000 +0000 ++++ xarchiver-0.4.6/src/support.c 2007-08-15 14:02:40.000000000 +0000 +@@ -31,7 +31,7 @@ + GtkWidget *file_image; + gchar *path; + GdkPixbuf *file_pixbuf = NULL; +- path = g_strconcat(DATADIR, "/pixmaps/xarchiver/", NULL); ++ path = g_strconcat(DATADIR, "/icons/", NULL); + path = g_strconcat(path, filename, NULL); + file_pixbuf = gdk_pixbuf_new_from_file (path, &error); + g_free (path); --- xarchiver-0.4.6.orig/debian/patches/00list +++ xarchiver-0.4.6/debian/patches/00list @@ -0,0 +1,2 @@ +01-desktop-icon.dpatch +03-mime-types.dpatch --- xarchiver-0.4.6.orig/debian/copyright +++ xarchiver-0.4.6/debian/copyright @@ -0,0 +1,30 @@ +This package was debianized by Daniel Baumann on +Sun, 12 Mar 2006 09:45:00 +0100. + +It was downloaded from . + +Upstream Author: Giuseppe Torelli + +License: + + Copyright (C) 2005-2006 Giuseppe Torelli + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General Public License +can be found in /usr/share/common-licenses/GPL file. + +The Debian packaging is (C) 2006-2007, Daniel Baumann and +is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'. --- xarchiver-0.4.6.orig/debian/compat +++ xarchiver-0.4.6/debian/compat @@ -0,0 +1 @@ +5 --- xarchiver-0.4.6.orig/debian/docs +++ xarchiver-0.4.6/debian/docs @@ -0,0 +1 @@ +TODO --- xarchiver-0.4.6.orig/debian/control +++ xarchiver-0.4.6/debian/control @@ -0,0 +1,22 @@ +Source: xarchiver +Section: x11 +Priority: optional +Maintainer: Xubuntu Developers +XSBC-Original-Maintainer: Daniel Baumann +Build-Depends: debhelper (>= 5), dpatch, autotools-dev, libgtk2.0-dev (>= 2.8) +Standards-Version: 3.7.3 +Homepage: http://xarchiver.xfce.org/ + +Package: xarchiver +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: arj, bzip2, rpm, p7zip-full, unzip, zip +Suggests: rar +Description: GTK frontend for most used compression formats + Xarchiver is a Desktop Environment independent GTK+ 2 frontend for manipulating + 7z, arj, bzip2, gzip, rar, tar, zip, and RPM files. It allows you to create + archives and add, extract, and delete files from them. Password protected + archives in the arj, 7z, rar, and zip formats are supported. + . + Xarchiver uses library package routines, if available. If you need even more + package formats, try xarchive which uses shell scripts. --- xarchiver-0.4.6.orig/debian/pixmap/xarchiver.xpm +++ xarchiver-0.4.6/debian/pixmap/xarchiver.xpm @@ -0,0 +1,260 @@ +/* XPM */ +static char * xarchiver_xpm[] = { +"32 27 230 2", +" c None", +". c #1A1814", +"+ c #36312B", +"@ c #47423A", +"# c #554D45", +"$ c #4C463E", +"% c #D0CECB", +"& c #C3C0BC", +"* c #6D665D", +"= c #3A342C", +"- c #25201A", +"; c #595552", +"> c #8F8A85", +", c #423D37", +"' c #70685E", +") c #787065", +"! c #F5F4F2", +"~ c #D6D3D1", +"{ c #534E46", +"] c #352F29", +"^ c #948E87", +"/ c #4D4740", +"( c #A09A93", +"_ c #9E9A96", +": c #44403A", +"< c #B1ACA6", +"[ c #A39C94", +"} c #36332D", +"| c #938E87", +"1 c #99948E", +"2 c #4D4843", +"3 c #B6B0A9", +"4 c #928B83", +"5 c #48443E", +"6 c #A8A29C", +"7 c #98928A", +"8 c #2B2824", +"9 c #89857F", +"0 c #7A736B", +"a c #5A554F", +"b c #C7C2BC", +"c c #ADA69F", +"d c #F8BD1B", +"e c #ED9800", +"f c #D77700", +"g c #A24800", +"h c #4A1700", +"i c #15130F", +"j c #27221C", +"k c #827B73", +"l c #6A6157", +"m c #251F18", +"n c #443B31", +"o c #635647", +"p c #554A3D", +"q c #483F34", +"r c #3C352D", +"s c #2F2A23", +"t c #78736D", +"u c #FACE47", +"v c #E3992A", +"w c #AF4400", +"x c #6D1A00", +"y c #2B0700", +"z c #59544E", +"A c #3B342C", +"B c #99938D", +"C c #D6D2CE", +"D c #817A72", +"E c #6E6254", +"F c #958A7E", +"G c #8B8379", +"H c #8A837B", +"I c #888179", +"J c #837C73", +"K c #A7A199", +"L c #C8C3BC", +"M c #F8CD4A", +"N c #D98625", +"O c #9F2C03", +"P c #460800", +"Q c #6C665F", +"R c #494238", +"S c #A9A39D", +"T c #F1EEEC", +"U c #ABA399", +"V c #F9C02F", +"W c #EEBA44", +"X c #BA5612", +"Y c #771300", +"Z c #250200", +"` c #4B4741", +" . c #464038", +".. c #959089", +"+. c #A19C96", +"@. c #DC9325", +"#. c #F2AA0F", +"$. c #FAAE00", +"%. c #E89100", +"&. c #BA5700", +"*. c #F8C334", +"=. c #E7A839", +"-. c #A9430D", +";. c #570B00", +">. c #68645E", +",. c #C6C2BD", +"'. c #A19A91", +"). c #CE6A00", +"!. c #EA9200", +"~. c #EF9900", +"{. c #EB9300", +"]. c #DD7E00", +"^. c #CD6D00", +"/. c #F6C232", +"(. c #DE932E", +"_. c #9A3409", +":. c #3C0700", +"<. c #3E3933", +"[. c #9E9994", +"}. c #706A63", +"|. c #CD6900", +"1. c #E68A00", +"2. c #ED9400", +"3. c #ED9500", +"4. c #ED9600", +"5. c #F3A100", +"6. c #D17308", +"7. c #761700", +"8. c #220200", +"9. c #59544F", +"0. c #BBB5AE", +"a. c #968F87", +"b. c #D37100", +"c. c #EC9300", +"d. c #EC9400", +"e. c #CD6B00", +"f. c #893700", +"g. c #47433E", +"h. c #9C9791", +"i. c #969089", +"j. c #DF8F11", +"k. c #F3A708", +"l. c #EA9100", +"m. c #E98F00", +"n. c #D87600", +"o. c #B24F00", +"p. c #59544D", +"q. c #BCB7B1", +"r. c #80786E", +"s. c #F6BC33", +"t. c #EAAC38", +"u. c #B75910", +"v. c #C46300", +"w. c #EB9200", +"x. c #DB7A00", +"y. c #AE4C00", +"z. c #55504A", +"A. c #A8A39C", +"B. c #8D867D", +"C. c #F7C446", +"D. c #DA8E28", +"E. c #95390D", +"F. c #4C0B00", +"G. c #964500", +"H. c #E18300", +"I. c #EC9600", +"J. c #D67400", +"K. c #221E1A", +"L. c #3E3832", +"M. c #918B82", +"N. c #7C746C", +"O. c #E69D3A", +"P. c #CE711A", +"Q. c #812305", +"R. c #2F0500", +"S. c #D06B00", +"T. c #E68C00", +"U. c #D87700", +"V. c #777067", +"W. c #484037", +"X. c #F4F3F1", +"Y. c #8C8379", +"Z. c #493C2D", +"`. c #2F1507", +" + c #230D06", +".+ c #210B06", +"++ c #180B08", +"@+ c #D47100", +"#+ c #DF8000", +"$+ c #BE5A00", +"%+ c #7E7770", +"&+ c #776F65", +"*+ c #C6C2BE", +"=+ c #D8D7D4", +"-+ c #867D72", +";+ c #716454", +">+ c #615547", +",+ c #463D31", +"'+ c #3D352B", +")+ c #3E362C", +"!+ c #2F2921", +"~+ c #6A655E", +"{+ c #9E968C", +"]+ c #EC9500", +"^+ c #C15C00", +"/+ c #47413A", +"(+ c #958C80", +"_+ c #B0A497", +":+ c #9E9386", +"<+ c #988D80", +"[+ c #968B7E", +"}+ c #8D857A", +"|+ c #C4BFBA", +"1+ c #E38700", +"2+ c #E08200", +"3+ c #C45E00", +"4+ c #CE6900", +"5+ c #E99000", +"6+ c #E28500", +"7+ c #C86200", +"8+ c #D46F00", +"9+ c #CF6600", +"0+ c #CB6000", +"a+ c #C95E00", +"b+ c #BB4B00", +"c+ c #5E1C00", +"d+ c #591700", +"e+ c #5A1900", +"f+ c #5C1E00", +"g+ c #491700", +" ", +" . + @ # $ % & * = - ", +" ; > , ' ) ! ~ { ] ^ ", +" / ( _ ", +" : < [ ", +" } | 1 ", +" 2 3 4 ", +" 5 6 7 ", +" 8 9 0 ", +" a b c d e f g h ", +" i j k l m n o p q r s t u v w x y ", +" z A B C D E F G H I J K L M N O P ", +" Q R S T U V W X Y Z ", +" ` ...+. @.#.$.$.$.%.&. *.=.-.;. ", +" >.,.'. ).!.~.~.{.].^./.(._.:. ", +" <.[.}. |.1.2.3.4.5.6.7.8. ", +" 9.0.a. b.c.4.3.d.e.f. ", +" g.h.i. j.k.l.3.3.m.n.o. ", +" p.q.r. s.t.u.v.w.4.3.w.x.y. ", +" z.A.B. C.D.E.F.G.H.I.3.3.l.J. ", +" K.L.M.N. O.P.Q.R. S.T.4.3.3.m.U. ", +" V.W.,.X.Y.Z. `. +.+++ @+{.4.3.3.{.#+$+ ", +" %+&+*+=+-+;+>+,+'+)+!+~+{+ ].]+3.3.3.{.#+^+ ", +" /+(+_+:+<+[+}+|+ 1+4.3.3.3.c.2+3+ ", +" 4+T.{.l.l.l.5+6+7+ ", +" 8+9+0+0+0+0+0+a+b+ ", +" c+d+d+d+d+d+e+f+g+ "}; --- xarchiver-0.4.6.orig/config.guess +++ xarchiver-0.4.6/config.guess @@ -1,9 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2005-12-13' +timestamp='2007-03-06' # 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 @@ -106,7 +107,7 @@ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; @@ -160,6 +161,7 @@ arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -206,8 +208,11 @@ *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; macppc:MirBSD:*:*) - echo powerppc-unknown-mirbsd${UNAME_RELEASE} + echo powerpc-unknown-mirbsd${UNAME_RELEASE} exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} @@ -764,12 +769,19 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + case ${UNAME_MACHINE} in + pc98) + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; - i*:MINGW*:*) + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) @@ -779,9 +791,15 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[345]*) - echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' - 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 ;; @@ -817,6 +835,9 @@ arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu exit ;; @@ -851,7 +872,11 @@ #endif #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; mips64:Linux:*:*) @@ -870,7 +895,11 @@ #endif #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) @@ -925,6 +954,9 @@ x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; + xtensa:Linux:*:*) + echo xtensa-unknown-linux-gnu + exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -967,7 +999,7 @@ LIBC=gnulibc1 # endif #else - #if defined(__INTEL_COMPILER) || defined(__PGI) + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) LIBC=gnu #else LIBC=gnuaout @@ -977,7 +1009,11 @@ LIBC=dietlibc #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`" + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^LIBC/{ + s: ::g + p + }'`" test x"${LIBC}" != x && { echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit @@ -1179,6 +1215,15 @@ SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; --- xarchiver-0.4.6.orig/config.sub +++ xarchiver-0.4.6/config.sub @@ -1,9 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2005-12-11' +timestamp='2007-01-18' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -240,15 +241,16 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -268,26 +270,25 @@ | mn10200 | mn10300 \ | mt \ | msp430 \ + | nios | nios2 \ | ns16k | ns32k \ | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | score \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b \ - | strongarm \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; - m32c) - basic_machine=$basic_machine-unknown - ;; m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown @@ -317,18 +318,18 @@ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ + | avr-* | avr32-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ - | m32r-* | m32rle-* \ + | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ @@ -350,29 +351,28 @@ | mmix-* \ | mt-* \ | msp430-* \ + | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | 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-* | sparc86x-* | sparclet-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) ;; - m32c-*) - ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -818,6 +818,12 @@ pc532 | pc532-*) basic_machine=ns32k-pc532 ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; @@ -904,6 +910,10 @@ sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; sei) basic_machine=mips-sei os=-seiux @@ -915,6 +925,9 @@ basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown ;; @@ -1120,7 +1133,7 @@ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sparc | sparcv8 | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; cydra) @@ -1193,7 +1206,8 @@ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ @@ -1208,7 +1222,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1360,6 +1374,12 @@ # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; @@ -1369,9 +1389,9 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff - ;; + c4x-* | tic4x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 @@ -1397,6 +1417,9 @@ m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;;