--- poedit-1.3.8~pre1.orig/debian/control +++ poedit-1.3.8~pre1/debian/control @@ -0,0 +1,18 @@ +Source: poedit +Section: text +Priority: optional +Maintainer: Daniel Baumann +Build-Depends: debhelper (>= 5), autotools-dev, gettext, libdb4.6-dev, libgtk2.0-dev, libgtkspell-dev, libwxgtk2.6-dev, wx-common, zip +Standards-Version: 3.7.2 + +Package: poedit +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, gettext +Description: gettext catalog editor + Generator for po to mo using the wxWindows toolkit, aiming to provide + a convenient way of editing gettext catalogs. It features UTF-8 support, fuzzy + and untranslated records highlighting, whitespace highlighting, references + browser, header editing and can be used to create new catalogs or update + existing catalogs from source code with a single click. + . + Homepage: --- poedit-1.3.8~pre1.orig/debian/changelog +++ poedit-1.3.8~pre1/debian/changelog @@ -0,0 +1,433 @@ +poedit (1.3.8~pre1-1) unstable; urgency=low + + * New upstream release. + + -- Daniel Baumann Mon, 26 Nov 2007 21:58:00 +0100 + +poedit (1.3.7+20071010-2) unstable; urgency=medium + + * Rebuilding against lidb4.6. + + -- Daniel Baumann Wed, 17 Oct 2007 10:29:00 +0200 + +poedit (1.3.7+20071010-1) unstable; urgency=medium + + * New upstream snapshot: + - Keeps ordering of msgids from the previous state (Closes: #420685). + + -- Daniel Baumann Wed, 10 Oct 2007 11:16:00 +0200 + +poedit (1.3.7-1) unstable; urgency=low + + * New upstream release: + - Uses correct short-cut for Swedish po file (Closes: #336822). + * Bumped package to debhelper 5. + * Building against libdb4.5-dev now. + + -- Daniel Baumann Sun, 15 Jul 2007 21:33:00 +0200 + +poedit (1.3.6-1) unstable; urgency=low + + * New upstream release: + - dropping 01-po-corruption.dpatch, was taken from a pre-release. + * Removed win32 specific parts of long description (Closes: #405842). + + -- Daniel Baumann Sat, 6 Jan 2007 19:54:00 +0100 + +poedit (1.3.5-2) unstable; urgency=medium + + * Applied patch from upstream to fix po corruption warning (Closes: #391934). + + -- Daniel Baumann Mon, 16 Oct 2006 16:11:00 +0200 + +poedit (1.3.5-1) unstable; urgency=low + + * New upstream release. + * Dropped dpatch to update some po files, it went upstream. + + -- Daniel Baumann Fri, 6 Oct 2006 23:31:00 +0200 + +poedit (1.3.4-4) unstable; urgency=low + + * Took over package from Luk. + * Redone debian directory based on new debhelper templates, additionally: + - launching /usr/bin/poeditor from the desktop file. + - included additional docs. + - included *.css for the html docs and imgages for translated html docs. + - installing icon and pixmap from source rather than shipping an own copy. + - using dpatch for upstream modifications. + + -- Daniel Baumann Tue, 11 Jul 2006 08:07:00 +0200 + +poedit (1.3.4-3) unstable; urgency=low + + * Update Standards-Version to 3.7.2 (no changes). + * Updated build dep on Berkeley DB to 4.4 + * Rebuild fixes SIGSEGV when trying to access help (Closes: #366614). + + -- Luk Claes Wed, 10 May 2006 00:25:10 +0200 + +poedit (1.3.4-2) unstable; urgency=low + + * Move poedit entry to the Apps/Text submenu and use a l10n hint + (Closes: #309085). + + -- Luk Claes Wed, 1 Feb 2006 11:07:42 +0100 + +poedit (1.3.4-1) unstable; urgency=low + + * New upstream version. + * Use libgtkspell. Closes: #328723 + + -- Luk Claes Mon, 3 Oct 2005 12:29:29 +0200 + +poedit (1.3.3-5) unstable; urgency=low + + * Depend on wxWidgets2.6. Closes: #308984, #324911 + * Removed autotools dependencies except for autotools-dev + * Removed version in build-dep on debhelper as even oldstable has a high + enough version + * Remove dpatch build-dep + + -- Luk Claes Thu, 15 Sep 2005 20:49:46 +0200 + +poedit (1.3.3-2) unstable; urgency=high + + * Rebuild for gcc transition. Closes: #323293 + + -- Luk Claes Sat, 20 Aug 2005 19:21:59 +0200 + +poedit (1.3.3-1) unstable; urgency=low + + * New upstream version. Closes: #315934 + * debian/watch: + - Watch only [0-9,.]* versions + * debian/rules: + - Removed several trivial comments and commented debhelper commands + * debian/poedit.dirs: + - Removed usr/sbin as it is not used in the package + * debian/poedit.desktop: + - Added Dutch version of the Comment (Dutch version of Name not necessary) + * debian/copyright: + - Updated years to 1999-2005 + * debian/control: + - Bumped Standards-Version to 3.6.2.1 (no changes) + - Package takeover: + * I'm the new maintainer + * Christine Spang is added as uploader + + -- Luk Claes Wed, 29 Jun 2005 16:00:20 +0200 + +poedit (1.3.2-4) unstable; urgency=low + + * debian/rules: + - Stop updating debian/changelog when config.{guess|sub} are updated, + on the request of autobuilder maintainers + * debian/control: + - Add Luk Claes to Uploaders. Prepare for package takeover. + + -- Christian Perrier Wed, 8 Jun 2005 07:18:24 +0200 + +poedit (1.3.2-3) unstable; urgency=low + + * Rebuild against wx2.4 as wx2.5.3 has been removed from unstable + Closes: #308476 + Reopens: #217067, #257482 + * debian/control: + Build-Depends reverted to wx2.4 stuff + Add automake1.7 to Build-Depends + * GNU config automated update: config.sub (20040211 to 20050422), + config.guess (20040202 to 20050422) + + -- Christian Perrier Wed, 11 May 2005 07:49:27 +0200 + +poedit (1.3.2-2) unstable; urgency=low + + * Correct use of hints and longtitle in the menu file + Thanks to Bill Allombert for pointing this. Closes: #296880 + + -- Christian Perrier Tue, 8 Mar 2005 08:04:59 +0100 + +poedit (1.3.2-1) unstable; urgency=low + + * New upstream version + * Remove dpatch use (temporarily?) as no patches are needed anymore + (temporarily? :-)) + * GNU config automated update: config.sub (20040211 to 20041130), + config.guess (20040202 to 20041112) + + -- Christian Perrier Sun, 30 Jan 2005 13:40:35 +0100 + +poedit (1.3.1-7) unstable; urgency=low + + * Buy myself a brain and really add a build dependency + on wx2.5-common. Closes: #291140 + + -- Christian Perrier Sat, 22 Jan 2005 10:47:30 +0100 + +poedit (1.3.1-6) unstable; urgency=low + + * Add dependency on wx2.5-common to fix FTBFS + Closes: #291140 + * Lintian fixes: + - Remove inital capital letter from the package description + + -- Christian Perrier Wed, 19 Jan 2005 10:54:00 +0100 + +poedit (1.3.1-5) unstable; urgency=low + + * GNU config automated update: config.sub (20040624 to 20041130), + config.guess (20040813 to 20041112) + * debian/patches/004_poedit-wx2.5.3-compilation.dpatch + Fix for avoiding a double assertion when compiling + with wxWindows 2.5.3 + Thanks to Luk Claes for helping me in finally finding the + correct path for solving this and have the debian/rules file + properly written (I hope so). Thanks as well to Helen Faulkner for + spending hours trying to track this bug down + Now, poedit correctly quits when closing it + Closes: #285940 + + -- Christian Perrier Sat, 15 Jan 2005 16:10:47 +0100 + +poedit (1.3.1-4) unstable; urgency=low + + * Rebuilt for unstable with wxwin 2.5 + Closes: #217067, #257482 + * 003_gcc-4.0-ftbfs.dpatch + Avoid FTBFS with gcc-4.0 + Thanks to Andreas Jochens for the patch + Closes: #284347 + + -- Christian Perrier Fri, 10 Dec 2004 22:43:14 +0100 + +poedit (1.3.1-3) experimental; urgency=low + + * Rebuilt with wxwin 2.5.x. Adds support for Unicode + Closes: #217067, #257482 + + -- Christian Perrier Sat, 4 Dec 2004 19:40:30 +0100 + +poedit (1.3.1-2) unstable; urgency=low + + * debian/compat debian/rules + - Now use debian/compat for debhelper compatibility level + * debian/rules + - Consistency in location definitions : docdir=debian/$(package) + * debian/control + - Build-Depends on debhelper >=4.0 + * debian/patches/002_poedit.1.dpatch + - Fix section in man page. Thanks, lintian. + + -- Christian Perrier Wed, 17 Nov 2004 18:39:39 +0100 + +poedit (1.3.1-1) unstable; urgency=low + + * New upstream version. Closes: #270610 + * This version fixes the following upstream bugs: + - now handles plural forms. Closes: #240854 + * [bubulle] Removed 01autocomment patch (should not be needed anymore) + * GNU config automated update: config.sub (20030818 to 20040624), + config.guess (20031003 to 20040813) + + -- Christian Perrier Fri, 17 Sep 2004 16:49:17 +0200 + +poedit (1.2.5-3) unstable; urgency=low + + * [bubulle] debian/control + - Updated to Standards 3.6.1.1 + * [bubulle] debian/poedit.xpm + - Remove extra space in icon file. Closes: #263078 + * GNU config automated update: config.sub (20040105 to 20040312), + config.guess (20040105 to 20040312) + * GNU config automated update: config.sub (20040312 to 20040624), + config.guess (20040312 to 20040719) + + -- Christian Perrier Sun, 15 Aug 2004 18:17:04 +0200 + +poedit (1.2.5-2) unstable; urgency=low + + * Switch to dpatch for managing patches to upstream sources + * Patch for correcting automents handling. Thanks, Tim Dijkstra + Closes: #232625 + + -- Christian Perrier Fri, 5 Mar 2004 18:18:17 +0100 + +poedit (1.2.5-1) unstable; urgency=low + + * New upstream version. Closes: #231224 + - Comment window may now be edited. Closes: #227379 + - Fuzzy status now properly updated. Closes: #227255 + - Exit dialog now offers a Cancel option. Closes: #225957 + * Prospectively added dh_buildinfo to debian/rules. New Build-Depends on + dh-buildinfo + * GNU config automated update: config.sub (20031007 to 20040105), + config.guess (20031007 to 20040105) + + -- Christian Perrier Fri, 5 Mar 2004 18:18:09 +0100 + +poedit (1.2.4-2) unstable; urgency=low + + * poedit.desktop is UTF-8 encoded. Closes: #225021 + * Ack NMU + + -- Christian Perrier Sat, 10 Jan 2004 18:04:01 +0100 + +poedit (1.2.4-1.2) unstable; urgency=low + + * Rebuilt with sources included. + + -- Arnaud Vandyck Sat, 20 Dec 2003 15:37:46 +0100 + +poedit (1.2.4-1.1) unstable; urgency=low + + * Christian asked for an NMU because of a PGP key problem. + + -- Arnaud Vandyck Sat, 20 Dec 2003 15:24:23 +0100 + +poedit (1.2.4-1) unstable; urgency=low + + * New upstream version. Closes: #224282 + + -- Christian Perrier Thu, 18 Dec 2003 07:30:16 +0100 + +poedit (1.2.3-2) unstable; urgency=medium + + * Rebuild against latest wxwin libraries. Closes:#217948 + + -- Christian Perrier Tue, 28 Oct 2003 18:04:19 +0100 + +poedit (1.2.3-1) unstable; urgency=low + + * New upstream version. Closes: #215523 + * Logic error in DB build dialogs fixed upstream. Closes: #211574 + * Statistics do not disappear anymore when using menus (fixed upstream) + Closes: #211836 + * GNU config automated update: config.sub (20010907 to 20031007), + config.guess (20010904 to 20031007) + + -- Christian Perrier Mon, 13 Oct 2003 11:45:15 +0200 + +poedit (1.2.2-4) unstable; urgency=low + + * Updated to Standards: 3.6.1 + * Added a 32x32 icon. Added to menu entry also + * GNU config automated update: config.sub (20030509 to 20030717), + config.guess (20030519 to 20030702) + * Added a menu entry for Gnome and KDE. Thanks monte@mail.lt for pointing + this. Closes: #204814 + * Program name reset to poedit. Use alternatives for avoiding a conflict + with potool. Closes: #206051 + * Brand new prerm script for the above + + -- Christian Perrier Thu, 21 Aug 2003 18:28:57 +0200 + +poedit (1.2.2-3) unstable; urgency=low + + * Updated to Standards: 3.5.10.0 (no change) + * GNU config automated update: config.sub (20030509 to 20030509), + config.guess (20030509 to 20030519) + + -- Christian Perrier Tue, 27 May 2003 14:23:19 +0200 + +poedit (1.2.2-2) unstable; urgency=low + + * Modified debian/rules for "Calling GNU configure properly", see + /usr/share/doc/autotools-dev/README.Debian.gz + * Modified debian/rules for using config.{guess,sub} from autotools-dev + if they're more recent than upstream ones. Added an autotools + target for this. Build dependency on autoconf, autotools-dev and devscripts + Closes: #193038 + * GNU config automated update: config.sub (20001104 to 20030509), + config.guess (20001104 to 20030509) + + -- Christian Perrier Mon, 12 May 2003 20:23:08 +0200 + +poedit (1.2.2-1) unstable; urgency=low + + * New upstream version. Closes: #192583 + * Renamed debian/menu to debian/poedit.menu + * Renamed debian/dirs to debian/poedit.dirs + * Removed useless poeditor.1 file in debian/ + * Updated to Standards: 3.5.9.0 + + -- Christian Perrier Fri, 9 May 2003 11:04:14 +0200 + +poedit (1.2.1+20030310-1) unstable; urgency=low + + * Upload with new maintainer information + * Previous NMU's acknowledged. Closes: #133386, #183159, #149986, #146708, #146520, #166122 + * Previous NMU successfully built on s390. Closes: #121585 + * Modified debian/rules for avoiding the copy of a CVS directory. Closes: #188096 + + -- Christian Perrier Sat, 5 Apr 2003 07:47:15 +0200 + +poedit (1.2.1+20030310-0.3) unstable; urgency=low + + * Non-maintainer upload + * G++ 3.0 compilation checked OK (on i386). Closes: #133386 + + -- Christian Perrier Thu, 3 Apr 2003 14:02:28 +0200 + +poedit (1.2.1+20030310-0.2) unstable; urgency=low + + * Non-maintainer upload + * Preparation of adoption + * Careful editing of debian/copyright files..:-). Thanks lintian. + * Compiled with libwxgtk2.4 (Closes: #183159) + + -- Christian Perrier Wed, 2 Apr 2003 18:49:07 +0200 + +poedit (1.2.1+20030310-0.1) unstable; urgency=low + + * CVS snapshot. + + -- Nicolas Boos Mon, 10 Mar 2003 21:47:43 +0100 + +poedit (1.2.1-0.1) unstable; urgency=low + + * New upstream release. + * debian/control: + - Bumped Standards-Version to 3.5.8. + - Replaced libgtk1.2-dev, libwxgtk2.3-dev and wxwin2.3-headers by + libgtk2.0-dev, libwxgtk2.4-dev and wxwin2.4-headers. + * debian/rules: + - Add menu file ... to the final deb. + + -- Nicolas Boos Sat, 22 Feb 2003 18:27:48 +0100 + +poedit (1.1.10-0.2) unstable; urgency=low + + * Added zip to build dependencies (closes: #166122). + + -- Matthias Klose Thu, 24 Oct 2002 07:42:04 +0200 + +poedit (1.1.10-0.1) unstable; urgency=low + + * NMU. + * Don't know why I do this and do not require removal from unstable ... + Anyway, needed for the python transition :-( + * New upstream version (closes: #149986). + * Build against wxwindows2.3. + * Fix build dependencies (closes: #146708). + * Add menu file (closes: #146520). + + -- Matthias Klose Thu, 24 Oct 2002 00:08:36 +0200 + +poedit (1.0.3-4) unstable; urgency=low + + * Spelling correction in debian/control description field (Closes: #125257). + + -- Yooseong Yang Mon, 31 Dec 2001 15:48:37 +0900 + +poedit (1.0.3-2) unstable; urgency=low + + * Command name changed into __poeditor__ not poedit (Closes: #101405). + + -- Yooseong Yang Wed, 27 June 2001 23:29:37 +0900 + +poedit (1.0.3) unstable; urgency=low + + * Initial Release. + + -- Yooseong Yang Wed, 27 June 2001 23:29:37 +0900 --- poedit-1.3.8~pre1.orig/debian/watch +++ poedit-1.3.8~pre1/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/poedit/poedit-([0-9,.]*)\.tar\.gz --- poedit-1.3.8~pre1.orig/debian/postinst +++ poedit-1.3.8~pre1/debian/postinst @@ -0,0 +1,25 @@ +#!/bin/sh + +set -e + +case "${1}" in + configure) + update-alternatives \ + --install /usr/bin/poedit poedit /usr/bin/poeditor 120 \ + --slave /usr/share/man/man1/poedit.1.gz poedit.1.gz \ + /usr/share/man/man1/poeditor.1.gz + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + + *) + echo "postinst called with unknown argument \`${1}'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 --- poedit-1.3.8~pre1.orig/debian/rules +++ poedit-1.3.8~pre1/debian/rules @@ -0,0 +1,116 @@ +#!/usr/bin/make -f + +# 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 + +CXXFLAGS=-ggdb + +DATE=$(shell date +%Y%m%d) + +upstream: + # Needs: subversion autoconf automake libtool + + # Getting sources + cd .. && \ + svn co https://poedit.svn.sourceforge.net/svnroot/poedit/poedit/trunk poedit && \ + mv poedit poedit-1.3.7+$(DATE) + + # Bootstrapping + cd ../poedit-1.3.7+$(DATE) && \ + aclocal -I admin && \ + automake --foreign -a -c -f && \ + autoconf + + # Removing unused files + find ../poedit-1.3.7+$(DATE) -type d -name .svn | xargs rm -rf + + # Creating tarball + tar cfz ../poedit_1.3.7+$(DATE).orig.tar.gz ../poedit-1.3.7+$(DATE) + +config.status: configure + dh_testdir + + # Configuring package + CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man + +build: build-stamp +build-stamp: config.status + dh_testdir + + # Building package + $(MAKE) + $(MAKE) -C locales force-update allpo allmo + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + + # Cleaning package + -$(MAKE) distclean + rm -f config.log + rm -f docs/*/*.zip + rm -f locales/*.mo + rm -f src/resources/resources.zip + +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub admin/config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess admin/config.guess +endif + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Installing package + $(MAKE) install prefix=$(CURDIR)/debian/poedit/usr GNOME_DATA_DIR=$(CURDIR)/debian/poedit/usr/share KDE_DATA_DIR=$(CURDIR)/debian/poedit/usr/share + + # Renaming executable + mv debian/poedit/usr/bin/poedit debian/poedit/usr/bin/poeditor + mv debian/poedit/usr/share/man/man1/poedit.1 debian/poedit/usr/share/man/man1/poeditor.1 + + # Installing pixmap + install -D -m 0644 src/icons/appicon/poedit.xpm debian/poedit/usr/share/pixmaps/poedit.xpm + +binary-indep: build install + +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs NEWS + dh_installdocs + dh_install + dh_installmenu + 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 --- poedit-1.3.8~pre1.orig/debian/prerm +++ poedit-1.3.8~pre1/debian/prerm @@ -0,0 +1,22 @@ +#!/bin/sh + +set -e + +case "${1}" in + remove|upgrade|deconfigure) + update-alternatives --remove poedit /usr/bin/poeditor + ;; + + failed-upgrade) + + ;; + + *) + echo "prerm called with unknown argument \`${1}'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 --- poedit-1.3.8~pre1.orig/debian/compat +++ poedit-1.3.8~pre1/debian/compat @@ -0,0 +1 @@ +5 --- poedit-1.3.8~pre1.orig/debian/menu +++ poedit-1.3.8~pre1/debian/menu @@ -0,0 +1,4 @@ +?package(poedit):needs="X11" section="Apps/Text"\ + title="poEdit" longtitle="Cross-platform gettext catalog editor"\ + hints="gettext,l10n"\ + command="/usr/bin/poeditor" icon="/usr/share/pixmaps/poedit.xpm" --- poedit-1.3.8~pre1.orig/debian/copyright +++ poedit-1.3.8~pre1/debian/copyright @@ -0,0 +1,32 @@ +This package was debianized by Daniel Baumann on +Tue, 11 Jul 2006 08:07:00 +0200. + +It was downloaded from . + +Upstream Author: Vaclav Slavik + +License: + + Copyright (C) 1999-2007 Vaclav Slavik + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +The Debian packaging is (C) 2006-2007, Daniel Baumann and +is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'. --- poedit-1.3.8~pre1.orig/debian/docs +++ poedit-1.3.8~pre1/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +TODO +docs/technote.txt --- poedit-1.3.8~pre1.orig/admin/config.sub +++ poedit-1.3.8~pre1/admin/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*) --- poedit-1.3.8~pre1.orig/admin/config.guess +++ poedit-1.3.8~pre1/admin/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