--- liferea-1.4.23.orig/debian/docs +++ liferea-1.4.23/debian/docs @@ -0,0 +1,2 @@ +AUTHORS +README --- liferea-1.4.23.orig/debian/compat +++ liferea-1.4.23/debian/compat @@ -0,0 +1 @@ +5 --- liferea-1.4.23.orig/debian/rules +++ liferea-1.4.23/debian/rules @@ -0,0 +1,110 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. +include /usr/share/quilt/quilt.make + +CFLAGS = -g -O2 +LDFLAGS = "-Wl,--as-needed" + +# 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) +ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) + SYSTEM = --build $(DEB_HOST_GNU_TYPE) +else + SYSTEM = --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) +endif + +#ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) +INSTALL_PROGRAM += -s +#endif + +# Network Manager is only available for linux +ifeq (linux,$(shell dpkg-architecture -qDEB_HOST_ARCH_OS)) +ENABLE_NM=--enable-nm +else +ENABLE_NM=--disable-nm +endif + +ifeq (lpia,$(shell dpkg-architecture -qDEB_BUILD_ARCH)) +ENABLE_HILDON=--enable-hildon +CFLAGS += -DMAEMO_CHANGES +else +ENABLE_HILDON=--disable-hildon +endif + +config.status: $(QUILT_STAMPFN) configure + dh_testdir + + cp -f /usr/share/misc/config.sub config.sub + cp -f /usr/share/misc/config.guess config.guess + CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"\ + ./configure $(SYSTEM) --prefix=/usr \ + --mandir=\$${prefix}/share/man --sysconfdir=/etc \ + --enable-gecko --disable-gtkhtml2 \ + --enable-sm --enable-gnutls --enable-lua --enable-libnotify \ + $(ENABLE_NM) $(ENABLE_HILDON) + ln -s $(CURDIR)/man/liferea.1 $(CURDIR)/debian/liferea-bin.1 + ln -s $(CURDIR)/man/liferea.1 $(CURDIR)/debian/liferea-add-feed.1 + +build: build-stamp + +build-stamp: config.status + dh_testdir + $(MAKE) + touch build-stamp + +clean: + dh_testdir + dh_testroot + + [ ! -f Makefile ] || $(MAKE) distclean + + dh_clean build-stamp config.log config.sub config.guess \ + debian/liferea-bin.1 debian/liferea-add-feed.1 + $(MAKE) -f debian/rules unpatch + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 $(MAKE) install DESTDIR=$(CURDIR)/debian/liferea + # add the debian menu icon + cp debian/liferea.xpm debian/liferea/usr/share/liferea/pixmaps/ + # create translation template + cd po; intltool-update -p + # Link documentation + mkdir -p debian/liferea/usr/share/doc/liferea + ln -s ../../liferea/doc/html debian/liferea/usr/share/doc/liferea/html + # Do not separately ship xspf's license + rm debian/liferea/usr/share/liferea/media/xspf_license.txt + dh_movefiles --sourcedir=debian/liferea + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installman debian/liferea-bin.1 debian/liferea-add-feed.1 + dh_installmenu + dh_gconf + dh_icons + dh_link + dh_strip --dbg-package=liferea-dbg + 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 --- liferea-1.4.23.orig/debian/changelog +++ liferea-1.4.23/debian/changelog @@ -0,0 +1,1721 @@ +liferea (1.4.23-0ubuntu1) jaunty; urgency=low + + * New upstream bugfix release (lp: #309108). + - Fixes a cache limit bug when merging items of feeds with + more items than the cache allows (lp: #291185). + * debian/patches/series: + - don't apply lua5.1.pc, we use lua5.0. + * debian/patches/fix_toggle_status_menu: + - Removed, applied upstream. + * debian/patches/fix_launcher_script_calling_xul: + - Removed, not needed anymore. + * debian/patches/01_ubuntu_feedlists, + debian/patches/hildon_frothing: + - Updated to apply again. + * debian/patches/xulrunner-1.9: + - Updated for the new code. + * debian/patches/90_autoreconf: + - New patch, generated by running autoreconf -fiv + * debian/patches/99_autoconf: + - Removed, obsoleted by 90_autoreconf. + * debian/rules: + - Don't disable gecko; enable it and check for libxul-embedding to build + the Xulrunner engine. Don't enable xulrunner anymore, as it's now done + via --enable-gecko. + * debian/patches/load_proper_xulrunner: + - Patch from Fabien Tassin to load the appropriate Xulrunner version. + This is a replacement for fix_launcher_script_calling_xul patch. + + -- Emilio Pozuelo Monfort Wed, 17 Dec 2008 20:43:04 +0100 + +liferea (1.4.18-1ubuntu2) jaunty; urgency=low + + * debian/patches/fix_launcher_script_calling_xul, + debian/patches/series: + - Don't hardcode the /usr/lib/xulrunner-devel-1.9.0.x path which is + only available when the -dev package is installed. Get the libdir + dynamically at runtime by asking xulrunner (LP: #295490) + + -- Fabien Tassin Wed, 26 Nov 2008 08:38:23 +0100 + +liferea (1.4.18-1ubuntu1) jaunty; urgency=low + + * Merge from Debian unstable, remaining changes: + - debian/patches/fix_toggle_status_menu: fix toggle status menu + entry + - Fixes ugly CPU spikes caused by broken expiring mechanism + - Change Build-Depends from xulrunner-dev to xulrunner-1.9-dev. + - debian/patches/fix_systray_behavior: fix systray mis-behaviour + when Liferea is visible in another workspace. + - debian/patches/hildon_frothing: add Hildonisation from Frothing as + a patch. + - Add libhildon-1-dev Build-Depends for lpia. + - --enable-maemo when building on lpia. + - Call intltool-update -p to generate translation template for Rosetta. + - Do not build transitional packages (not required due to Conflicts/ + Provides/Replaces). + - Build-depend on liblualib50-dev instead of liblua5.1-0-dev. + - Do not build webkit package. + - Edit xulrunner-1.9 patch to not patch configure, handle that in + 99_autoconf. + - Add 01_ubuntu_feedlists patch and disable debian-example-feeds + - + * Ubuntu changes superseded in Debian: + - debian/patches/xulrunner-1.9: XULRUNNER_HOME check is disabled, we + don't need to check for -DXPCOM_GLUE any more. + + -- Steve Langasek Tue, 25 Nov 2008 15:36:50 -0800 + +liferea (1.4.18-1) unstable; urgency=low + + * New Upstream Release. + - Add build-depends on intltool. + - Rebase quilt patches. No conflicts. + - Disable checking of XULRUNNER_HOME from upstream's configure. Debian + does not need that setting. + - Fixes 100% CPU use regression. (Closes: #493365, #487927). + * Ack 14.16b-0.1 NMU. Thanks Mike Hommey. + * Remove Franz Pletz from Maintainer field. Thanks for all your work in + liferea, Franz. + * Refresh quilt patches for compatibility with the "3.0 (quilt)" source + package format. + * Remove -1 source-dep on quilt. No need to be so specific. + * Update Standards-Version to 3.8.0. + - Copy debian/README.source documenting use of quilt for patches from + quilt docs. + + -- Luis Rodrigo Gallardo Cruz Sun, 24 Aug 2008 11:13:24 -0700 + +liferea (1.4.18-0ubuntu2) intrepid; urgency=low + + * debian/patches/fix_toggle_status_menu: + - Fix toggle status menu entry (lp: #285486). + + -- Emilio Pozuelo Monfort Sat, 18 Oct 2008 22:35:31 +0200 + +liferea (1.4.18-0ubuntu1) intrepid; urgency=low + + * New upstream release (LP: #259578) + * Fixes ugly CPU spikes caused by broken expiring mechanism + * debian/patches/xulrunner-1.9: don't die on missing XULRUNNER_HOME when + -DXPCOM_GLUE is found. + * debian/patches/99_autoconf: updated to reflect changes. + + -- Fabien Tassin Mon, 18 Aug 2008 22:24:30 +0200 + +liferea (1.4.16b-0.1ubuntu1) intrepid; urgency=low + + * Merge from Debian unstable. + * Remaining Ubuntu changes: + - Change Build-Depends from xulrunner-dev to xulrunner-1.9-dev. + - Add intltool to Build-Depends. + - Fix systray mis-behaviour when Liferea is visible in another workspace. + - Add Hildonisation from Frothing as a patch. + - Add libhildon-1-dev Build-Depends for lpia. + - --enable-maemo when building on lpia. + - Call intltool-update -p to generate translation template for Rosetta. + - Do not build transitional packages (not required due to Conflicts/ + Provides/Replaces). + - Build-depend on liblualib50-dev instead of liblua5.1-0-dev. + - Do not build webkit package. + - Munge Maintainer field as per spec. + * Ubuntu changes dropped: + - mobile.desktop, it isn't needed any more. + - Added xulrunner-1.9 to liferea dependencies. + - Quilt changes. + * Edit xulrunner-1.9 patch to not patch configure, handle that in + 99_autoconf. + + -- Steve Kowalik Mon, 23 Jun 2008 12:44:17 +0100 + +liferea (1.4.16b-0.1) unstable; urgency=low + + * New upstream release. + * Non-maintainer upload. + * debian/control: Build-depend on xulrunner-dev instead of libxul-dev, + and add dependency on xulrunner-1.9 to liferea. + * debian/patches/xulrunner-1.9, debian/patches/series: Patch configure.ac + and configure to look for libxul-embedding-unstable.pc instead of + libxul-embedding.pc. + Closes: #480087, 479055. + + -- Mike Hommey Sun, 22 Jun 2008 18:27:28 +0200 + +liferea (1.4.15-1ubuntu2) intrepid; urgency=low + + * Fix LP: #238958 - systray mis-behavior when liferea is visible in a + different workspace. Make the window move to the current workspace when + the systray is clicked instead of doing nothing. Patch by Fabien Tassin + and Sasa Bodiroza + - add debian/patches/fix_systray_behavior + - update debian/patches/series + * Update the xul1.9 patch to look for a specific xulrunner-1.9 instead + of depending on wildcards for the corrupted places work-around. This was + causing issues when multiple xulrunner are installed + - update debian/patches/xul1.9 + + -- Fabien Tassin Mon, 09 Jun 2008 01:10:48 +0200 + +liferea (1.4.15-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes (LP: #228827): + - debian/control: + + Added xulrunner-1.9-dev and intltool to build-deps. + + Add libhildon-1-dev to the Build-Depends for lpia. + + Removed libxul-dev and libwebkitgtk-dev from build-deps. + + Build-depend on liblualib50-dev instead of liblua5.1-0-dev. + + Changed Maintainer field to match DebianMaintainerSpec. + + Added xulrunner-1.9 to liferea dependencies. + + Do not build transitional packages (not required due to Conflicts/ + Provides/Replaces). + + Do not build webkit package. + - debian/liferea-webkit.files: + + Not needed. We don't build the webkit rendering plugin. + - debian/rules: + + Install a mobile.desktop file suitable for mobile when on lpia. + + Call intltool-update -p to generate translation template for Rosetta + + Don't disable gecko, and don't enable xulrunner and webkit. + + Add --enable-hildon when building on lpia. + * In debian/patches/: Removed next patches, they are included upstream: + - 02_upstream_fix_crash_on_quit_when_updating.dpatch + - 03_upstream_fix_crash_on_ctrl+Q_when_nothing_selected.dpatch + * In debian/patches/: Migrate Ubuntu's patches from dpatch to quilt: + - Removed 00list, added below patches to series + - Removed 01_ubuntu_feedlists.dpatch, added 01_ubuntu_feedlists + - Removed 99_autoconf.dpatch, rebuilt and added 99_autoconf + - Removed debian-example-feeds.dpatch, added debian-example-feeds + - Removed hildon_frothing.dpatch, added hildon_frothing + - Removed lua5.1.pc.dpatch, added lua5.1.pc + - Removed www-browser.dpatch, added www-browser + - Removed xul1.9.dpatch, added xul1.9 + - Removed xul1.9.code.dpatch, added xul1.9.code + * In debian/control: Change Depends and Build-Depends for xulrunner-1.9-dev, + so it depends on version 1.9~rc1 or greater + * In debian/rules: + - Include /usr/share/quilt/quilt.make, instead of + /usr/share/dpatch/dpatch.make + - Modify patch-stamp to $(QUILT_STAMPFN) + + + -- Sasa Bodiroza Thu, 08 May 2008 20:00:00 +0200 + +liferea (1.4.15-1) unstable; urgency=low + + * New upstream release. + - Fixes subscription not updated anymore when number of flagged items = + cache limit (Closes: #433393). + - Fixes invalid XHTML in searches when using Swedish translation + (Closes: #475603). + - Several other bugfixes and translation updates, see upstream Changelog. + * Updated for new webkit: + - Remove webkit-update-revert patch, which existed for compatibility with + older webkit snapshots. + - Update Build-Depends to libwebkit-dev + + -- Luis Rodrigo Gallardo Cruz Sat, 19 Apr 2008 19:18:20 -0500 + +liferea (1.4.14-1) unstable; urgency=low + + * New Upstream Release (Closes: #468410). + - Avoids copying "new_susbscription" from previous versions' config dir + (Closes: #469245). + - Fixes several crashes reported upstream. + - Fixes several, and works around the remaining, issues that caused + negative read item counts. + - Includes our patch for 454184. + - We reverted upstream changes for compatibility with newer webkit + snapshots. Debian sid currently has r27674. + * debian/patches/lua5.1.pc rebased for line numbering changes. + + -- Luis Rodrigo Gallardo Cruz Fri, 14 Mar 2008 19:09:01 -0600 + +liferea (1.4.14-0ubuntu4) hardy; urgency=low + + * debian/patches/02_upstream_fix_crash_on_quit_when_updating.dpatch: + - Patch from upstream r3810, fix a crash when quiting Liferea when it's + automatically updating the feeds. LP: #211264 + * debian/patches/03_upstream_fix_crash_on_ctrl+Q_when_nothing_selected.dpatch + - Patch from upstream r3771, fix a crash when exiting Liferea with Ctrl+Q + when there's no feed selected (e.g. on startup). + * debian/patches/00list: + - Added above patches. + + -- Emilio Pozuelo Monfort Mon, 07 Apr 2008 20:15:36 +0200 + +liferea (1.4.14-0ubuntu3) hardy; urgency=low + + * fix generation of corrupted places by setting up + LD_LIBRARY_PATH properly (LP: #203413) + - update debian/patches/xul1.9.dpatch + + -- Alexander Sack Mon, 31 Mar 2008 17:41:42 +0200 + +liferea (1.4.14-0ubuntu2) hardy; urgency=low + + * fix glue startup code to also load the internal symbols through + GREStartupGlueInternal() - LP: #207410 + + update debian/patches/xul1.9.code.dpatch + + -- Alexander Sack Thu, 27 Mar 2008 16:32:14 +0100 + +liferea (1.4.14-0ubuntu1) hardy; urgency=low + + * New upstream release (LP: #201226) + - Fixes SQL join when matching item metadata + in a search folder. + - Added workaround for negative search folder + unread count values. + - Fixes Debian #469245: hanging on cache migration + from 1.0 when copying deprecated named pipe + "new_subscription" (reported by Oliver Berger). + - Workaround for Debian #454184: crash on startup + * debian/patches/hildon_autoconf: Removed, use 99_autoconf.dpatch + + -- Pedro Fragoso Wed, 12 Mar 2008 19:01:04 +0000 + +liferea (1.4.12-1) unstable; urgency=low + + * New Upstream Release (Closes: #465442). + * Check the result of calling gtk_moz_embed_get_nsIWebBrowser. + (Closes: #454184). + * liferea-webkit diverts on install the xulrunner rendering plugin, to + avoid it pulling libxul and dependencies into ram (Closes: #445320). + * Depend on debhelper (>= 5.0.51~), because of dh_icons. + * Migrate patch handling to quilt. + * Add --host args to ./configure call. + * Link with --as-needed. Apply joss' patch from #347650 to ltmain.sh. + + -- Luis Rodrigo Gallardo Cruz Sat, 23 Feb 2008 17:26:22 -0600 + +liferea (1.4.12-0ubuntu2) hardy; urgency=low + + * Change the hildon patches to applied regardless, it's too hard otherwise. + * Remove autom4te.cache from the hildon_autoconf patch. + * Add -DMAEMO_CHANGES to CFLAGS on lpia. + + -- Steve Kowalik Fri, 08 Feb 2008 12:20:42 +1100 + +liferea (1.4.12-0ubuntu1) hardy; urgency=low + + * New upstream release: + - Added support for OPML blogrolls with "xmlURL" + (instead of "xmlUrl") feed attributes as created + by LiveJournal blogroll exports. + - Fixes SF #1879861: browser skimming hotkey doesn't + work correctly when used in search folders. LP: #185930. + - Removes versioned notification plugin soname. + + -- Emilio Pozuelo Monfort Sun, 03 Feb 2008 03:42:50 +0100 + +liferea (1.4.11-1ubuntu2) hardy; urgency=low + + xulrunner-1.9 support + * add xul 1.9 support patches + - update debian/patches/00list + - add debian/patches/xul1.9.code.dpatch + - add debian/patches/xul1.9dpatch + * use configure args --enable-gecko=xulrunner-1.9 --disable-xulrunner + - update debian/rules + * fixup build-depends and depends to use xulrunner-1.9-dev and xulrunner-1.9 + - update debian/control + * drop midbrowser hacks for lpia + - update debian/control + - update debian/patches/hildon_autoconf.dpatch + - remove debian/patches/midbrowser_support.dpatch + - update debian/patches/00list.lpia + + -- Alexander Sack Mon, 28 Jan 2008 13:15:45 +0100 + +liferea (1.4.11-1ubuntu1) hardy; urgency=low + + * Merge from Debian (LP: #173590), remaining changes: + - debian/control: + + Added firefox-dev and intltool to build-deps. + + Add libhildon-1-dev to the Build-Depends for lpia. + + Removed libxul-dev and libwebkitgtk-dev from build-deps. + + Build-depend on liblualib50-dev instead of liblua5.1-0-dev. + + Changed Maintainer field to match DebianMaintainerSpec. + + Added firefox to liferea dependencies. + + Do not build transitional packages (not required due to Conflicts/ + Provides/Replaces). + + Do not build webkit package. + - debian/liferea-webkit.files: + + Not needed. We don't build the webkit rendering plugin. + - debian/rules: + + Call intltool-update -p to generate translation template for Rosetta + + Don't disable gecko, and don't enable xulrunner and webkit. + + Add --enable-hildon when building on lpia. + - debian/patches/01_ubuntu_feedlists.dpatch: + + Add Ubuntu specific feeds. LP #51604. + - debian/patches/00list: + + Do not apply lua5.1.pc, as lua5.1 is in universe. + - debian/mobile.desktop, + debian/rules: + + * Install a .desktop file suitable for mobile when on lpia. + - debian/patches/00list.lpia, + debian/patches/hildon_autoconf.dpatch, + debian/patches/hildon_frothing.dpatch, + debian/patches/midbrowser_support.dpatch: + + Add patches from Frothing for Hildonisation. + + -- Emilio Pozuelo Monfort Mon, 21 Jan 2008 18:02:36 +0100 + +liferea (1.4.11-1) unstable; urgency=low + + * New upstream release (Closes: #461364). + - Fixes crash when selecting news bins (Closes: #461347). + - Integrates translate-spanish-feedlist.dpatch. + - Other updates and fixes for bugs not reported in Debian, see upstream + changelog. + + -- Luis Rodrigo Gallardo Cruz Sat, 19 Jan 2008 09:23:46 -0600 + +liferea (1.4.10-1) unstable; urgency=low + + * New upstream release. + - Add debian-example-feeds.dpatch with the addresses of Debian Planets to + the lists of example feeds. + - Fixes wrong handling of old items due to cache limits (Closes: #453322). + - Fixes crashing on search (Closes: #454333). + - Removes comments from database when the parent item is deleted, preventing + unlimited growth of the database. On migration from 1.4.9 it will + delete *all* comments from the database, but this should be invisible + to users, as they will be re-fetched when the parent entry is first + viewed. + - New European Portuguese translation. + - Other updates and fixes for bugs not reported in Debian, see upstream + changelog. + * Add translations for strings in Spanish example feedlist. + * Change my address to rodrigo@debian.org. + - Remove Dm-Upload-Allowed field, as it's pointless now. + * Set liferea-dbg's priority to extra. Put ${shlibs:Depends} and + ${misc:Depends} into its control entry, in case something ever needs + to add a dependency there. + * Update Standards-Version to 3.7.3. No changes needed. + * Remove clean-patched target and make the clean target call make unpatch at + the end, to eliminate the unsafe handling when called using -j. + * Recommend: a file download tool (Closes Ubuntu#173590). + + -- Luis Rodrigo Gallardo Cruz Sat, 22 Dec 2007 13:51:30 -0600 + +liferea (1.4.10-0ubuntu2) hardy; urgency=low + + * Add patches from Frothing for Hildonisation. + * Add --enable-hildon when building on lpia. + * Add libhildon-1-dev to the Build-Depends for lpia. + * Build-Depend on midbrowser-dev on lpia instead of firefox-dev. + * Add a patch so ./configure recognizes midbrowser-dev. + * Install a .desktop file suitable for mobile when on lpia. + + -- Steve Kowalik Fri, 11 Jan 2008 12:57:04 +1100 + +liferea (1.4.10-0ubuntu1) hardy; urgency=low + + * New upstream release: + - Fixes SF #1850139: assertion when searching for + feed item (reported by Mlind), amongst other things. LP: #176129. + + -- Emilio Pozuelo Monfort Wed, 19 Dec 2007 21:50:53 +0100 + +liferea (1.4.9-1ubuntu1) hardy; urgency=low + + * New upstream release. + - Adds a Ctrl+W shortcut to close tabs. LP: #138747. + - Fixes a crash when the DB is locked. LP: #133066. + * debian/patches/01_ubuntu_feedlists.dpatch: + - Added. Adds planet.ubuntu.com and fridge.ubuntu.com to all the + feedlist, and also local planets where possible. LP: #51604. + - Updated 00list accordingly. + + * Sync with Debian, remaining Ubuntu changes: + - debian/control: + + Added firefox-dev and intltool to build-deps. + + Removed libxul-dev and libwebkitgtk-dev from build-deps. + + Build-depend on liblualib50-dev instead of liblua5.1-0-dev. + + Changed Maintainer field to match DebianMaintainerSpec. + + Added firefox to liferea dependencies. + + Do not build transitional packages (not required due to Conflicts/ + Provides/Replaces). + + Do not build webkit package. + - debian/liferea-webkit.files: + + Not needed. We don't build the webkit rendering plugin. + - debian/rules: + + Call intltool-update -p to generate translation template for Rosetta + + Don't disable gecko, and don't enable xulrunner and webkit. + - debian/patches/01_ubuntu_feedlists.dpatch: + + Add Ubuntu specific feeds. LP #51604. + - debian/patches/00list: + + Do not apply lua5.1.pc, as lua5.1 is in universe. + + -- Emilio Pozuelo Monfort Tue, 04 Dec 2007 23:54:36 +0100 + +liferea (1.4.9-1) unstable; urgency=low + + * New upstream releases. + [1.4.7] - Fixed catalan translation (Closes: #444888). + [1.4.8] - Fix insecure setting of LD_LIBRARY_PATH (CVE-2005-4791) + (Closes: #451548). + [1.4.9] - Fixes broken negative search folders rules (Closes: #453521). + - Various other bug fixes not reported in Debian, see upstream changelog. + * Set Dm-Upload-Allowed: yes in debian/control. + + -- Luis Rodrigo Gallardo Cruz Sat, 01 Dec 2007 20:16:06 -0600 + +liferea (1.4.8-0ubuntu1) hardy; urgency=low + + * New upstream release. LP: #160460. + + -- Emilio Pozuelo Monfort Thu, 22 Nov 2007 16:55:29 +0100 + +iliferea (1.4.7-0ubuntu1) hardy; urgency=low + + * New upstream release. LP: #154727, #156303, #141158, LP: #134086, + LP: #125896. + * debian/control: change liblua50-dev to liblualib50-dev, so configure + recognizes LUA50. This builds the Script Manager. LP: #158422. + * debian/patches/10_from_upstream_fixes_lp_151217.dpatch, + debian/patches/20_from_upstream_fix_sql_join_lp_141155.dpatch, + debian/patches/30_from_upstream_workaround_data_loss_lp_138208.dpatch: + - Removed, fixed upstream. + + * Merge from Debian unstable, remaining Ubuntu changes: + - debian/control: + + Added firefox-dev and intltool to build-deps. + + Removed libxul-dev and libwebkitgtk-dev from build-deps. + + Build-depend on liblualib50-dev instead of liblua5.1-0-dev. + + Changed Maintainer field to match DebianMaintainerSpec. + + Added firefox to liferea dependencies. + + Do not build transitional packages (not required due to Conflicts/ + Provides/Replaces). + + Do not build webkit package. + - debian/rules: + + Call intltool-update -p to generate translation template for Rosetta + + Don't disable gecko, and don't enable xulrunner and webkit. + - debian/liferea-webkit.files: + + Not needed. We don't build the webkit rendering plugin. + + -- Emilio Pozuelo Monfort Mon, 29 Oct 2007 23:14:45 +0100 + +liferea (1.4.6-1) unstable; urgency=low + + * New upstream releases. + 1.4.5b: + - Fixes use of sqlite3_free, avoiding crashing when using with sqlite + 3.5 (Closes: #446050). + + 1.4.6: + - No longer segfaults when selecting empty folder (Closes: #445457). + - Fixes loss of customized feed titles (Closes: #443413). + - Various other bug fixes not reported in Debian, see upstream changelog. + + * debian/control: + - Correct typo in liferea-webkit description (Closes: #446109). + - Remove XS- prefix from Vcs-* fields. + - Move Homepage from description into propper field. + + -- Luis Rodrigo Gallardo Cruz Tue, 30 Oct 2007 14:16:59 -0600 + +liferea (1.4.5-1) unstable; urgency=low + + * New upstream releases. + 1.4.3b: + - Better handling of extra XML namespaces (Closes: #430782). + - Avoid dropping flagged items from the cache (Closes: #442811, #443427). + + 1.4.4: + - Fixes assertion when cancelling feed updates using the update monitor + dialog. + - No longer tries to run scripts to retrieve favicons (Closes: #443751). + - Reduces minimum window size (Closes: #434866). + + 1.4.5: + - Fixes crash when using "Select File" from the advanced subscribtion + dialog (Closes: #445387). + - Close and reopen database every 500 write attempts, to work around + data loss on unclean termination (Closes: #445666). + - Adapt WebKit plugin to renamed function names. + + * debian/rules: Add call to dh_icons, to register program icons with the + Gtk icon cache. Thanks to Emilio Pozuelo Monfort for the suggestion. + * debian/control: Update build-depends to libwebkitgtk-dev, the new name + of the WebKit package. + + -- Luis Rodrigo Gallardo Cruz Wed, 10 Oct 2007 16:50:17 -0500 + +liferea (1.4.4-0ubuntu3) gutsy; urgency=low + + * debian/patches/20_from_upstream_fix_sql_join_lp_141155.dpatch: + - Added, fixes a bad sql join when modifying search folders. LP: #141155. + * debian/patches/30_from_upstream_workaround_data_loss_lp_138208.dpatch: + - Added, fixes data loss on forced termination. LP: #138208. + + -- Emilio Pozuelo Monfort Fri, 12 Oct 2007 13:43:09 +0200 + +liferea (1.4.4-0ubuntu2) gutsy; urgency=low + + * debian/patches/10_from_upstream_fixes_lp_151217.dpatch: + Added, fixes a crash when adding a local feed (Add Subscription>Advanced + Local file>Select file. LP: #151217. + + -- Emilio Pozuelo Monfort Wed, 10 Oct 2007 20:44:29 +0200 + +liferea (1.4.4-0ubuntu1) gutsy; urgency=low + + * New upstream release. (LP: #125896, #127789). + - Removing deprecated "Encoding" entry from + .desktop file (Luis Rodrigo Gallardo Cruz) + - Fixed warnings/errors with "gecko" as program + name. Now the correct name "liferea" is used. + - Fixes assertion when cancelling feed updates + using the update monitor dialog. (reported + by caccolangrifata and Aleksei Miheev) + - Fixes Debian #443751: Tries to run scripts + to retrieve favicons (reported by Daniel + Jacobowitz) + - Fixes SF #1803072: Search folders broken + - Fixes vertical/horizontal pane position saving + when exiting Liferea while the mainwindow is + not visible. (Keith Curtis) + * upload ok'd by Steve Langasek + * debian/rules: + - Use dh_icons instead of dh_iconcache. + + -- Emilio Pozuelo Monfort Mon, 01 Oct 2007 18:48:33 +0200 + +liferea (1.4.3b-0ubuntu2) gutsy; urgency=low + + * debian/control: + + Use lua5.0 instead of 5.1, as we don't have 5.1 in main for gutsy. + + -- Sebastian Dröge Sat, 29 Sep 2007 07:40:19 +0200 + +liferea (1.4.3b-0ubuntu1) gutsy; urgency=low + + * New upstream release. (UVFe LP: #145326) + * Version 1.4.3b (Stable) + - Fixes a data loss problem that causes flagged + items to be dropped out of cache. Normally + flagged items are never to be dropped. + (reported by Keith Curtis) + + * Version 1.4.3 (Stable) + - Fixes a grave bug that caused continuous feed + downloads when the default update interval is + set to 0, which is to mean disabled. + - Fixes assertions in db_item_check() and db_query_to_sql() for search + folders that do not have rules. (reported by pochu) + - Fixes SF #1798880: problem when using Ctrl-u + inside a search folder matching unread items. (LP: #102161) + - Fixes Debian #430782: better handling of RSS 2.0 + LiveJournal feeds which use lj: prefix for some + HTML elements. (reported by Daniel Jacobowitz) + - Fixes SF #1799476: crash when following links. + (reported by jphendrix) (LP: #141250) + + Version 1.4.2b (Stable) + - Fixes compilation problems of GtkHTML2 rendering. + - Fixes SF #1798158: problem with 'mark as read' + option in popup window (reported by zodmaner) + - Now removes leading/trailing white spaces from + feed list node titles. (patch from Christian Dywan) + - Fixes broken HTTP authentication. Auth info was + just not passed with HTTP requests. (reported + by Jim Henderson) + - Fixes Debian #442798: update interval values + isn't correctly updated. Interval unit is lost. + (reported by Yannick Palanque) + + * Merge with Debian, remaining Ubuntu changes: + - debian/control: + + Added firefox-dev and intltool to build-deps. + + Removed libxul-dev from build-deps. + + Changed Maintainer field to match DebianMaintainerSpec. + + Added firefox to liferea dependencies. + + Do not build transitional packages (not required due to Conflicts/ + Provides/Replaces) + - debian/rules: + + Call intltool-update -p to generate translation template for Rosetta + + Call dh_iconcache + + Don't disable gecko + - debian/patches/00list: + + Do not apply expand_treeview.dpatch, since it's fixed since 1.4.2. + + -- Emilio Pozuelo Monfort Tue, 25 Sep 2007 16:56:01 +0200 + +liferea (1.4.3-1) unstable; urgency=low + + * New upstream release (Closes: #442112). + - Remove debian/patches/expand_treeview.dpatch: Included upstream. + - Fixes using the spacebar to browse articles (Closes: #368986). + - Fixes silent loss of the update interval unit (Closes: #442798). + * debian/control, debian/rules, debian/liferea-webkit.files: + Enable experimental webkit support (Closes: #443469). + + -- Luis Rodrigo Gallardo Cruz Mon, 24 Sep 2007 16:33:07 -0500 + +liferea (1.4.2-0ubuntu1) gutsy; urgency=low + + * New upstream release (LP: #137990, LP: #130606, LP: #131742). + + -- Emilio Pozuelo Monfort Fri, 07 Sep 2007 14:22:15 +0200 + +liferea (1.4.1-1) unstable; urgency=low + + * New upstream version (Closes: #440499). + - Upload 1.4 series to unstable. + - debian/control: libgtk2.0-dev requirement downgraded again to 2.8 + - debian/patches/expand_treeview.dpatch: Patch from upstream, to be merged + in 1.4.2 + * Add XS-Vcs fields. + * Comply with the new debian menu structure. + + -- Luis Rodrigo Gallardo Cruz Wed, 05 Sep 2007 18:34:44 -0500 + +liferea (1.4~rc3-1) gutsy; urgency=low + + * New upstream release, featuring many bugfixes and translation updates. + * debian/control: + + Require Gtk >= 2.10.0. + + -- Sebastian Dröge Sun, 22 Jul 2007 23:44:06 +0200 + +liferea (1.4~RC2-1) experimental; urgency=low + + * New upstream release (Closes: #424903) + - Comment feeds. + - Feed cache is now stored in sqllite. + - Main menu is reorganized. + - Notification area icon is transparent again (Closes: #426779). + - Other miscelaneous improvements and fixes. + - Updated Build-Dependencies: libsqlite3-dev (>= 3.3.9), libglade2-dev, + libgtk2.0-dev (>= 2.10.0) + * Migrate scripting plugin to lua 5.1 + * Added -dbg package. + * Improve clean rule + + -- Luis Rodrigo Gallardo Cruz Fri, 13 Jul 2007 12:48:37 -0500 + +liferea (1.4~rc1-0ubuntu1) gutsy; urgency=low + + * New upstream release. + * debian/control: + - Added libsqlite3-dev and libglade2-dev to build-depends. + + -- Emilio Pozuelo Monfort Sun, 08 Jul 2007 13:49:29 +0200 + +liferea (1.2.20-1) unstable; urgency=low + + * New upstream version (Closes: #426779). + * Improve clean rule. + + -- Luis Rodrigo Gallardo Cruz Mon, 23 Jul 2007 12:52:14 -0500 + +liferea (1.4~RC2-1) experimental; urgency=low + + * New upstream release (Closes: #424903) + - Comment feeds. + - Feed cache is now stored in sqllite. + - Main menu is reorganized. + - Notification area icon is transparent again (Closes: #426779). + - Other miscelaneous improvements and fixes. + - Updated Build-Dependencies: libsqlite3-dev (>= 3.3.9), libglade2-dev, + libgtk2.0-dev (>= 2.10.0) + * Migrate scripting plugin to lua 5.1 + * Added -dbg package. + * Improve clean rule + + -- Luis Rodrigo Gallardo Cruz Fri, 13 Jul 2007 12:48:37 -0500 + +liferea (1.2.19-0ubuntu1) gutsy; urgency=low + + * New upstream release. + - Fixes SF #1741243 which caused endless loops on + LiveJournal authentication. + - Added Brazilian-Portugese localized feed list. + (Og Maciel) + + -- Emilio Pozuelo Monfort Tue, 03 Jul 2007 21:48:48 +0200 + +liferea (1.2.18-0ubuntu1) gutsy; urgency=low + + * New upstream release. + - Fixes some memory leaks (Hubert Figuiere) + - Improved manpage (Emilo Pozuelo Monfort) + - Starter script support for $DEBUGGER (Hubert Figuiere) + - Fixed XulRunner library root compilation parameter + (Hubert Figuiere) + - Making the tray icon transparent again when the + "show new count" option is disabled. + * debian/control: + - Remove libnspr4-dev (not needed anymore). + + -- Emilio Pozuelo Monfort Sat, 23 Jun 2007 13:24:15 +0200 + +liferea (1.2.17-0ubuntu1) gutsy; urgency=low + + * Merge with Debian, remaining Ubuntu changes: + - debian/control: + + Added libnspr4-dev, firefox-dev and intltool to build-deps + + Removed libxul-dev from build-deps + + Changed Maintainer field + + Added firefox to liferea dependencies. + + Do not build transitional packages (not required due to Conflicts/ + Provides/Replaces) + - debian/rules: + + Call intltool-update -p to generate translation template for Rosetta + + Call dh_iconcache + + Don't disable gecko + + * New upstream release + - Fixes some memory leaks (Hubert Figuiere) + - Fixes SF #1731789 "Open Feed" in detailed libnotify + popup view did not work (reported by vfiend) + - Fixes SF #1736409 HTTP Digest authentication handling + to support spaces in quoted value strings. + - Ignores GNUTLS_E_UNEXPECTED_PACKET_LENGTH (-9) + errors which seems to happen with GMail feeds. + - New Czech translation from Martin Picek + - New Basque default feed list from Iñaki Larrañaga Murgoitio + + -- Emilio Pozuelo Monfort Sat, 16 Jun 2007 10:47:47 +0200 + +liferea (1.2.16b-1) unstable; urgency=low + + * New upstream release. + - Aditional power consumption fixes. (Closes: #423839) + * dbus-1-utils was eliminated. Fix dependency. + + -- Luis Rodrigo Gallardo Cruz Fri, 08 Jun 2007 15:35:56 -0500 + +liferea (1.2.16b-0ubuntu1) gutsy; urgency=low + + * New upstream release + * Merge with Debian, remaining Ubuntu changes: + - debian/control: + + Added libnspr4-dev, firefox-dev and intltool to build-deps + + Removed libxul-dev from build-deps + + Changed Maintainer field + + Added firefox to liferea dependencies, and removed dbus-1-utils + + Do not build transitional packages (not required due to Conflicts/ + Provides/Replaces) + - debian/rules: + + Call intltool-update -p to generate translation template for Rosetta + + Call dh_iconcache + + Don't disable gecko + + -- Emilio Pozuelo Monfort Tue, 05 Jun 2007 01:33:18 +0200 + +liferea (1.2.15b-1) unstable; urgency=low + + * New upstream release. + - Better update result processing timer, should cause + less CPU usage. (Closes: #423839) + * Remove libgtkhtml2-dev from Build-deps. It has not actually been + needed since the removal of the gtkhtml rendering plugin. + * Reintroduce -xulrunner as a dummy update package. Apt won't upgrade + liferea from 1.0.27-2 without it. (Closes: #425472) + + -- Luis Rodrigo Gallardo Cruz Mon, 21 May 2007 20:48:56 -0500 + +liferea (1.2.15b-0ubuntu1) gutsy; urgency=low + + * New upstream release (LP: #115981) + + -- Emilio Pozuelo Monfort Mon, 21 May 2007 16:12:42 +0200 + +liferea (1.2.15-0ubuntu1) gutsy; urgency=low + + * New upstream release (LP: #85650, #114356) + - Better update result processing timer, should cause + less CPU usage. (patch from Arjan van de Ven) + - Increased security: disallowing clicking on file:// + links in the rendering widget, as well as preventing + from opening such links using the context menu. + - Fixes unresolved symbol in LUA binding. + (SF #1720462, reported by Jonathan Cristoforetti) + - Fixes broken base URL when selecting items in 3 pane + mode from folders. + + -- Emilio Pozuelo Monfort Thu, 17 May 2007 20:02:31 +0200 + +liferea (1.2.14-1) unstable; urgency=low + + [Franz Pletz] + * New upstream release. (Closes: #415951) + * debian/watch: Upstream releases minor fixes as letters in version. + * debian/control: + - Stop building liferea-xulrunner, liferea-gtkhtml and liferea-mozilla + transitional packages, they don't serve any purpose. + - Remove versions from Conflicts and Replaces to let dpkg remove the + transitional packages. + - Bumped Standards-Version to 3.7.2.2, no changes necessary. + * debian/copyright: Update copyright holders. + * Remove debian/NEWS.Debian, not relevant anymore. + * debian/rules: Fix typo, libnotyfy -> libnotify. + * src/ui/ui_prefs.c: Add x-www-browser to external browser settings. + (Closes: 415314) + + [Rodrigo Gallardo] + * Only enable network manager in linux builds. + + -- Luis Rodrigo Gallardo Cruz Wed, 9 May 2007 15:21:21 -0500 + +liferea (1.2.14-0ubuntu1) gutsy; urgency=low + + * New upstream release + * Merge with Debian, remaining Ubuntu changes: + + debian/control: + - Added libnspr4-dev, firefox-dev, libxt-dev and intltool to build-deps + - Removed libxml-parser-perl, libgtkhtml2-dev and libxul-dev from + build-deps + - Added firefox to liferea dependencies, and removed dbus-1-utils + - Make liferea replaces/conflicts/provides release-independent + - Updated Maintainer to Ubuntu Core Developers + + debian/control, debian/rules, debian/NEWS.Debian: + - We don't build the Xulrunner engine, but the Gecko (Firefox) one + + debian/rules + - Call intltool-update -p to generate translation template for Rosetta + (LP: #78885) + - Call dh_iconcache + + -- Emilio Pozuelo Monfort Tue, 08 May 2007 00:58:51 +0200 + +liferea (1.2.13-0ubuntu2) gutsy; urgency=low + + * debian/control + - Added libnspr4-dev to build-deps (LP: #112384) + + -- Emilio Pozuelo Monfort Fri, 04 May 2007 14:13:12 +0200 + +liferea (1.2.13-0ubuntu1) gutsy; urgency=low + + * New upstream release (LP: #98725, #103688, #110458) + + -- Emilio Pozuelo Monfort Thu, 19 Apr 2007 13:49:51 +0200 + +liferea (1.2.10c-0ubuntu1) feisty; urgency=low + + * New upstream release (LP: #102114) + - Reverting fix of 1.2.10 to prevent crashes in the Gecko support code when + clicking links in the HTML view. (LP: #98522, LP: #98861, LP: #98968) + - Changed feed property label (auto-load link) to match real (suboptimal) + behaviour when external browser is configured. + - Adds a hot key (Ctrl-L) to mark all feeds as read. + (patch suggested by Paul Dwerryhouse) + - Update of Turkish translation (Mehmet Atif Ergun) + * Fixed deb-a-day feed (and others) (LP: #51603) + + -- Emilio Pozuelo Monfort Mon, 2 Apr 2007 23:17:34 +0200 + +liferea (1.2.10b-0ubuntu1) feisty; urgency=low + + * New upstream release (LP: #98532, #98522) + + -- Emilio Pozuelo Monfort Thu, 29 Mar 2007 11:49:34 +0200 + +liferea (1.2.10-0ubuntu1) feisty; urgency=low + + * New upstream release (LP #97182, #89484) + + -- Emilio Pozuelo Monfort Wed, 28 Mar 2007 00:05:27 +0200 + +liferea (1.2.9-0ubuntu1) feisty; urgency=low + + * New upstream release: + Version 1.2.9 (Stable) + + Fixes negative unread count problems introduced with + the last release. + + Lowered memory usage by correctly unloading feeds from + memory after unselecting recursively displayed folders. + + Improved performance by avoiding unnecessary folder load + recursions. + + New preference option that allows enabling the display + of the number of new items in the tray icon. + + New preference option that allows to disable minimizing + to tray when closing the main window. + + Adding DBUS introspection (patch by moonz) + Translation + + Update of German translation (Lars Strojny) + + Version 1.2.8 (Stable) + + Adds a DBUS ping function that is used by the + liferea-add-feed script to check if the program is running. + + The liferea-add-feed script now starts Liferea if necessary. + (solution by intangible/tsukasa) + + Added 1x1 pixel filter to adblocking stylesheet. + + Fixes SF #1668278: error when exporting the feed list + although the export was successfully completed + (reported by Allan Engelhardt) + + Fixes SF #1657717: memory leak when stripping DHTML from + HTML type metadata (reported by Hubert Figuiere) + Translations: + + Updated Italian translation (Dario Conigliaro) + + Updated Brazilian Portugese translation (Og Maciel) + + New Swedish translation (Daniel Nylander) + + -- Sebastian Dröge Mon, 26 Mar 2007 09:44:28 +0200 + +liferea (1.2.7-1) experimental; urgency=low + + * New upstream release (closes: #404330, #408475). + * Remove liferea-xulrunner and liferea-mozilla packages. Now that we use a + single rendering engine there's no point to the package split anymore. + * Build with support for + - libnotify + - network-manager + * Bump debhelper compatibility mode to 5. + * Update watch file for 1.2.x series. + + -- Luis Rodrigo Gallardo Cruz Mon, 12 Mar 2007 10:36:17 -0600 + +liferea (1.2.7-0ubuntu1) feisty; urgency=low + + * New upstream release: + Version 1.2.7 (Stable) + + Fixes in the feed list loading error handling. + + Now after successful feed list import on startup a + feedlist.opml backup file will be created. + + Fixes LUA support detection. + + -- Sebastian Dröge Thu, 22 Feb 2007 10:34:34 +0100 + +liferea (1.2.6b-0ubuntu1) feisty; urgency=low + + * New upstream release: + Version 1.2.6b (Stable) + - Fixes SF #1654989 that caused crashes when marking duplicate + items as read/unread (reported by turminal) + - Merged patch SF #1646186 by mooonz that improves LUA build + support and allows compilation against LUA 5.0 and 5.1 + - Update of French translation (Vincent Lefevre) + - Update of Japanese translation (Takeshi AIHANA) + Version 1.2.6 (Stable) + - Conditional display of the feed title when viewing + merged item lists so that it is clear what the source + feed of a displayed item is. + - The item view header now provides a list of the feeds + that contain a duplicate of the feed. + - When changing the read status of an item with duplicates + in other feeds the read status is propagated to the other + item instances. + - Update of French translation (Vincent Lefevre) + Version 1.2.5 (Stable) + - Disabling GtkHTML2 support for x86_64 platforms. + Maintainers: please do discontinue any GtkHTML2 support + on such platforms if possible, as it cause only trouble! + - Removed console warning that was given on each startup + as long as social bookmarking site was not set. + - Fixes Debian #408475: liferea wrapper script is brittle, + depends on $0 (report and patch by jrodman) + - Fixes a type problem in the Digest authentication that + caused crashes on AMD64 (SF #1636563) + - Fixes for Turkish translation (Mehmet Atif Ergun) + - Fixes for Arabic translation (Khaled Hosny) + - New Russian translation (Oleg Maloglovets) + * debian/control: + + Update maintainer field... + + Drop gtkhtml backend as it is not supported anymore upstream because of + too many bugs, especially 64bit related. Provide painless update to + mozilla backend with a dummy package. + + -- Sebastian Dröge Tue, 20 Feb 2007 23:43:30 +0100 + +liferea (1.0.27-2) unstable; urgency=low + + * Remove liferea-gtkhtml. This plugin is basically unusable on 64bit + architectures. (Closes: #379900, #407152, #361376, #368866) + * Remove upstream's NEWS file, it contains only version release dates. + + -- Luis Rodrigo Gallardo Cruz Tue, 30 Jan 2007 11:49:35 -0600 + +liferea (1.2.4-0ubuntu2) feisty; urgency=low + + * debian/rules: + + Call intltool-update -p to generate translation template for Rosetta + (Ubuntu: #78885) + + -- Sebastian Dröge Fri, 26 Jan 2007 14:49:11 +0100 + +liferea (1.2.4-0ubuntu1) feisty; urgency=low + + * New upstream release: + + Fixes a possible GUI deadlock usually happening when + using the Gecko rendering during background feed updates. + + Fixes a problem with relative feed base URLs. + + Update of French translation (Vincent Lefevre) + + New Turkish translation (Mehmet Atif Ergun) + + -- Sebastian Dröge Mon, 22 Jan 2007 18:33:03 +0100 + +liferea (1.2.3-0ubuntu1) feisty; urgency=low + + * New upstream release: + + HTML view respects GTK theme colors now. + + Fixes negative new count values in the mainwindow status bar. + + Fixes incorrect unread count of parent folder when removing + subscriptions with unread items. + + Fixes node info updating when marking read with middle + mouse button in the feed list. + + Fixes a bug that caused item loss in news bins. + + Adds Arabic translation from Khaled Hosny. + * debian/control: + + Update build dependencies + + -- Sebastian Dröge Thu, 11 Jan 2007 18:15:04 +0100 + +liferea (1.2.2-0ubuntu1) feisty; urgency=low + + * New upstream release + + -- Sebastian Dröge Mon, 8 Jan 2007 14:40:29 +0100 + +liferea (1.2.1-0ubuntu2) feisty; urgency=low + + * debian/rules: + + Call dh_iconcache + * debian/control, + debian/liferea-lua.files: + + Drop -lua package to be in sync with Debian again + + -- Sebastian Dröge Sun, 31 Dec 2006 09:57:21 +0100 + +liferea (1.2.1-0ubuntu1) feisty; urgency=low + + * New upstream release + * debian/control: + + Update build dependencies + + Add liferea-lua package + + -- Sebastian Dröge Fri, 29 Dec 2006 11:31:28 +0100 + +liferea (1.0.27-1ubuntu1) feisty; urgency=low + + * Sync with Debian: + + debian/control: + - Add libxt-dev build dependency + - Drop dbus-1-utils dependency + + debian/control, + debian/liferea-mozilla.files, + debian/rules: + - Use firefox, not xulrunner + + liferea.schemas: + - Use localized dates + + opml/feedlist*.opml: + - Add Planet Ubuntu + + -- Sebastian Dröge Fri, 15 Dec 2006 10:37:38 +0100 + +liferea (1.0.27-1) unstable; urgency=low + + * New upstream release - Bugfix release related to 64 bit archs. + * Avoid shipping upstream's changelog twice. + + -- Luis Rodrigo Gallardo Cruz Thu, 7 Dec 2006 23:47:20 -0600 + +liferea (1.0.26-1) unstable; urgency=low + + * New upstream release (Closes: #372763). + + -- Luis Rodrigo Gallardo Cruz Mon, 20 Nov 2006 09:21:35 -0600 + +liferea (1.0.25-1) unstable; urgency=low + + * New upstream release (Closes: #393160). + * Merged changes from experimental version: + - Provide long description for liferea-mozilla (closes: #379669). + - Generate gconf2 dependency by using ${misc:Depends}, so that it's + properly versioned. + - Link html documentation from /usr/share/doc/liferea. + - Added build-depends on autotools-dev, to get config.sub and config.guess. + + -- Luis Rodrigo Gallardo Cruz Thu, 2 Nov 2006 20:32:29 -0600 + +liferea (1.1.7c-1) experimental; urgency=low + + * New upstream release. (closes: #391112) + - HTTPS. + - lua scripting. + * Added long description to liferea-mozilla, to please lintian. + * Generate gconf2 dependency by using ${misc:Depends}, so that it's + properly versioned. + * Link html documentation from /usr/share/doc/liferea. + * Added build-depends on autotools-dev, to get config.sub and config.guess. + + -- Luis Rodrigo Gallardo Cruz Fri, 20 Oct 2006 21:06:20 -0500 + +liferea (1.0.18-1) unstable; urgency=low + + * New upstream release. (Closes: #378645) + * Ensure clean upgrade path for users of liferea-mozilla by reintroducing + liferea-mozilla as a transitional package which depends on + liferea-xulrunner. (Closes: #370216) + * Added debian/docs. + + -- Franz Pletz Sun, 23 Jul 2006 03:56:11 +0200 + +liferea (1.0.17-1) unstable; urgency=low + + * New upstream release + - Closes: #374194, #376849, #372724, #364084, #366822, #304830. + * New maintainer. (Closes: #378389) + * Added debian/watch. + * debian/control: + - Removed circular dependencies. (Closes: #370434) + - Bumped Standard-Version to 3.7.2.0, no changes necessary. + - Added libsm-dev to Build-Depends (see next item). + * debian/rules: + - Added --enable-sm to configure call to ensure Xsession support is + being built. (Closes: #374428) + - Manpage for liferea-add-feed, symlink to liferea.1. + * Tweaked debian/copyright. + + -- Franz Pletz Wed, 19 Jul 2006 00:02:49 +0200 + +liferea (1.0.12-1) unstable; urgency=low + + * New upstream release. + * Dropping Mozilla-backend support and replacing now for xulrunner + - Closes: #361376, #353957, #364069. + + -- David Moreno Garza Mon, 8 May 2006 17:36:08 -0500 + +liferea (1.0.10-1) unstable; urgency=low + + * New upstream release. + * Checking now if DBUS_SESSION_BUS_ADDRESS is set (Closes: #364084). + + -- David Moreno Garza Sun, 23 Apr 2006 02:33:23 -0500 + +liferea (1.0.9-1) unstable; urgency=low + + * New upstream release (Closes: ##363638). + + -- David Moreno Garza Fri, 21 Apr 2006 11:19:45 -0500 + +liferea (1.0.7-1) unstable; urgency=low + + * New upstream release. + + -- David Moreno Garza Sun, 5 Mar 2006 22:34:13 -0400 + +liferea (1.0.6-1) unstable; urgency=low + + * New upstream release. + + -- David Moreno Garza Sun, 5 Mar 2006 13:03:24 -0400 + +liferea (1.0.5-1) unstable; urgency=low + + * New upstream release. + * Updated pt_BR translation (Closes: #352448). + + -- David Moreno Garza Tue, 21 Feb 2006 20:00:06 -0600 + +liferea (1.0.4-1) unstable; urgency=low + + * New upstream release. + + -- David Moreno Garza Sat, 11 Feb 2006 17:35:24 -0600 + +liferea (1.0.3-2) unstable; urgency=low + + * Really fixed the Atom 1.0 parsing bug (Closes: #350779). + + -- David Moreno Garza Thu, 9 Feb 2006 08:21:36 -0600 + +liferea (1.0.3-1) unstable; urgency=low + + * New upstream release. + * Atom 1.0 parsing bug fixed (Closes: #330116, #350779). + + -- David Moreno Garza Sat, 4 Feb 2006 15:34:53 -0600 + +liferea (1.0.2-1) unstable; urgency=low + + * New upstream release (Closes: #350009). + + -- David Moreno Garza Thu, 26 Jan 2006 12:06:15 -0600 + +liferea (1.0-2) unstable; urgency=low + + * Building against libdbus-glib-1-dev instead of obsolete dbus-glib-1-dev + - Closes: #348500. + + -- David Moreno Garza Tue, 17 Jan 2006 19:09:44 -0600 + +liferea (1.0-1) unstable; urgency=low + + * New upstream release (The Merry Christmas release). + * Adding runtime dependency on gconf2. + - Closes: #343362, #343502. + * Using only dbus-glib-1-dev for now while libdbus-glib-1-dev makes it + into unstable. + - Closes: #333103. + * Date on Atom feeds are correct handled. + - Closes: #339433. + * Parse errors are now displayed when clicking a special link. + - Closes: #327848. + + -- David Moreno Garza Sun, 25 Dec 2005 15:04:12 -0600 + +liferea (0.9.7b+test1.0rc4-1) unstable; urgency=low + + * New upstream release (Closes: #301062). + * Making dbus to communicate with liferea properly. + - Closes: #313329, #320971, #332669. + * Added run dependency on dbus-1-utils. + * Making dbus-glib a reality on unstable. + - Closes: #333103. + * NET_TIMEOUT is now running properly. + - Closes: #323442. + * Mozilla backend now load links properly. + - Closes: #326156. + * Maximization is working since experimental. + - Closes: #330344. + * Tray icon background is transparent. + - Closes: #330343. + + -- David Moreno Garza Mon, 28 Nov 2005 15:58:06 -0600 + +liferea (0.9.7b+test1.0rc3-1) experimental; urgency=low + + * New upstream release + * Bdepending on "libdbus-glib-1-dev | dbus-glib-1-dev" now for + GNOME 2.12 transition (Closes: #333103). + + -- David Moreno Garza Tue, 8 Nov 2005 11:31:30 -0600 + +liferea (0.9.7b+test1.0rc2-1) experimental; urgency=low + + * New upstream experimental release. + * Stay maximised when clicking systray (Closes: #330344). + + -- David Moreno Garza Sat, 15 Oct 2005 23:31:56 -0500 + +liferea (0.9.7b+test1.0rc1-1) experimental; urgency=low + + * New upstream test release. + + -- David Moreno Garza Fri, 23 Sep 2005 17:05:59 -0500 + +liferea (0.9.7b-1) unstable; urgency=low + + * New upstream release. + + -- David Moreno Garza Sun, 4 Sep 2005 15:58:52 -0500 + +liferea (0.9.7a-1) unstable; urgency=low + + * New upstream release. + * Fixed ja_JP file to show menu links (Closes: #320907). + + -- David Moreno Garza Tue, 30 Aug 2005 11:38:59 -0500 + +liferea (0.9.6-1) unstable; urgency=low + + * New upstream release. + + -- David Moreno Garza Sat, 20 Aug 2005 13:02:46 -0500 + +liferea (0.9.5-1) unstable; urgency=low + + * New upstream release. + + -- David Moreno Garza Mon, 8 Aug 2005 00:58:41 -0500 + +liferea (0.9.4-1) unstable; urgency=low + + * New upstream release. + * Fixed links with `#' bug (Closes: #319536). + + -- David Moreno Garza Wed, 27 Jul 2005 11:10:23 -0500 + +liferea (0.9.3-1) unstable; urgency=low + + * New upstream release. + * No confusing warning anymore when there are no user settings + for the enclosure handling (mime.xml) (Closes: #312313). + * No crashing anymore when trying to open an item without a + link in a tab (Closes: #312984). + * Fixes a crash on IA64 due to undefined return types (Closes: #313526). + * Corrections of German translation (Closes: #314001). + + -- David Moreno Garza Fri, 8 Jul 2005 22:40:09 +0300 + +liferea (0.9.2-1) unstable; urgency=low + + * New upstream release (Closes: #309832). + * Added dependency on dbus-glib-1 since now Liferea uses DBUS messaging. + * vfolder crashes fixed (Closes: #302102, #302155, #302058). + * Configuration lose fixed (Closes: #281634). + * OPML export crash fixed (Closes: #300452). + + -- David Moreno Garza Thu, 19 May 2005 10:26:38 -0500 + +liferea (0.9.1-1) unstable; urgency=low + + * New upstream release (Closes: #299246). + - Liferea is not using Firefox's module since gtkembedmoz is not + implemented on mozilla-firefox package, atm. + * Added updated german translation (Closes: #295017). + * RDF adding is working properly now (Closes: #298906). + * Transport error is working properly now (Closes: #299036). + * Reduced long descriptions of unneeded text. + + -- David Moreno Garza Sat, 19 Mar 2005 18:22:04 -0600 + +liferea (0.9.0b-1) unstable; urgency=low + + * New upstream release (Closes: #292705). + * Remembers now the sorting order after an upgrade (Closes: #281715). + * Shows date info on the condensed view (Closes: #276040). + * Taking every information item on OPML feeds (Closes: #254148). + * Corrected hang on kicker restart (Closes: #281622). + * Removed filter unread headlines feature (Closes: #279064). + + -- David Moreno Garza Sat, 30 Jan 2005 23:35:05 -0600 + +liferea (0.6.4b-2) unstable; urgency=low + + * Corrected fail on fallback in ipv6-ipv4 (Closes: #287910). + + -- David Moreno Garza Mon, 3 Jan 2005 23:27:04 -0600 + +liferea (0.6.4b-1) unstable; urgency=low + + * NMU sponsored by Marek Habersack . + * New upstream release which fixes the previous bug around the + proxy update - it was forgotten to close it by upstream author. + (Closes: #283674). + + -- David Moreno Garza Thu, 2 Dec 2004 13:27:11 -0600 + +liferea (0.6.4-1) unstable; urgency=low + + * NMU sponsored by Marek Habersack . + * New upstream release + * Proxy update problem fixed (Closes: #283674). + + -- David Moreno Garza Tue, 30 Nov 2004 19:16:09 -0600 + +liferea (0.6.3-1) unstable; urgency=low + + * New upstream release + * Fixed condensed view crash (Closes: #281180). + + -- David Moreno Garza Fri, 26 Nov 2004 08:01:14 -0600 + +liferea (0.6.2-1) unstable; urgency=low + + * New upstream release. + * Now enforces umask 0077 when saving the feed list (Closes: #280786). + + -- David Moreno Garza Sun, 14 Nov 2004 12:31:46 -0600 + +liferea (0.6.1-1) unstable; urgency=low + + * New upstream release (Closes: #273851). + * New updated state (Closes: #268177). + * Support for IDN domains (Closes: #273103). + * Condensed view unmarks now all read items (Closes: #234471). + + -- David Moreno Garza Tue, 2 Nov 2004 13:10:02 -0600 + +liferea (0.6.0-2) unstable; urgency=low + + * Fixed typo at debian/control (Closes: #277231, #277232, #277233). + * Fixed FTBFS in alpha and ia64, because of libc6-dev (Closes: #273535). + * Fixed unneeded build-deps. + + -- David Moreno Garza Mon, 18 Oct 2004 22:41:11 -0500 + +liferea (0.6.0-1) unstable; urgency=low + + * New upstream release. + * New Debian maintainer. + * NMU sponsored by Marek Habersack . + + -- David Moreno Garza Mon, 20 Sep 2004 23:08:08 -0500 + +liferea (0.5.3b-2) unstable; urgency=low + + * Memory leak fix from 0.5.3c. + + -- christophe barbe Tue, 31 Aug 2004 13:33:47 -0400 + +liferea (0.5.3b-1) unstable; urgency=low + + * New upstream release. + + -- christophe barbe Mon, 23 Aug 2004 10:05:52 -0400 + +liferea (0.5.3-1) unstable; urgency=low + + * New upstream release. + + -- christophe barbe Tue, 17 Aug 2004 10:06:45 -0400 + +liferea (0.5.2c-1) unstable; urgency=low + + * New upstream release. + + -- christophe barbe Tue, 3 Aug 2004 13:08:30 -0400 + +liferea (0.5.2-3) unstable; urgency=low + + * Fix missing dependencies in liferea-mozilla. + * Patch from Nathan J. Conrad to support servers sending compressed favicons. + + -- christophe barbe Mon, 26 Jul 2004 12:51:00 -0400 + +liferea (0.5.2-2) unstable; urgency=high + + * Fix broken favicon updating code that was shortening the feed url. + + -- christophe barbe Fri, 23 Jul 2004 14:15:46 -0400 + +liferea (0.5.2-1) unstable; urgency=low + + * New upstream release. + + -- christophe barbe Fri, 23 Jul 2004 09:20:37 -0400 + +liferea (0.5.1-2) unstable; urgency=low + + * Added missing Build-dependency (Thanks Nathan Conrad). + + -- christophe barbe Sat, 10 Jul 2004 00:11:36 -0400 + +liferea (0.5.1-1) unstable; urgency=low + + * New upstream release. + * RSS 1.0 Creative Commons module (Closes: #254959). + + -- christophe barbe Wed, 30 Jun 2004 21:19:43 -0400 + +liferea (0.5.0-3) unstable; urgency=low + + * Fix broken mailto: handling (patch from Nathan Conrad) (Closes: #256132). + + -- christophe barbe Mon, 28 Jun 2004 09:46:38 -0400 + +liferea (0.5.0-2) unstable; urgency=low + + * Rebuilt against latest mozilla (Closes: #256516). + + -- christophe barbe Sun, 27 Jun 2004 16:41:39 -0400 + +liferea (0.5.0-1) unstable; urgency=low + + * New upstream release. + * Fixed tooltip in menubar (Closes: #255297). + * Fixed HTTP Authentication (Closes: #252091). + + -- christophe barbe Sun, 20 Jun 2004 10:30:09 -0400 + +liferea (0.4.9-1) unstable; urgency=low + + * New upstrean release (Closes: #251363). + + -- christophe barbe Thu, 27 May 2004 20:15:26 -0400 + +liferea (0.4.8-2) unstable; urgency=low + + * Patch from Nathan Conrad to save exported feed list before removing the + old format list (Closes: #248655). + + -- christophe barbe Thu, 13 May 2004 23:15:54 -0400 + +liferea (0.4.8-1) unstable; urgency=low + + * New upstream release. + This release BREAKS DOWNWARD COMPATIBILITY. + You should export your feed list before upgrading. + + -- christophe barbe Sun, 9 May 2004 17:58:30 -0400 + +liferea (0.4.7d-3) unstable; urgency=low + + * Fixed 0.4.7d upstream (no more empty feed entries). + + -- christophe barbe Thu, 29 Apr 2004 09:33:10 -0400 + +liferea (0.4.7d-2) unstable; urgency=low + + * Back down most changes in 0.4.7d. + + -- christophe barbe Thu, 29 Apr 2004 07:19:32 -0400 + +liferea (0.4.7d-1) unstable; urgency=low + + * New upstream release. + + -- christophe barbe Wed, 28 Apr 2004 21:17:19 -0400 + +liferea (0.4.7c-5) unstable; urgency=low + + * liferea-(gtkhtml|mozilla) depend on the same version of liferea. + + -- christophe barbe Mon, 26 Apr 2004 09:00:56 -0400 + +liferea (0.4.7c-4) unstable; urgency=low + + * Versioned dependency on liferea (Closes: #245908, #245942). + + -- christophe barbe Mon, 26 Apr 2004 06:59:10 -0400 + +liferea (0.4.7c-3) unstable; urgency=low + + * Patch from CVS to fix gtkhtml rendering bug (Closes: #245257). + + -- christophe barbe Sun, 25 Apr 2004 07:34:41 -0400 + +liferea (0.4.7c-2) unstable; urgency=low + + * Split package in 3 to avoid imposing unwanted dependencies. + Install liferea-mozilla if you want a early preview of the mozilla + rendering feature. + (Closes: #243730). + + -- christophe barbe Wed, 21 Apr 2004 21:10:02 -0400 + +liferea (0.4.7c-1) unstable; urgency=low + + * New Upstream Release. + * Update date on updated feed item (Closes: #243003). + * Fix parsing RSS module tags crash (Closes: #243957). + + -- christophe barbe Tue, 20 Apr 2004 20:18:04 -0400 + +liferea (0.4.7b-2) unstable; urgency=low + + * Fix shell feed handling code. + + -- christophe barbe Thu, 15 Apr 2004 15:39:52 -0400 + +liferea (0.4.7b-1) unstable; urgency=low + + * New upstream release (Fix DnD bug and update http client code). + + -- christophe barbe Mon, 12 Apr 2004 20:24:50 -0400 + +liferea (0.4.7-1) unstable; urgency=low + + * New upstream release: + - Major rewrite, expect minor bugs. + - New proxy code and tab in preferences dialog box (Closes: #229118). + - Atom 0.3 support (Closes: #229704). + - Experimental mozilla support (see preferences). + + -- christophe barbe Sun, 11 Apr 2004 10:57:53 -0400 + +liferea (0.4.6e-1) unstable; urgency=low + + * New upstream release + Fix OPML support (Closes: #237306). + + -- christophe barbe Fri, 12 Mar 2004 18:43:44 -0500 + +liferea (0.4.6d-1) unstable; urgency=low + + * New upstream release. + + -- christophe barbe Mon, 8 Mar 2004 18:42:51 -0500 + +liferea (0.4.6c-1) unstable; urgency=low + + * New upstream release. + + -- christophe barbe Sat, 28 Feb 2004 14:24:52 -0500 + +liferea (0.4.6b-3) unstable; urgency=low + + * Improved debian/rules to support debug build. + + -- christophe barbe Wed, 14 Jan 2004 22:30:24 -0500 + +liferea (0.4.6b-2) unstable; urgency=low + + * The "I can build it twice" upload (Closes: #227761) + Thanks to Guillaume Morin. + + -- christophe barbe Wed, 14 Jan 2004 20:13:03 -0500 + +liferea (0.4.6b-1) unstable; urgency=low + + * New Upstream Release to fix a bug in popup menu + (No other changes) + + -- christophe barbe Wed, 7 Jan 2004 09:06:21 -0500 + +liferea (0.4.6-1) unstable; urgency=low + + * New upstream release. + * To quote the upstream changelog: + + THIS CHANGE WILL MAKE ALREADY READ BUT NOT + UPDATED ITEMS UNREAD AGAIN ON THE FIRST UPDATE + AFTER THIS UPGRADE. THIS IS NOT A BUG AND IS + DUE TO THE CHANGED HTML CACHE AND WILL HAPPEN + ONLY ONCE. + + -- christophe barbe Tue, 6 Jan 2004 21:07:02 -0500 + +liferea (0.4.5-1) unstable; urgency=low + + * New upstream release (including favicon support). + * Correctly handle http redirect (Closes: #219643). + + -- christophe barbe Sun, 7 Dec 2003 20:13:42 -0500 + +liferea (0.4.4-1) unstable; urgency=low + + * New upstream release. + + -- christophe barbe Fri, 14 Nov 2003 20:52:45 -0500 + +liferea (0.4.3-2) unstable; urgency=low + + * Build against gnome 2.4 libs (Closes: #218275). + + -- christophe barbe Wed, 5 Nov 2003 12:34:46 -0500 + +liferea (0.4.3-1) unstable; urgency=low + + * New upstream release. + + -- christophe barbe Thu, 16 Oct 2003 22:31:45 -0400 + +liferea (0.4.1-2) unstable; urgency=low + + * Fixed debian menu icon (Closes: #216016). + * Improved short description. + + -- christophe barbe Wed, 15 Oct 2003 20:13:32 -0400 + +liferea (0.4.1-1) unstable; urgency=low + + * New upstream release (with upstream patch) + features persistent feed storage and feed type auto-detection. + * First upload to unstable. + + -- christophe barbe Sun, 12 Oct 2003 13:09:57 -0400 + +liferea (0.4.0-1) experimental; urgency=low + + * New upstream release. + + -- christophe barbe Fri, 10 Oct 2003 22:40:47 -0400 + +liferea (0.3.8-1) experimental; urgency=low + + * New upstream release. + + -- christophe barbe Tue, 30 Sep 2003 11:31:29 -0400 + +liferea (0.3.7-1) experimental; urgency=low + + * Initial Release, close ITP (Closes: #211484). + + -- christophe barbe Wed, 17 Sep 2003 18:30:49 -0400 + --- liferea-1.4.23.orig/debian/README.source +++ liferea-1.4.23/debian/README.source @@ -0,0 +1,57 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To configure quilt to use debian/patches instead of patches, you want +either to export QUILT_PATCHES=debian/patches in your environment +or use this snippet in your ~/.quiltrc: + + for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do + if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then + export QUILT_PATCHES=debian/patches + fi + done + +To get the fully patched source after unpacking the source package, cd to +the root level of the source package and run: + + quilt push -a + +The last patch listed in debian/patches/series will become the current +patch. + +To add a new set of changes, first run quilt push -a, and then run: + + quilt new + +where is a descriptive name for the patch, used as the filename in +debian/patches. Then, for every file that will be modified by this patch, +run: + + quilt add + +before editing those files. You must tell quilt with quilt add what files +will be part of the patch before making changes or quilt will not work +properly. After editing the files, run: + + quilt refresh + +to save the results as a patch. + +Alternately, if you already have an external patch and you just want to +add it to the build system, run quilt push -a and then: + + quilt import -P /path/to/patch + quilt push -a + +(add -p 0 to quilt import if needed). as above is the filename to +use in debian/patches. The last quilt push -a will apply the patch to +make sure it works properly. + +To remove an existing patch from the list of patches that will be applied, +run: + + quilt delete + +You may need to run quilt pop -a to unapply patches first before running +this command. --- liferea-1.4.23.orig/debian/control +++ liferea-1.4.23/debian/control @@ -0,0 +1,39 @@ +Source: liferea +Section: gnome +Priority: optional +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Luis Rodrigo Gallardo Cruz +Build-Depends: autotools-dev, quilt (>=0.40), + debhelper (>= 5.0.51~), xulrunner-1.9-dev, + libgconf2-dev, libdbus-glib-1-dev, libsm-dev, libgnutls-dev, + liblualib50-dev, libnotify-dev, libxml-parser-perl, libxslt1-dev, + libsqlite3-dev (>= 3.3.9), libglade2-dev, libgtk2.0-dev (>= 2.8.0), + libnm-glib-dev [!kfreebsd-i386 !kfreebsd-amd64], libhildon-1-dev [lpia], + intltool +Standards-Version: 3.8.0 +Homepage: http://liferea.sourceforge.net/ +Vcs-Browser: http://git.debian.org/?p=collab-maint/liferea.git +Vcs-Git: git://git.debian.org/git/collab-maint/liferea.git + +Package: liferea +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, xulrunner-1.9 +Recommends: dbus (>= 1.0.2-5), dbus-x11, wget | curl | gwget | kget +Conflicts: liferea-gtkhtml, liferea-mozilla, liferea-xulrunner (<< 1.2.15b-1) +Replaces: liferea-gtkhtml, liferea-xulrunner, liferea-mozilla +Provides: liferea-gtkhtml, liferea-xulrunner, liferea-mozilla +Description: feed aggregator for GNOME + Liferea is a simple FeedReader clone for GNOME. It is a reader for + RSS/RDF feeds which also supports CDF channels, Atom/Echo/PIE feeds and + OCS directories. + . + Liferea is an abbreviation for Linux Feed Reader. + +Package: liferea-dbg +Architecture: any +Priority: extra +Depends: liferea (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Description: liferea debug symbols + This package contains the debug symbols for liferea. It's useful if you + find a bug in the application and want to help fix it. + --- liferea-1.4.23.orig/debian/copyright +++ liferea-1.4.23/debian/copyright @@ -0,0 +1,64 @@ +This package was debianized by christophe barbe on +Wed, 17 Sep 2003 18:30:49 -0400. + +It was downloaded from http://liferea.sourceforge.net/ + +Upstream Authors: + Lars Lindner + +Copyright Holders: + 2002 Charles Kerr + 2003-2007 Lars Lindner + 2004-2006 Nathan J. Conrad + +License: + + 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 +version 2 can be found in /usr/share/common-licenses/GPL-2 file. + +For xspf: +Copyright (c) 2005, Fabricio Zuardi +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + * Neither the name of the author nor the names of its contributors + may be used to endorse or promote products derived from this + software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + --- liferea-1.4.23.orig/debian/menu +++ liferea-1.4.23/debian/menu @@ -0,0 +1,7 @@ +?package(liferea):needs="X11"\ + section="Applications/Network/Web News"\ + title="Liferea: Linux Feed Reader"\ + command="/usr/bin/liferea"\ + hints="Experienced,Small"\ + longtitle="GNOME feed aggregator"\ + icon="/usr/share/liferea/pixmaps/liferea.xpm" --- liferea-1.4.23.orig/debian/liferea.xpm +++ liferea-1.4.23/debian/liferea.xpm @@ -0,0 +1,168 @@ +/* XPM */ +static char * available_xpm[] = { +"16 16 149 2", +" c None", +". c #39434B", +"+ c #575E61", +"@ c #505355", +"# c #434546", +"$ c #3B3E41", +"% c #3F454B", +"& c #1E272F", +"* c #3A4044", +"= c #696C6F", +"- c #AFB8BE", +"; c #D9E5ED", +"> c #DCE9F1", +", c #CBDCE8", +"' c #C7D6E2", +") c #B6BFC5", +"! c #2E3235", +"~ c #11181D", +"{ c #373D40", +"] c #7E8589", +"^ c #D6E0E7", +"/ c #D5E4EC", +"( c #C7DCE9", +"_ c #C2D7E6", +": c #C4D8E4", +"< c #D8E4EC", +"[ c #D8E5EE", +"} c #C6D2DC", +"| c #434F57", +"1 c #06090A", +"2 c #29363F", +"3 c #4A5054", +"4 c #D2DEE5", +"5 c #C8D9E4", +"6 c #BED3E0", +"7 c #BFD9E9", +"8 c #BCD5E7", +"9 c #BCD2E1", +"0 c #C5D6E2", +"a c #C8D8E4", +"b c #CDDCE8", +"c c #A4B9C8", +"d c #1D2328", +"e c #404B54", +"f c #9BA8AF", +"g c #C0D1DD", +"h c #A1BDD1", +"i c #ABC8DB", +"j c #B2CFE2", +"k c #ACCADE", +"l c #BBD2E0", +"m c #C6D7E3", +"n c #AFC4D4", +"o c #ABBFCF", +"p c #ADC5D5", +"q c #5D707D", +"r c #000000", +"s c #343D43", +"t c #7D97AE", +"u c #809EB6", +"v c #8DADC5", +"w c #94B5CC", +"x c #97B8D0", +"y c #97B8CF", +"z c #CEDFEA", +"A c #C6D8E3", +"B c #BBD0DE", +"C c #AEC5D3", +"D c #9BB6C9", +"E c #7D98AB", +"F c #000001", +"G c #1D252D", +"H c #8BA7BD", +"I c #89A7BD", +"J c #81A3BB", +"K c #7B9FBB", +"L c #7FA3BF", +"M c #88AAC4", +"N c #C8DBE7", +"O c #BBD1DE", +"P c #AFC5D5", +"Q c #A5BECE", +"R c #90AABF", +"S c #4E6F8E", +"T c #0D1720", +"U c #4C7091", +"V c #9DB6C9", +"W c #ADC5D6", +"X c #84A4BC", +"Y c #6188A7", +"Z c #5881A2", +"` c #7D9CB5", +" . c #7D9AB1", +".. c #A7BFD1", +"+. c #9FB7CA", +"@. c #809CB2", +"#. c #2F5172", +"$. c #496C8B", +"%. c #99B2C6", +"&. c #A9C1D1", +"*. c #AAC2D2", +"=. c #81A0B7", +"-. c #4D7595", +";. c #4A7090", +">. c #3E6386", +",. c #A1B8CA", +"'. c #99B4C8", +"). c #5E7D97", +"!. c #183655", +"~. c #050A0E", +"{. c #1C354C", +"]. c #62829B", +"^. c #9DB7CA", +"/. c #A2BCCD", +"(. c #5B7A95", +"_. c #3E6484", +":. c #3E6383", +"<. c #2F5577", +"[. c #8DA8BB", +"}. c #92B0C4", +"|. c #3E5D79", +"1. c #06111C", +"2. c #070D14", +"3. c #294968", +"4. c #9BB6CA", +"5. c #8EA7BC", +"6. c #335573", +"7. c #335878", +"8. c #325676", +"9. c #284C6D", +"0. c #7997AF", +"a. c #81A1B9", +"b. c #0A1F35", +"c. c #060D14", +"d. c #698699", +"e. c #44627F", +"f. c #204264", +"g. c #254666", +"h. c #234463", +"i. c #1D3E60", +"j. c #2D4C67", +"k. c #182A3C", +"l. c #070A0C", +"m. c #0D1E2F", +"n. c #163351", +"o. c #1A3D5F", +"p. c #183858", +"q. c #102A44", +"r. c #030C13", +" ", +" . + @ # $ % & ", +" * = - ; > , ' ) ! ~ ", +" { ] ^ / ( _ : < [ } | 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 F ", +" T U V W X Y Z ` ...+.@.#.r ", +" T $.%.&.*.=.-.;.>.,.'.).!.r ", +" ~.{.].^./.(._.:.<.[.}.|.1.r ", +" 2.3.4.5.6.7.8.9.0.a.b.F ", +" r c.d.e.f.g.h.i.j.k.r r ", +" r l.m.n.o.p.q.r.r r ", +" r r r r r r ", +" "}; --- liferea-1.4.23.orig/debian/source.lintian-overrides +++ liferea-1.4.23/debian/source.lintian-overrides @@ -0,0 +1,7 @@ +# Without these liferea does not build on kfreebsd, thus, they're not errors. +liferea source: non-standard-arch-in-source-relation kfreebsd-i386 [build-depends: libnm-glib-dev [!kfreebsd-i386 !kfreebsd-amd64]] +liferea source: non-standard-arch-in-source-relation kfreebsd-amd64 [build-depends: libnm-glib-dev [!kfreebsd-i386 !kfreebsd-amd64]] + +# Yes, we depend on the -1 revision. That's because we need the makefile +# snippet, which is a feature of the debian package, not of upstream. +liferea source: build-depends-on-1-revision build-depends: quilt (>= 0.40-1) --- liferea-1.4.23.orig/debian/watch +++ liferea-1.4.23/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/liferea/liferea-(1\.4).([\d]+[a-z]*)+\.tar\.gz debian --- liferea-1.4.23.orig/debian/patches/debian-example-feeds +++ liferea-1.4.23/debian/patches/debian-example-feeds @@ -0,0 +1,253 @@ +Add the Debian planets to the example feed lists. + +Index: b/opml/feedlist.opml +=================================================================== +--- a/opml/feedlist.opml ++++ b/opml/feedlist.opml +@@ -7,6 +7,11 @@ + + + ++ ++ ++ ++ ++ + + + +Index: b/opml/feedlist_bg.opml +=================================================================== +--- a/opml/feedlist_bg.opml ++++ b/opml/feedlist_bg.opml +@@ -15,6 +15,10 @@ + + + ++ ++ ++ ++ + + + +Index: b/opml/feedlist_ca.opml +=================================================================== +--- a/opml/feedlist_ca.opml ++++ b/opml/feedlist_ca.opml +@@ -20,6 +20,10 @@ + + + ++ ++ ++ ++ + + + +Index: b/opml/feedlist_de.opml +=================================================================== +--- a/opml/feedlist_de.opml ++++ b/opml/feedlist_de.opml +@@ -6,6 +6,7 @@ + + + ++ + + + +@@ -15,6 +16,10 @@ + + + ++ ++ ++ ++ + + + +Index: b/opml/feedlist_es.opml +=================================================================== +--- a/opml/feedlist_es.opml ++++ b/opml/feedlist_es.opml +@@ -6,6 +6,7 @@ + + + ++ + + + +@@ -17,6 +18,10 @@ + + + ++ ++ ++ ++ + + + +Index: b/opml/feedlist_eu.opml +=================================================================== +--- a/opml/feedlist_eu.opml ++++ b/opml/feedlist_eu.opml +@@ -27,6 +27,10 @@ + + + ++ ++ ++ ++ + + + +Index: b/opml/feedlist_fr.opml +=================================================================== +--- a/opml/feedlist_fr.opml ++++ b/opml/feedlist_fr.opml +@@ -15,6 +15,8 @@ + + + ++ ++ + + + +@@ -25,6 +27,10 @@ + + + ++ ++ ++ ++ + + + +Index: b/opml/feedlist_nl.opml +=================================================================== +--- a/opml/feedlist_nl.opml ++++ b/opml/feedlist_nl.opml +@@ -7,6 +7,10 @@ + + + ++ ++ ++ ++ + + + +Index: b/opml/feedlist_pl.opml +=================================================================== +--- a/opml/feedlist_pl.opml ++++ b/opml/feedlist_pl.opml +@@ -15,6 +15,10 @@ + + + ++ ++ ++ ++ + + + +Index: b/opml/feedlist_pt.opml +=================================================================== +--- a/opml/feedlist_pt.opml ++++ b/opml/feedlist_pt.opml +@@ -5,6 +5,7 @@ + + + ++ + + + +@@ -13,6 +14,10 @@ + + + ++ ++ ++ ++ + + + +Index: b/opml/feedlist_pt_BR.opml +=================================================================== +--- a/opml/feedlist_pt_BR.opml ++++ b/opml/feedlist_pt_BR.opml +@@ -6,12 +6,16 @@ + + + +- ++ + + + + + ++ ++ ++ ++ + + + +Index: b/opml/feedlist_ru.opml +=================================================================== +--- a/opml/feedlist_ru.opml ++++ b/opml/feedlist_ru.opml +@@ -18,6 +18,10 @@ + + + ++ ++ ++ ++ + + + +Index: b/opml/feedlist_sk.opml +=================================================================== +--- a/opml/feedlist_sk.opml ++++ b/opml/feedlist_sk.opml +@@ -9,6 +9,10 @@ + + + ++ ++ ++ ++ + + + +Index: b/opml/feedlist_sv.opml +=================================================================== +--- a/opml/feedlist_sv.opml ++++ b/opml/feedlist_sv.opml +@@ -14,6 +14,10 @@ + + + ++ ++ ++ ++ + + + --- liferea-1.4.23.orig/debian/patches/fix_systray_behavior +++ liferea-1.4.23/debian/patches/fix_systray_behavior @@ -0,0 +1,63 @@ +--- + src/ui/ui_mainwindow.c | 13 ++++++++++++- + src/ui/ui_tray.c | 3 +++ + 2 files changed, 15 insertions(+), 1 deletion(-) + +Index: liferea-1.4.15/src/ui/ui_mainwindow.c +=================================================================== +--- liferea-1.4.15.orig/src/ui/ui_mainwindow.c ++++ liferea-1.4.15/src/ui/ui_mainwindow.c +@@ -969,17 +969,28 @@ + return on_quit(widget, event, mw); + ui_mainwindow_save_position(); + gtk_widget_hide(GTK_WIDGET(mw->window)); + return TRUE; + } + + void ui_mainwindow_toggle_visibility(GtkMenuItem *menuitem, gpointer data) { + +- if((gdk_window_get_state(GTK_WIDGET(mainwindow)->window) & GDK_WINDOW_STATE_ICONIFIED) || !GTK_WIDGET_VISIBLE(mainwindow)) { ++ if(gdk_window_get_state(GTK_WIDGET(mainwindow)->window) & GDK_WINDOW_STATE_ICONIFIED) { ++ /* The window is either iconified, or on another workspace */ ++ /* Raise it in one click */ ++ if (GTK_WIDGET_VISIBLE(mainwindow)) { ++ ui_mainwindow_save_position(); ++ gtk_widget_hide(mainwindow); ++ } ++ ui_mainwindow_restore_position(mainwindow); ++ gtk_window_present(GTK_WINDOW(mainwindow)); ++ } ++ else if(!GTK_WIDGET_VISIBLE(mainwindow)) { ++ /* The window is neither iconified nor on another workspace, but is not visible */ + ui_mainwindow_restore_position(mainwindow); + gtk_window_present(GTK_WINDOW(mainwindow)); + } else { + ui_mainwindow_save_position(); + gtk_widget_hide(mainwindow); + } + } + +Index: liferea-1.4.15/src/ui/ui_tray.c +=================================================================== +--- liferea-1.4.15.orig/src/ui/ui_tray.c ++++ liferea-1.4.15/src/ui/ui_tray.c +@@ -222,16 +222,19 @@ + g_free(tmp); + g_free(msg); + } + + /* a click on the systray icon should show the program window + if invisible or hide it if visible */ + static void tray_icon_pressed(GtkWidget *button, GdkEventButton *event, EggTrayIcon *icon) { + ++ if ((event->type == GDK_2BUTTON_PRESS) || (event->type == GDK_3BUTTON_PRESS)) ++ return; /* ignore double and triple clicks */ ++ + switch(event->button) { + case 1: + ui_mainwindow_toggle_visibility(NULL, NULL); + break; + case 3: + gtk_menu_popup(ui_popup_make_systray_menu(), NULL, NULL, NULL, NULL, event->button, event->time); + break; + } --- liferea-1.4.23.orig/debian/patches/hildon_frothing +++ liferea-1.4.23/debian/patches/hildon_frothing @@ -0,0 +1,5603 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## hildon_frothing.dpatch by Steve Kowalik +## Original patch by Ian Lawrence for Frothing +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patches from Frothing to use Hildon + +@DPATCH@ +Index: liferea-1.4.16b/Makefile.am +=================================================================== +--- liferea-1.4.16b.orig/Makefile.am 2008-07-04 11:17:40.000000000 +1000 ++++ liferea-1.4.16b/Makefile.am 2008-07-04 11:17:47.000000000 +1000 +@@ -8,7 +8,7 @@ + @INTLTOOL_DESKTOP_RULE@ + + gladedir = $(pkgdatadir) +-glade_DATA = liferea.glade ++glade_DATA = liferea.glade liferea_hildon.glade + + schemadir = @GCONF_SCHEMA_FILE_DIR@ + schema_DATA = liferea.schemas +Index: liferea-1.4.16b/configure.ac +=================================================================== +--- liferea-1.4.16b.orig/configure.ac 2008-07-04 11:17:47.000000000 +1000 ++++ liferea-1.4.16b/configure.ac 2008-07-04 11:17:47.000000000 +1000 +@@ -40,6 +40,7 @@ + AC_ARG_ENABLE(gnutls, AS_HELP_STRING([--enable-gnutls],[Attempt to use GNUTLS for SSL support @<:@default=yes@:>@]),,enable_gnutls=yes) + AC_ARG_ENABLE(libnotify, AS_HELP_STRING([--disable-libnotify],[don't compile the libnotify plugin]),,enable_libnotify=yes) + AC_ARG_ENABLE(lua, AS_HELP_STRING([--disable-lua],[don't compile with LUA scripting support]),,enable_lua=yes) ++AC_ARG_ENABLE(hildon, AS_HELP_STRING([--enable-hildon],[compile for Hildon enviroment @<:@default=no@:>@]),,enable_hildon=no) + + AC_MSG_CHECKING([for 64bit platform]) + case "$target" in +@@ -221,6 +222,19 @@ + + AM_CONDITIONAL(WITH_GTKHTML2, test "x$enable_gtkhtml2" = "xyes") + ++dnl ******** ++dnl Hildon ++dnl ******** ++ ++if test "x$enable_hildon" = "xyes"; then ++ dnl AC_MSG_CHECKING([for GtkHTML2 support]) ++ PKG_CHECK_MODULES([HILDON], hildon-1 >= 1.0.5,enable_hildon=yes,enable_hildon=no) ++else ++ enable_hildon=no ++fi ++ ++AM_CONDITIONAL(WITH_HILDON, test "x$enable_hildon" = "xyes") ++ + dnl For now, require GtkHTML2, Mozilla, XulRunner or WebKit. + if test "x$enable_gecko" != "xyes" -a "x$enable_gtkhtml2" != "xyes" -a "x$enable_webkit" != "xyes"; then + >-------AC_MSG_ERROR([ +@@ -543,6 +557,7 @@ + echo "Build XulRunner Plugin.......... : $enable_xulrunner" + echo "Build WebKit Plugin............. : $enable_webkit" + echo "Build GtkHTML Plugin............ : $enable_gtkhtml2" ++echo "Build Hildon support............ : $enable_hildon" + echo + echo "Build libnotify Plugin.......... : $enable_libnotify" + echo "Build LUA scripting Plugin ..... : $enable_lua" +Index: liferea-1.4.16b/liferea_hildon.glade +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ liferea-1.4.16b/liferea_hildon.glade 2008-07-04 11:17:47.000000000 +1000 +@@ -0,0 +1,5379 @@ ++ ++ ++ ++ ++ ++ True ++ ++ ++ True ++ ++ ++ True ++ True ++ 170 ++ ++ ++ True ++ True ++ GTK_POLICY_NEVER ++ GTK_POLICY_AUTOMATIC ++ GTK_SHADOW_IN ++ ++ ++ True ++ True ++ True ++ False ++ True ++ ++ ++ ++ ++ ++ False ++ True ++ ++ ++ ++ ++ True ++ True ++ False ++ True ++ ++ ++ True ++ ++ ++ True ++ False ++ False ++ ++ ++ True ++ True ++ 199 ++ ++ ++ True ++ ++ ++ ++ ++ ++ False ++ True ++ ++ ++ ++ ++ True ++ ++ ++ ++ ++ ++ True ++ True ++ ++ ++ ++ ++ False ++ ++ ++ ++ ++ True ++ normal view ++ ++ ++ tab ++ False ++ False ++ ++ ++ ++ ++ True ++ True ++ 100 ++ ++ ++ True ++ ++ ++ ++ ++ ++ False ++ True ++ ++ ++ ++ ++ True ++ ++ ++ ++ ++ ++ True ++ True ++ ++ ++ ++ ++ 1 ++ False ++ ++ ++ ++ ++ True ++ wide view ++ ++ ++ tab ++ 1 ++ False ++ False ++ ++ ++ ++ ++ True ++ ++ ++ ++ ++ True ++ ++ ++ True ++ True ++ gtk-go-back ++ True ++ 0 ++ ++ ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ ++ ++ True ++ True ++ gtk-go-forward ++ True ++ 0 ++ ++ ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ ++ ++ True ++ True ++ 1 0 100 1 10 10 ++ 1 ++ ++ ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ ++ ++ True ++ View Headlines ++ ++ ++ ++ ++ False ++ False ++ ++ ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ 2 ++ False ++ ++ ++ ++ ++ True ++ combined view ++ ++ ++ tab ++ 2 ++ False ++ False ++ ++ ++ ++ ++ ++ ++ False ++ ++ ++ ++ ++ True ++ Headlines ++ ++ ++ tab ++ False ++ False ++ ++ ++ ++ ++ True ++ True ++ ++ ++ ++ ++ ++ ++ True ++ ++ ++ True ++ True ++ GTK_RELIEF_NONE ++ 0 ++ ++ ++ ++ True ++ gtk-missing-image ++ ++ Online/Offline Button ++ ++ ++ ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ False ++ ++ ++ 1 ++ ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ ++ ++ True ++ 5 ++ Subscription Properties ++ False ++ GTK_WIN_POS_CENTER ++ GDK_WINDOW_TYPE_HINT_DIALOG ++ False ++ ++ ++ True ++ 2 ++ ++ ++ True ++ True ++ 5 ++ ++ ++ True ++ 12 ++ 18 ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 0 ++ <span weight="bold">Feed Name</span> ++ True ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ 12 ++ ++ ++ True ++ 12 ++ ++ ++ True ++ Feed _Name: ++ True ++ feedNameEntry ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ True ++ * ++ True ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ False ++ ++ ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 0 ++ <span weight="bold">Update Interval</span> ++ True ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ 12 ++ ++ ++ True ++ 6 ++ ++ ++ True ++ True ++ _Use global default update interval. ++ True ++ 0 ++ True ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ 6 ++ ++ ++ True ++ True ++ _Feed specific update interval of ++ True ++ 0 ++ True ++ updateIntervalDefault ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ 6 ++ ++ ++ True ++ True ++ 0 0 10000 1 60 60 ++ 1 ++ ++ ++ ++ ++ True ++ minutes ++hours ++days ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ True ++ True ++ _Don't update this feed automatically. ++ True ++ 0 ++ True ++ updateIntervalDefault ++ ++ ++ False ++ False ++ 2 ++ ++ ++ ++ ++ True ++ ++ ++ ++ False ++ False ++ 3 ++ ++ ++ ++ ++ 339 ++ True ++ 0 ++ This feed provider suggests an update interval of %d minutes. ++ True ++ ++ ++ False ++ False ++ 4 ++ ++ ++ ++ ++ ++ ++ False ++ 1 ++ ++ ++ ++ ++ False ++ 1 ++ ++ ++ ++ ++ False ++ ++ ++ ++ ++ True ++ General ++ ++ ++ tab ++ False ++ False ++ ++ ++ ++ ++ True ++ 12 ++ 18 ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 0 ++ <b>Feed Source</b> ++ True ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ 12 ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 2 ++ 2 ++ 12 ++ 6 ++ ++ ++ True ++ True ++ * ++ ++ ++ 1 ++ 2 ++ 1 ++ 2 ++ ++ ++ ++ ++ ++ True ++ 6 ++ ++ ++ True ++ True ++ _URL ++ True ++ 0 ++ True ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ True ++ _Command ++ True ++ 0 ++ True ++ feed_loc_url ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ True ++ ++ ++ True ++ True ++ _Local File ++ True ++ 0 ++ True ++ feed_loc_url ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ ++ ++ ++ False ++ 1 ++ ++ ++ ++ ++ True ++ True ++ Select File... ++ True ++ 0 ++ ++ ++ False ++ False ++ 2 ++ ++ ++ ++ ++ False ++ 2 ++ ++ ++ ++ ++ 1 ++ 2 ++ GTK_FILL ++ GTK_FILL ++ ++ ++ ++ ++ True ++ 0 ++ _Source: ++ True ++ sourceEntry ++ ++ ++ 1 ++ 2 ++ GTK_FILL ++ ++ ++ ++ ++ ++ True ++ 0 ++ 0 ++ Source Type: ++ ++ ++ GTK_FILL ++ GTK_FILL ++ ++ ++ ++ ++ False ++ ++ ++ ++ ++ True ++ 6 ++ ++ ++ True ++ True ++ Use conversion _filter ++ True ++ 0 ++ True ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ 12 ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 0 ++ Liferea can use external filter plugins in order to access feeds and directories in non-supported formats. See the documentation for more information. ++ True ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ 12 ++ ++ ++ True ++ Convert _using: ++ True ++ filterEntry ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ 6 ++ ++ ++ True ++ True ++ * ++ ++ ++ ++ ++ True ++ True ++ Select File... ++ True ++ 0 ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ 1 ++ False ++ ++ ++ ++ ++ True ++ Source ++ ++ ++ tab ++ 1 ++ False ++ False ++ ++ ++ ++ ++ True ++ 12 ++ 6 ++ ++ ++ 347 ++ True ++ 0 ++ The cache setting controls if the contents of feeds are saved when Liferea exits. Marked items are always saved to the cache. ++ True ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ True ++ _Default cache settings ++ True ++ 0 ++ True ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ True ++ True ++ Di_sable cache ++ True ++ 0 ++ True ++ feedCacheDefault ++ ++ ++ False ++ False ++ 2 ++ ++ ++ ++ ++ True ++ True ++ _Unlimited cache ++ True ++ 0 ++ True ++ feedCacheDefault ++ ++ ++ False ++ False ++ 3 ++ ++ ++ ++ ++ True ++ 6 ++ ++ ++ True ++ True ++ _Limit cache to ++ True ++ 0 ++ True ++ feedCacheDefault ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ True ++ 0 0 10000 1 10 1 ++ 1 ++ True ++ True ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ True ++ items. ++ ++ ++ False ++ False ++ 2 ++ ++ ++ ++ ++ False ++ False ++ 4 ++ ++ ++ ++ ++ 2 ++ False ++ ++ ++ ++ ++ True ++ Archive ++ ++ ++ tab ++ 2 ++ False ++ False ++ ++ ++ ++ ++ True ++ 12 ++ 6 ++ ++ ++ True ++ True ++ Use HTTP _authentication ++ True ++ 0 ++ True ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ 12 ++ ++ ++ True ++ 2 ++ 2 ++ 12 ++ 6 ++ ++ ++ True ++ 0 ++ User_name: ++ True ++ usernameEntry ++ ++ ++ GTK_FILL ++ ++ ++ ++ ++ ++ True ++ 0 ++ _Password: ++ True ++ passwordEntry ++ ++ ++ 1 ++ 2 ++ GTK_FILL ++ ++ ++ ++ ++ ++ True ++ True ++ * ++ ++ ++ 1 ++ 2 ++ ++ ++ ++ ++ ++ True ++ True ++ False ++ * ++ ++ ++ 1 ++ 2 ++ 1 ++ 2 ++ ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ True ++ True ++ _Don't use proxy for download ++ True ++ 0 ++ True ++ ++ ++ False ++ False ++ 6 ++ 2 ++ ++ ++ ++ ++ 3 ++ False ++ ++ ++ ++ ++ True ++ Download ++ ++ ++ tab ++ 3 ++ False ++ False ++ ++ ++ ++ ++ True ++ 12 ++ 6 ++ ++ ++ True ++ True ++ _Automatically download all enclosures of this feed. ++ True ++ 0 ++ True ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ True ++ Auto-_load item link in configured browser when selecting articles. ++ True ++ 0 ++ True ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ 4 ++ False ++ ++ ++ ++ ++ True ++ Advanced ++ ++ ++ tab ++ 4 ++ False ++ False ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ True ++ GTK_BUTTONBOX_END ++ ++ ++ True ++ True ++ True ++ gtk-cancel ++ True ++ -6 ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ gtk-ok ++ True ++ -5 ++ ++ ++ 1 ++ ++ ++ ++ ++ False ++ GTK_PACK_END ++ ++ ++ ++ ++ ++ ++ True ++ 5 ++ New Subscription ++ False ++ True ++ GTK_WIN_POS_CENTER ++ 400 ++ GDK_WINDOW_TYPE_HINT_DIALOG ++ False ++ ++ ++ ++ True ++ 2 ++ ++ ++ True ++ ++ ++ True ++ 5 ++ 6 ++ ++ ++ True ++ 0 ++ <b>Feed Source</b> ++ True ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ ++ ++ True ++ ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ 2 ++ 2 ++ 12 ++ 6 ++ ++ ++ True ++ True ++ * ++ ++ ++ 1 ++ 2 ++ 1 ++ 2 ++ ++ ++ ++ ++ ++ True ++ 0 ++ _Source: ++ True ++ sourceEntry ++ ++ ++ 1 ++ 2 ++ GTK_FILL ++ ++ ++ ++ ++ ++ True ++ ++ ++ True ++ True ++ _URL ++ True ++ 0 ++ True ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ True ++ _Command ++ True ++ 0 ++ True ++ feed_loc_url ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ True ++ ++ ++ True ++ True ++ _Local File ++ True ++ 0 ++ True ++ feed_loc_url ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ ++ ++ ++ False ++ 1 ++ ++ ++ ++ ++ True ++ True ++ Select File... ++ True ++ 0 ++ ++ ++ False ++ False ++ 2 ++ ++ ++ ++ ++ False ++ 2 ++ ++ ++ ++ ++ 1 ++ 2 ++ GTK_FILL ++ GTK_FILL ++ ++ ++ ++ ++ True ++ 0 ++ 0 ++ Source Type: ++ ++ ++ GTK_FILL ++ GTK_FILL ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ True ++ 0 ++ <b>Download / Postprocessing</b> ++ True ++ ++ ++ False ++ False ++ 2 ++ ++ ++ ++ ++ True ++ ++ ++ True ++ ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ True ++ _Don't use proxy for download ++ True ++ 0 ++ True ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ 3 ++ ++ ++ ++ ++ 6 ++ ++ ++ True ++ ++ ++ True ++ ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ True ++ Use conversion _filter ++ True ++ 0 ++ True ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ False ++ False ++ ++ ++ ++ ++ ++ ++ True ++ ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 0 ++ Liferea can use external filter plugins in order to access feeds and directories in non-supported formats. See the documentation for more information. ++ True ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ 6 ++ ++ ++ True ++ ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ Convert _using: ++ True ++ filterEntry ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ True ++ True ++ * ++ ++ ++ 2 ++ ++ ++ ++ ++ True ++ True ++ Select File... ++ True ++ 0 ++ ++ ++ False ++ False ++ 3 ++ ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ 4 ++ ++ ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ True ++ GTK_BUTTONBOX_END ++ ++ ++ True ++ True ++ True ++ gtk-cancel ++ True ++ -6 ++ ++ ++ ++ ++ True ++ True ++ True ++ gtk-ok ++ True ++ -5 ++ ++ ++ 1 ++ ++ ++ ++ ++ False ++ GTK_PACK_END ++ ++ ++ ++ ++ ++ ++ True ++ 5 ++ New Folder ++ False ++ True ++ GDK_WINDOW_TYPE_HINT_DIALOG ++ False ++ ++ ++ ++ True ++ 2 ++ ++ ++ True ++ ++ ++ True ++ 5 ++ 12 ++ ++ ++ True ++ _Folder name: ++ True ++ foldertitleentry ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ True ++ * ++ True ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ True ++ GTK_BUTTONBOX_END ++ ++ ++ True ++ True ++ True ++ gtk-cancel ++ True ++ -6 ++ ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ gtk-ok ++ True ++ -5 ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ False ++ GTK_PACK_END ++ ++ ++ ++ ++ ++ ++ True ++ 5 ++ Rename ++ False ++ True ++ GDK_WINDOW_TYPE_HINT_DIALOG ++ False ++ ++ ++ ++ True ++ 2 ++ ++ ++ True ++ 5 ++ 12 ++ ++ ++ True ++ _New Name: ++ True ++ nameentry ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ True ++ * ++ True ++ ++ ++ 1 ++ ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ True ++ GTK_BUTTONBOX_END ++ ++ ++ True ++ True ++ True ++ gtk-cancel ++ True ++ 0 ++ ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ gtk-ok ++ True ++ -5 ++ ++ ++ 1 ++ ++ ++ ++ ++ False ++ GTK_PACK_END ++ ++ ++ ++ ++ ++ ++ True ++ 5 ++ Create Search Engine Feed ++ False ++ GDK_WINDOW_TYPE_HINT_DIALOG ++ False ++ ++ ++ True ++ 2 ++ ++ ++ True ++ 5 ++ 6 ++ ++ ++ True ++ 12 ++ ++ ++ True ++ _Search for: ++ True ++ searchkeywords ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ True ++ True ++ enter any search string you want ++ * ++ True ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ True ++ 12 ++ ++ ++ True ++ Maximal _Number Of Result Items: ++ True ++ resultcount ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ True ++ 15 1 1000 1 10 10 ++ 1 ++ ++ ++ 1 ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ True ++ 0 ++ Note: Liferea will generate a feed subscription which is used to query the search engine results for the specified search string. You can keep this feed permanently and update it like any other subscription. ++ True ++ ++ ++ False ++ False ++ 2 ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ True ++ GTK_BUTTONBOX_END ++ ++ ++ True ++ True ++ True ++ gtk-cancel ++ True ++ -6 ++ ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ gtk-ok ++ True ++ -5 ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ False ++ GTK_PACK_END ++ ++ ++ ++ ++ ++ ++ True ++ 5 ++ About ++ False ++ 300 ++ 200 ++ GDK_WINDOW_TYPE_HINT_DIALOG ++ False ++ ++ ++ True ++ 2 ++ ++ ++ True ++ True ++ 5 ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 15 ++ Liferea A.B.C ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ 4 ++ Liferea is a news aggregator for GTK+ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ True ++ True ++ GTK_RELIEF_NONE ++ 0 ++ ++ ++ ++ True ++ <span color="blue" underline="single">Liferea Homepage</span> ++ True ++ ++ ++ ++ ++ False ++ False ++ 2 ++ ++ ++ ++ ++ True ++ 5 ++ Copyright (c) 2003-2007 ++Lars Lindner <lars.lindner@gmail.com> and ++Nathan J. Conrad <t98502@users.sourceforge.net> ++ ++ GTK_JUSTIFY_CENTER ++ ++ ++ False ++ False ++ 3 ++ ++ ++ ++ ++ False ++ ++ ++ ++ ++ True ++ About ++ ++ ++ tab ++ False ++ False ++ ++ ++ ++ ++ True ++ True ++ GTK_POLICY_NEVER ++ GTK_POLICY_AUTOMATIC ++ ++ ++ True ++ GTK_SHADOW_NONE ++ ++ ++ True ++ 0 ++ 0.10000000149011612 ++ 5 ++ 5 ++ Code, Patches, Debugging ++ ++James Doherty ++Jeremy Messenger ++John McKnight ++Tomasz Maka ++Karl Soderstrom ++Christophe Barbe ++Juho Snellman ++Roshan Revankar ++Oliver Feiler ++Niklas Morberg ++Johannes Schlueter ++Pierre Phaneuf ++ahmed el-helw ++James Bowes ++Marc Deslauriers ++Amit D. Chaudhary ++Christoph Hohmann ++Raphael Slinckx ++Bjorn Monnens ++Thomas de Grenier de Latour ++Aristotle Pagaltzis ++Norman Jonas ++Sebastian Droege ++Daniel Gryniewicz ++Remi Cardona ++Frederic Peters ++Don Malcolm ++Ed Catmur ++Chris Pirillo ++Eric Anderson ++and many more... ++ ++Code from other projects ++ ++Anders Carlsson (tray icon support) ++Philippe Martin, Brion Vibber (favicon support) ++Jonathan Blandford (GtkTreeModelFilter) ++Kristian Rietveld (GtkTreeModelFilter) ++ ++Included Software ++ ++Liferea uses the XSPF Web Music Player to ++allow direct podcast playback. This player was ++written by Fabricio Zuardi and can be found ++at http://musicplayer.sourceforge.net ++ ++ ++ ++ ++ ++ ++ 1 ++ False ++ ++ ++ ++ ++ True ++ Contributors ++ ++ ++ tab ++ 1 ++ False ++ False ++ ++ ++ ++ ++ True ++ True ++ GTK_POLICY_AUTOMATIC ++ GTK_POLICY_AUTOMATIC ++ ++ ++ True ++ GTK_SHADOW_NONE ++ ++ ++ True ++ 0 ++ 0.10000000149011612 ++ 5 ++ 5 ++ Bart Kreska <bartkreska@users.sourceforge.net> ++Dario Conigliaro <djdas@djdas.net> ++Fernando Ike de Oliveira <fike@midstorm.org> ++Khaled Hosny <khaledhosny@eglug.org> ++Sargate Kanogan <sargate@gmail.com> ++Takeshi AIHANA <takeshi.aihana@gmail.com> ++Vincent Lefèvre <vincent@vinc17.org> ++Oleg Maloglovets <oleg@koleso-auto.ru> ++Og Maciel <ogmaciel@ubuntu.com> ++Mehmet Atif Ergun <mehmetaergun@gmail.com> ++Daniel Nylander <po@danielnylander.se> ++Ihar Hrachyshka <booxter@users.sf.net> ++Emanuele Grande <caccolangrifata@gmail.com> ++ ++ ++ ++ ++ ++ ++ 2 ++ False ++ ++ ++ ++ ++ True ++ Translation ++ ++ ++ tab ++ 2 ++ False ++ False ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ True ++ GTK_BUTTONBOX_END ++ ++ ++ True ++ True ++ True ++ True ++ gtk-close ++ True ++ -7 ++ ++ ++ ++ ++ ++ False ++ GTK_PACK_END ++ ++ ++ ++ ++ ++ ++ True ++ 5 ++ Authentication ++ False ++ GDK_WINDOW_TYPE_HINT_DIALOG ++ False ++ ++ ++ True ++ 2 ++ ++ ++ True ++ 5 ++ 12 ++ ++ ++ True ++ 0 ++ Enter the username and password for "%s" (%s): ++ True ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ 2 ++ 2 ++ 12 ++ 6 ++ ++ ++ True ++ 0 ++ User_name: ++ True ++ usernameEntry ++ ++ ++ GTK_FILL ++ ++ ++ ++ ++ ++ True ++ 0 ++ _Password: ++ True ++ passwordEntry ++ ++ ++ 1 ++ 2 ++ GTK_FILL ++ ++ ++ ++ ++ ++ True ++ True ++ * ++ True ++ ++ ++ 1 ++ 2 ++ ++ ++ ++ ++ ++ True ++ True ++ False ++ * ++ True ++ ++ ++ 1 ++ 2 ++ 1 ++ 2 ++ ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ True ++ 0 ++ Note: <i>The username and password will be saved to your Liferea feedlist file without using encryption.</i> ++ True ++ True ++ ++ ++ False ++ False ++ 2 ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ True ++ GTK_BUTTONBOX_END ++ ++ ++ True ++ True ++ True ++ gtk-cancel ++ True ++ -6 ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ gtk-ok ++ True ++ -5 ++ ++ ++ 1 ++ ++ ++ ++ ++ False ++ GTK_PACK_END ++ ++ ++ ++ ++ ++ ++ True ++ 5 ++ Search Folder Properties ++ 350 ++ 250 ++ GDK_WINDOW_TYPE_HINT_DIALOG ++ False ++ ++ ++ True ++ 2 ++ ++ ++ True ++ 5 ++ 12 ++ ++ ++ True ++ 12 ++ ++ ++ True ++ _Name: ++ True ++ feedNameEntry ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ True ++ * ++ ++ ++ 1 ++ ++ ++ ++ ++ False ++ ++ ++ ++ ++ True ++ ++ ++ True ++ 0 ++ <b>Rule</b> ++ True ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ 12 ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 6 ++ ++ ++ True ++ True ++ gtk-add ++ True ++ 0 ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ Note: Items are added to the search folder if at least one additive rule ++matches. They are removed if at least one removing rule matches. ++ ++ ++ 1 ++ ++ ++ ++ ++ False ++ ++ ++ ++ ++ True ++ True ++ GTK_POLICY_AUTOMATIC ++ GTK_POLICY_AUTOMATIC ++ ++ ++ True ++ ++ ++ ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ True ++ GTK_BUTTONBOX_END ++ ++ ++ True ++ True ++ True ++ gtk-cancel ++ True ++ -6 ++ ++ ++ ++ ++ True ++ True ++ True ++ gtk-ok ++ True ++ -5 ++ ++ ++ 1 ++ ++ ++ ++ ++ False ++ GTK_PACK_END ++ ++ ++ ++ ++ ++ ++ True ++ 5 ++ Downloading Enclosure ++ False ++ GDK_WINDOW_TYPE_HINT_DIALOG ++ False ++ ++ ++ ++ True ++ 2 ++ ++ ++ True ++ 5 ++ 12 ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 0 ++ Downloading an enclosure of type: ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ 6 ++ <b>text/plain</b> ++ True ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ True ++ 0 ++ What should Liferea do with this enclosure? Please enter the command you want to be executed below. The downloaded file will be supplied as an argument for this command: ++ True ++ ++ ++ False ++ False ++ 2 ++ ++ ++ ++ ++ True ++ 6 ++ ++ ++ True ++ True ++ * ++ ++ ++ ++ ++ True ++ True ++ _Browse ++ True ++ 0 ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ 3 ++ ++ ++ ++ ++ True ++ True ++ _Do this automatically for files like this from now on. ++ True ++ 0 ++ True ++ ++ ++ False ++ False ++ 4 ++ ++ ++ ++ ++ False ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ True ++ GTK_BUTTONBOX_END ++ ++ ++ True ++ True ++ True ++ gtk-cancel ++ True ++ -6 ++ ++ ++ ++ ++ True ++ True ++ True ++ gtk-ok ++ True ++ -5 ++ ++ ++ 1 ++ ++ ++ ++ ++ False ++ GTK_PACK_END ++ ++ ++ ++ ++ ++ ++ True ++ 5 ++ Search All Feeds ++ False ++ GDK_WINDOW_TYPE_HINT_DIALOG ++ False ++ ++ ++ True ++ 2 ++ ++ ++ True ++ 5 ++ 12 ++ ++ ++ True ++ 12 ++ ++ ++ True ++ _Search for: ++ True ++ searchentry ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ True ++ Enter a search string Liferea should find either in a items title or in its content. ++ * ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ False ++ ++ ++ ++ ++ 6 ++ 1 ++ ++ ++ ++ ++ True ++ GTK_BUTTONBOX_END ++ ++ ++ True ++ True ++ True ++ gtk-close ++ True ++ -7 ++ ++ ++ ++ ++ ++ True ++ False ++ True ++ True ++ Saves this search as a search folder, which will appear in the feed list. ++ -10 ++ ++ ++ ++ True ++ 0 ++ 0 ++ ++ ++ True ++ 2 ++ ++ ++ True ++ gtk-add ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ Search Folder ++ True ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ True ++ False ++ True ++ True ++ Starts searching for the specified text in all feeds. The search result will appear in the item list. ++ gtk-find ++ True ++ 0 ++ ++ ++ ++ 2 ++ ++ ++ ++ ++ False ++ GTK_PACK_END ++ ++ ++ ++ ++ ++ ++ True ++ Update Monitor ++ 400 ++ 300 ++ True ++ GDK_WINDOW_TYPE_HINT_DIALOG ++ ++ ++ True ++ ++ ++ True ++ 6 ++ 2 ++ 2 ++ 6 ++ 6 ++ ++ ++ True ++ 0 ++ <b>Downloading Now</b> ++ True ++ ++ ++ GTK_FILL ++ ++ ++ ++ ++ ++ True ++ 0 ++ <b>Pending Requests</b> ++ True ++ ++ ++ 1 ++ 2 ++ GTK_FILL ++ ++ ++ ++ ++ ++ True ++ True ++ GTK_POLICY_AUTOMATIC ++ GTK_POLICY_AUTOMATIC ++ GTK_SHADOW_IN ++ ++ ++ True ++ True ++ False ++ ++ ++ ++ ++ 1 ++ 2 ++ 1 ++ 2 ++ ++ ++ ++ ++ True ++ True ++ GTK_POLICY_AUTOMATIC ++ GTK_POLICY_AUTOMATIC ++ GTK_SHADOW_IN ++ ++ ++ True ++ True ++ False ++ ++ ++ ++ ++ 1 ++ 2 ++ ++ ++ ++ ++ 2 ++ ++ ++ ++ ++ True ++ GTK_BUTTONBOX_END ++ ++ ++ True ++ True ++ True ++ 0 ++ ++ ++ ++ True ++ 0 ++ 0 ++ ++ ++ True ++ 2 ++ ++ ++ True ++ gtk-delete ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ Cancel _All ++ True ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ True ++ True ++ True ++ gtk-close ++ True ++ -7 ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ False ++ GTK_PACK_END ++ ++ ++ ++ ++ ++ ++ True ++ New Subscription ++ GDK_WINDOW_TYPE_HINT_DIALOG ++ ++ ++ True ++ ++ ++ True ++ 12 ++ 6 ++ ++ ++ True ++ 0 ++ <b>Feed Source</b> ++ True ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ ++ ++ True ++ ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ 2 ++ 1 ++ 12 ++ 6 ++ ++ ++ True ++ True ++ * ++ ++ ++ 1 ++ 2 ++ ++ ++ ++ ++ ++ True ++ 0 ++ Enter a website location to use feed autodiscovery or in case you know it the exact feed location. ++ True ++ ++ ++ GTK_FILL ++ ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ 2 ++ ++ ++ ++ ++ True ++ GTK_BUTTONBOX_END ++ ++ ++ True ++ True ++ True ++ gtk-cancel ++ True ++ -6 ++ ++ ++ ++ ++ True ++ True ++ True ++ Advanced... ++ True ++ -10 ++ ++ ++ 1 ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ gtk-ok ++ True ++ -5 ++ ++ ++ 2 ++ ++ ++ ++ ++ False ++ GTK_PACK_END ++ ++ ++ ++ ++ ++ ++ True ++ Script Manager ++ 500 ++ 500 ++ GDK_WINDOW_TYPE_HINT_DIALOG ++ ++ ++ True ++ ++ ++ True ++ 12 ++ 6 ++ ++ ++ True ++ 6 ++ ++ ++ True ++ <b>Hook</b> ++ True ++ True ++ scripthooksmenu ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ True ++ 0 ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ False ++ ++ ++ ++ ++ True ++ ++ ++ False ++ 1 ++ ++ ++ ++ ++ True ++ True ++ 130 ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 0 ++ <b>Registered Scripts</b> ++ True ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ True ++ GTK_POLICY_NEVER ++ GTK_POLICY_AUTOMATIC ++ GTK_SHADOW_IN ++ ++ ++ True ++ True ++ False ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ True ++ True ++ gtk-add ++ True ++ 0 ++ ++ ++ ++ False ++ False ++ 2 ++ ++ ++ ++ ++ True ++ True ++ gtk-remove ++ True ++ 0 ++ ++ ++ ++ False ++ False ++ 3 ++ ++ ++ ++ ++ False ++ True ++ ++ ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 0 ++ <b>Script Code</b> ++ True ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ True ++ GTK_POLICY_AUTOMATIC ++ GTK_POLICY_AUTOMATIC ++ GTK_SHADOW_IN ++ ++ ++ True ++ True ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ True ++ 0 ++ ++ ++ True ++ ++ ++ True ++ True ++ 0 ++ ++ ++ ++ True ++ 0 ++ 0 ++ ++ ++ True ++ 2 ++ ++ ++ True ++ gtk-save ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ Save Script ++ True ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ ++ ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ True ++ 0 ++ ++ ++ ++ True ++ 0 ++ 0 ++ ++ ++ True ++ 2 ++ ++ ++ True ++ gtk-execute ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ Run Now ++ True ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ ++ ++ False ++ 2 ++ ++ ++ ++ ++ True ++ True ++ ++ ++ ++ ++ 2 ++ ++ ++ ++ ++ True ++ ++ ++ True ++ True ++ * ++ ++ ++ ++ ++ ++ True ++ True ++ Exec Command ++ True ++ 0 ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ False ++ 3 ++ ++ ++ ++ ++ 2 ++ ++ ++ ++ ++ True ++ GTK_BUTTONBOX_END ++ ++ ++ True ++ True ++ True ++ gtk-close ++ True ++ -7 ++ ++ ++ ++ ++ False ++ GTK_PACK_END ++ ++ ++ ++ ++ ++ ++ True ++ Add Script ++ GDK_WINDOW_TYPE_HINT_DIALOG ++ ++ ++ True ++ ++ ++ True ++ 12 ++ 2 ++ 2 ++ 6 ++ 6 ++ ++ ++ True ++ True ++ 0 ++ ++ ++ 1 ++ 2 ++ GTK_FILL ++ ++ ++ ++ ++ ++ True ++ True ++ * ++ ++ ++ 1 ++ 2 ++ 1 ++ 2 ++ ++ ++ ++ ++ ++ True ++ True ++ Reuse existing script ++ True ++ 0 ++ True ++ ++ ++ GTK_FILL ++ ++ ++ ++ ++ ++ True ++ True ++ Create new script ++ True ++ 0 ++ True ++ scriptAddReuseRadioBtn ++ ++ ++ 1 ++ 2 ++ GTK_FILL ++ ++ ++ ++ ++ ++ 2 ++ ++ ++ ++ ++ True ++ GTK_BUTTONBOX_END ++ ++ ++ True ++ True ++ True ++ gtk-cancel ++ True ++ -6 ++ ++ ++ ++ ++ True ++ True ++ True ++ gtk-ok ++ True ++ -5 ++ ++ ++ 1 ++ ++ ++ ++ ++ False ++ GTK_PACK_END ++ ++ ++ ++ ++ ++ ++ True ++ Create News Bin ++ GDK_WINDOW_TYPE_HINT_DIALOG ++ ++ ++ True ++ ++ ++ True ++ ++ ++ True ++ 5 ++ 12 ++ ++ ++ True ++ _News Bin Name: ++ True ++ nameentry ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ True ++ * ++ True ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ 2 ++ ++ ++ ++ ++ True ++ GTK_BUTTONBOX_END ++ ++ ++ True ++ True ++ True ++ gtk-cancel ++ True ++ -6 ++ ++ ++ ++ ++ ++ True ++ True ++ True ++ True ++ gtk-ok ++ True ++ -5 ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ False ++ GTK_PACK_END ++ ++ ++ ++ ++ ++ ++ True ++ 5 ++ Liferea Preferences ++ GTK_WIN_POS_CENTER ++ 300 ++ GDK_WINDOW_TYPE_HINT_DIALOG ++ False ++ ++ ++ ++ True ++ 2 ++ ++ ++ True ++ True ++ 5 ++ ++ ++ True ++ 12 ++ 18 ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 0 ++ <span weight="bold">Feed Cache Handling</span> ++ True ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ 12 ++ ++ ++ True ++ 12 ++ ++ ++ True ++ Default _number of items per feed to save: ++ True ++ True ++ itemCountBtn ++ ++ ++ False ++ False ++ ++ ++ ++ ++ 60 ++ True ++ True ++ 0 0 1000000 1 10 10 ++ 1 ++ True ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ False ++ ++ ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 0 ++ <span weight="bold">Feed Update Settings</span> ++ True ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ 12 ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 12 ++ ++ ++ True ++ Default Feed Refresh _Interval: ++ True ++ refreshIntervalSpinButton ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ 6 ++ ++ ++ 60 ++ True ++ True ++ 1 0 10000 1 60 60 ++ 1 ++ ++ ++ ++ ++ ++ True ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ False ++ 1 ++ ++ ++ ++ ++ False ++ ++ ++ ++ ++ True ++ 0 ++ Note: <i>Please remember to set a reasonable refresh time. Usually it is a waste of bandwidth to poll feeds more often than each hour.</i> ++ True ++ True ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ True ++ 12 ++ ++ ++ True ++ At _startup: ++ True ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ False ++ 2 ++ ++ ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ False ++ 1 ++ ++ ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ Feeds ++ ++ ++ tab ++ False ++ False ++ ++ ++ ++ ++ True ++ 12 ++ 18 ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 0 ++ <span weight="bold">Folder Display Settings</span> ++ True ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ 12 ++ ++ ++ True ++ 6 ++ ++ ++ True ++ True ++ _Show the items of all child feeds when a folder is selected. ++ True ++ 0 ++ True ++ ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ 0 ++ 24 ++ <i>This option can cause significant delays when loading folders containing many feeds.</i> ++ True ++ True ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ True ++ True ++ _Hide read items. ++ True ++ 0 ++ True ++ ++ ++ ++ False ++ False ++ 2 ++ ++ ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ False ++ ++ ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 0 ++ <span weight="bold">Feed Icons (Favicons)</span> ++ True ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ 12 ++ ++ ++ True ++ ++ ++ True ++ True ++ _Update all favicons now ++ True ++ 0 ++ ++ ++ False ++ False ++ ++ ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ False ++ 1 ++ ++ ++ ++ ++ 1 ++ False ++ ++ ++ ++ ++ True ++ Folders ++ ++ ++ tab ++ 1 ++ False ++ False ++ ++ ++ ++ ++ True ++ 12 ++ 18 ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 0 ++ <span weight="bold">Reading Headlines</span> ++ True ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ 12 ++ ++ ++ True ++ 12 ++ ++ ++ True ++ _Skim through articles with: ++ True ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ False ++ ++ ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 0 ++ <span weight="bold">Web Integration</span> ++ True ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ 12 ++ ++ ++ True ++ 2 ++ 2 ++ 6 ++ 6 ++ ++ ++ True ++ 0 ++ ++ ++ 1 ++ 2 ++ 1 ++ 2 ++ GTK_FILL ++ ++ ++ ++ ++ ++ True ++ True ++ 0 ++ ++ ++ 1 ++ 2 ++ GTK_FILL ++ ++ ++ ++ ++ ++ True ++ 0 ++ _Post Bookmarks to ++ True ++ socialpopup ++ ++ ++ GTK_FILL ++ ++ ++ ++ ++ ++ 0 ++ Search _Link for ++ True ++ searchpopup ++ ++ ++ 1 ++ 2 ++ GTK_FILL ++ ++ ++ ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ False ++ 1 ++ ++ ++ ++ ++ 2 ++ False ++ False ++ ++ ++ ++ ++ True ++ Headlines ++ ++ ++ tab ++ 2 ++ False ++ False ++ ++ ++ ++ ++ True ++ 12 ++ 18 ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 0 ++ <span weight="bold">Internal Browser Settings</span> ++ True ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ 12 ++ ++ ++ True ++ 6 ++ ++ ++ True ++ True ++ Open links in Liferea's _window. ++ True ++ 0 ++ True ++ ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ True ++ _Disable Javascript. ++ True ++ 0 ++ True ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ ++ ++ False ++ 6 ++ 1 ++ ++ ++ ++ ++ False ++ ++ ++ ++ ++ False ++ ++ ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 0 ++ <span weight="bold">External Browser Settings</span> ++ True ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ 12 ++ ++ ++ True ++ 3 ++ 2 ++ 12 ++ 6 ++ ++ ++ True ++ 0 ++ _Browser: ++ True ++ browserpopup ++ ++ ++ GTK_FILL ++ ++ ++ ++ ++ ++ True ++ 0 ++ _Manual: ++(%s for URL) ++ True ++ browsercmd ++ ++ ++ 2 ++ 3 ++ GTK_FILL ++ ++ ++ ++ ++ ++ True ++ True ++ * ++ True ++ ++ ++ ++ 1 ++ 2 ++ 2 ++ 3 ++ ++ ++ ++ ++ ++ True ++ 0 ++ _Open link in: ++ True ++ browserlocpopup ++ ++ ++ 1 ++ 2 ++ GTK_FILL ++ ++ ++ ++ ++ ++ True ++ True ++ 0 ++ ++ ++ 1 ++ 2 ++ 1 ++ 2 ++ GTK_FILL ++ ++ ++ ++ ++ ++ True ++ True ++ 0 ++ ++ ++ 1 ++ 2 ++ GTK_FILL ++ ++ ++ ++ ++ ++ ++ ++ False ++ 6 ++ 1 ++ ++ ++ ++ ++ False ++ 1 ++ ++ ++ ++ ++ 3 ++ False ++ ++ ++ ++ ++ True ++ Browser ++ ++ ++ tab ++ 3 ++ False ++ False ++ ++ ++ ++ ++ True ++ 12 ++ 18 ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 0 ++ <span weight="bold">Notification Settings</span> ++ True ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ 12 ++ ++ ++ True ++ 6 ++ ++ ++ True ++ True ++ Show a _popup window with new headlines. ++ True ++ 0 ++ True ++ ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ 6 ++ ++ ++ True ++ True ++ Show a status _icon in the notification area (system tray). ++ True ++ 0 ++ True ++ ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ ++ ++ True ++ ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ 6 ++ ++ ++ True ++ True ++ Show _number of new items in the tray icon. ++ True ++ 0 ++ True ++ ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ True ++ T_erminate instead of minimizing to tray icon. ++ True ++ 0 ++ True ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ False ++ 1 ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ False ++ ++ ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 0 ++ <span weight="bold">Menu and Toolbar Settings</span> ++ True ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ 12 ++ ++ ++ True ++ 6 ++ ++ ++ True ++ True ++ Show Menu _And Toolbar ++ True ++ 0 ++ True ++ ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ True ++ Show _Menu Only ++ True ++ 0 ++ True ++ menuradiobtn1 ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ True ++ True ++ Show _Toolbar Only ++ True ++ 0 ++ True ++ menuradiobtn1 ++ ++ ++ ++ False ++ False ++ 2 ++ ++ ++ ++ ++ True ++ 12 ++ ++ ++ True ++ 0 ++ Toolbar _button labels: ++ True ++ True ++ toolbarCombo ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ False ++ 3 ++ ++ ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ False ++ 1 ++ ++ ++ ++ ++ 4 ++ False ++ ++ ++ ++ ++ True ++ GUI ++ ++ ++ tab ++ 4 ++ False ++ False ++ ++ ++ ++ ++ True ++ ++ ++ True ++ 12 ++ 18 ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 0 ++ <span weight="bold">HTTP Proxy Server</span> ++ True ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ 12 ++ ++ ++ True ++ 6 ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ 6 ++ ++ ++ True ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ _Auto Detect (GNOME or environment) ++ True ++ 0 ++ True ++ True ++ ++ ++ ++ ++ True ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ _No Proxy ++ True ++ 0 ++ True ++ True ++ proxyAutoDetectRadio ++ ++ ++ 1 ++ ++ ++ ++ ++ True ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ _Manual Setting: ++ True ++ 0 ++ True ++ True ++ proxyAutoDetectRadio ++ ++ ++ 2 ++ ++ ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 2 ++ 2 ++ 12 ++ 6 ++ ++ ++ True ++ 0 ++ Proxy _Host: ++ True ++ proxyhostentry ++ ++ ++ GTK_FILL ++ ++ ++ ++ ++ ++ True ++ True ++ * ++ True ++ ++ ++ 1 ++ 2 ++ ++ ++ ++ ++ ++ ++ True ++ True ++ * ++ True ++ ++ ++ 1 ++ 2 ++ 1 ++ 2 ++ ++ ++ ++ ++ ++ ++ True ++ 0 ++ Proxy _Port: ++ True ++ proxyportentry ++ ++ ++ 1 ++ 2 ++ GTK_FILL ++ ++ ++ ++ ++ ++ 3 ++ ++ ++ ++ ++ True ++ True ++ Use Proxy Au_thentication ++ True ++ 0 ++ True ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ True ++ 21 ++ ++ ++ True ++ 2 ++ 2 ++ 12 ++ 6 ++ ++ ++ True ++ 0 ++ Proxy _Username: ++ True ++ ++ ++ GTK_FILL ++ ++ ++ ++ ++ ++ True ++ True ++ * ++ True ++ ++ ++ 1 ++ 2 ++ ++ ++ ++ ++ ++ ++ True ++ True ++ False ++ * ++ True ++ ++ ++ 1 ++ 2 ++ 1 ++ 2 ++ ++ ++ ++ ++ ++ ++ True ++ 0 ++ Proxy Pass_word: ++ True ++ proxypasswordentry ++ ++ ++ 1 ++ 2 ++ GTK_FILL ++ ++ ++ ++ ++ ++ ++ ++ 2 ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ 3 ++ ++ ++ ++ ++ False ++ False ++ ++ ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ False ++ ++ ++ ++ ++ False ++ ++ ++ ++ ++ 5 ++ False ++ ++ ++ ++ ++ True ++ Proxy ++ ++ ++ tab ++ 5 ++ False ++ False ++ ++ ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ 12 ++ 18 ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ 6 ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ 0 ++ <span weight="bold">Downloading Enclosures</span> ++ True ++ ++ ++ False ++ ++ ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ 12 ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ 2 ++ 2 ++ 6 ++ 6 ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ ++ ++ True ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ ++ ++ ++ ++ ++ True ++ True ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ _Browse ++ True ++ 0 ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ 1 ++ 2 ++ 1 ++ 2 ++ ++ ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ ++ ++ 1 ++ ++ ++ ++ ++ 1 ++ 2 ++ ++ ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ 0 ++ _Save downloads in ++ True ++ ++ ++ 1 ++ 2 ++ ++ ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ 0 ++ _Download using ++ True ++ ++ ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ False ++ ++ ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ 6 ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ 0 ++ <span weight="bold">Opening Enclosures</span> ++ True ++ ++ ++ False ++ ++ ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ 12 ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ 6 ++ ++ ++ True ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ GTK_POLICY_AUTOMATIC ++ ++ ++ True ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ True ++ ++ ++ ++ ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ 6 ++ ++ ++ True ++ True ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ gtk-properties ++ True ++ 0 ++ ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ True ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ gtk-delete ++ True ++ 0 ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ 6 ++ False ++ ++ ++ ++ ++ True ++ Enclosures ++ ++ ++ tab ++ 6 ++ False ++ False ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ True ++ GTK_BUTTONBOX_END ++ ++ ++ True ++ True ++ True ++ gtk-close ++ True ++ -7 ++ ++ ++ ++ ++ ++ False ++ GTK_PACK_END ++ ++ ++ ++ ++ ++ +Index: liferea-1.4.16b/src/Makefile.am +=================================================================== +--- liferea-1.4.16b.orig/src/Makefile.am 2008-07-04 11:17:40.000000000 +1000 ++++ liferea-1.4.16b/src/Makefile.am 2008-07-04 11:17:47.000000000 +1000 +@@ -69,7 +69,7 @@ + fl_sources/libliflsources.a \ + notification/liblinotification.a \ + ui/libliui.a \ +- $(PACKAGE_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS) $(DBUS_LIBS) $(NM_LIBS) $(INTLLIBS) $(GNUTLS_LIBS) ++ $(PACKAGE_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS) $(DBUS_LIBS) $(NM_LIBS) $(INTLLIBS) $(GNUTLS_LIBS) $(HILDON_LIBS) + + if WITH_DBUS + +Index: liferea-1.4.16b/src/ui/Makefile.am +=================================================================== +--- liferea-1.4.16b.orig/src/ui/Makefile.am 2008-07-04 11:17:40.000000000 +1000 ++++ liferea-1.4.16b/src/ui/Makefile.am 2008-07-04 11:17:47.000000000 +1000 +@@ -8,7 +8,7 @@ + + noinst_LIBRARIES = libliui.a + +-libliui_a_CFLAGS = $(PACKAGE_CFLAGS) $(DBUS_CFLAGS) ++libliui_a_CFLAGS = $(PACKAGE_CFLAGS) $(DBUS_CFLAGS) $(HILDON_CFLAGS) + libliui_a_SOURCES = \ + eggtrayicon.c eggtrayicon.h \ + ui_auth.c ui_auth.h \ +Index: liferea-1.4.16b/src/ui/ui_dialog.c +=================================================================== +--- liferea-1.4.16b.orig/src/ui/ui_dialog.c 2008-07-04 11:17:40.000000000 +1000 ++++ liferea-1.4.16b/src/ui/ui_dialog.c 2008-07-04 11:17:47.000000000 +1000 +@@ -136,7 +136,11 @@ + if (filename) + ld->priv->xml = glade_xml_new (filename, name, GETTEXT_PACKAGE); + else ++#ifdef MAEMO_CHANGES ++ ld->priv->xml = glade_xml_new (PACKAGE_DATA_DIR G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "liferea_hildon.glade", name, GETTEXT_PACKAGE); ++#else + ld->priv->xml = glade_xml_new (PACKAGE_DATA_DIR G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "liferea.glade", name, GETTEXT_PACKAGE); ++#endif + g_return_val_if_fail (ld->priv->xml != NULL, NULL); + + ld->priv->dialog = glade_xml_get_widget (ld->priv->xml, name); +Index: liferea-1.4.16b/src/ui/ui_mainwindow.c +=================================================================== +--- liferea-1.4.16b.orig/src/ui/ui_mainwindow.c 2008-07-04 11:17:47.000000000 +1000 ++++ liferea-1.4.16b/src/ui/ui_mainwindow.c 2008-07-04 11:17:47.000000000 +1000 +@@ -28,6 +28,10 @@ + #include + #include + ++#ifdef MAEMO_CHANGES ++# include ++#endif ++ + #include + #include + +@@ -59,7 +63,13 @@ + #include "ui/ui_update.h" + + static struct mainwindow { ++#ifdef MAEMO_CHANGES ++ HildonProgram *program; ++ GtkWidget *container; ++ GtkWidget *window; ++#else + GtkWindow *window; ++#endif + GtkWidget *menubar; + GtkWidget *toolbar; + GtkWidget *itemlistContainer; /**< scrolled window holding item list tree view */ +@@ -532,7 +542,16 @@ + + window = liferea_shell_lookup ("mainwindow"); + mw = mainwindow_priv = g_new0 (struct mainwindow, 1); ++ ++#ifdef MAEMO_CHANGES ++ mw->program = HILDON_PROGRAM(hildon_program_get_instance()); ++ mw->container = window; ++ mw->window = hildon_window_new(); ++ gtk_container_add(GTK_CONTAINER(mw->window), GTK_WIDGET(mw->container)); ++ hildon_program_add_window(mw->program, HILDON_WINDOW(mw->window)); ++#else + mw->window = GTK_WINDOW (window); ++#endif + + toolbar_style = conf_get_toolbar_style (); + +@@ -540,7 +559,12 @@ + gtk_widget_set_name (liferea_shell_lookup ("feedlist"), "feedlist"); + + ui_mainwindow_create_menus(mw); +- gtk_box_pack_start (GTK_BOX (liferea_shell_lookup ("vbox1")), mw->toolbar, FALSE, FALSE, 0); ++ ++#ifdef MAEMO_CHANGES ++ gtk_box_pack_end (GTK_BOX (liferea_shell_lookup ("vbox1")), mw->toolbar, FALSE, FALSE, 0); ++#else ++ gtk_box_pack_start (GTK_BOX (liferea_shell_lookup ("vbox1")), mw->toolbar, FALSE, FALSE, 0); ++#endif + gtk_box_reorder_child(GTK_BOX (liferea_shell_lookup ("vbox1")), mw->toolbar, 0); + gtk_box_pack_start (GTK_BOX (liferea_shell_lookup ("vbox1")), mw->menubar, FALSE, FALSE, 0); + gtk_box_reorder_child(GTK_BOX (liferea_shell_lookup ("vbox1")), mw->menubar, 0); +@@ -1261,9 +1285,11 @@ + gtk_action_group_add_actions (mw->itemActions, ui_mainwindow_item_action_entries, G_N_ELEMENTS (ui_mainwindow_item_action_entries), mw); + gtk_ui_manager_insert_action_group (ui_manager, mw->itemActions, 0); + ++#ifndef MAEMO_CHANGES + accel_group = gtk_ui_manager_get_accel_group (ui_manager); + gtk_window_add_accel_group (mw->window, accel_group); + g_object_unref (accel_group); ++#endif + + if(!gtk_ui_manager_add_ui_from_string(ui_manager, ui_mainwindow_ui_desc, -1, &error)) + g_error("building menus failed: %s", error->message); +@@ -1272,6 +1298,27 @@ + + mw->menubar = gtk_ui_manager_get_widget (ui_manager, "/MainwindowMenubar"); + mw->toolbar = gtk_ui_manager_get_widget (ui_manager, "/maintoolbar"); ++ ++ ++#ifdef MAEMO_CHANGES ++ GtkWidget *main_menu; ++ GList *iter; ++ ++ /* Create new main menu */ ++ main_menu = gtk_menu_new(); ++ ++ iter = gtk_container_get_children (GTK_CONTAINER (mw->menubar)); ++ while (iter) { ++ GtkWidget *menu; ++ ++ menu = GTK_WIDGET (iter->data); ++ gtk_widget_reparent(menu, main_menu); ++ ++ iter = g_list_next (iter); ++ } ++ ++ hildon_window_set_menu(HILDON_WINDOW(mw->window), GTK_MENU(main_menu)); ++#endif + + /* what a pain, why is there no markup for this option? */ + g_object_set (G_OBJECT (gtk_ui_manager_get_widget (ui_manager, "/maintoolbar/newFeedButton")), "is_important", TRUE, NULL); +Index: liferea-1.4.16b/src/ui/ui_shell.c +=================================================================== +--- liferea-1.4.16b.orig/src/ui/ui_shell.c 2008-07-04 11:17:40.000000000 +1000 ++++ liferea-1.4.16b/src/ui/ui_shell.c 2008-07-04 11:17:47.000000000 +1000 +@@ -110,7 +110,11 @@ + liferea_shell = ls; + + ls->priv = LIFEREA_SHELL_GET_PRIVATE (ls); ++#ifdef MAEMO_CHANGES ++ ls->priv->xml = glade_xml_new (PACKAGE_DATA_DIR G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "liferea_hildon.glade", "mainwindow", GETTEXT_PACKAGE); ++#else + ls->priv->xml = glade_xml_new (PACKAGE_DATA_DIR G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "liferea.glade", "mainwindow", GETTEXT_PACKAGE); ++#endif + glade_xml_signal_autoconnect (ls->priv->xml); + } + --- liferea-1.4.23.orig/debian/patches/01_ubuntu_feedlists +++ liferea-1.4.23/debian/patches/01_ubuntu_feedlists @@ -0,0 +1,210 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_ubuntu_feedlists.dpatch by Emilio Pozuelo Monfort +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Let's put some Ubuntu English and localized feeds in the default feedlist. +## DP: https://bugs.launchpad.net/ubuntu/+source/liferea/+bug/51604 +## DP: http://emilio.pozuelo.org/?p=24 + +@DPATCH@ +diff -urNad liferea-1.4.9~/opml/feedlist.opml liferea-1.4.9/opml/feedlist.opml +--- liferea-1.4.9~/opml/feedlist.opml 2007-11-27 01:22:26.000000000 +0100 ++++ liferea-1.4.9/opml/feedlist.opml 2007-12-02 19:14:42.000000000 +0100 +@@ -7,6 +7,8 @@ + + + ++ ++ + + + +diff -urNad liferea-1.4.9~/opml/feedlist_ca.opml liferea-1.4.9/opml/feedlist_ca.opml +--- liferea-1.4.9~/opml/feedlist_ca.opml 2007-11-27 01:29:49.000000000 +0100 ++++ liferea-1.4.9/opml/feedlist_ca.opml 2007-12-02 19:13:55.000000000 +0100 +@@ -5,6 +5,9 @@ + + + ++ ++ ++ + + + +@@ -20,6 +23,8 @@ + + + ++ ++ + + + +diff -urNad liferea-1.4.9~/opml/feedlist_de.opml liferea-1.4.9/opml/feedlist_de.opml +--- liferea-1.4.9~/opml/feedlist_de.opml 2007-11-27 01:28:42.000000000 +0100 ++++ liferea-1.4.9/opml/feedlist_de.opml 2007-12-02 19:16:25.000000000 +0100 +@@ -7,6 +7,7 @@ + + + ++ + + + +@@ -15,6 +16,8 @@ + + + ++ ++ + + + +diff -urNad liferea-1.4.9~/opml/feedlist_es.opml liferea-1.4.9/opml/feedlist_es.opml +--- liferea-1.4.9~/opml/feedlist_es.opml 2007-11-27 01:27:08.000000000 +0100 ++++ liferea-1.4.9/opml/feedlist_es.opml 2007-12-02 19:19:05.000000000 +0100 +@@ -6,6 +6,7 @@ + + + ++ + + + +@@ -17,6 +18,8 @@ + + + ++ ++ + + + +diff -urNad liferea-1.4.9~/opml/feedlist_eu.opml liferea-1.4.9/opml/feedlist_eu.opml +--- liferea-1.4.9~/opml/feedlist_eu.opml 2007-11-27 01:26:20.000000000 +0100 ++++ liferea-1.4.9/opml/feedlist_eu.opml 2007-12-02 19:19:48.000000000 +0100 +@@ -27,6 +27,8 @@ + + + ++ ++ + + + +diff -urNad liferea-1.4.9~/opml/feedlist_fr.opml liferea-1.4.9/opml/feedlist_fr.opml +--- liferea-1.4.9~/opml/feedlist_fr.opml 2007-11-27 01:25:46.000000000 +0100 ++++ liferea-1.4.9/opml/feedlist_fr.opml 2007-12-02 19:20:45.000000000 +0100 +@@ -6,6 +6,7 @@ + + + ++ + + + +@@ -25,6 +26,8 @@ + + + ++ ++ + + + +diff -urNad liferea-1.4.9~/opml/feedlist_nl.opml liferea-1.4.9/opml/feedlist_nl.opml +--- liferea-1.4.9~/opml/feedlist_nl.opml 2007-11-27 01:25:20.000000000 +0100 ++++ liferea-1.4.9/opml/feedlist_nl.opml 2007-12-02 19:21:13.000000000 +0100 +@@ -7,6 +7,8 @@ + + + ++ ++ + + + +@@ -24,6 +26,7 @@ + + + ++ + + + +diff -urNad liferea-1.4.9~/opml/feedlist_pl.opml liferea-1.4.9/opml/feedlist_pl.opml +--- liferea-1.4.9~/opml/feedlist_pl.opml 2007-11-27 01:25:03.000000000 +0100 ++++ liferea-1.4.9/opml/feedlist_pl.opml 2007-12-02 19:21:40.000000000 +0100 +@@ -6,6 +6,7 @@ + + + ++ + + + +@@ -15,6 +16,8 @@ + + + ++ ++ + + + +diff -urNad liferea-1.4.9~/opml/feedlist_pt_BR.opml liferea-1.4.9/opml/feedlist_pt_BR.opml +--- liferea-1.4.9~/opml/feedlist_pt_BR.opml 2007-11-27 01:24:39.000000000 +0100 ++++ liferea-1.4.9/opml/feedlist_pt_BR.opml 2007-12-02 19:33:06.000000000 +0100 +@@ -6,12 +6,15 @@ + + + ++ + + + + + + ++ ++ + + + +diff -urNad liferea-1.4.9~/opml/feedlist_ru.opml liferea-1.4.9/opml/feedlist_ru.opml +--- liferea-1.4.9~/opml/feedlist_ru.opml 2007-11-27 01:23:52.000000000 +0100 ++++ liferea-1.4.9/opml/feedlist_ru.opml 2007-12-02 19:36:43.000000000 +0100 +@@ -18,6 +18,8 @@ + + + ++ ++ + + + +diff -urNad liferea-1.4.9~/opml/feedlist_sk.opml liferea-1.4.9/opml/feedlist_sk.opml +--- liferea-1.4.9~/opml/feedlist_sk.opml 2007-11-27 01:23:01.000000000 +0100 ++++ liferea-1.4.9/opml/feedlist_sk.opml 2007-12-02 19:37:35.000000000 +0100 +@@ -9,6 +9,8 @@ + + + ++ ++ + + + +diff -urNad liferea-1.4.9~/opml/feedlist_sv.opml liferea-1.4.9/opml/feedlist_sv.opml +--- liferea-1.4.9~/opml/feedlist_sv.opml 2007-07-23 19:56:57.000000000 +0200 ++++ liferea-1.4.9/opml/feedlist_sv.opml 2007-12-02 19:38:01.000000000 +0100 +@@ -15,6 +15,8 @@ + + + ++ ++ + + + --- liferea-1.4.23.orig/debian/patches/90_autoreconf +++ liferea-1.4.23/debian/patches/90_autoreconf @@ -0,0 +1,5908 @@ +diff -ruNp liferea-1.4.23.orig/compile liferea-1.4.23.new/compile +--- liferea-1.4.23.orig/compile 2007-07-26 22:32:17.000000000 +0200 ++++ liferea-1.4.23.new/compile 2008-12-16 16:31:10.000000000 +0100 +@@ -1,8 +1,9 @@ + #! /bin/sh +- + # Wrapper for compilers which do not understand `-c -o'. + +-# Copyright 1999, 2000 Free Software Foundation, Inc. ++scriptversion=2005-05-14.22 ++ ++# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. + # Written by Tom Tromey . + # + # This program is free software; you can redistribute it and/or modify +@@ -17,91 +18,125 @@ + # + # 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a + # configuration script generated by Autoconf, you may include it under + # the same distribution terms that you use for the rest of that program. + +-# Usage: +-# compile PROGRAM [ARGS]... +-# `-o FOO.o' is removed from the args passed to the actual compile. +- +-# Usage statement added by Billy Biggs . +-if [ -z $1 ]; then +- echo "Wrapper for compilers which do not understand '-c -o'." +- echo "usage: compile PROGRAM [ARGS]..." +- echo "'-o FOO.o' is removed from the args passed to the actual compile." +- exit 1 +-fi +- +-prog=$1 +-shift ++# This file is maintained in Automake, please report ++# bugs to or send patches to ++# . ++ ++case $1 in ++ '') ++ echo "$0: No command. Try \`$0 --help' for more information." 1>&2 ++ exit 1; ++ ;; ++ -h | --h*) ++ cat <<\EOF ++Usage: compile [--help] [--version] PROGRAM [ARGS] ++ ++Wrapper for compilers which do not understand `-c -o'. ++Remove `-o dest.o' from ARGS, run PROGRAM with the remaining ++arguments, and rename the output as expected. ++ ++If you are trying to build a whole package this is not the ++right script to run: please start by reading the file `INSTALL'. ++ ++Report bugs to . ++EOF ++ exit $? ++ ;; ++ -v | --v*) ++ echo "compile $scriptversion" ++ exit $? ++ ;; ++esac + + ofile= + cfile= +-args= +-while test $# -gt 0; do +- case "$1" in +- -o) +- # configure might choose to run compile as `compile cc -o foo foo.c'. +- # So we do something ugly here. +- ofile=$2 +- shift +- case "$ofile" in +- *.o | *.obj) +- ;; +- *) +- args="$args -o $ofile" +- ofile= +- ;; +- esac +- ;; +- *.c) +- cfile=$1 +- args="$args $1" +- ;; +- *) +- args="$args $1" +- ;; +- esac +- shift ++eat= ++ ++for arg ++do ++ if test -n "$eat"; then ++ eat= ++ else ++ case $1 in ++ -o) ++ # configure might choose to run compile as `compile cc -o foo foo.c'. ++ # So we strip `-o arg' only if arg is an object. ++ eat=1 ++ case $2 in ++ *.o | *.obj) ++ ofile=$2 ++ ;; ++ *) ++ set x "$@" -o "$2" ++ shift ++ ;; ++ esac ++ ;; ++ *.c) ++ cfile=$1 ++ set x "$@" "$1" ++ shift ++ ;; ++ *) ++ set x "$@" "$1" ++ shift ++ ;; ++ esac ++ fi ++ shift + done + + if test -z "$ofile" || test -z "$cfile"; then +- # If no `-o' option was seen then we might have been invoked from a +- # pattern rule where we don't need one. That is ok -- this is a +- # normal compilation that the losing compiler can handle. If no +- # `.c' file was seen then we are probably linking. That is also +- # ok. +- exec "$prog" $args ++ # If no `-o' option was seen then we might have been invoked from a ++ # pattern rule where we don't need one. That is ok -- this is a ++ # normal compilation that the losing compiler can handle. If no ++ # `.c' file was seen then we are probably linking. That is also ++ # ok. ++ exec "$@" + fi + + # Name of file we expect compiler to create. +-cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'` ++cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'` + + # Create the lock directory. + # Note: use `[/.-]' here to ensure that we don't use the same name + # that we are using for the .o file. Also, base the name on the expected + # object file name, since that is what matters with a parallel build. +-lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d ++lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d + while true; do +- if mkdir $lockdir > /dev/null 2>&1; then +- break +- fi +- sleep 1 ++ if mkdir "$lockdir" >/dev/null 2>&1; then ++ break ++ fi ++ sleep 1 + done + # FIXME: race condition here if user kills between mkdir and trap. +-trap "rmdir $lockdir; exit 1" 1 2 15 ++trap "rmdir '$lockdir'; exit 1" 1 2 15 + + # Run the compile. +-"$prog" $args +-status=$? ++"$@" ++ret=$? + + if test -f "$cofile"; then +- mv "$cofile" "$ofile" ++ mv "$cofile" "$ofile" ++elif test -f "${cofile}bj"; then ++ mv "${cofile}bj" "$ofile" + fi + +-rmdir $lockdir +-exit $status ++rmdir "$lockdir" ++exit $ret ++ ++# Local Variables: ++# mode: shell-script ++# sh-indentation: 2 ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "scriptversion=" ++# time-stamp-format: "%:y-%02m-%02d.%02H" ++# time-stamp-end: "$" ++# End: +diff -ruNp liferea-1.4.23.orig/config.guess liferea-1.4.23.new/config.guess +--- liferea-1.4.23.orig/config.guess 1970-01-01 01:00:00.000000000 +0100 ++++ liferea-1.4.23.new/config.guess 2008-12-16 16:31:12.000000000 +0100 +@@ -0,0 +1,1526 @@ ++#! /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, 2006, 2007, 2008 ++# Free Software Foundation, Inc. ++ ++timestamp='2008-01-23' ++ ++# 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 ++# 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 Street - Fifth Floor, Boston, MA ++# 02110-1301, USA. ++# ++# As a special exception to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. ++ ++ ++# Originally written by Per Bothner . ++# Please send patches to . Submit a context ++# diff and a properly formatted ChangeLog entry. ++# ++# This script attempts to guess a canonical system name similar to ++# config.sub. If it succeeds, it prints the system name on stdout, and ++# exits with 0. Otherwise, it exits with 1. ++# ++# The plan is that this can be called by configure scripts if you ++# don't specify an explicit build system type. ++ ++me=`echo "$0" | sed -e 's,.*/,,'` ++ ++usage="\ ++Usage: $0 [OPTION] ++ ++Output the configuration name of the system \`$me' is run on. ++ ++Operation modes: ++ -h, --help print this help, then exit ++ -t, --time-stamp print date of last modification, then exit ++ -v, --version print version number, then exit ++ ++Report bugs and patches to ." ++ ++version="\ ++GNU config.guess ($timestamp) ++ ++Originally written by Per Bothner. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, ++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++ ++This is free software; see the source for copying conditions. There is NO ++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." ++ ++help=" ++Try \`$me --help' for more information." ++ ++# Parse command line ++while test $# -gt 0 ; do ++ case $1 in ++ --time-stamp | --time* | -t ) ++ echo "$timestamp" ; exit ;; ++ --version | -v ) ++ echo "$version" ; exit ;; ++ --help | --h* | -h ) ++ echo "$usage"; exit ;; ++ -- ) # Stop option processing ++ shift; break ;; ++ - ) # Use stdin as input. ++ break ;; ++ -* ) ++ echo "$me: invalid option $1$help" >&2 ++ exit 1 ;; ++ * ) ++ break ;; ++ esac ++done ++ ++if test $# != 0; then ++ echo "$me: too many arguments$help" >&2 ++ exit 1 ++fi ++ ++trap 'exit 1' 1 2 15 ++ ++# CC_FOR_BUILD -- compiler used by this script. Note that the use of a ++# compiler to aid in system detection is discouraged as it requires ++# temporary files to be created and, as you can see below, it is a ++# headache to deal with in a portable fashion. ++ ++# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still ++# use `HOST_CC' if defined, but it is deprecated. ++ ++# Portable tmp directory creation inspired by the Autoconf team. ++ ++set_cc_for_build=' ++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 "$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 ; } ; ++dummy=$tmp/dummy ; ++tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; ++case $CC_FOR_BUILD,$HOST_CC,$CC in ++ ,,) echo "int x;" > $dummy.c ; ++ for c in cc gcc c89 c99 ; do ++ if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then ++ CC_FOR_BUILD="$c"; break ; ++ fi ; ++ done ; ++ if test x"$CC_FOR_BUILD" = x ; then ++ CC_FOR_BUILD=no_compiler_found ; ++ fi ++ ;; ++ ,,*) CC_FOR_BUILD=$CC ;; ++ ,*,*) CC_FOR_BUILD=$HOST_CC ;; ++esac ; set_cc_for_build= ;' ++ ++# This is needed to find uname on a Pyramid OSx when run in the BSD universe. ++# (ghazi@noc.rutgers.edu 1994-08-24) ++if (test -f /.attbin/uname) >/dev/null 2>&1 ; then ++ PATH=$PATH:/.attbin ; export PATH ++fi ++ ++UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown ++UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown ++UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown ++UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown ++ ++# Note: order is significant - the case branches are not exclusive. ++ ++case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ++ *:NetBSD:*:*) ++ # NetBSD (nbsd) targets should (where applicable) match one or ++ # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, ++ # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently ++ # switched to ELF, *-*-netbsd* would select the old ++ # object file format. This provides both forward ++ # compatibility and a consistent mechanism for selecting the ++ # object file format. ++ # ++ # Note: NetBSD doesn't particularly care about the vendor ++ # portion of the name. We always set it to "unknown". ++ sysctl="sysctl -n hw.machine_arch" ++ UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ ++ /usr/sbin/$sysctl 2>/dev/null || echo unknown)` ++ case "${UNAME_MACHINE_ARCH}" in ++ armeb) machine=armeb-unknown ;; ++ 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 ++ # to ELF recently, or will in the future. ++ case "${UNAME_MACHINE_ARCH}" in ++ arm*|i386|m68k|ns32k|sh3*|sparc|vax) ++ eval $set_cc_for_build ++ if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep __ELF__ >/dev/null ++ then ++ # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). ++ # Return netbsd for either. FIX? ++ os=netbsd ++ else ++ os=netbsdelf ++ fi ++ ;; ++ *) ++ os=netbsd ++ ;; ++ esac ++ # The OS release ++ # Debian GNU/NetBSD machines have a different userland, and ++ # thus, need a distinct triplet. However, they do not need ++ # kernel version information, so it can be replaced with a ++ # suitable tag, in the style of linux-gnu. ++ case "${UNAME_VERSION}" in ++ Debian*) ++ release='-gnu' ++ ;; ++ *) ++ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` ++ ;; ++ esac ++ # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: ++ # contains redundant information, the shorter form: ++ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. ++ echo "${machine}-${os}${release}" ++ exit ;; ++ *:OpenBSD:*:*) ++ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} ++ exit ;; ++ *:ekkoBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} ++ exit ;; ++ *:SolidBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} ++ exit ;; ++ macppc:MirBSD:*:*) ++ echo powerpc-unknown-mirbsd${UNAME_RELEASE} ++ exit ;; ++ *:MirBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} ++ exit ;; ++ alpha:OSF1:*:*) ++ case $UNAME_RELEASE in ++ *4.0) ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ++ ;; ++ *5.*) ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ++ ;; ++ esac ++ # According to Compaq, /usr/sbin/psrinfo has been available on ++ # OSF/1 and Tru64 systems produced since 1995. I hope that ++ # covers most systems running today. This code pipes the CPU ++ # types through head -n 1, so we only detect the type of CPU 0. ++ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` ++ case "$ALPHA_CPU_TYPE" in ++ "EV4 (21064)") ++ UNAME_MACHINE="alpha" ;; ++ "EV4.5 (21064)") ++ UNAME_MACHINE="alpha" ;; ++ "LCA4 (21066/21068)") ++ UNAME_MACHINE="alpha" ;; ++ "EV5 (21164)") ++ UNAME_MACHINE="alphaev5" ;; ++ "EV5.6 (21164A)") ++ UNAME_MACHINE="alphaev56" ;; ++ "EV5.6 (21164PC)") ++ UNAME_MACHINE="alphapca56" ;; ++ "EV5.7 (21164PC)") ++ UNAME_MACHINE="alphapca57" ;; ++ "EV6 (21264)") ++ UNAME_MACHINE="alphaev6" ;; ++ "EV6.7 (21264A)") ++ UNAME_MACHINE="alphaev67" ;; ++ "EV6.8CB (21264C)") ++ UNAME_MACHINE="alphaev68" ;; ++ "EV6.8AL (21264B)") ++ UNAME_MACHINE="alphaev68" ;; ++ "EV6.8CX (21264D)") ++ UNAME_MACHINE="alphaev68" ;; ++ "EV6.9A (21264/EV69A)") ++ UNAME_MACHINE="alphaev69" ;; ++ "EV7 (21364)") ++ UNAME_MACHINE="alphaev7" ;; ++ "EV7.9 (21364A)") ++ UNAME_MACHINE="alphaev79" ;; ++ esac ++ # A Pn.n version is a patched version. ++ # A Vn.n version is a released version. ++ # A Tn.n version is a released field test version. ++ # A Xn.n version is an unreleased experimental baselevel. ++ # 1.2 uses "1.2" for uname -r. ++ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` ++ exit ;; ++ Alpha\ *:Windows_NT*:*) ++ # How do we know it's Interix rather than the generic POSIX subsystem? ++ # Should we change UNAME_MACHINE based on the output of uname instead ++ # of the specific Alpha model? ++ echo alpha-pc-interix ++ exit ;; ++ 21064:Windows_NT:50:3) ++ echo alpha-dec-winnt3.5 ++ exit ;; ++ Amiga*:UNIX_System_V:4.0:*) ++ echo m68k-unknown-sysv4 ++ exit ;; ++ *:[Aa]miga[Oo][Ss]:*:*) ++ echo ${UNAME_MACHINE}-unknown-amigaos ++ exit ;; ++ *:[Mm]orph[Oo][Ss]:*:*) ++ echo ${UNAME_MACHINE}-unknown-morphos ++ exit ;; ++ *:OS/390:*:*) ++ echo i370-ibm-openedition ++ exit ;; ++ *:z/VM:*:*) ++ echo s390-ibm-zvmoe ++ exit ;; ++ *:OS400:*:*) ++ echo powerpc-ibm-os400 ++ exit ;; ++ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) ++ echo arm-acorn-riscix${UNAME_RELEASE} ++ exit ;; ++ arm:riscos:*:*|arm:RISCOS:*:*) ++ echo arm-unknown-riscos ++ exit ;; ++ SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) ++ echo hppa1.1-hitachi-hiuxmpp ++ exit ;; ++ Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) ++ # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. ++ if test "`(/bin/universe) 2>/dev/null`" = att ; then ++ echo pyramid-pyramid-sysv3 ++ else ++ echo pyramid-pyramid-bsd ++ fi ++ exit ;; ++ NILE*:*:*:dcosx) ++ echo pyramid-pyramid-svr4 ++ exit ;; ++ DRS?6000:unix:4.0:6*) ++ echo sparc-icl-nx6 ++ exit ;; ++ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) ++ case `/usr/bin/uname -p` in ++ sparc) echo sparc-icl-nx7; exit ;; ++ esac ;; ++ sun4H:SunOS:5.*:*) ++ echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; ++ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) ++ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; ++ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) ++ echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; ++ sun4*:SunOS:6*:*) ++ # According to config.sub, this is the proper way to canonicalize ++ # SunOS6. Hard to guess exactly what SunOS6 will be like, but ++ # it's likely to be more like Solaris than SunOS4. ++ echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; ++ sun4*:SunOS:*:*) ++ case "`/usr/bin/arch -k`" in ++ Series*|S4*) ++ UNAME_RELEASE=`uname -v` ++ ;; ++ esac ++ # Japanese Language versions have a version number like `4.1.3-JL'. ++ echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` ++ exit ;; ++ sun3*:SunOS:*:*) ++ echo m68k-sun-sunos${UNAME_RELEASE} ++ exit ;; ++ sun*:*:4.2BSD:*) ++ UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` ++ test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 ++ case "`/bin/arch`" in ++ sun3) ++ echo m68k-sun-sunos${UNAME_RELEASE} ++ ;; ++ sun4) ++ echo sparc-sun-sunos${UNAME_RELEASE} ++ ;; ++ esac ++ exit ;; ++ aushp:SunOS:*:*) ++ echo sparc-auspex-sunos${UNAME_RELEASE} ++ exit ;; ++ # The situation for MiNT is a little confusing. The machine name ++ # can be virtually everything (everything which is not ++ # "atarist" or "atariste" at least should have a processor ++ # > m68000). The system name ranges from "MiNT" over "FreeMiNT" ++ # to the lowercase version "mint" (or "freemint"). Finally ++ # the system name "TOS" denotes a system which is actually not ++ # MiNT. But MiNT is downward compatible to TOS, so this should ++ # be no problem. ++ atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) ++ echo m68k-atari-mint${UNAME_RELEASE} ++ exit ;; ++ atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) ++ echo m68k-atari-mint${UNAME_RELEASE} ++ exit ;; ++ *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) ++ echo m68k-atari-mint${UNAME_RELEASE} ++ exit ;; ++ milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) ++ echo m68k-milan-mint${UNAME_RELEASE} ++ exit ;; ++ hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) ++ echo m68k-hades-mint${UNAME_RELEASE} ++ exit ;; ++ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) ++ echo m68k-unknown-mint${UNAME_RELEASE} ++ exit ;; ++ m68k:machten:*:*) ++ echo m68k-apple-machten${UNAME_RELEASE} ++ exit ;; ++ powerpc:machten:*:*) ++ echo powerpc-apple-machten${UNAME_RELEASE} ++ exit ;; ++ RISC*:Mach:*:*) ++ echo mips-dec-mach_bsd4.3 ++ exit ;; ++ RISC*:ULTRIX:*:*) ++ echo mips-dec-ultrix${UNAME_RELEASE} ++ exit ;; ++ VAX*:ULTRIX*:*:*) ++ echo vax-dec-ultrix${UNAME_RELEASE} ++ exit ;; ++ 2020:CLIX:*:* | 2430:CLIX:*:*) ++ echo clipper-intergraph-clix${UNAME_RELEASE} ++ exit ;; ++ mips:*:*:UMIPS | mips:*:*:RISCos) ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++#ifdef __cplusplus ++#include /* for printf() prototype */ ++ int main (int argc, char *argv[]) { ++#else ++ int main (argc, argv) int argc; char *argv[]; { ++#endif ++ #if defined (host_mips) && defined (MIPSEB) ++ #if defined (SYSTYPE_SYSV) ++ printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); ++ #endif ++ #if defined (SYSTYPE_SVR4) ++ printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); ++ #endif ++ #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) ++ printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); ++ #endif ++ #endif ++ exit (-1); ++ } ++EOF ++ $CC_FOR_BUILD -o $dummy $dummy.c && ++ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && ++ SYSTEM_NAME=`$dummy $dummyarg` && ++ { echo "$SYSTEM_NAME"; exit; } ++ echo mips-mips-riscos${UNAME_RELEASE} ++ exit ;; ++ Motorola:PowerMAX_OS:*:*) ++ echo powerpc-motorola-powermax ++ exit ;; ++ Motorola:*:4.3:PL8-*) ++ echo powerpc-harris-powermax ++ exit ;; ++ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) ++ echo powerpc-harris-powermax ++ exit ;; ++ Night_Hawk:Power_UNIX:*:*) ++ echo powerpc-harris-powerunix ++ exit ;; ++ m88k:CX/UX:7*:*) ++ echo m88k-harris-cxux7 ++ exit ;; ++ m88k:*:4*:R4*) ++ echo m88k-motorola-sysv4 ++ exit ;; ++ m88k:*:3*:R3*) ++ echo m88k-motorola-sysv3 ++ exit ;; ++ AViiON:dgux:*:*) ++ # DG/UX returns AViiON for all architectures ++ UNAME_PROCESSOR=`/usr/bin/uname -p` ++ if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] ++ then ++ if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ ++ [ ${TARGET_BINARY_INTERFACE}x = x ] ++ then ++ echo m88k-dg-dgux${UNAME_RELEASE} ++ else ++ echo m88k-dg-dguxbcs${UNAME_RELEASE} ++ fi ++ else ++ echo i586-dg-dgux${UNAME_RELEASE} ++ fi ++ exit ;; ++ M88*:DolphinOS:*:*) # DolphinOS (SVR3) ++ echo m88k-dolphin-sysv3 ++ exit ;; ++ M88*:*:R3*:*) ++ # Delta 88k system running SVR3 ++ echo m88k-motorola-sysv3 ++ exit ;; ++ XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) ++ echo m88k-tektronix-sysv3 ++ exit ;; ++ Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) ++ echo m68k-tektronix-bsd ++ exit ;; ++ *:IRIX*:*:*) ++ echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` ++ exit ;; ++ ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. ++ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id ++ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' ++ i*86:AIX:*:*) ++ echo i386-ibm-aix ++ exit ;; ++ ia64:AIX:*:*) ++ if [ -x /usr/bin/oslevel ] ; then ++ IBM_REV=`/usr/bin/oslevel` ++ else ++ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} ++ fi ++ echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} ++ exit ;; ++ *:AIX:2:3) ++ if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #include ++ ++ main() ++ { ++ if (!__power_pc()) ++ exit(1); ++ puts("powerpc-ibm-aix3.2.5"); ++ exit(0); ++ } ++EOF ++ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` ++ then ++ echo "$SYSTEM_NAME" ++ else ++ echo rs6000-ibm-aix3.2.5 ++ fi ++ elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then ++ echo rs6000-ibm-aix3.2.4 ++ else ++ echo rs6000-ibm-aix3.2 ++ fi ++ exit ;; ++ *:AIX:*:[456]) ++ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` ++ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then ++ IBM_ARCH=rs6000 ++ else ++ IBM_ARCH=powerpc ++ fi ++ if [ -x /usr/bin/oslevel ] ; then ++ IBM_REV=`/usr/bin/oslevel` ++ else ++ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} ++ fi ++ echo ${IBM_ARCH}-ibm-aix${IBM_REV} ++ exit ;; ++ *:AIX:*:*) ++ echo rs6000-ibm-aix ++ exit ;; ++ ibmrt:4.4BSD:*|romp-ibm:BSD:*) ++ echo romp-ibm-bsd4.4 ++ exit ;; ++ ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and ++ echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to ++ exit ;; # report: romp-ibm BSD 4.3 ++ *:BOSX:*:*) ++ echo rs6000-bull-bosx ++ exit ;; ++ DPX/2?00:B.O.S.:*:*) ++ echo m68k-bull-sysv3 ++ exit ;; ++ 9000/[34]??:4.3bsd:1.*:*) ++ echo m68k-hp-bsd ++ exit ;; ++ hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) ++ echo m68k-hp-bsd4.4 ++ exit ;; ++ 9000/[34678]??:HP-UX:*:*) ++ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` ++ case "${UNAME_MACHINE}" in ++ 9000/31? ) HP_ARCH=m68000 ;; ++ 9000/[34]?? ) HP_ARCH=m68k ;; ++ 9000/[678][0-9][0-9]) ++ if [ -x /usr/bin/getconf ]; then ++ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` ++ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` ++ case "${sc_cpu_version}" in ++ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 ++ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 ++ 532) # CPU_PA_RISC2_0 ++ case "${sc_kernel_bits}" in ++ 32) HP_ARCH="hppa2.0n" ;; ++ 64) HP_ARCH="hppa2.0w" ;; ++ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 ++ esac ;; ++ esac ++ fi ++ if [ "${HP_ARCH}" = "" ]; then ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ ++ #define _HPUX_SOURCE ++ #include ++ #include ++ ++ int main () ++ { ++ #if defined(_SC_KERNEL_BITS) ++ long bits = sysconf(_SC_KERNEL_BITS); ++ #endif ++ long cpu = sysconf (_SC_CPU_VERSION); ++ ++ switch (cpu) ++ { ++ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; ++ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; ++ case CPU_PA_RISC2_0: ++ #if defined(_SC_KERNEL_BITS) ++ switch (bits) ++ { ++ case 64: puts ("hppa2.0w"); break; ++ case 32: puts ("hppa2.0n"); break; ++ default: puts ("hppa2.0"); break; ++ } break; ++ #else /* !defined(_SC_KERNEL_BITS) */ ++ puts ("hppa2.0"); break; ++ #endif ++ default: puts ("hppa1.0"); break; ++ } ++ exit (0); ++ } ++EOF ++ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` ++ test -z "$HP_ARCH" && HP_ARCH=hppa ++ fi ;; ++ esac ++ if [ ${HP_ARCH} = "hppa2.0w" ] ++ then ++ eval $set_cc_for_build ++ ++ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating ++ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler ++ # generating 64-bit code. GNU and HP use different nomenclature: ++ # ++ # $ CC_FOR_BUILD=cc ./config.guess ++ # => hppa2.0w-hp-hpux11.23 ++ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess ++ # => hppa64-hp-hpux11.23 ++ ++ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | ++ grep __LP64__ >/dev/null ++ then ++ HP_ARCH="hppa2.0w" ++ else ++ HP_ARCH="hppa64" ++ fi ++ fi ++ echo ${HP_ARCH}-hp-hpux${HPUX_REV} ++ exit ;; ++ ia64:HP-UX:*:*) ++ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` ++ echo ia64-hp-hpux${HPUX_REV} ++ exit ;; ++ 3050*:HI-UX:*:*) ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #include ++ int ++ main () ++ { ++ long cpu = sysconf (_SC_CPU_VERSION); ++ /* The order matters, because CPU_IS_HP_MC68K erroneously returns ++ true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct ++ results, however. */ ++ if (CPU_IS_PA_RISC (cpu)) ++ { ++ switch (cpu) ++ { ++ case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; ++ case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; ++ case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; ++ default: puts ("hppa-hitachi-hiuxwe2"); break; ++ } ++ } ++ else if (CPU_IS_HP_MC68K (cpu)) ++ puts ("m68k-hitachi-hiuxwe2"); ++ else puts ("unknown-hitachi-hiuxwe2"); ++ exit (0); ++ } ++EOF ++ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && ++ { echo "$SYSTEM_NAME"; exit; } ++ echo unknown-hitachi-hiuxwe2 ++ exit ;; ++ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) ++ echo hppa1.1-hp-bsd ++ exit ;; ++ 9000/8??:4.3bsd:*:*) ++ echo hppa1.0-hp-bsd ++ exit ;; ++ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) ++ echo hppa1.0-hp-mpeix ++ exit ;; ++ hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) ++ echo hppa1.1-hp-osf ++ exit ;; ++ hp8??:OSF1:*:*) ++ echo hppa1.0-hp-osf ++ exit ;; ++ i*86:OSF1:*:*) ++ if [ -x /usr/sbin/sysversion ] ; then ++ echo ${UNAME_MACHINE}-unknown-osf1mk ++ else ++ echo ${UNAME_MACHINE}-unknown-osf1 ++ fi ++ exit ;; ++ parisc*:Lites*:*:*) ++ echo hppa1.1-hp-lites ++ exit ;; ++ C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) ++ echo c1-convex-bsd ++ exit ;; ++ C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) ++ if getsysinfo -f scalar_acc ++ then echo c32-convex-bsd ++ else echo c2-convex-bsd ++ fi ++ exit ;; ++ C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) ++ echo c34-convex-bsd ++ exit ;; ++ C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) ++ echo c38-convex-bsd ++ exit ;; ++ C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) ++ echo c4-convex-bsd ++ exit ;; ++ CRAY*Y-MP:*:*:*) ++ echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ exit ;; ++ CRAY*[A-Z]90:*:*:*) ++ echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ ++ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ ++ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ ++ -e 's/\.[^.]*$/.X/' ++ exit ;; ++ CRAY*TS:*:*:*) ++ echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ exit ;; ++ CRAY*T3E:*:*:*) ++ echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ exit ;; ++ CRAY*SV1:*:*:*) ++ echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ exit ;; ++ *:UNICOS/mp:*:*) ++ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ exit ;; ++ F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) ++ FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` ++ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; ++ 5000:UNIX_System_V:4.*:*) ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` ++ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; ++ i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) ++ echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} ++ exit ;; ++ sparc*:BSD/OS:*:*) ++ echo sparc-unknown-bsdi${UNAME_RELEASE} ++ exit ;; ++ *:BSD/OS:*:*) ++ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} ++ exit ;; ++ *:FreeBSD:*:*) ++ 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 ;; ++ *:MINGW*:*) ++ echo ${UNAME_MACHINE}-pc-mingw32 ++ exit ;; ++ i*:windows32*:*) ++ # uname -m includes "-pc" on this system. ++ echo ${UNAME_MACHINE}-mingw32 ++ exit ;; ++ i*:PW*:*) ++ echo ${UNAME_MACHINE}-pc-pw32 ++ 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 ;; ++ IA64) ++ echo ia64-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 ;; ++ i*:Windows_NT*:* | Pentium*:Windows_NT*:*) ++ # How do we know it's Interix rather than the generic POSIX subsystem? ++ # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we ++ # UNAME_MACHINE based on the output of uname instead of i386? ++ echo i586-pc-interix ++ exit ;; ++ i*:UWIN*:*) ++ echo ${UNAME_MACHINE}-pc-uwin ++ exit ;; ++ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) ++ echo x86_64-unknown-cygwin ++ exit ;; ++ p*:CYGWIN*:*) ++ echo powerpcle-unknown-cygwin ++ exit ;; ++ prep*:SunOS:5.*:*) ++ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; ++ *:GNU:*:*) ++ # the GNU system ++ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` ++ exit ;; ++ *:GNU/*:*:*) ++ # other systems with GNU libc and userland ++ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu ++ exit ;; ++ i*86:Minix:*:*) ++ echo ${UNAME_MACHINE}-pc-minix ++ exit ;; ++ arm*:Linux:*:*) ++ eval $set_cc_for_build ++ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_EABI__ ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ else ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ fi ++ exit ;; ++ avr32*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ cris:Linux:*:*) ++ echo cris-axis-linux-gnu ++ exit ;; ++ crisv32:Linux:*:*) ++ echo crisv32-axis-linux-gnu ++ exit ;; ++ frv:Linux:*:*) ++ echo frv-unknown-linux-gnu ++ exit ;; ++ ia64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ m32r*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ m68*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ mips:Linux:*:*) ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #undef CPU ++ #undef mips ++ #undef mipsel ++ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) ++ CPU=mipsel ++ #else ++ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) ++ CPU=mips ++ #else ++ CPU= ++ #endif ++ #endif ++EOF ++ 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:*:*) ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #undef CPU ++ #undef mips64 ++ #undef mips64el ++ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) ++ CPU=mips64el ++ #else ++ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) ++ CPU=mips64 ++ #else ++ CPU= ++ #endif ++ #endif ++EOF ++ 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:*:*) ++ echo or32-unknown-linux-gnu ++ exit ;; ++ ppc:Linux:*:*) ++ echo powerpc-unknown-linux-gnu ++ exit ;; ++ ppc64:Linux:*:*) ++ echo powerpc64-unknown-linux-gnu ++ exit ;; ++ alpha:Linux:*:*) ++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in ++ EV5) UNAME_MACHINE=alphaev5 ;; ++ EV56) UNAME_MACHINE=alphaev56 ;; ++ PCA56) UNAME_MACHINE=alphapca56 ;; ++ PCA57) UNAME_MACHINE=alphapca56 ;; ++ EV6) UNAME_MACHINE=alphaev6 ;; ++ EV67) UNAME_MACHINE=alphaev67 ;; ++ EV68*) UNAME_MACHINE=alphaev68 ;; ++ esac ++ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null ++ 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-gnu ;; ++ PA8*) echo hppa2.0-unknown-linux-gnu ;; ++ *) echo hppa-unknown-linux-gnu ;; ++ esac ++ exit ;; ++ parisc64:Linux:*:* | hppa64:Linux:*:*) ++ echo hppa64-unknown-linux-gnu ++ exit ;; ++ s390:Linux:*:* | s390x:Linux:*:*) ++ echo ${UNAME_MACHINE}-ibm-linux ++ exit ;; ++ sh64*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ sh*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ sparc:Linux:*:* | sparc64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ vax:Linux:*:*) ++ echo ${UNAME_MACHINE}-dec-linux-gnu ++ exit ;; ++ x86_64:Linux:*:*) ++ echo x86_64-unknown-linux-gnu ++ exit ;; ++ xtensa*:Linux:*:*) ++ echo ${UNAME_MACHINE}-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 ++ # problems with other programs or directories called `ld' in the path. ++ # Set LC_ALL=C to ensure ld outputs messages in English. ++ ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ ++ | sed -ne '/supported targets:/!d ++ s/[ ][ ]*/ /g ++ s/.*supported targets: *// ++ s/ .*// ++ p'` ++ case "$ld_supported_targets" in ++ elf32-i386) ++ TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" ++ ;; ++ a.out-i386-linux) ++ echo "${UNAME_MACHINE}-pc-linux-gnuaout" ++ exit ;; ++ coff-i386) ++ 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-gnuoldld" ++ exit ;; ++ esac ++ # Determine whether the default compiler is a.out or elf ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #include ++ #ifdef __ELF__ ++ # ifdef __GLIBC__ ++ # if __GLIBC__ >= 2 ++ LIBC=gnu ++ # else ++ LIBC=gnulibc1 ++ # endif ++ # else ++ LIBC=gnulibc1 ++ # endif ++ #else ++ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) ++ LIBC=gnu ++ #else ++ LIBC=gnuaout ++ #endif ++ #endif ++ #ifdef __dietlibc__ ++ LIBC=dietlibc ++ #endif ++EOF ++ 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 ++ } ++ test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } ++ ;; ++ i*86:DYNIX/ptx:4*:*) ++ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. ++ # earlier versions are messed up and put the nodename in both ++ # sysname and nodename. ++ echo i386-sequent-sysv4 ++ exit ;; ++ i*86:UNIX_SV:4.2MP:2.*) ++ # Unixware is an offshoot of SVR4, but it has its own version ++ # number series starting with 2... ++ # I am not positive that other SVR4 systems won't match this, ++ # I just have to hope. -- rms. ++ # Use sysv4.2uw... so that sysv4* matches it. ++ echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} ++ exit ;; ++ i*86:OS/2:*:*) ++ # If we were able to find `uname', then EMX Unix compatibility ++ # is probably installed. ++ echo ${UNAME_MACHINE}-pc-os2-emx ++ exit ;; ++ i*86:XTS-300:*:STOP) ++ echo ${UNAME_MACHINE}-unknown-stop ++ exit ;; ++ i*86:atheos:*:*) ++ echo ${UNAME_MACHINE}-unknown-atheos ++ exit ;; ++ i*86:syllable:*:*) ++ echo ${UNAME_MACHINE}-pc-syllable ++ exit ;; ++ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) ++ echo i386-unknown-lynxos${UNAME_RELEASE} ++ exit ;; ++ i*86:*DOS:*:*) ++ echo ${UNAME_MACHINE}-pc-msdosdjgpp ++ exit ;; ++ i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) ++ UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` ++ if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then ++ echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} ++ else ++ echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} ++ fi ++ exit ;; ++ i*86:*:5:[678]*) ++ # UnixWare 7.x, OpenUNIX and OpenServer 6. ++ case `/bin/uname -X | grep "^Machine"` in ++ *486*) UNAME_MACHINE=i486 ;; ++ *Pentium) UNAME_MACHINE=i586 ;; ++ *Pent*|*Celeron) UNAME_MACHINE=i686 ;; ++ esac ++ echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} ++ exit ;; ++ i*86:*:3.2:*) ++ if test -f /usr/options/cb.name; then ++ UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then ++ UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` ++ (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 ++ (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ ++ && UNAME_MACHINE=i586 ++ (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ ++ && UNAME_MACHINE=i686 ++ (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ ++ && UNAME_MACHINE=i686 ++ echo ${UNAME_MACHINE}-pc-sco$UNAME_REL ++ else ++ echo ${UNAME_MACHINE}-pc-sysv32 ++ fi ++ exit ;; ++ pc:*:*:*) ++ # Left here for compatibility: ++ # uname -m prints for DJGPP always 'pc', but it prints nothing about ++ # the processor, so we play safe by assuming i386. ++ echo i386-pc-msdosdjgpp ++ exit ;; ++ Intel:Mach:3*:*) ++ echo i386-pc-mach3 ++ exit ;; ++ paragon:*:*:*) ++ echo i860-intel-osf1 ++ exit ;; ++ i860:*:4.*:*) # i860-SVR4 ++ if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then ++ echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 ++ else # Add other i860-SVR4 vendors below as they are discovered. ++ echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 ++ fi ++ exit ;; ++ mini*:CTIX:SYS*5:*) ++ # "miniframe" ++ echo m68010-convergent-sysv ++ exit ;; ++ mc68k:UNIX:SYSTEM5:3.51m) ++ echo m68k-convergent-sysv ++ exit ;; ++ M680?0:D-NIX:5.3:*) ++ echo m68k-diab-dnix ++ exit ;; ++ M68*:*:R3V[5678]*:*) ++ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; ++ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) ++ OS_REL='' ++ test -r /etc/.relid \ ++ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; ++ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4; exit; } ;; ++ m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) ++ echo m68k-unknown-lynxos${UNAME_RELEASE} ++ exit ;; ++ mc68030:UNIX_System_V:4.*:*) ++ echo m68k-atari-sysv4 ++ exit ;; ++ TSUNAMI:LynxOS:2.*:*) ++ echo sparc-unknown-lynxos${UNAME_RELEASE} ++ exit ;; ++ rs6000:LynxOS:2.*:*) ++ echo rs6000-unknown-lynxos${UNAME_RELEASE} ++ exit ;; ++ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) ++ echo powerpc-unknown-lynxos${UNAME_RELEASE} ++ exit ;; ++ SM[BE]S:UNIX_SV:*:*) ++ echo mips-dde-sysv${UNAME_RELEASE} ++ exit ;; ++ RM*:ReliantUNIX-*:*:*) ++ echo mips-sni-sysv4 ++ exit ;; ++ RM*:SINIX-*:*:*) ++ echo mips-sni-sysv4 ++ exit ;; ++ *:SINIX-*:*:*) ++ if uname -p 2>/dev/null >/dev/null ; then ++ UNAME_MACHINE=`(uname -p) 2>/dev/null` ++ echo ${UNAME_MACHINE}-sni-sysv4 ++ else ++ echo ns32k-sni-sysv ++ fi ++ exit ;; ++ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort ++ # says ++ echo i586-unisys-sysv4 ++ exit ;; ++ *:UNIX_System_V:4*:FTX*) ++ # From Gerald Hewes . ++ # How about differentiating between stratus architectures? -djm ++ echo hppa1.1-stratus-sysv4 ++ exit ;; ++ *:*:*:FTX*) ++ # From seanf@swdc.stratus.com. ++ echo i860-stratus-sysv4 ++ exit ;; ++ i*86:VOS:*:*) ++ # From Paul.Green@stratus.com. ++ echo ${UNAME_MACHINE}-stratus-vos ++ exit ;; ++ *:VOS:*:*) ++ # From Paul.Green@stratus.com. ++ echo hppa1.1-stratus-vos ++ exit ;; ++ mc68*:A/UX:*:*) ++ echo m68k-apple-aux${UNAME_RELEASE} ++ exit ;; ++ news*:NEWS-OS:6*:*) ++ echo mips-sony-newsos6 ++ exit ;; ++ R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) ++ if [ -d /usr/nec ]; then ++ echo mips-nec-sysv${UNAME_RELEASE} ++ else ++ echo mips-unknown-sysv${UNAME_RELEASE} ++ fi ++ exit ;; ++ BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. ++ echo powerpc-be-beos ++ exit ;; ++ BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. ++ echo powerpc-apple-beos ++ exit ;; ++ BePC:BeOS:*:*) # BeOS running on Intel PC compatible. ++ echo i586-pc-beos ++ exit ;; ++ SX-4:SUPER-UX:*:*) ++ echo sx4-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-5:SUPER-UX:*:*) ++ echo sx5-nec-superux${UNAME_RELEASE} ++ exit ;; ++ 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 ;; ++ *:Rhapsody:*:*) ++ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} ++ exit ;; ++ *:Darwin:*:*) ++ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown ++ case $UNAME_PROCESSOR in ++ unknown) UNAME_PROCESSOR=powerpc ;; ++ esac ++ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} ++ exit ;; ++ *:procnto*:*:* | *:QNX:[0123456789]*:*) ++ UNAME_PROCESSOR=`uname -p` ++ if test "$UNAME_PROCESSOR" = "x86"; then ++ UNAME_PROCESSOR=i386 ++ UNAME_MACHINE=pc ++ fi ++ echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} ++ exit ;; ++ *:QNX:*:4*) ++ echo i386-pc-qnx ++ exit ;; ++ NSE-?:NONSTOP_KERNEL:*:*) ++ echo nse-tandem-nsk${UNAME_RELEASE} ++ exit ;; ++ NSR-?:NONSTOP_KERNEL:*:*) ++ echo nsr-tandem-nsk${UNAME_RELEASE} ++ exit ;; ++ *:NonStop-UX:*:*) ++ echo mips-compaq-nonstopux ++ exit ;; ++ BS2000:POSIX*:*:*) ++ echo bs2000-siemens-sysv ++ exit ;; ++ DS/*:UNIX_System_V:*:*) ++ echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} ++ exit ;; ++ *:Plan9:*:*) ++ # "uname -m" is not consistent, so use $cputype instead. 386 ++ # is converted to i386 for consistency with other x86 ++ # operating systems. ++ if test "$cputype" = "386"; then ++ UNAME_MACHINE=i386 ++ else ++ UNAME_MACHINE="$cputype" ++ fi ++ echo ${UNAME_MACHINE}-unknown-plan9 ++ exit ;; ++ *:TOPS-10:*:*) ++ echo pdp10-unknown-tops10 ++ exit ;; ++ *:TENEX:*:*) ++ echo pdp10-unknown-tenex ++ exit ;; ++ KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) ++ echo pdp10-dec-tops20 ++ exit ;; ++ XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) ++ echo pdp10-xkl-tops20 ++ exit ;; ++ *:TOPS-20:*:*) ++ echo pdp10-unknown-tops20 ++ exit ;; ++ *:ITS:*:*) ++ echo pdp10-unknown-its ++ exit ;; ++ SEI:*:*:SEIUX) ++ echo mips-sei-seiux${UNAME_RELEASE} ++ exit ;; ++ *:DragonFly:*:*) ++ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ++ exit ;; ++ *:*VMS:*:*) ++ UNAME_MACHINE=`(uname -p) 2>/dev/null` ++ case "${UNAME_MACHINE}" in ++ A*) echo alpha-dec-vms ; exit ;; ++ I*) echo ia64-dec-vms ; exit ;; ++ V*) echo vax-dec-vms ; exit ;; ++ esac ;; ++ *:XENIX:*:SysV) ++ echo i386-pc-xenix ++ exit ;; ++ i*86:skyos:*:*) ++ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' ++ exit ;; ++ i*86:rdos:*:*) ++ echo ${UNAME_MACHINE}-pc-rdos ++ exit ;; ++esac ++ ++#echo '(No uname command or uname output not recognized.)' 1>&2 ++#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 ++ ++eval $set_cc_for_build ++cat >$dummy.c < ++# include ++#endif ++main () ++{ ++#if defined (sony) ++#if defined (MIPSEB) ++ /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, ++ I don't know.... */ ++ printf ("mips-sony-bsd\n"); exit (0); ++#else ++#include ++ printf ("m68k-sony-newsos%s\n", ++#ifdef NEWSOS4 ++ "4" ++#else ++ "" ++#endif ++ ); exit (0); ++#endif ++#endif ++ ++#if defined (__arm) && defined (__acorn) && defined (__unix) ++ printf ("arm-acorn-riscix\n"); exit (0); ++#endif ++ ++#if defined (hp300) && !defined (hpux) ++ printf ("m68k-hp-bsd\n"); exit (0); ++#endif ++ ++#if defined (NeXT) ++#if !defined (__ARCHITECTURE__) ++#define __ARCHITECTURE__ "m68k" ++#endif ++ int version; ++ version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; ++ if (version < 4) ++ printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); ++ else ++ printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); ++ exit (0); ++#endif ++ ++#if defined (MULTIMAX) || defined (n16) ++#if defined (UMAXV) ++ printf ("ns32k-encore-sysv\n"); exit (0); ++#else ++#if defined (CMU) ++ printf ("ns32k-encore-mach\n"); exit (0); ++#else ++ printf ("ns32k-encore-bsd\n"); exit (0); ++#endif ++#endif ++#endif ++ ++#if defined (__386BSD__) ++ printf ("i386-pc-bsd\n"); exit (0); ++#endif ++ ++#if defined (sequent) ++#if defined (i386) ++ printf ("i386-sequent-dynix\n"); exit (0); ++#endif ++#if defined (ns32000) ++ printf ("ns32k-sequent-dynix\n"); exit (0); ++#endif ++#endif ++ ++#if defined (_SEQUENT_) ++ struct utsname un; ++ ++ uname(&un); ++ ++ if (strncmp(un.version, "V2", 2) == 0) { ++ printf ("i386-sequent-ptx2\n"); exit (0); ++ } ++ if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ ++ printf ("i386-sequent-ptx1\n"); exit (0); ++ } ++ printf ("i386-sequent-ptx\n"); exit (0); ++ ++#endif ++ ++#if defined (vax) ++# if !defined (ultrix) ++# include ++# if defined (BSD) ++# if BSD == 43 ++ printf ("vax-dec-bsd4.3\n"); exit (0); ++# else ++# if BSD == 199006 ++ printf ("vax-dec-bsd4.3reno\n"); exit (0); ++# else ++ printf ("vax-dec-bsd\n"); exit (0); ++# endif ++# endif ++# else ++ printf ("vax-dec-bsd\n"); exit (0); ++# endif ++# else ++ printf ("vax-dec-ultrix\n"); exit (0); ++# endif ++#endif ++ ++#if defined (alliant) && defined (i860) ++ printf ("i860-alliant-bsd\n"); exit (0); ++#endif ++ ++ exit (1); ++} ++EOF ++ ++$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && ++ { echo "$SYSTEM_NAME"; exit; } ++ ++# Apollos put the system type in the environment. ++ ++test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } ++ ++# Convex versions that predate uname can use getsysinfo(1) ++ ++if [ -x /usr/convex/getsysinfo ] ++then ++ case `getsysinfo -f cpu_type` in ++ c1*) ++ echo c1-convex-bsd ++ exit ;; ++ c2*) ++ if getsysinfo -f scalar_acc ++ then echo c32-convex-bsd ++ else echo c2-convex-bsd ++ fi ++ exit ;; ++ c34*) ++ echo c34-convex-bsd ++ exit ;; ++ c38*) ++ echo c38-convex-bsd ++ exit ;; ++ c4*) ++ echo c4-convex-bsd ++ exit ;; ++ esac ++fi ++ ++cat >&2 < in order to provide the needed ++information to handle your system. ++ ++config.guess timestamp = $timestamp ++ ++uname -m = `(uname -m) 2>/dev/null || echo unknown` ++uname -r = `(uname -r) 2>/dev/null || echo unknown` ++uname -s = `(uname -s) 2>/dev/null || echo unknown` ++uname -v = `(uname -v) 2>/dev/null || echo unknown` ++ ++/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` ++/bin/uname -X = `(/bin/uname -X) 2>/dev/null` ++ ++hostinfo = `(hostinfo) 2>/dev/null` ++/bin/universe = `(/bin/universe) 2>/dev/null` ++/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` ++/bin/arch = `(/bin/arch) 2>/dev/null` ++/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` ++/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` ++ ++UNAME_MACHINE = ${UNAME_MACHINE} ++UNAME_RELEASE = ${UNAME_RELEASE} ++UNAME_SYSTEM = ${UNAME_SYSTEM} ++UNAME_VERSION = ${UNAME_VERSION} ++EOF ++ ++exit 1 ++ ++# Local variables: ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "timestamp='" ++# time-stamp-format: "%:y-%02m-%02d" ++# time-stamp-end: "'" ++# End: +diff -ruNp liferea-1.4.23.orig/config.sub liferea-1.4.23.new/config.sub +--- liferea-1.4.23.orig/config.sub 1970-01-01 01:00:00.000000000 +0100 ++++ liferea-1.4.23.new/config.sub 2008-12-16 16:31:12.000000000 +0100 +@@ -0,0 +1,1658 @@ ++#! /bin/sh ++# Configuration validation subroutine script. ++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ++# Free Software Foundation, Inc. ++ ++timestamp='2008-01-16' ++ ++# This file is (in principle) common to ALL GNU software. ++# The presence of a machine in this file suggests that SOME GNU software ++# can handle that machine. It does not imply ALL GNU software can. ++# ++# 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 ++# 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 Street - Fifth Floor, Boston, MA ++# 02110-1301, USA. ++# ++# As a special exception to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. ++ ++ ++# Please send patches to . Submit a context ++# diff and a properly formatted ChangeLog entry. ++# ++# Configuration subroutine to validate and canonicalize a configuration type. ++# Supply the specified configuration type as an argument. ++# If it is invalid, we print an error message on stderr and exit with code 1. ++# Otherwise, we print the canonical config type on stdout and succeed. ++ ++# This file is supposed to be the same for all GNU packages ++# and recognize all the CPU types, system types and aliases ++# that are meaningful with *any* GNU software. ++# Each package is responsible for reporting which valid configurations ++# it does not support. The user should be able to distinguish ++# a failure to support a valid configuration from a meaningless ++# configuration. ++ ++# The goal of this file is to map all the various variations of a given ++# machine specification into a single specification in the form: ++# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM ++# or in some cases, the newer four-part form: ++# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM ++# It is wrong to echo any other type of specification. ++ ++me=`echo "$0" | sed -e 's,.*/,,'` ++ ++usage="\ ++Usage: $0 [OPTION] CPU-MFR-OPSYS ++ $0 [OPTION] ALIAS ++ ++Canonicalize a configuration name. ++ ++Operation modes: ++ -h, --help print this help, then exit ++ -t, --time-stamp print date of last modification, then exit ++ -v, --version print version number, then exit ++ ++Report bugs and patches to ." ++ ++version="\ ++GNU config.sub ($timestamp) ++ ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, ++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++ ++This is free software; see the source for copying conditions. There is NO ++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." ++ ++help=" ++Try \`$me --help' for more information." ++ ++# Parse command line ++while test $# -gt 0 ; do ++ case $1 in ++ --time-stamp | --time* | -t ) ++ echo "$timestamp" ; exit ;; ++ --version | -v ) ++ echo "$version" ; exit ;; ++ --help | --h* | -h ) ++ echo "$usage"; exit ;; ++ -- ) # Stop option processing ++ shift; break ;; ++ - ) # Use stdin as input. ++ break ;; ++ -* ) ++ echo "$me: invalid option $1$help" ++ exit 1 ;; ++ ++ *local*) ++ # First pass through any local machine types. ++ echo $1 ++ exit ;; ++ ++ * ) ++ break ;; ++ esac ++done ++ ++case $# in ++ 0) echo "$me: missing argument$help" >&2 ++ exit 1;; ++ 1) ;; ++ *) echo "$me: too many arguments$help" >&2 ++ exit 1;; ++esac ++ ++# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). ++# Here we must recognize all the valid KERNEL-OS combinations. ++maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` ++case $maybe_os in ++ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ ++ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ ++ storm-chaos* | os2-emx* | rtmk-nova*) ++ os=-$maybe_os ++ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ++ ;; ++ *) ++ basic_machine=`echo $1 | sed 's/-[^-]*$//'` ++ if [ $basic_machine != $1 ] ++ then os=`echo $1 | sed 's/.*-/-/'` ++ else os=; fi ++ ;; ++esac ++ ++### Let's recognize common machines as not being operating systems so ++### that things like config.sub decstation-3100 work. We also ++### recognize some manufacturers as not being operating systems, so we ++### can provide default operating systems below. ++case $os in ++ -sun*os*) ++ # Prevent following clause from handling this invalid input. ++ ;; ++ -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ ++ -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ ++ -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ ++ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ ++ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ ++ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ ++ -apple | -axis | -knuth | -cray) ++ os= ++ basic_machine=$1 ++ ;; ++ -sim | -cisco | -oki | -wec | -winbond) ++ os= ++ basic_machine=$1 ++ ;; ++ -scout) ++ ;; ++ -wrs) ++ os=-vxworks ++ basic_machine=$1 ++ ;; ++ -chorusos*) ++ os=-chorusos ++ basic_machine=$1 ++ ;; ++ -chorusrdb) ++ os=-chorusrdb ++ basic_machine=$1 ++ ;; ++ -hiux*) ++ os=-hiuxwe2 ++ ;; ++ -sco6) ++ os=-sco5v6 ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -sco5) ++ os=-sco3.2v5 ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -sco4) ++ os=-sco3.2v4 ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -sco3.2.[4-9]*) ++ os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -sco3.2v[4-9]*) ++ # Don't forget version if it is 3.2v4 or newer. ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -sco5v6*) ++ # Don't forget version if it is 3.2v4 or newer. ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -sco*) ++ os=-sco3.2v2 ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -udk*) ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -isc) ++ os=-isc2.2 ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -clix*) ++ basic_machine=clipper-intergraph ++ ;; ++ -isc*) ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -lynx*) ++ os=-lynxos ++ ;; ++ -ptx*) ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` ++ ;; ++ -windowsnt*) ++ os=`echo $os | sed -e 's/windowsnt/winnt/'` ++ ;; ++ -psos*) ++ os=-psos ++ ;; ++ -mint | -mint[0-9]*) ++ basic_machine=m68k-atari ++ os=-mint ++ ;; ++esac ++ ++# Decode aliases for certain CPU-COMPANY combinations. ++case $basic_machine in ++ # Recognize the basic CPU types without company name. ++ # Some are omitted here because they have special meanings below. ++ 1750a | 580 \ ++ | a29k \ ++ | 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 | avr32 \ ++ | bfin \ ++ | c4x | clipper \ ++ | d10v | d30v | dlx | dsp16xx \ ++ | fido | fr30 | frv \ ++ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ ++ | i370 | i860 | i960 | ia64 \ ++ | ip2k | iq2000 \ ++ | m32c | m32r | m32rle | m68000 | m68k | m88k \ ++ | maxq | mb | microblaze | mcore | mep \ ++ | mips | mipsbe | mipseb | mipsel | mipsle \ ++ | mips16 \ ++ | mips64 | mips64el \ ++ | mips64vr | mips64vrel \ ++ | mips64orion | mips64orionel \ ++ | mips64vr4100 | mips64vr4100el \ ++ | mips64vr4300 | mips64vr4300el \ ++ | mips64vr5000 | mips64vr5000el \ ++ | mips64vr5900 | mips64vr5900el \ ++ | mipsisa32 | mipsisa32el \ ++ | mipsisa32r2 | mipsisa32r2el \ ++ | mipsisa64 | mipsisa64el \ ++ | mipsisa64r2 | mipsisa64r2el \ ++ | mipsisa64sb1 | mipsisa64sb1el \ ++ | mipsisa64sr71k | mipsisa64sr71kel \ ++ | mipstx39 | mipstx39el \ ++ | mn10200 | mn10300 \ ++ | mt \ ++ | msp430 \ ++ | nios | nios2 \ ++ | ns16k | ns32k \ ++ | or32 \ ++ | pdp10 | pdp11 | pj | pjl \ ++ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ ++ | pyramid \ ++ | 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 | sparc64v | sparc86x | sparclet | sparclite \ ++ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ ++ | spu | strongarm \ ++ | tahoe | thumb | tic4x | tic80 | tron \ ++ | v850 | v850e \ ++ | we32k \ ++ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ ++ | z8k) ++ basic_machine=$basic_machine-unknown ++ ;; ++ m6811 | m68hc11 | m6812 | m68hc12) ++ # Motorola 68HC11/12. ++ basic_machine=$basic_machine-unknown ++ os=-none ++ ;; ++ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ++ ;; ++ ms1) ++ basic_machine=mt-unknown ++ ;; ++ ++ # We use `pc' rather than `unknown' ++ # because (1) that's what they normally are, and ++ # (2) the word "unknown" tends to confuse beginning users. ++ i*86 | x86_64) ++ basic_machine=$basic_machine-pc ++ ;; ++ # Object if more than one company name word. ++ *-*-*) ++ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 ++ exit 1 ++ ;; ++ # Recognize the basic CPU types with company name. ++ 580-* \ ++ | a29k-* \ ++ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ ++ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ ++ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ ++ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ ++ | avr-* | avr32-* \ ++ | bfin-* | bs2000-* \ ++ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ ++ | clipper-* | craynv-* | cydra-* \ ++ | d10v-* | d30v-* | dlx-* \ ++ | elxsi-* \ ++ | 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-* \ ++ | m32c-* | m32r-* | m32rle-* \ ++ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ ++ | m88110-* | m88k-* | maxq-* | mcore-* \ ++ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ ++ | mips16-* \ ++ | mips64-* | mips64el-* \ ++ | mips64vr-* | mips64vrel-* \ ++ | mips64orion-* | mips64orionel-* \ ++ | mips64vr4100-* | mips64vr4100el-* \ ++ | mips64vr4300-* | mips64vr4300el-* \ ++ | mips64vr5000-* | mips64vr5000el-* \ ++ | mips64vr5900-* | mips64vr5900el-* \ ++ | mipsisa32-* | mipsisa32el-* \ ++ | mipsisa32r2-* | mipsisa32r2el-* \ ++ | mipsisa64-* | mipsisa64el-* \ ++ | mipsisa64r2-* | mipsisa64r2el-* \ ++ | mipsisa64sb1-* | mipsisa64sb1el-* \ ++ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ ++ | mipstx39-* | mipstx39el-* \ ++ | 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-* | sheb-* | shbe-* \ ++ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ ++ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ ++ | sparclite-* \ ++ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ ++ | tahoe-* | thumb-* \ ++ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ ++ | tron-* \ ++ | v850-* | v850e-* | vax-* \ ++ | we32k-* \ ++ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ ++ | xstormy16-* | xtensa*-* \ ++ | ymp-* \ ++ | z8k-*) ++ ;; ++ # Recognize the basic CPU types without company name, with glob match. ++ xtensa*) ++ basic_machine=$basic_machine-unknown ++ ;; ++ # Recognize the various machine names and aliases which stand ++ # for a CPU type and a company and sometimes even an OS. ++ 386bsd) ++ basic_machine=i386-unknown ++ os=-bsd ++ ;; ++ 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) ++ basic_machine=m68000-att ++ ;; ++ 3b*) ++ basic_machine=we32k-att ++ ;; ++ a29khif) ++ basic_machine=a29k-amd ++ os=-udi ++ ;; ++ abacus) ++ basic_machine=abacus-unknown ++ ;; ++ adobe68k) ++ basic_machine=m68010-adobe ++ os=-scout ++ ;; ++ alliant | fx80) ++ basic_machine=fx80-alliant ++ ;; ++ altos | altos3068) ++ basic_machine=m68k-altos ++ ;; ++ am29k) ++ basic_machine=a29k-none ++ os=-bsd ++ ;; ++ amd64) ++ basic_machine=x86_64-pc ++ ;; ++ amd64-*) ++ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ amdahl) ++ basic_machine=580-amdahl ++ os=-sysv ++ ;; ++ amiga | amiga-*) ++ basic_machine=m68k-unknown ++ ;; ++ amigaos | amigados) ++ basic_machine=m68k-unknown ++ os=-amigaos ++ ;; ++ amigaunix | amix) ++ basic_machine=m68k-unknown ++ os=-sysv4 ++ ;; ++ apollo68) ++ basic_machine=m68k-apollo ++ os=-sysv ++ ;; ++ apollo68bsd) ++ basic_machine=m68k-apollo ++ os=-bsd ++ ;; ++ aux) ++ basic_machine=m68k-apple ++ os=-aux ++ ;; ++ balance) ++ basic_machine=ns32k-sequent ++ os=-dynix ++ ;; ++ blackfin) ++ basic_machine=bfin-unknown ++ os=-linux ++ ;; ++ blackfin-*) ++ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; ++ c90) ++ basic_machine=c90-cray ++ os=-unicos ++ ;; ++ convex-c1) ++ basic_machine=c1-convex ++ os=-bsd ++ ;; ++ convex-c2) ++ basic_machine=c2-convex ++ os=-bsd ++ ;; ++ convex-c32) ++ basic_machine=c32-convex ++ os=-bsd ++ ;; ++ convex-c34) ++ basic_machine=c34-convex ++ os=-bsd ++ ;; ++ convex-c38) ++ basic_machine=c38-convex ++ os=-bsd ++ ;; ++ cray | j90) ++ basic_machine=j90-cray ++ os=-unicos ++ ;; ++ craynv) ++ basic_machine=craynv-cray ++ os=-unicosmp ++ ;; ++ cr16) ++ basic_machine=cr16-unknown ++ os=-elf ++ ;; ++ crds | unos) ++ basic_machine=m68k-crds ++ ;; ++ crisv32 | crisv32-* | etraxfs*) ++ basic_machine=crisv32-axis ++ ;; ++ cris | cris-* | etrax*) ++ basic_machine=cris-axis ++ ;; ++ crx) ++ basic_machine=crx-unknown ++ os=-elf ++ ;; ++ da30 | da30-*) ++ basic_machine=m68k-da30 ++ ;; ++ decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) ++ basic_machine=mips-dec ++ ;; ++ decsystem10* | dec10*) ++ basic_machine=pdp10-dec ++ os=-tops10 ++ ;; ++ decsystem20* | dec20*) ++ basic_machine=pdp10-dec ++ os=-tops20 ++ ;; ++ delta | 3300 | motorola-3300 | motorola-delta \ ++ | 3300-motorola | delta-motorola) ++ basic_machine=m68k-motorola ++ ;; ++ delta88) ++ basic_machine=m88k-motorola ++ os=-sysv3 ++ ;; ++ djgpp) ++ basic_machine=i586-pc ++ os=-msdosdjgpp ++ ;; ++ dpx20 | dpx20-*) ++ basic_machine=rs6000-bull ++ os=-bosx ++ ;; ++ dpx2* | dpx2*-bull) ++ basic_machine=m68k-bull ++ os=-sysv3 ++ ;; ++ ebmon29k) ++ basic_machine=a29k-amd ++ os=-ebmon ++ ;; ++ elxsi) ++ basic_machine=elxsi-elxsi ++ os=-bsd ++ ;; ++ encore | umax | mmax) ++ basic_machine=ns32k-encore ++ ;; ++ es1800 | OSE68k | ose68k | ose | OSE) ++ basic_machine=m68k-ericsson ++ os=-ose ++ ;; ++ fx2800) ++ basic_machine=i860-alliant ++ ;; ++ genix) ++ basic_machine=ns32k-ns ++ ;; ++ gmicro) ++ basic_machine=tron-gmicro ++ os=-sysv ++ ;; ++ go32) ++ basic_machine=i386-pc ++ os=-go32 ++ ;; ++ h3050r* | hiux*) ++ basic_machine=hppa1.1-hitachi ++ os=-hiuxwe2 ++ ;; ++ h8300hms) ++ basic_machine=h8300-hitachi ++ os=-hms ++ ;; ++ h8300xray) ++ basic_machine=h8300-hitachi ++ os=-xray ++ ;; ++ h8500hms) ++ basic_machine=h8500-hitachi ++ os=-hms ++ ;; ++ harris) ++ basic_machine=m88k-harris ++ os=-sysv3 ++ ;; ++ hp300-*) ++ basic_machine=m68k-hp ++ ;; ++ hp300bsd) ++ basic_machine=m68k-hp ++ os=-bsd ++ ;; ++ hp300hpux) ++ basic_machine=m68k-hp ++ os=-hpux ++ ;; ++ hp3k9[0-9][0-9] | hp9[0-9][0-9]) ++ basic_machine=hppa1.0-hp ++ ;; ++ hp9k2[0-9][0-9] | hp9k31[0-9]) ++ basic_machine=m68000-hp ++ ;; ++ hp9k3[2-9][0-9]) ++ basic_machine=m68k-hp ++ ;; ++ hp9k6[0-9][0-9] | hp6[0-9][0-9]) ++ basic_machine=hppa1.0-hp ++ ;; ++ hp9k7[0-79][0-9] | hp7[0-79][0-9]) ++ basic_machine=hppa1.1-hp ++ ;; ++ hp9k78[0-9] | hp78[0-9]) ++ # FIXME: really hppa2.0-hp ++ basic_machine=hppa1.1-hp ++ ;; ++ hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) ++ # FIXME: really hppa2.0-hp ++ basic_machine=hppa1.1-hp ++ ;; ++ hp9k8[0-9][13679] | hp8[0-9][13679]) ++ basic_machine=hppa1.1-hp ++ ;; ++ hp9k8[0-9][0-9] | hp8[0-9][0-9]) ++ basic_machine=hppa1.0-hp ++ ;; ++ hppa-next) ++ os=-nextstep3 ++ ;; ++ hppaosf) ++ basic_machine=hppa1.1-hp ++ os=-osf ++ ;; ++ hppro) ++ basic_machine=hppa1.1-hp ++ os=-proelf ++ ;; ++ i370-ibm* | ibm*) ++ basic_machine=i370-ibm ++ ;; ++# I'm not sure what "Sysv32" means. Should this be sysv3.2? ++ i*86v32) ++ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` ++ os=-sysv32 ++ ;; ++ i*86v4*) ++ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` ++ os=-sysv4 ++ ;; ++ i*86v) ++ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` ++ os=-sysv ++ ;; ++ i*86sol2) ++ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` ++ os=-solaris2 ++ ;; ++ i386mach) ++ basic_machine=i386-mach ++ os=-mach ++ ;; ++ i386-vsta | vsta) ++ basic_machine=i386-unknown ++ os=-vsta ++ ;; ++ iris | iris4d) ++ basic_machine=mips-sgi ++ case $os in ++ -irix*) ++ ;; ++ *) ++ os=-irix4 ++ ;; ++ esac ++ ;; ++ isi68 | isi) ++ basic_machine=m68k-isi ++ os=-sysv ++ ;; ++ m68knommu) ++ basic_machine=m68k-unknown ++ os=-linux ++ ;; ++ m68knommu-*) ++ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; ++ m88k-omron*) ++ basic_machine=m88k-omron ++ ;; ++ magnum | m3230) ++ basic_machine=mips-mips ++ os=-sysv ++ ;; ++ merlin) ++ basic_machine=ns32k-utek ++ os=-sysv ++ ;; ++ mingw32) ++ basic_machine=i386-pc ++ os=-mingw32 ++ ;; ++ mingw32ce) ++ basic_machine=arm-unknown ++ os=-mingw32ce ++ ;; ++ miniframe) ++ basic_machine=m68000-convergent ++ ;; ++ *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) ++ basic_machine=m68k-atari ++ os=-mint ++ ;; ++ mips3*-*) ++ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ++ ;; ++ mips3*) ++ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ++ ;; ++ monitor) ++ basic_machine=m68k-rom68k ++ os=-coff ++ ;; ++ morphos) ++ basic_machine=powerpc-unknown ++ os=-morphos ++ ;; ++ msdos) ++ basic_machine=i386-pc ++ os=-msdos ++ ;; ++ ms1-*) ++ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ++ ;; ++ mvs) ++ basic_machine=i370-ibm ++ os=-mvs ++ ;; ++ ncr3000) ++ basic_machine=i486-ncr ++ os=-sysv4 ++ ;; ++ netbsd386) ++ basic_machine=i386-unknown ++ os=-netbsd ++ ;; ++ netwinder) ++ basic_machine=armv4l-rebel ++ os=-linux ++ ;; ++ news | news700 | news800 | news900) ++ basic_machine=m68k-sony ++ os=-newsos ++ ;; ++ news1000) ++ basic_machine=m68030-sony ++ os=-newsos ++ ;; ++ news-3600 | risc-news) ++ basic_machine=mips-sony ++ os=-newsos ++ ;; ++ necv70) ++ basic_machine=v70-nec ++ os=-sysv ++ ;; ++ next | m*-next ) ++ basic_machine=m68k-next ++ case $os in ++ -nextstep* ) ++ ;; ++ -ns2*) ++ os=-nextstep2 ++ ;; ++ *) ++ os=-nextstep3 ++ ;; ++ esac ++ ;; ++ nh3000) ++ basic_machine=m68k-harris ++ os=-cxux ++ ;; ++ nh[45]000) ++ basic_machine=m88k-harris ++ os=-cxux ++ ;; ++ nindy960) ++ basic_machine=i960-intel ++ os=-nindy ++ ;; ++ mon960) ++ basic_machine=i960-intel ++ os=-mon960 ++ ;; ++ nonstopux) ++ basic_machine=mips-compaq ++ os=-nonstopux ++ ;; ++ np1) ++ basic_machine=np1-gould ++ ;; ++ nsr-tandem) ++ basic_machine=nsr-tandem ++ ;; ++ op50n-* | op60c-*) ++ basic_machine=hppa1.1-oki ++ os=-proelf ++ ;; ++ openrisc | openrisc-*) ++ basic_machine=or32-unknown ++ ;; ++ os400) ++ basic_machine=powerpc-ibm ++ os=-os400 ++ ;; ++ OSE68000 | ose68000) ++ basic_machine=m68000-ericsson ++ os=-ose ++ ;; ++ os68k) ++ basic_machine=m68k-none ++ os=-os68k ++ ;; ++ pa-hitachi) ++ basic_machine=hppa1.1-hitachi ++ os=-hiuxwe2 ++ ;; ++ paragon) ++ basic_machine=i860-intel ++ os=-osf ++ ;; ++ parisc) ++ basic_machine=hppa-unknown ++ os=-linux ++ ;; ++ parisc-*) ++ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; ++ pbd) ++ basic_machine=sparc-tti ++ ;; ++ pbb) ++ basic_machine=m68k-tti ++ ;; ++ 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 ++ ;; ++ pentiumpro | p6 | 6x86 | athlon | athlon_*) ++ basic_machine=i686-pc ++ ;; ++ pentiumii | pentium2 | pentiumiii | pentium3) ++ basic_machine=i686-pc ++ ;; ++ pentium4) ++ basic_machine=i786-pc ++ ;; ++ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) ++ basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ pentiumpro-* | p6-* | 6x86-* | athlon-*) ++ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) ++ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ pentium4-*) ++ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ pn) ++ basic_machine=pn-gould ++ ;; ++ power) basic_machine=power-ibm ++ ;; ++ ppc) basic_machine=powerpc-unknown ++ ;; ++ ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ ppcle | powerpclittle | ppc-le | powerpc-little) ++ basic_machine=powerpcle-unknown ++ ;; ++ ppcle-* | powerpclittle-*) ++ basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ ppc64) basic_machine=powerpc64-unknown ++ ;; ++ ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ ppc64le | powerpc64little | ppc64-le | powerpc64-little) ++ basic_machine=powerpc64le-unknown ++ ;; ++ ppc64le-* | powerpc64little-*) ++ basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ ps2) ++ basic_machine=i386-ibm ++ ;; ++ pw32) ++ basic_machine=i586-unknown ++ os=-pw32 ++ ;; ++ rdos) ++ basic_machine=i386-pc ++ os=-rdos ++ ;; ++ rom68k) ++ basic_machine=m68k-rom68k ++ os=-coff ++ ;; ++ rm[46]00) ++ basic_machine=mips-siemens ++ ;; ++ rtpc | rtpc-*) ++ basic_machine=romp-ibm ++ ;; ++ s390 | s390-*) ++ basic_machine=s390-ibm ++ ;; ++ s390x | s390x-*) ++ basic_machine=s390x-ibm ++ ;; ++ sa29200) ++ basic_machine=a29k-amd ++ os=-udi ++ ;; ++ sb1) ++ basic_machine=mipsisa64sb1-unknown ++ ;; ++ sb1el) ++ basic_machine=mipsisa64sb1el-unknown ++ ;; ++ sde) ++ basic_machine=mipsisa32-sde ++ os=-elf ++ ;; ++ sei) ++ basic_machine=mips-sei ++ os=-seiux ++ ;; ++ sequent) ++ basic_machine=i386-sequent ++ ;; ++ sh) ++ basic_machine=sh-hitachi ++ os=-hms ++ ;; ++ sh5el) ++ basic_machine=sh5le-unknown ++ ;; ++ sh64) ++ basic_machine=sh64-unknown ++ ;; ++ sparclite-wrs | simso-wrs) ++ basic_machine=sparclite-wrs ++ os=-vxworks ++ ;; ++ sps7) ++ basic_machine=m68k-bull ++ os=-sysv2 ++ ;; ++ spur) ++ basic_machine=spur-unknown ++ ;; ++ st2000) ++ basic_machine=m68k-tandem ++ ;; ++ stratus) ++ basic_machine=i860-stratus ++ os=-sysv4 ++ ;; ++ sun2) ++ basic_machine=m68000-sun ++ ;; ++ sun2os3) ++ basic_machine=m68000-sun ++ os=-sunos3 ++ ;; ++ sun2os4) ++ basic_machine=m68000-sun ++ os=-sunos4 ++ ;; ++ sun3os3) ++ basic_machine=m68k-sun ++ os=-sunos3 ++ ;; ++ sun3os4) ++ basic_machine=m68k-sun ++ os=-sunos4 ++ ;; ++ sun4os3) ++ basic_machine=sparc-sun ++ os=-sunos3 ++ ;; ++ sun4os4) ++ basic_machine=sparc-sun ++ os=-sunos4 ++ ;; ++ sun4sol2) ++ basic_machine=sparc-sun ++ os=-solaris2 ++ ;; ++ sun3 | sun3-*) ++ basic_machine=m68k-sun ++ ;; ++ sun4) ++ basic_machine=sparc-sun ++ ;; ++ sun386 | sun386i | roadrunner) ++ basic_machine=i386-sun ++ ;; ++ sv1) ++ basic_machine=sv1-cray ++ os=-unicos ++ ;; ++ symmetry) ++ basic_machine=i386-sequent ++ os=-dynix ++ ;; ++ t3e) ++ basic_machine=alphaev5-cray ++ os=-unicos ++ ;; ++ t90) ++ basic_machine=t90-cray ++ os=-unicos ++ ;; ++ tic54x | c54x*) ++ basic_machine=tic54x-unknown ++ os=-coff ++ ;; ++ tic55x | c55x*) ++ basic_machine=tic55x-unknown ++ os=-coff ++ ;; ++ tic6x | c6x*) ++ basic_machine=tic6x-unknown ++ os=-coff ++ ;; ++ tile*) ++ basic_machine=tile-unknown ++ os=-linux-gnu ++ ;; ++ tx39) ++ basic_machine=mipstx39-unknown ++ ;; ++ tx39el) ++ basic_machine=mipstx39el-unknown ++ ;; ++ toad1) ++ basic_machine=pdp10-xkl ++ os=-tops20 ++ ;; ++ tower | tower-32) ++ basic_machine=m68k-ncr ++ ;; ++ tpf) ++ basic_machine=s390x-ibm ++ os=-tpf ++ ;; ++ udi29k) ++ basic_machine=a29k-amd ++ os=-udi ++ ;; ++ ultra3) ++ basic_machine=a29k-nyu ++ os=-sym1 ++ ;; ++ v810 | necv810) ++ basic_machine=v810-nec ++ os=-none ++ ;; ++ vaxv) ++ basic_machine=vax-dec ++ os=-sysv ++ ;; ++ vms) ++ basic_machine=vax-dec ++ os=-vms ++ ;; ++ vpp*|vx|vx-*) ++ basic_machine=f301-fujitsu ++ ;; ++ vxworks960) ++ basic_machine=i960-wrs ++ os=-vxworks ++ ;; ++ vxworks68) ++ basic_machine=m68k-wrs ++ os=-vxworks ++ ;; ++ vxworks29k) ++ basic_machine=a29k-wrs ++ os=-vxworks ++ ;; ++ w65*) ++ basic_machine=w65-wdc ++ os=-none ++ ;; ++ w89k-*) ++ basic_machine=hppa1.1-winbond ++ os=-proelf ++ ;; ++ xbox) ++ basic_machine=i686-pc ++ os=-mingw32 ++ ;; ++ xps | xps100) ++ basic_machine=xps100-honeywell ++ ;; ++ ymp) ++ basic_machine=ymp-cray ++ os=-unicos ++ ;; ++ z8k-*-coff) ++ basic_machine=z8k-unknown ++ os=-sim ++ ;; ++ none) ++ basic_machine=none-none ++ os=-none ++ ;; ++ ++# Here we handle the default manufacturer of certain CPU types. It is in ++# some cases the only manufacturer, in others, it is the most popular. ++ w89k) ++ basic_machine=hppa1.1-winbond ++ ;; ++ op50n) ++ basic_machine=hppa1.1-oki ++ ;; ++ op60c) ++ basic_machine=hppa1.1-oki ++ ;; ++ romp) ++ basic_machine=romp-ibm ++ ;; ++ mmix) ++ basic_machine=mmix-knuth ++ ;; ++ rs6000) ++ basic_machine=rs6000-ibm ++ ;; ++ vax) ++ basic_machine=vax-dec ++ ;; ++ pdp10) ++ # there are many clones, so DEC is not a safe bet ++ basic_machine=pdp10-unknown ++ ;; ++ pdp11) ++ basic_machine=pdp11-dec ++ ;; ++ we32k) ++ basic_machine=we32k-att ++ ;; ++ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) ++ basic_machine=sh-unknown ++ ;; ++ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) ++ basic_machine=sparc-sun ++ ;; ++ cydra) ++ basic_machine=cydra-cydrome ++ ;; ++ orion) ++ basic_machine=orion-highlevel ++ ;; ++ orion105) ++ basic_machine=clipper-highlevel ++ ;; ++ mac | mpw | mac-mpw) ++ basic_machine=m68k-apple ++ ;; ++ pmac | pmac-mpw) ++ basic_machine=powerpc-apple ++ ;; ++ *-unknown) ++ # Make sure to match an already-canonicalized machine name. ++ ;; ++ *) ++ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 ++ exit 1 ++ ;; ++esac ++ ++# Here we canonicalize certain aliases for manufacturers. ++case $basic_machine in ++ *-digital*) ++ basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` ++ ;; ++ *-commodore*) ++ basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` ++ ;; ++ *) ++ ;; ++esac ++ ++# Decode manufacturer-specific aliases for certain operating systems. ++ ++if [ x"$os" != x"" ] ++then ++case $os in ++ # First match some system type aliases ++ # that might get confused with valid system types. ++ # -solaris* is a basic system type, with this one exception. ++ -solaris1 | -solaris1.*) ++ os=`echo $os | sed -e 's|solaris1|sunos4|'` ++ ;; ++ -solaris) ++ os=-solaris2 ++ ;; ++ -svr4*) ++ os=-sysv4 ++ ;; ++ -unixware*) ++ os=-sysv4.2uw ++ ;; ++ -gnu/linux*) ++ os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ++ ;; ++ # First accept the basic system types. ++ # The portable systems comes first. ++ # Each alternative MUST END IN A *, to match a version number. ++ # -sysv* is not here because it comes later, after sysvr4. ++ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ ++ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ ++ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ ++ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ ++ | -aos* \ ++ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ ++ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ ++ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ ++ | -openbsd* | -solidbsd* \ ++ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ ++ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ ++ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ ++ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ ++ | -chorusos* | -chorusrdb* \ ++ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ++ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ ++ | -uxpv* | -beos* | -mpeix* | -udk* \ ++ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ ++ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ ++ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ ++ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ ++ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ ++ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ ++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) ++ # Remember, each alternative MUST END IN *, to match a version number. ++ ;; ++ -qnx*) ++ case $basic_machine in ++ x86-* | i*86-*) ++ ;; ++ *) ++ os=-nto$os ++ ;; ++ esac ++ ;; ++ -nto-qnx*) ++ ;; ++ -nto*) ++ os=`echo $os | sed -e 's|nto|nto-qnx|'` ++ ;; ++ -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ ++ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ ++ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ++ ;; ++ -mac*) ++ os=`echo $os | sed -e 's|mac|macos|'` ++ ;; ++ -linux-dietlibc) ++ os=-linux-dietlibc ++ ;; ++ -linux*) ++ os=`echo $os | sed -e 's|linux|linux-gnu|'` ++ ;; ++ -sunos5*) ++ os=`echo $os | sed -e 's|sunos5|solaris2|'` ++ ;; ++ -sunos6*) ++ os=`echo $os | sed -e 's|sunos6|solaris3|'` ++ ;; ++ -opened*) ++ os=-openedition ++ ;; ++ -os400*) ++ os=-os400 ++ ;; ++ -wince*) ++ os=-wince ++ ;; ++ -osfrose*) ++ os=-osfrose ++ ;; ++ -osf*) ++ os=-osf ++ ;; ++ -utek*) ++ os=-bsd ++ ;; ++ -dynix*) ++ os=-bsd ++ ;; ++ -acis*) ++ os=-aos ++ ;; ++ -atheos*) ++ os=-atheos ++ ;; ++ -syllable*) ++ os=-syllable ++ ;; ++ -386bsd) ++ os=-bsd ++ ;; ++ -ctix* | -uts*) ++ os=-sysv ++ ;; ++ -nova*) ++ os=-rtmk-nova ++ ;; ++ -ns2 ) ++ os=-nextstep2 ++ ;; ++ -nsk*) ++ os=-nsk ++ ;; ++ # Preserve the version number of sinix5. ++ -sinix5.*) ++ os=`echo $os | sed -e 's|sinix|sysv|'` ++ ;; ++ -sinix*) ++ os=-sysv4 ++ ;; ++ -tpf*) ++ os=-tpf ++ ;; ++ -triton*) ++ os=-sysv3 ++ ;; ++ -oss*) ++ os=-sysv3 ++ ;; ++ -svr4) ++ os=-sysv4 ++ ;; ++ -svr3) ++ os=-sysv3 ++ ;; ++ -sysvr4) ++ os=-sysv4 ++ ;; ++ # This must come after -sysvr4. ++ -sysv*) ++ ;; ++ -ose*) ++ os=-ose ++ ;; ++ -es1800*) ++ os=-ose ++ ;; ++ -xenix) ++ os=-xenix ++ ;; ++ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) ++ os=-mint ++ ;; ++ -aros*) ++ os=-aros ++ ;; ++ -kaos*) ++ os=-kaos ++ ;; ++ -zvmoe) ++ os=-zvmoe ++ ;; ++ -none) ++ ;; ++ *) ++ # Get rid of the `-' at the beginning of $os. ++ os=`echo $os | sed 's/[^-]*-//'` ++ echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 ++ exit 1 ++ ;; ++esac ++else ++ ++# Here we handle the default operating systems that come with various machines. ++# The value should be what the vendor currently ships out the door with their ++# machine or put another way, the most popular os provided with the machine. ++ ++# Note that if you're going to try to match "-MANUFACTURER" here (say, ++# "-sun"), then you have to tell the case statement up towards the top ++# that MANUFACTURER isn't an operating system. Otherwise, code above ++# will signal an error saying that MANUFACTURER isn't an operating ++# system, and we'll never get to this point. ++ ++case $basic_machine in ++ score-*) ++ os=-elf ++ ;; ++ spu-*) ++ os=-elf ++ ;; ++ *-acorn) ++ os=-riscix1.2 ++ ;; ++ arm*-rebel) ++ os=-linux ++ ;; ++ arm*-semi) ++ os=-aout ++ ;; ++ c4x-* | tic4x-*) ++ os=-coff ++ ;; ++ # This must come before the *-dec entry. ++ pdp10-*) ++ os=-tops20 ++ ;; ++ pdp11-*) ++ os=-none ++ ;; ++ *-dec | vax-*) ++ os=-ultrix4.2 ++ ;; ++ m68*-apollo) ++ os=-domain ++ ;; ++ i386-sun) ++ os=-sunos4.0.2 ++ ;; ++ m68000-sun) ++ os=-sunos3 ++ # This also exists in the configure program, but was not the ++ # default. ++ # os=-sunos4 ++ ;; ++ m68*-cisco) ++ os=-aout ++ ;; ++ mep-*) ++ os=-elf ++ ;; ++ mips*-cisco) ++ os=-elf ++ ;; ++ mips*-*) ++ os=-elf ++ ;; ++ or32-*) ++ os=-coff ++ ;; ++ *-tti) # must be before sparc entry or we get the wrong os. ++ os=-sysv3 ++ ;; ++ sparc-* | *-sun) ++ os=-sunos4.1.1 ++ ;; ++ *-be) ++ os=-beos ++ ;; ++ *-haiku) ++ os=-haiku ++ ;; ++ *-ibm) ++ os=-aix ++ ;; ++ *-knuth) ++ os=-mmixware ++ ;; ++ *-wec) ++ os=-proelf ++ ;; ++ *-winbond) ++ os=-proelf ++ ;; ++ *-oki) ++ os=-proelf ++ ;; ++ *-hp) ++ os=-hpux ++ ;; ++ *-hitachi) ++ os=-hiux ++ ;; ++ i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) ++ os=-sysv ++ ;; ++ *-cbm) ++ os=-amigaos ++ ;; ++ *-dg) ++ os=-dgux ++ ;; ++ *-dolphin) ++ os=-sysv3 ++ ;; ++ m68k-ccur) ++ os=-rtu ++ ;; ++ m88k-omron*) ++ os=-luna ++ ;; ++ *-next ) ++ os=-nextstep ++ ;; ++ *-sequent) ++ os=-ptx ++ ;; ++ *-crds) ++ os=-unos ++ ;; ++ *-ns) ++ os=-genix ++ ;; ++ i370-*) ++ os=-mvs ++ ;; ++ *-next) ++ os=-nextstep3 ++ ;; ++ *-gould) ++ os=-sysv ++ ;; ++ *-highlevel) ++ os=-bsd ++ ;; ++ *-encore) ++ os=-bsd ++ ;; ++ *-sgi) ++ os=-irix ++ ;; ++ *-siemens) ++ os=-sysv4 ++ ;; ++ *-masscomp) ++ os=-rtu ++ ;; ++ f30[01]-fujitsu | f700-fujitsu) ++ os=-uxpv ++ ;; ++ *-rom68k) ++ os=-coff ++ ;; ++ *-*bug) ++ os=-coff ++ ;; ++ *-apple) ++ os=-macos ++ ;; ++ *-atari*) ++ os=-mint ++ ;; ++ *) ++ os=-none ++ ;; ++esac ++fi ++ ++# Here we handle the case where we know the os, and the CPU type, but not the ++# manufacturer. We pick the logical manufacturer. ++vendor=unknown ++case $basic_machine in ++ *-unknown) ++ case $os in ++ -riscix*) ++ vendor=acorn ++ ;; ++ -sunos*) ++ vendor=sun ++ ;; ++ -aix*) ++ vendor=ibm ++ ;; ++ -beos*) ++ vendor=be ++ ;; ++ -hpux*) ++ vendor=hp ++ ;; ++ -mpeix*) ++ vendor=hp ++ ;; ++ -hiux*) ++ vendor=hitachi ++ ;; ++ -unos*) ++ vendor=crds ++ ;; ++ -dgux*) ++ vendor=dg ++ ;; ++ -luna*) ++ vendor=omron ++ ;; ++ -genix*) ++ vendor=ns ++ ;; ++ -mvs* | -opened*) ++ vendor=ibm ++ ;; ++ -os400*) ++ vendor=ibm ++ ;; ++ -ptx*) ++ vendor=sequent ++ ;; ++ -tpf*) ++ vendor=ibm ++ ;; ++ -vxsim* | -vxworks* | -windiss*) ++ vendor=wrs ++ ;; ++ -aux*) ++ vendor=apple ++ ;; ++ -hms*) ++ vendor=hitachi ++ ;; ++ -mpw* | -macos*) ++ vendor=apple ++ ;; ++ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) ++ vendor=atari ++ ;; ++ -vos*) ++ vendor=stratus ++ ;; ++ esac ++ basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` ++ ;; ++esac ++ ++echo $basic_machine$os ++exit ++ ++# Local variables: ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "timestamp='" ++# time-stamp-format: "%:y-%02m-%02d" ++# time-stamp-end: "'" ++# End: +diff -ruNp liferea-1.4.23.orig/configure liferea-1.4.23.new/configure +--- liferea-1.4.23.orig/configure 2008-12-12 00:16:22.000000000 +0100 ++++ liferea-1.4.23.new/configure 2008-12-16 16:31:08.000000000 +0100 +@@ -971,6 +971,10 @@ GTKHTML2_CFLAGS + GTKHTML2_LIBS + WITH_GTKHTML2_TRUE + WITH_GTKHTML2_FALSE ++HILDON_CFLAGS ++HILDON_LIBS ++WITH_HILDON_TRUE ++WITH_HILDON_FALSE + GCONFTOOL + GCONF_SCHEMA_CONFIG_SOURCE + GCONF_SCHEMA_FILE_DIR +@@ -1036,6 +1040,8 @@ WEBKIT_CFLAGS + WEBKIT_LIBS + GTKHTML2_CFLAGS + GTKHTML2_LIBS ++HILDON_CFLAGS ++HILDON_LIBS + PACKAGE_CFLAGS + PACKAGE_LIBS + DBUS_CFLAGS +@@ -1646,6 +1652,7 @@ Optional Features: + --enable-gnutls Attempt to use GNUTLS for SSL support [default=yes] + --disable-libnotify don't compile the libnotify plugin + --disable-lua don't compile with LUA scripting support ++ --enable-hildon compile for Hildon enviroment [default=no] + --enable-cpp-rtti Enable C++ RTTI + --disable-schemas-install Disable the schemas installation + +@@ -1708,6 +1715,9 @@ Some influential environment variables: + C compiler flags for GTKHTML2, overriding pkg-config + GTKHTML2_LIBS + linker flags for GTKHTML2, overriding pkg-config ++ HILDON_CFLAGS ++ C compiler flags for HILDON, overriding pkg-config ++ HILDON_LIBS linker flags for HILDON, overriding pkg-config + PACKAGE_CFLAGS + C compiler flags for PACKAGE, overriding pkg-config + PACKAGE_LIBS +@@ -4604,7 +4614,7 @@ ia64-*-hpux*) + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 4607 "configure"' > conftest.$ac_ext ++ echo '#line 4617 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -7661,11 +7671,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7664: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7674: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:7668: \$? = $ac_status" >&5 ++ echo "$as_me:7678: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -7951,11 +7961,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7954: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7964: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:7958: \$? = $ac_status" >&5 ++ echo "$as_me:7968: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -8055,11 +8065,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8058: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8068: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:8062: \$? = $ac_status" >&5 ++ echo "$as_me:8072: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -10432,7 +10442,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext <&5) ++ (eval echo "\"\$as_me:12946: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:12940: \$? = $ac_status" >&5 ++ echo "$as_me:12950: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -13037,11 +13047,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:13040: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13050: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:13044: \$? = $ac_status" >&5 ++ echo "$as_me:13054: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -14635,11 +14645,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:14638: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14648: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:14642: \$? = $ac_status" >&5 ++ echo "$as_me:14652: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -14739,11 +14749,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:14742: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14752: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:14746: \$? = $ac_status" >&5 ++ echo "$as_me:14756: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -16959,11 +16969,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16962: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16972: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:16966: \$? = $ac_status" >&5 ++ echo "$as_me:16976: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -17249,11 +17259,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:17252: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17262: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:17256: \$? = $ac_status" >&5 ++ echo "$as_me:17266: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -17353,11 +17363,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:17356: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17366: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:17360: \$? = $ac_status" >&5 ++ echo "$as_me:17370: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -23129,6 +23139,13 @@ else + enable_lua=yes + fi + ++# Check whether --enable-hildon was given. ++if test "${enable_hildon+set}" = set; then ++ enableval=$enable_hildon; ++else ++ enable_hildon=no ++fi ++ + + { echo "$as_me:$LINENO: checking for 64bit platform" >&5 + echo $ECHO_N "checking for 64bit platform... $ECHO_C" >&6; } +@@ -26099,12 +26116,12 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_XULRUNNER_CFLAGS="$XULRUNNER_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxul-embedding \$gecko_cv_extra_pkg_dependencies\"") >&5 +- ($PKG_CONFIG --exists --print-errors "libxul-embedding $gecko_cv_extra_pkg_dependencies") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxul-embedding-unstable \$gecko_cv_extra_pkg_dependencies\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "libxul-embedding-unstable $gecko_cv_extra_pkg_dependencies") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_XULRUNNER_CFLAGS=`$PKG_CONFIG --cflags "libxul-embedding $gecko_cv_extra_pkg_dependencies" 2>/dev/null` ++ pkg_cv_XULRUNNER_CFLAGS=`$PKG_CONFIG --cflags "libxul-embedding-unstable $gecko_cv_extra_pkg_dependencies" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -26117,12 +26134,12 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_XULRUNNER_LIBS="$XULRUNNER_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxul-embedding \$gecko_cv_extra_pkg_dependencies\"") >&5 +- ($PKG_CONFIG --exists --print-errors "libxul-embedding $gecko_cv_extra_pkg_dependencies") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxul-embedding-unstable \$gecko_cv_extra_pkg_dependencies\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "libxul-embedding-unstable $gecko_cv_extra_pkg_dependencies") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_XULRUNNER_LIBS=`$PKG_CONFIG --libs "libxul-embedding $gecko_cv_extra_pkg_dependencies" 2>/dev/null` ++ pkg_cv_XULRUNNER_LIBS=`$PKG_CONFIG --libs "libxul-embedding-unstable $gecko_cv_extra_pkg_dependencies" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -26141,14 +26158,14 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- XULRUNNER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libxul-embedding $gecko_cv_extra_pkg_dependencies"` ++ XULRUNNER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libxul-embedding-unstable $gecko_cv_extra_pkg_dependencies"` + else +- XULRUNNER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxul-embedding $gecko_cv_extra_pkg_dependencies"` ++ XULRUNNER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxul-embedding-unstable $gecko_cv_extra_pkg_dependencies"` + fi + # Put the nasty error message in config.log where it belongs + echo "$XULRUNNER_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements (libxul-embedding $gecko_cv_extra_pkg_dependencies) were not met: ++ { { echo "$as_me:$LINENO: error: Package requirements (libxul-embedding-unstable $gecko_cv_extra_pkg_dependencies) were not met: + + $XULRUNNER_PKG_ERRORS + +@@ -26159,7 +26176,7 @@ Alternatively, you may set the environme + and XULRUNNER_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements (libxul-embedding $gecko_cv_extra_pkg_dependencies) were not met: ++echo "$as_me: error: Package requirements (libxul-embedding-unstable $gecko_cv_extra_pkg_dependencies) were not met: + + $XULRUNNER_PKG_ERRORS + +@@ -26490,6 +26507,92 @@ else + fi + + ++ ++if test "x$enable_hildon" = "xyes"; then ++ ++pkg_failed=no ++{ echo "$as_me:$LINENO: checking for HILDON" >&5 ++echo $ECHO_N "checking for HILDON... $ECHO_C" >&6; } ++ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$HILDON_CFLAGS"; then ++ pkg_cv_HILDON_CFLAGS="$HILDON_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-1 >= 1.0.5\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "hildon-1 >= 1.0.5") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_HILDON_CFLAGS=`$PKG_CONFIG --cflags "hildon-1 >= 1.0.5" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++if test -n "$PKG_CONFIG"; then ++ if test -n "$HILDON_LIBS"; then ++ pkg_cv_HILDON_LIBS="$HILDON_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-1 >= 1.0.5\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "hildon-1 >= 1.0.5") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_HILDON_LIBS=`$PKG_CONFIG --libs "hildon-1 >= 1.0.5" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ HILDON_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "hildon-1 >= 1.0.5"` ++ else ++ HILDON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hildon-1 >= 1.0.5"` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$HILDON_PKG_ERRORS" >&5 ++ ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ enable_hildon=no ++elif test $pkg_failed = untried; then ++ enable_hildon=no ++else ++ HILDON_CFLAGS=$pkg_cv_HILDON_CFLAGS ++ HILDON_LIBS=$pkg_cv_HILDON_LIBS ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ enable_hildon=yes ++fi ++else ++ enable_hildon=no ++fi ++ ++ if test "x$enable_hildon" = "xyes"; then ++ WITH_HILDON_TRUE= ++ WITH_HILDON_FALSE='#' ++else ++ WITH_HILDON_TRUE='#' ++ WITH_HILDON_FALSE= ++fi ++ ++ + if test "x$enable_gecko" != "xyes" -a "x$enable_gtkhtml2" != "xyes" -a "x$enable_webkit" != "xyes"; then + { { echo "$as_me:$LINENO: error: + *** You must have either GtkHTML2, XulRunner, Mozilla or WebKit +@@ -29069,6 +29172,13 @@ echo "$as_me: error: conditional \"WITH_ + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi ++if test -z "${WITH_HILDON_TRUE}" && test -z "${WITH_HILDON_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"WITH_HILDON\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"WITH_HILDON\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi + if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +@@ -29943,6 +30053,10 @@ GTKHTML2_CFLAGS!$GTKHTML2_CFLAGS$ac_deli + GTKHTML2_LIBS!$GTKHTML2_LIBS$ac_delim + WITH_GTKHTML2_TRUE!$WITH_GTKHTML2_TRUE$ac_delim + WITH_GTKHTML2_FALSE!$WITH_GTKHTML2_FALSE$ac_delim ++HILDON_CFLAGS!$HILDON_CFLAGS$ac_delim ++HILDON_LIBS!$HILDON_LIBS$ac_delim ++WITH_HILDON_TRUE!$WITH_HILDON_TRUE$ac_delim ++WITH_HILDON_FALSE!$WITH_HILDON_FALSE$ac_delim + GCONFTOOL!$GCONFTOOL$ac_delim + GCONF_SCHEMA_CONFIG_SOURCE!$GCONF_SCHEMA_CONFIG_SOURCE$ac_delim + GCONF_SCHEMA_FILE_DIR!$GCONF_SCHEMA_FILE_DIR$ac_delim +@@ -29978,7 +30092,7 @@ LIBOBJS!$LIBOBJS$ac_delim + LTLIBOBJS!$LTLIBOBJS$ac_delim + _ACEOF + +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 41; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 45; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +@@ -30609,6 +30723,7 @@ echo + echo "Build Mozilla Plugin............ : $enable_gecko" + echo "Build WebKit Plugin............. : $enable_webkit" + echo "Build GtkHTML Plugin............ : $enable_gtkhtml2" ++echo "Build Hildon support............ : $enable_hildon" + echo + echo "Build libnotify Plugin.......... : $enable_libnotify" + echo "Build LUA scripting Plugin ..... : $enable_lua" +diff -ruNp liferea-1.4.23.orig/depcomp liferea-1.4.23.new/depcomp +--- liferea-1.4.23.orig/depcomp 2007-07-26 22:32:17.000000000 +0200 ++++ liferea-1.4.23.new/depcomp 2008-12-16 16:31:12.000000000 +0100 +@@ -1,7 +1,10 @@ + #! /bin/sh +- + # depcomp - compile a program generating dependencies as side-effects +-# Copyright 1999, 2000, 2003 Free Software Foundation, Inc. ++ ++scriptversion=2007-03-29.01 ++ ++# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software ++# Foundation, Inc. + + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +@@ -15,8 +18,8 @@ + + # 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., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ++# 02110-1301, USA. + + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -25,22 +28,45 @@ + + # Originally written by Alexandre Oliva . + ++case $1 in ++ '') ++ echo "$0: No command. Try \`$0 --help' for more information." 1>&2 ++ exit 1; ++ ;; ++ -h | --h*) ++ cat <<\EOF ++Usage: depcomp [--help] [--version] PROGRAM [ARGS] ++ ++Run PROGRAMS ARGS to compile a file, generating dependencies ++as side-effects. ++ ++Environment variables: ++ depmode Dependency tracking mode. ++ source Source file read by `PROGRAMS ARGS'. ++ object Object file output by `PROGRAMS ARGS'. ++ DEPDIR directory where to store dependencies. ++ depfile Dependency file to output. ++ tmpdepfile Temporary file to use when outputing dependencies. ++ libtool Whether libtool is used (yes/no). ++ ++Report bugs to . ++EOF ++ exit $? ++ ;; ++ -v | --v*) ++ echo "depcomp $scriptversion" ++ exit $? ++ ;; ++esac ++ + if test -z "$depmode" || test -z "$source" || test -z "$object"; then + echo "depcomp: Variables source, object and depmode must be set" 1>&2 + exit 1 + fi +-# `libtool' can also be set to `yes' or `no'. +- +-if test -z "$depfile"; then +- base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'` +- dir=`echo "$object" | sed 's,/.*$,/,'` +- if test "$dir" = "$object"; then +- dir= +- fi +- # FIXME: should be _deps on DOS. +- depfile="$dir.deps/$base" +-fi + ++# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. ++depfile=${depfile-`echo "$object" | ++ sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} + tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} + + rm -f "$tmpdepfile" +@@ -66,7 +92,20 @@ gcc3) + ## gcc 3 implements dependency tracking that does exactly what + ## we want. Yay! Note: for some reason libtool 1.4 doesn't like + ## it if -MD -MP comes after the -MF stuff. Hmm. +- "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" ++## Unfortunately, FreeBSD c89 acceptance of flags depends upon ++## the command line argument order; so add the flags where they ++## appear in depend2.am. Note that the slowdown incurred here ++## affects only configure: in makefiles, %FASTDEP% shortcuts this. ++ for arg ++ do ++ case $arg in ++ -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; ++ *) set fnord "$@" "$arg" ;; ++ esac ++ shift # fnord ++ shift # $arg ++ done ++ "$@" + stat=$? + if test $stat -eq 0; then : + else +@@ -176,34 +215,39 @@ aix) + # current directory. Also, the AIX compiler puts `$object:' at the + # start of each line; $object doesn't have directory information. + # Version 6 uses the directory in both cases. +- stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` +- tmpdepfile="$stripped.u" ++ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` ++ test "x$dir" = "x$object" && dir= ++ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + if test "$libtool" = yes; then ++ tmpdepfile1=$dir$base.u ++ tmpdepfile2=$base.u ++ tmpdepfile3=$dir.libs/$base.u + "$@" -Wc,-M + else ++ tmpdepfile1=$dir$base.u ++ tmpdepfile2=$dir$base.u ++ tmpdepfile3=$dir$base.u + "$@" -M + fi + stat=$? + +- if test -f "$tmpdepfile"; then : +- else +- stripped=`echo "$stripped" | sed 's,^.*/,,'` +- tmpdepfile="$stripped.u" +- fi +- + if test $stat -eq 0; then : + else +- rm -f "$tmpdepfile" ++ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi + ++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" ++ do ++ test -f "$tmpdepfile" && break ++ done + if test -f "$tmpdepfile"; then +- outname="$stripped.o" + # Each line is of the form `foo.o: dependent.h'. + # Do two passes, one to just change these to + # `$object: dependent.h' and one to simply `dependent.h:'. +- sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" +- sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" ++ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" ++ # That's a tab and a space in the []. ++ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + else + # The sourcefile does not contain any dependencies, so just + # store a dummy comment line, to avoid errors with the Makefile +@@ -251,6 +295,46 @@ icc) + rm -f "$tmpdepfile" + ;; + ++hp2) ++ # The "hp" stanza above does not work with aCC (C++) and HP's ia64 ++ # compilers, which have integrated preprocessors. The correct option ++ # to use with these is +Maked; it writes dependencies to a file named ++ # 'foo.d', which lands next to the object file, wherever that ++ # happens to be. ++ # Much of this is similar to the tru64 case; see comments there. ++ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` ++ test "x$dir" = "x$object" && dir= ++ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` ++ if test "$libtool" = yes; then ++ tmpdepfile1=$dir$base.d ++ tmpdepfile2=$dir.libs/$base.d ++ "$@" -Wc,+Maked ++ else ++ tmpdepfile1=$dir$base.d ++ tmpdepfile2=$dir$base.d ++ "$@" +Maked ++ fi ++ stat=$? ++ if test $stat -eq 0; then : ++ else ++ rm -f "$tmpdepfile1" "$tmpdepfile2" ++ exit $stat ++ fi ++ ++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" ++ do ++ test -f "$tmpdepfile" && break ++ done ++ if test -f "$tmpdepfile"; then ++ sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" ++ # Add `dependent.h:' lines. ++ sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile" ++ else ++ echo "#dummy" > "$depfile" ++ fi ++ rm -f "$tmpdepfile" "$tmpdepfile2" ++ ;; ++ + tru64) + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. +@@ -262,27 +346,43 @@ tru64) + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + + if test "$libtool" = yes; then +- tmpdepfile1="$dir.libs/$base.lo.d" +- tmpdepfile2="$dir.libs/$base.d" ++ # With Tru64 cc, shared objects can also be used to make a ++ # static library. This mechanism is used in libtool 1.4 series to ++ # handle both shared and static libraries in a single compilation. ++ # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. ++ # ++ # With libtool 1.5 this exception was removed, and libtool now ++ # generates 2 separate objects for the 2 libraries. These two ++ # compilations output dependencies in $dir.libs/$base.o.d and ++ # in $dir$base.o.d. We have to check for both files, because ++ # one of the two compilations can be disabled. We should prefer ++ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is ++ # automatically cleaned when .libs/ is deleted, while ignoring ++ # the former would cause a distcleancheck panic. ++ tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 ++ tmpdepfile2=$dir$base.o.d # libtool 1.5 ++ tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 ++ tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else +- tmpdepfile1="$dir$base.o.d" +- tmpdepfile2="$dir$base.d" ++ tmpdepfile1=$dir$base.o.d ++ tmpdepfile2=$dir$base.d ++ tmpdepfile3=$dir$base.d ++ tmpdepfile4=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -eq 0; then : + else +- rm -f "$tmpdepfile1" "$tmpdepfile2" ++ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" + exit $stat + fi + +- if test -f "$tmpdepfile1"; then +- tmpdepfile="$tmpdepfile1" +- else +- tmpdepfile="$tmpdepfile2" +- fi ++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" ++ do ++ test -f "$tmpdepfile" && break ++ done + if test -f "$tmpdepfile"; then + sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" + # That's a tab and a space in the []. +@@ -426,7 +526,8 @@ cpp) + done + + "$@" -E | +- sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | ++ sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ ++ -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | + sed '$ s: \\$::' > "$tmpdepfile" + rm -f "$depfile" + echo "$object : \\" > "$depfile" +@@ -477,3 +578,12 @@ none) + esac + + exit 0 ++ ++# Local Variables: ++# mode: shell-script ++# sh-indentation: 2 ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "scriptversion=" ++# time-stamp-format: "%:y-%02m-%02d.%02H" ++# time-stamp-end: "$" ++# End: +diff -ruNp liferea-1.4.23.orig/doc/html/Makefile.in liferea-1.4.23.new/doc/html/Makefile.in +--- liferea-1.4.23.orig/doc/html/Makefile.in 2008-12-12 00:16:25.000000000 +0100 ++++ liferea-1.4.23.new/doc/html/Makefile.in 2008-12-16 16:31:11.000000000 +0100 +@@ -107,6 +107,8 @@ GNUTLS_LIBS = @GNUTLS_LIBS@ + GREP = @GREP@ + GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ + GTKHTML2_LIBS = @GTKHTML2_LIBS@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff -ruNp liferea-1.4.23.orig/doc/Makefile.in liferea-1.4.23.new/doc/Makefile.in +--- liferea-1.4.23.orig/doc/Makefile.in 2008-12-12 00:16:24.000000000 +0100 ++++ liferea-1.4.23.new/doc/Makefile.in 2008-12-16 16:31:11.000000000 +0100 +@@ -109,6 +109,8 @@ GNUTLS_LIBS = @GNUTLS_LIBS@ + GREP = @GREP@ + GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ + GTKHTML2_LIBS = @GTKHTML2_LIBS@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff -ruNp liferea-1.4.23.orig/INSTALL liferea-1.4.23.new/INSTALL +--- liferea-1.4.23.orig/INSTALL 2007-07-23 19:56:59.000000000 +0200 ++++ liferea-1.4.23.new/INSTALL 2008-12-16 16:31:12.000000000 +0100 +@@ -1,8 +1,8 @@ + Installation Instructions + ************************* + +-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free +-Software Foundation, Inc. ++Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, ++2006, 2007 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives + unlimited permission to copy, distribute and modify it. +@@ -10,7 +10,10 @@ unlimited permission to copy, distribute + Basic Installation + ================== + +-These are generic installation instructions. ++Briefly, the shell commands `./configure; make; make install' should ++configure, build, and install this package. The following ++more-detailed instructions are generic; see the `README' file for ++instructions specific to this package. + + The `configure' shell script attempts to guess correct values for + various system-dependent variables used during compilation. It uses +@@ -23,9 +26,9 @@ debugging `configure'). + + It can also use an optional file (typically called `config.cache' + and enabled with `--cache-file=config.cache' or simply `-C') that saves +-the results of its tests to speed up reconfiguring. (Caching is ++the results of its tests to speed up reconfiguring. Caching is + disabled by default to prevent problems with accidental use of stale +-cache files.) ++cache files. + + If you need to do unusual things to compile the package, please try + to figure out how `configure' could check whether to do them, and mail +@@ -35,20 +38,17 @@ some point `config.cache' contains resul + may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +-`configure' by a program called `autoconf'. You only need +-`configure.ac' if you want to change it or regenerate `configure' using +-a newer version of `autoconf'. ++`configure' by a program called `autoconf'. You need `configure.ac' if ++you want to change it or regenerate `configure' using a newer version ++of `autoconf'. + + The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type +- `./configure' to configure the package for your system. If you're +- using `csh' on an old version of System V, you might need to type +- `sh ./configure' instead to prevent `csh' from trying to execute +- `configure' itself. ++ `./configure' to configure the package for your system. + +- Running `configure' takes awhile. While running, it prints some +- messages telling which features it is checking for. ++ Running `configure' might take a while. While running, it prints ++ some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + +@@ -67,6 +67,9 @@ The simplest way to compile this package + all sorts of other programs in order to regenerate files that came + with the distribution. + ++ 6. Often, you can also type `make uninstall' to remove the installed ++ files again. ++ + Compilers and Options + ===================== + +@@ -78,7 +81,7 @@ details on some of the pertinent environ + by setting variables in the command line or in the environment. Here + is an example: + +- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix ++ ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +@@ -87,17 +90,15 @@ Compiling For Multiple Architectures + + You can compile the package for more than one kind of computer at the + same time, by placing the object files for each architecture in their +-own directory. To do this, you must use a version of `make' that +-supports the `VPATH' variable, such as GNU `make'. `cd' to the ++own directory. To do this, you can use GNU `make'. `cd' to the + directory where you want the object files and executables to go and run + the `configure' script. `configure' automatically checks for the + source code in the directory that `configure' is in and in `..'. + +- If you have to use a `make' that does not support the `VPATH' +-variable, you have to compile the package for one architecture at a +-time in the source code directory. After you have installed the +-package for one architecture, use `make distclean' before reconfiguring +-for another architecture. ++ With a non-GNU `make', it is safer to compile the package for one ++architecture at a time in the source code directory. After you have ++installed the package for one architecture, use `make distclean' before ++reconfiguring for another architecture. + + Installation Names + ================== +@@ -190,12 +191,12 @@ them in the `configure' command line, us + ./configure CC=/usr/local2/bin/gcc + + causes the specified `gcc' to be used as the C compiler (unless it is +-overridden in the site shell script). Here is a another example: ++overridden in the site shell script). + +- /bin/bash ./configure CONFIG_SHELL=/bin/bash ++Unfortunately, this technique does not work for `CONFIG_SHELL' due to ++an Autoconf bug. Until the bug is fixed you can use this workaround: + +-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent +-configuration-related scripts to be executed by `/bin/bash'. ++ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + + `configure' Invocation + ====================== +diff -ruNp liferea-1.4.23.orig/install-sh liferea-1.4.23.new/install-sh +--- liferea-1.4.23.orig/install-sh 2007-07-26 22:32:16.000000000 +0200 ++++ liferea-1.4.23.new/install-sh 2008-12-16 16:31:11.000000000 +0100 +@@ -1,7 +1,8 @@ + #!/bin/sh +-# + # install - install a program, script, or datafile +-# ++ ++scriptversion=2006-12-25.00 ++ + # This originates from X11R5 (mit/util/scripts/install.sh), which was + # later released in X11R6 (xc/config/util/install.sh) with the + # following copyright and license. +@@ -38,257 +39,481 @@ + # when there is no Makefile. + # + # This script is compatible with the BSD install script, but was written +-# from scratch. It can only install one file at a time, a restriction +-# shared with many OS's install programs. ++# from scratch. + ++nl=' ++' ++IFS=" "" $nl" + + # set DOITPROG to echo to test this script + + # Don't use :- since 4.3BSD and earlier shells don't like it. +-doit="${DOITPROG-}" +- ++doit=${DOITPROG-} ++if test -z "$doit"; then ++ doit_exec=exec ++else ++ doit_exec=$doit ++fi + +-# put in absolute paths if you don't have them in your path; or use env. vars. ++# Put in absolute file names if you don't have them in your path; ++# or use environment vars. + +-mvprog="${MVPROG-mv}" +-cpprog="${CPPROG-cp}" +-chmodprog="${CHMODPROG-chmod}" +-chownprog="${CHOWNPROG-chown}" +-chgrpprog="${CHGRPPROG-chgrp}" +-stripprog="${STRIPPROG-strip}" +-rmprog="${RMPROG-rm}" +-mkdirprog="${MKDIRPROG-mkdir}" +- +-transformbasename="" +-transform_arg="" +-instcmd="$mvprog" +-chmodcmd="$chmodprog 0755" +-chowncmd="" +-chgrpcmd="" +-stripcmd="" ++chgrpprog=${CHGRPPROG-chgrp} ++chmodprog=${CHMODPROG-chmod} ++chownprog=${CHOWNPROG-chown} ++cmpprog=${CMPPROG-cmp} ++cpprog=${CPPROG-cp} ++mkdirprog=${MKDIRPROG-mkdir} ++mvprog=${MVPROG-mv} ++rmprog=${RMPROG-rm} ++stripprog=${STRIPPROG-strip} ++ ++posix_glob='?' ++initialize_posix_glob=' ++ test "$posix_glob" != "?" || { ++ if (set -f) 2>/dev/null; then ++ posix_glob= ++ else ++ posix_glob=: ++ fi ++ } ++' ++ ++posix_mkdir= ++ ++# Desired mode of installed file. ++mode=0755 ++ ++chgrpcmd= ++chmodcmd=$chmodprog ++chowncmd= ++mvcmd=$mvprog + rmcmd="$rmprog -f" +-mvcmd="$mvprog" +-src="" +-dst="" +-dir_arg="" +- +-while [ x"$1" != x ]; do +- case $1 in +- -c) instcmd=$cpprog +- shift +- continue;; +- +- -d) dir_arg=true +- shift +- continue;; +- +- -m) chmodcmd="$chmodprog $2" +- shift +- shift +- continue;; +- +- -o) chowncmd="$chownprog $2" +- shift +- shift +- continue;; +- +- -g) chgrpcmd="$chgrpprog $2" +- shift +- shift +- continue;; +- +- -s) stripcmd=$stripprog +- shift +- continue;; +- +- -t=*) transformarg=`echo $1 | sed 's/-t=//'` +- shift +- continue;; +- +- -b=*) transformbasename=`echo $1 | sed 's/-b=//'` +- shift +- continue;; ++stripcmd= + +- *) if [ x"$src" = x ] +- then +- src=$1 +- else +- # this colon is to work around a 386BSD /bin/sh bug +- : +- dst=$1 +- fi +- shift +- continue;; +- esac +-done ++src= ++dst= ++dir_arg= ++dst_arg= + +-if [ x"$src" = x ] +-then +- echo "$0: no input file specified" >&2 +- exit 1 +-else +- : +-fi ++copy_on_change=false ++no_target_directory= + +-if [ x"$dir_arg" != x ]; then +- dst=$src +- src="" +- +- if [ -d "$dst" ]; then +- instcmd=: +- chmodcmd="" +- else +- instcmd=$mkdirprog +- fi +-else ++usage="\ ++Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE ++ or: $0 [OPTION]... SRCFILES... DIRECTORY ++ or: $0 [OPTION]... -t DIRECTORY SRCFILES... ++ or: $0 [OPTION]... -d DIRECTORIES... + +-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command +-# might cause directories to be created, which would be especially bad +-# if $src (and thus $dsttmp) contains '*'. +- +- if [ -f "$src" ] || [ -d "$src" ] +- then +- : +- else +- echo "$0: $src does not exist" >&2 +- exit 1 +- fi ++In the 1st form, copy SRCFILE to DSTFILE. ++In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. ++In the 4th, create DIRECTORIES. + +- if [ x"$dst" = x ] +- then +- echo "$0: no destination specified" >&2 +- exit 1 +- else +- : +- fi ++Options: ++ --help display this help and exit. ++ --version display version info and exit. + +-# If destination is a directory, append the input filename; if your system +-# does not like double slashes in filenames, you may need to add some logic ++ -c (ignored) ++ -C install only if different (preserve the last data modification time) ++ -d create directories instead of installing files. ++ -g GROUP $chgrpprog installed files to GROUP. ++ -m MODE $chmodprog installed files to MODE. ++ -o USER $chownprog installed files to USER. ++ -s $stripprog installed files. ++ -t DIRECTORY install into DIRECTORY. ++ -T report an error if DSTFILE is a directory. + +- if [ -d "$dst" ] +- then +- dst=$dst/`basename "$src"` +- else +- : +- fi +-fi ++Environment variables override the default commands: ++ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG ++ RMPROG STRIPPROG ++" + +-## this sed command emulates the dirname command +-dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` ++while test $# -ne 0; do ++ case $1 in ++ -c) ;; + +-# Make sure that the destination directory exists. +-# this part is taken from Noah Friedman's mkinstalldirs script ++ -C) copy_on_change=true;; + +-# Skip lots of stat calls in the usual case. +-if [ ! -d "$dstdir" ]; then +-defaultIFS=' +- ' +-IFS="${IFS-$defaultIFS}" +- +-oIFS=$IFS +-# Some sh's can't handle IFS=/ for some reason. +-IFS='%' +-set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` +-IFS=$oIFS +- +-pathcomp='' +- +-while [ $# -ne 0 ] ; do +- pathcomp=$pathcomp$1 +- shift +- +- if [ ! -d "$pathcomp" ] ; +- then +- $mkdirprog "$pathcomp" +- else +- : +- fi ++ -d) dir_arg=true;; + +- pathcomp=$pathcomp/ +-done +-fi ++ -g) chgrpcmd="$chgrpprog $2" ++ shift;; + +-if [ x"$dir_arg" != x ] +-then +- $doit $instcmd "$dst" && +- +- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi && +- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi && +- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi && +- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi +-else ++ --help) echo "$usage"; exit $?;; + +-# If we're going to rename the final executable, determine the name now. ++ -m) mode=$2 ++ case $mode in ++ *' '* | *' '* | *' ++'* | *'*'* | *'?'* | *'['*) ++ echo "$0: invalid mode: $mode" >&2 ++ exit 1;; ++ esac ++ shift;; + +- if [ x"$transformarg" = x ] +- then +- dstfile=`basename "$dst"` +- else +- dstfile=`basename "$dst" $transformbasename | +- sed $transformarg`$transformbasename +- fi ++ -o) chowncmd="$chownprog $2" ++ shift;; + +-# don't allow the sed command to completely eliminate the filename ++ -s) stripcmd=$stripprog;; + +- if [ x"$dstfile" = x ] +- then +- dstfile=`basename "$dst"` +- else +- : +- fi ++ -t) dst_arg=$2 ++ shift;; + +-# Make a couple of temp file names in the proper directory. ++ -T) no_target_directory=true;; + +- dsttmp=$dstdir/_inst.$$_ +- rmtmp=$dstdir/_rm.$$_ ++ --version) echo "$0 $scriptversion"; exit $?;; + +-# Trap to clean up temp files at exit. ++ --) shift ++ break;; + +- trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0 +- trap '(exit $?); exit' 1 2 13 15 ++ -*) echo "$0: invalid option: $1" >&2 ++ exit 1;; + +-# Move or copy the file name to the temp name ++ *) break;; ++ esac ++ shift ++done + +- $doit $instcmd "$src" "$dsttmp" && ++if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then ++ # When -d is used, all remaining arguments are directories to create. ++ # When -t is used, the destination is already specified. ++ # Otherwise, the last argument is the destination. Remove it from $@. ++ for arg ++ do ++ if test -n "$dst_arg"; then ++ # $@ is not empty: it contains at least $arg. ++ set fnord "$@" "$dst_arg" ++ shift # fnord ++ fi ++ shift # arg ++ dst_arg=$arg ++ done ++fi + +-# and set any options; do chmod last to preserve setuid bits ++if test $# -eq 0; then ++ if test -z "$dir_arg"; then ++ echo "$0: no input file specified." >&2 ++ exit 1 ++ fi ++ # It's OK to call `install-sh -d' without argument. ++ # This can happen when creating conditional directories. ++ exit 0 ++fi + +-# If any of these fail, we abort the whole thing. If we want to +-# ignore errors from any of these, just make sure not to ignore +-# errors from the above "$doit $instcmd $src $dsttmp" command. ++if test -z "$dir_arg"; then ++ trap '(exit $?); exit' 1 2 13 15 + +- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi && +- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi && +- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi && +- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi && ++ # Set umask so as not to create temps with too-generous modes. ++ # However, 'strip' requires both read and write access to temps. ++ case $mode in ++ # Optimize common cases. ++ *644) cp_umask=133;; ++ *755) cp_umask=22;; ++ ++ *[0-7]) ++ if test -z "$stripcmd"; then ++ u_plus_rw= ++ else ++ u_plus_rw='% 200' ++ fi ++ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; ++ *) ++ if test -z "$stripcmd"; then ++ u_plus_rw= ++ else ++ u_plus_rw=,u+rw ++ fi ++ cp_umask=$mode$u_plus_rw;; ++ esac ++fi + +-# Now remove or move aside any old file at destination location. We try this +-# two ways since rm can't unlink itself on some systems and the destination +-# file might be busy for other reasons. In this case, the final cleanup +-# might fail but the new file should still install successfully. ++for src ++do ++ # Protect names starting with `-'. ++ case $src in ++ -*) src=./$src;; ++ esac ++ ++ if test -n "$dir_arg"; then ++ dst=$src ++ dstdir=$dst ++ test -d "$dstdir" ++ dstdir_status=$? ++ else ++ ++ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command ++ # might cause directories to be created, which would be especially bad ++ # if $src (and thus $dsttmp) contains '*'. ++ if test ! -f "$src" && test ! -d "$src"; then ++ echo "$0: $src does not exist." >&2 ++ exit 1 ++ fi ++ ++ if test -z "$dst_arg"; then ++ echo "$0: no destination specified." >&2 ++ exit 1 ++ fi ++ ++ dst=$dst_arg ++ # Protect names starting with `-'. ++ case $dst in ++ -*) dst=./$dst;; ++ esac + +-{ +- if [ -f "$dstdir/$dstfile" ] +- then +- $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null || +- $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null || +- { +- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 +- (exit 1); exit +- } ++ # If destination is a directory, append the input filename; won't work ++ # if double slashes aren't ignored. ++ if test -d "$dst"; then ++ if test -n "$no_target_directory"; then ++ echo "$0: $dst_arg: Is a directory" >&2 ++ exit 1 ++ fi ++ dstdir=$dst ++ dst=$dstdir/`basename "$src"` ++ dstdir_status=0 ++ else ++ # Prefer dirname, but fall back on a substitute if dirname fails. ++ dstdir=` ++ (dirname "$dst") 2>/dev/null || ++ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$dst" : 'X\(//\)[^/]' \| \ ++ X"$dst" : 'X\(//\)$' \| \ ++ X"$dst" : 'X\(/\)' \| . 2>/dev/null || ++ echo X"$dst" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q' ++ ` ++ ++ test -d "$dstdir" ++ dstdir_status=$? ++ fi ++ fi ++ ++ obsolete_mkdir_used=false ++ ++ if test $dstdir_status != 0; then ++ case $posix_mkdir in ++ '') ++ # Create intermediate dirs using mode 755 as modified by the umask. ++ # This is like FreeBSD 'install' as of 1997-10-28. ++ umask=`umask` ++ case $stripcmd.$umask in ++ # Optimize common cases. ++ *[2367][2367]) mkdir_umask=$umask;; ++ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; ++ ++ *[0-7]) ++ mkdir_umask=`expr $umask + 22 \ ++ - $umask % 100 % 40 + $umask % 20 \ ++ - $umask % 10 % 4 + $umask % 2 ++ `;; ++ *) mkdir_umask=$umask,go-w;; ++ esac ++ ++ # With -d, create the new directory with the user-specified mode. ++ # Otherwise, rely on $mkdir_umask. ++ if test -n "$dir_arg"; then ++ mkdir_mode=-m$mode + else +- : ++ mkdir_mode= + fi +-} && + +-# Now rename the file to the real destination. ++ posix_mkdir=false ++ case $umask in ++ *[123567][0-7][0-7]) ++ # POSIX mkdir -p sets u+wx bits regardless of umask, which ++ # is incompatible with FreeBSD 'install' when (umask & 300) != 0. ++ ;; ++ *) ++ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ ++ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 ++ ++ if (umask $mkdir_umask && ++ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 ++ then ++ if test -z "$dir_arg" || { ++ # Check for POSIX incompatibilities with -m. ++ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or ++ # other-writeable bit of parent directory when it shouldn't. ++ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. ++ ls_ld_tmpdir=`ls -ld "$tmpdir"` ++ case $ls_ld_tmpdir in ++ d????-?r-*) different_mode=700;; ++ d????-?--*) different_mode=755;; ++ *) false;; ++ esac && ++ $mkdirprog -m$different_mode -p -- "$tmpdir" && { ++ ls_ld_tmpdir_1=`ls -ld "$tmpdir"` ++ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" ++ } ++ } ++ then posix_mkdir=: ++ fi ++ rmdir "$tmpdir/d" "$tmpdir" ++ else ++ # Remove any dirs left behind by ancient mkdir implementations. ++ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null ++ fi ++ trap '' 0;; ++ esac;; ++ esac + +- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" ++ if ++ $posix_mkdir && ( ++ umask $mkdir_umask && ++ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ++ ) ++ then : ++ else ++ ++ # The umask is ridiculous, or mkdir does not conform to POSIX, ++ # or it failed possibly due to a race condition. Create the ++ # directory the slow way, step by step, checking for races as we go. ++ ++ case $dstdir in ++ /*) prefix='/';; ++ -*) prefix='./';; ++ *) prefix='';; ++ esac ++ ++ eval "$initialize_posix_glob" ++ ++ oIFS=$IFS ++ IFS=/ ++ $posix_glob set -f ++ set fnord $dstdir ++ shift ++ $posix_glob set +f ++ IFS=$oIFS ++ ++ prefixes= ++ ++ for d ++ do ++ test -z "$d" && continue ++ ++ prefix=$prefix$d ++ if test -d "$prefix"; then ++ prefixes= ++ else ++ if $posix_mkdir; then ++ (umask=$mkdir_umask && ++ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break ++ # Don't fail if two instances are running concurrently. ++ test -d "$prefix" || exit 1 ++ else ++ case $prefix in ++ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; ++ *) qprefix=$prefix;; ++ esac ++ prefixes="$prefixes '$qprefix'" ++ fi ++ fi ++ prefix=$prefix/ ++ done + +-fi && ++ if test -n "$prefixes"; then ++ # Don't fail if two instances are running concurrently. ++ (umask $mkdir_umask && ++ eval "\$doit_exec \$mkdirprog $prefixes") || ++ test -d "$dstdir" || exit 1 ++ obsolete_mkdir_used=true ++ fi ++ fi ++ fi ++ ++ if test -n "$dir_arg"; then ++ { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && ++ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && ++ { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || ++ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 ++ else ++ ++ # Make a couple of temp file names in the proper directory. ++ dsttmp=$dstdir/_inst.$$_ ++ rmtmp=$dstdir/_rm.$$_ ++ ++ # Trap to clean up those temp files at exit. ++ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 ++ ++ # Copy the file name to the temp name. ++ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && ++ ++ # and set any options; do chmod last to preserve setuid bits. ++ # ++ # If any of these fail, we abort the whole thing. If we want to ++ # ignore errors from any of these, just make sure not to ignore ++ # errors from the above "$doit $cpprog $src $dsttmp" command. ++ # ++ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && ++ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && ++ { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && ++ { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && ++ ++ # If -C, don't bother to copy if it wouldn't change the file. ++ if $copy_on_change && ++ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && ++ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && ++ ++ eval "$initialize_posix_glob" && ++ $posix_glob set -f && ++ set X $old && old=:$2:$4:$5:$6 && ++ set X $new && new=:$2:$4:$5:$6 && ++ $posix_glob set +f && ++ ++ test "$old" = "$new" && ++ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 ++ then ++ rm -f "$dsttmp" ++ else ++ # Rename the file to the real destination. ++ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || ++ ++ # The rename failed, perhaps because mv can't rename something else ++ # to itself, or perhaps because mv is so ancient that it does not ++ # support -f. ++ { ++ # Now remove or move aside any old file at destination location. ++ # We try this two ways since rm can't unlink itself on some ++ # systems and the destination file might be busy for other ++ # reasons. In this case, the final cleanup might fail but the new ++ # file should still install successfully. ++ { ++ test ! -f "$dst" || ++ $doit $rmcmd -f "$dst" 2>/dev/null || ++ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && ++ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } ++ } || ++ { echo "$0: cannot unlink or rename $dst" >&2 ++ (exit 1); exit 1 ++ } ++ } && ++ ++ # Now rename the file to the real destination. ++ $doit $mvcmd "$dsttmp" "$dst" ++ } ++ fi || exit 1 + +-# The final little trick to "correctly" pass the exit status to the exit trap. ++ trap '' 0 ++ fi ++done + +-{ +- (exit 0); exit +-} ++# Local variables: ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "scriptversion=" ++# time-stamp-format: "%:y-%02m-%02d.%02H" ++# time-stamp-end: "$" ++# End: +diff -ruNp liferea-1.4.23.orig/ltmain.sh liferea-1.4.23.new/ltmain.sh +--- liferea-1.4.23.orig/ltmain.sh 2007-07-11 21:52:34.000000000 +0200 ++++ liferea-1.4.23.new/ltmain.sh 2008-04-29 23:33:55.000000000 +0200 +@@ -2,7 +2,7 @@ + # NOTE: Changing this file will not affect anything until you rerun configure. + # + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, +-# 2007 Free Software Foundation, Inc. ++# 2007, 2008 Free Software Foundation, Inc. + # Originally by Gordon Matzigkeit , 1996 + # + # This program is free software; you can redistribute it and/or modify +@@ -43,8 +43,8 @@ EXIT_FAILURE=1 + + PROGRAM=ltmain.sh + PACKAGE=libtool +-VERSION="1.5.24 Debian 1.5.24-1" +-TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)" ++VERSION="1.5.26 Debian 1.5.26-4" ++TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)" + + # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +@@ -113,15 +113,21 @@ esac + # These must not be set unconditionally because not all systems understand + # e.g. LANG=C (notably SCO). + # We save the old values to restore during execute mode. +-for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES ++lt_env= ++for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES + do + eval "if test \"\${$lt_var+set}\" = set; then + save_$lt_var=\$$lt_var ++ lt_env=\"$lt_var=\$$lt_var \$lt_env\" + $lt_var=C + export $lt_var + fi" + done + ++if test -n "$lt_env"; then ++ lt_env="env $lt_env" ++fi ++ + # Make sure IFS has a sensible default + lt_nl=' + ' +@@ -485,7 +491,7 @@ do + echo "\ + $PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP + +-Copyright (C) 2007 Free Software Foundation, Inc. ++Copyright (C) 2008 Free Software Foundation, Inc. + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + exit $? +@@ -788,6 +794,7 @@ if test -z "$show_help"; then + *.for) xform=for ;; + *.java) xform=java ;; + *.obj) xform=obj ;; ++ *.sx) xform=sx ;; + esac + + libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` +@@ -956,7 +963,7 @@ EOF + $run $rm "$lobj" "$output_obj" + + $show "$command" +- if $run eval "$command"; then : ++ if $run eval $lt_env "$command"; then : + else + test -n "$output_obj" && $run $rm $removelist + exit $EXIT_FAILURE +@@ -1028,7 +1035,7 @@ EOF + command="$command$suppress_output" + $run $rm "$obj" "$output_obj" + $show "$command" +- if $run eval "$command"; then : ++ if $run eval $lt_env "$command"; then : + else + $run $rm $removelist + exit $EXIT_FAILURE +@@ -1161,6 +1168,7 @@ EOF + thread_safe=no + vinfo= + vinfo_number=no ++ single_module="${wl}-single_module" + + func_infer_tag $base_compile + +@@ -1646,6 +1654,11 @@ EOF + continue + ;; + ++ -multi_module) ++ single_module="${wl}-multi_module" ++ continue ++ ;; ++ + -module) + module=yes + continue +@@ -2152,7 +2165,12 @@ EOF + continue + fi + name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` +- for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do ++ if test "$linkmode" = lib; then ++ searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" ++ else ++ searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" ++ fi ++ for searchdir in $searchdirs; do + for search_ext in .la $std_shrext .so .a; do + # Search the libtool library + lib="$searchdir/lib${name}${search_ext}" +@@ -2948,12 +2966,18 @@ EOF + # we do not want to link against static libs, + # but need to link against shared + eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` ++ eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names" ; then + for tmp in $deplibrary_names ; do + depdepl=$tmp + done +- if test -f "$path/$depdepl" ; then ++ if test -f "$deplibdir/$depdepl" ; then ++ depdepl="$deplibdir/$depdepl" ++ elif test -f "$path/$depdepl" ; then + depdepl="$path/$depdepl" ++ else ++ # Can't find it, oh well... ++ depdepl= + fi + # do not add paths which are already there + case " $newlib_search_path " in +@@ -3101,9 +3125,10 @@ EOF + + case $linkmode in + oldlib) +- if test -n "$deplibs"; then +- $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 +- fi ++ case " $deplibs" in ++ *\ -l* | *\ -L*) ++ $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;; ++ esac + + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 +@@ -4245,9 +4270,10 @@ EOF + ;; + + obj) +- if test -n "$deplibs"; then +- $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 +- fi ++ case " $deplibs" in ++ *\ -l* | *\ -L*) ++ $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;; ++ esac + + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2 +@@ -6486,7 +6512,7 @@ relink_command=\"$relink_command\"" + fi + + # Restore saved environment variables +- for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES ++ for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES + do + eval "if test \"\${save_$lt_var+set}\" = set; then + $lt_var=\$save_$lt_var; export $lt_var +diff -ruNp liferea-1.4.23.orig/Makefile.in liferea-1.4.23.new/Makefile.in +--- liferea-1.4.23.orig/Makefile.in 2008-12-12 00:16:29.000000000 +0100 ++++ liferea-1.4.23.new/Makefile.in 2008-12-16 16:31:12.000000000 +0100 +@@ -143,6 +143,8 @@ GNUTLS_LIBS = @GNUTLS_LIBS@ + GREP = @GREP@ + GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ + GTKHTML2_LIBS = @GTKHTML2_LIBS@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -294,7 +296,7 @@ desktop_in_files = liferea.desktop.in + desktopdir = $(datadir)/applications + desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) + gladedir = $(pkgdatadir) +-glade_DATA = liferea.glade ++glade_DATA = liferea.glade liferea_hildon.glade + schemadir = @GCONF_SCHEMA_FILE_DIR@ + schema_DATA = liferea.schemas + cssdir = $(pkgdatadir)/css +diff -ruNp liferea-1.4.23.orig/man/Makefile.in liferea-1.4.23.new/man/Makefile.in +--- liferea-1.4.23.orig/man/Makefile.in 2008-12-12 00:16:25.000000000 +0100 ++++ liferea-1.4.23.new/man/Makefile.in 2008-12-16 16:31:11.000000000 +0100 +@@ -113,6 +113,8 @@ GNUTLS_LIBS = @GNUTLS_LIBS@ + GREP = @GREP@ + GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ + GTKHTML2_LIBS = @GTKHTML2_LIBS@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff -ruNp liferea-1.4.23.orig/man/pl/Makefile.in liferea-1.4.23.new/man/pl/Makefile.in +--- liferea-1.4.23.orig/man/pl/Makefile.in 2008-12-12 00:16:25.000000000 +0100 ++++ liferea-1.4.23.new/man/pl/Makefile.in 2008-12-16 16:31:11.000000000 +0100 +@@ -101,6 +101,8 @@ GNUTLS_LIBS = @GNUTLS_LIBS@ + GREP = @GREP@ + GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ + GTKHTML2_LIBS = @GTKHTML2_LIBS@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff -ruNp liferea-1.4.23.orig/missing liferea-1.4.23.new/missing +--- liferea-1.4.23.orig/missing 2007-07-26 22:32:16.000000000 +0200 ++++ liferea-1.4.23.new/missing 2008-12-16 16:31:11.000000000 +0100 +@@ -1,6 +1,10 @@ + #! /bin/sh + # Common stub for a few missing GNU programs while installing. +-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. ++ ++scriptversion=2006-05-10.23 ++ ++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 ++# Free Software Foundation, Inc. + # Originally by Fran,cois Pinard , 1996. + + # This program is free software; you can redistribute it and/or modify +@@ -15,8 +19,8 @@ + + # 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., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ++# 02110-1301, USA. + + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -29,6 +33,8 @@ if test $# -eq 0; then + fi + + run=: ++sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' ++sed_minuso='s/.* -o \([^ ]*\).*/\1/p' + + # In the cases where this matters, `missing' is being run in the + # srcdir already. +@@ -38,18 +44,24 @@ else + configure_ac=configure.in + fi + +-case "$1" in ++msg="missing on your system" ++ ++case $1 in + --run) + # Try to run requested program, and just exit if it succeeds. + run= + shift + "$@" && exit 0 ++ # Exit code 63 means version mismatch. This often happens ++ # when the user try to use an ancient version of a tool on ++ # a file that requires a minimum version. In this case we ++ # we should proceed has if the program had been absent, or ++ # if --run hadn't been passed. ++ if test $? = 63; then ++ run=: ++ msg="probably too old" ++ fi + ;; +-esac +- +-# If it does not exist, or fails to run (possibly an outdated version), +-# try to emulate it. +-case "$1" in + + -h|--h|--he|--hel|--help) + echo "\ +@@ -67,6 +79,7 @@ Supported PROGRAM values: + aclocal touch file \`aclocal.m4' + autoconf touch file \`configure' + autoheader touch file \`config.h.in' ++ autom4te touch the output file, or create a stub one + automake touch all \`Makefile.in' files + bison create \`y.tab.[ch]', if possible, from existing .[ch] + flex create \`lex.yy.c', if possible, from existing .c +@@ -74,11 +87,15 @@ Supported PROGRAM values: + lex create \`lex.yy.c', if possible, from existing .c + makeinfo touch the output file + tar try tar, gnutar, gtar, then tar without non-portable flags +- yacc create \`y.tab.[ch]', if possible, from existing .[ch]" ++ yacc create \`y.tab.[ch]', if possible, from existing .[ch] ++ ++Send bug reports to ." ++ exit $? + ;; + + -v|--v|--ve|--ver|--vers|--versi|--versio|--version) +- echo "missing 0.4 - GNU automake" ++ echo "missing $scriptversion (GNU Automake)" ++ exit $? + ;; + + -*) +@@ -87,14 +104,44 @@ Supported PROGRAM values: + exit 1 + ;; + +- aclocal*) ++esac ++ ++# Now exit if we have it, but it failed. Also exit now if we ++# don't have it and --version was passed (most likely to detect ++# the program). ++case $1 in ++ lex|yacc) ++ # Not GNU programs, they don't have --version. ++ ;; ++ ++ tar) ++ if test -n "$run"; then ++ echo 1>&2 "ERROR: \`tar' requires --run" ++ exit 1 ++ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then ++ exit 1 ++ fi ++ ;; ++ ++ *) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 ++ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then ++ # Could not run --version or --help. This is probably someone ++ # running `$TOOL --version' or `$TOOL --help' to check whether ++ # $TOOL exists and not knowing $TOOL uses missing. ++ exit 1 + fi ++ ;; ++esac + ++# If it does not exist, or fails to run (possibly an outdated version), ++# try to emulate it. ++case $1 in ++ aclocal*) + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' is $msg. You should only need it if + you modified \`acinclude.m4' or \`${configure_ac}'. You might want + to install the \`Automake' and \`Perl' packages. Grab them from + any GNU archive site." +@@ -102,13 +149,8 @@ WARNING: \`$1' is missing on your system + ;; + + autoconf) +- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then +- # We have it, but it failed. +- exit 1 +- fi +- + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' is $msg. You should only need it if + you modified \`${configure_ac}'. You might want to install the + \`Autoconf' and \`GNU m4' packages. Grab them from any GNU + archive site." +@@ -116,13 +158,8 @@ WARNING: \`$1' is missing on your system + ;; + + autoheader) +- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then +- # We have it, but it failed. +- exit 1 +- fi +- + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' is $msg. You should only need it if + you modified \`acconfig.h' or \`${configure_ac}'. You might want + to install the \`Autoconf' and \`GNU m4' packages. Grab them + from any GNU archive site." +@@ -130,7 +167,7 @@ WARNING: \`$1' is missing on your system + test -z "$files" && files="config.h" + touch_files= + for f in $files; do +- case "$f" in ++ case $f in + *:*) touch_files="$touch_files "`echo "$f" | + sed -e 's/^[^:]*://' -e 's/:.*//'`;; + *) touch_files="$touch_files $f.in";; +@@ -140,13 +177,8 @@ WARNING: \`$1' is missing on your system + ;; + + automake*) +- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then +- # We have it, but it failed. +- exit 1 +- fi +- + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' is $msg. You should only need it if + you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. + You might want to install the \`Automake' and \`Perl' packages. + Grab them from any GNU archive site." +@@ -156,20 +188,15 @@ WARNING: \`$1' is missing on your system + ;; + + autom4te) +- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then +- # We have it, but it failed. +- exit 1 +- fi +- + echo 1>&2 "\ +-WARNING: \`$1' is needed, and you do not seem to have it handy on your +- system. You might have modified some files without having the ++WARNING: \`$1' is needed, but is $msg. ++ You might have modified some files without having the + proper tools for further handling them. + You can get \`$1' as part of \`Autoconf' from any GNU + archive site." + +- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` +- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` ++ file=`echo "$*" | sed -n "$sed_output"` ++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then + touch $file + else +@@ -185,74 +212,67 @@ WARNING: \`$1' is needed, and you do not + + bison|yacc) + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' $msg. You should only need it if + you modified a \`.y' file. You may need the \`Bison' package + in order for those modifications to take effect. You can get + \`Bison' from any GNU archive site." + rm -f y.tab.c y.tab.h +- if [ $# -ne 1 ]; then ++ if test $# -ne 1; then + eval LASTARG="\${$#}" +- case "$LASTARG" in ++ case $LASTARG in + *.y) + SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` +- if [ -f "$SRCFILE" ]; then ++ if test -f "$SRCFILE"; then + cp "$SRCFILE" y.tab.c + fi + SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` +- if [ -f "$SRCFILE" ]; then ++ if test -f "$SRCFILE"; then + cp "$SRCFILE" y.tab.h + fi + ;; + esac + fi +- if [ ! -f y.tab.h ]; then ++ if test ! -f y.tab.h; then + echo >y.tab.h + fi +- if [ ! -f y.tab.c ]; then ++ if test ! -f y.tab.c; then + echo 'main() { return 0; }' >y.tab.c + fi + ;; + + lex|flex) + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' is $msg. You should only need it if + you modified a \`.l' file. You may need the \`Flex' package + in order for those modifications to take effect. You can get + \`Flex' from any GNU archive site." + rm -f lex.yy.c +- if [ $# -ne 1 ]; then ++ if test $# -ne 1; then + eval LASTARG="\${$#}" +- case "$LASTARG" in ++ case $LASTARG in + *.l) + SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` +- if [ -f "$SRCFILE" ]; then ++ if test -f "$SRCFILE"; then + cp "$SRCFILE" lex.yy.c + fi + ;; + esac + fi +- if [ ! -f lex.yy.c ]; then ++ if test ! -f lex.yy.c; then + echo 'main() { return 0; }' >lex.yy.c + fi + ;; + + help2man) +- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then +- # We have it, but it failed. +- exit 1 +- fi +- + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' is $msg. You should only need it if + you modified a dependency of a manual page. You may need the + \`Help2man' package in order for those modifications to take + effect. You can get \`Help2man' from any GNU archive site." + +- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` +- if test -z "$file"; then +- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` +- fi +- if [ -f "$file" ]; then ++ file=`echo "$*" | sed -n "$sed_output"` ++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` ++ if test -f "$file"; then + touch $file + else + test -z "$file" || exec >$file +@@ -262,32 +282,36 @@ WARNING: \`$1' is missing on your system + ;; + + makeinfo) +- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then +- # We have makeinfo, but it failed. +- exit 1 +- fi +- + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' is $msg. You should only need it if + you modified a \`.texi' or \`.texinfo' file, or any other file + indirectly affecting the aspect of the manual. The spurious + call might also be the consequence of using a buggy \`make' (AIX, + DU, IRIX). You might want to install the \`Texinfo' package or + the \`GNU make' package. Grab either from any GNU archive site." +- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` ++ # The file to touch is that specified with -o ... ++ file=`echo "$*" | sed -n "$sed_output"` ++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -z "$file"; then +- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` +- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` +- fi ++ # ... or it is the one specified with @setfilename ... ++ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` ++ file=`sed -n ' ++ /^@setfilename/{ ++ s/.* \([^ ]*\) *$/\1/ ++ p ++ q ++ }' $infile` ++ # ... or it is derived from the source name (dir/f.texi becomes f.info) ++ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info ++ fi ++ # If the file does not exist, the user really needs makeinfo; ++ # let's fail without touching anything. ++ test -f $file || exit 1 + touch $file + ;; + + tar) + shift +- if test -n "$run"; then +- echo 1>&2 "ERROR: \`tar' requires --run" +- exit 1 +- fi + + # We have already tried tar in the generic part. + # Look for gnutar/gtar before invocation to avoid ugly error +@@ -300,13 +324,13 @@ WARNING: \`$1' is missing on your system + fi + firstarg="$1" + if shift; then +- case "$firstarg" in ++ case $firstarg in + *o*) + firstarg=`echo "$firstarg" | sed s/o//` + tar "$firstarg" "$@" && exit 0 + ;; + esac +- case "$firstarg" in ++ case $firstarg in + *h*) + firstarg=`echo "$firstarg" | sed s/h//` + tar "$firstarg" "$@" && exit 0 +@@ -323,8 +347,8 @@ WARNING: I can't seem to be able to run + + *) + echo 1>&2 "\ +-WARNING: \`$1' is needed, and you do not seem to have it handy on your +- system. You might have modified some files without having the ++WARNING: \`$1' is needed, and is $msg. ++ You might have modified some files without having the + proper tools for further handling them. Check the \`README' file, + it often tells you about the needed prerequisites for installing + this package. You may also peek at any GNU archive site, in case +@@ -334,3 +358,10 @@ WARNING: \`$1' is needed, and you do not + esac + + exit 0 ++ ++# Local variables: ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "scriptversion=" ++# time-stamp-format: "%:y-%02m-%02d.%02H" ++# time-stamp-end: "$" ++# End: +diff -ruNp liferea-1.4.23.orig/mkinstalldirs liferea-1.4.23.new/mkinstalldirs +--- liferea-1.4.23.orig/mkinstalldirs 2007-07-26 22:32:16.000000000 +0200 ++++ liferea-1.4.23.new/mkinstalldirs 2008-12-16 16:31:12.000000000 +0100 +@@ -1,21 +1,36 @@ + #! /bin/sh + # mkinstalldirs --- make directory hierarchy +-# Author: Noah Friedman +-# Created: 1993-05-16 +-# Public domain + ++scriptversion=2006-05-11.19 ++ ++# Original author: Noah Friedman ++# Created: 1993-05-16 ++# Public domain. ++# ++# This file is maintained in Automake, please report ++# bugs to or send patches to ++# . ++ ++nl=' ++' ++IFS=" "" $nl" + errstatus=0 +-dirmode="" ++dirmode= + + usage="\ +-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." ++Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... ++ ++Create each directory DIR (with mode MODE, if specified), including all ++leading file name components. ++ ++Report bugs to ." + + # process command line arguments + while test $# -gt 0 ; do + case $1 in + -h | --help | --h*) # -h for help +- echo "$usage" 1>&2 +- exit 0 ++ echo "$usage" ++ exit $? + ;; + -m) # -m PERM arg + shift +@@ -23,6 +38,10 @@ while test $# -gt 0 ; do + dirmode=$1 + shift + ;; ++ --version) ++ echo "$0 $scriptversion" ++ exit $? ++ ;; + --) # stop option processing + shift + break +@@ -50,30 +69,58 @@ case $# in + 0) exit 0 ;; + esac + ++# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and ++# mkdir -p a/c at the same time, both will detect that a is missing, ++# one will create a, then the other will try to create a and die with ++# a "File exists" error. This is a problem when calling mkinstalldirs ++# from a parallel make. We use --version in the probe to restrict ++# ourselves to GNU mkdir, which is thread-safe. + case $dirmode in + '') +- if mkdir -p -- . 2>/dev/null; then ++ if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + echo "mkdir -p -- $*" + exec mkdir -p -- "$@" ++ else ++ # On NextStep and OpenStep, the `mkdir' command does not ++ # recognize any option. It will interpret all options as ++ # directories to create, and then abort because `.' already ++ # exists. ++ test -d ./-p && rmdir ./-p ++ test -d ./--version && rmdir ./--version + fi + ;; + *) +- if mkdir -m "$dirmode" -p -- . 2>/dev/null; then ++ if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && ++ test ! -d ./--version; then + echo "mkdir -m $dirmode -p -- $*" + exec mkdir -m "$dirmode" -p -- "$@" ++ else ++ # Clean up after NextStep and OpenStep mkdir. ++ for d in ./-m ./-p ./--version "./$dirmode"; ++ do ++ test -d $d && rmdir $d ++ done + fi + ;; + esac + + for file + do +- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` ++ case $file in ++ /*) pathcomp=/ ;; ++ *) pathcomp= ;; ++ esac ++ oIFS=$IFS ++ IFS=/ ++ set fnord $file + shift ++ IFS=$oIFS + +- pathcomp= + for d + do +- pathcomp="$pathcomp$d" ++ test "x$d" = x && continue ++ ++ pathcomp=$pathcomp$d + case $pathcomp in + -*) pathcomp=./$pathcomp ;; + esac +@@ -84,21 +131,21 @@ do + mkdir "$pathcomp" || lasterr=$? + + if test ! -d "$pathcomp"; then +- errstatus=$lasterr ++ errstatus=$lasterr + else +- if test ! -z "$dirmode"; then ++ if test ! -z "$dirmode"; then + echo "chmod $dirmode $pathcomp" +- lasterr="" +- chmod "$dirmode" "$pathcomp" || lasterr=$? ++ lasterr= ++ chmod "$dirmode" "$pathcomp" || lasterr=$? + +- if test ! -z "$lasterr"; then +- errstatus=$lasterr +- fi +- fi ++ if test ! -z "$lasterr"; then ++ errstatus=$lasterr ++ fi ++ fi + fi + fi + +- pathcomp="$pathcomp/" ++ pathcomp=$pathcomp/ + done + done + +@@ -107,5 +154,8 @@ exit $errstatus + # Local Variables: + # mode: shell-script + # sh-indentation: 2 ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "scriptversion=" ++# time-stamp-format: "%:y-%02m-%02d.%02H" ++# time-stamp-end: "$" + # End: +-# mkinstalldirs ends here +diff -ruNp liferea-1.4.23.orig/opml/Makefile.in liferea-1.4.23.new/opml/Makefile.in +--- liferea-1.4.23.orig/opml/Makefile.in 2008-12-12 00:16:25.000000000 +0100 ++++ liferea-1.4.23.new/opml/Makefile.in 2008-12-16 16:31:11.000000000 +0100 +@@ -107,6 +107,8 @@ GNUTLS_LIBS = @GNUTLS_LIBS@ + GREP = @GREP@ + GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ + GTKHTML2_LIBS = @GTKHTML2_LIBS@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff -ruNp liferea-1.4.23.orig/pixmaps/Makefile.in liferea-1.4.23.new/pixmaps/Makefile.in +--- liferea-1.4.23.orig/pixmaps/Makefile.in 2008-12-12 00:16:25.000000000 +0100 ++++ liferea-1.4.23.new/pixmaps/Makefile.in 2008-12-16 16:31:11.000000000 +0100 +@@ -109,6 +109,8 @@ GNUTLS_LIBS = @GNUTLS_LIBS@ + GREP = @GREP@ + GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ + GTKHTML2_LIBS = @GTKHTML2_LIBS@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff -ruNp liferea-1.4.23.orig/src/fl_sources/Makefile.in liferea-1.4.23.new/src/fl_sources/Makefile.in +--- liferea-1.4.23.orig/src/fl_sources/Makefile.in 2008-12-12 00:16:26.000000000 +0100 ++++ liferea-1.4.23.new/src/fl_sources/Makefile.in 2008-12-16 16:31:11.000000000 +0100 +@@ -133,6 +133,8 @@ GNUTLS_LIBS = @GNUTLS_LIBS@ + GREP = @GREP@ + GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ + GTKHTML2_LIBS = @GTKHTML2_LIBS@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff -ruNp liferea-1.4.23.orig/src/gtkhtml2/Makefile.in liferea-1.4.23.new/src/gtkhtml2/Makefile.in +--- liferea-1.4.23.orig/src/gtkhtml2/Makefile.in 2008-12-12 00:16:26.000000000 +0100 ++++ liferea-1.4.23.new/src/gtkhtml2/Makefile.in 2008-12-16 16:31:11.000000000 +0100 +@@ -131,6 +131,8 @@ GNUTLS_LIBS = @GNUTLS_LIBS@ + GREP = @GREP@ + GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ + GTKHTML2_LIBS = @GTKHTML2_LIBS@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff -ruNp liferea-1.4.23.orig/src/Makefile.in liferea-1.4.23.new/src/Makefile.in +--- liferea-1.4.23.orig/src/Makefile.in 2008-12-12 00:16:26.000000000 +0100 ++++ liferea-1.4.23.new/src/Makefile.in 2008-12-16 16:31:11.000000000 +0100 +@@ -69,7 +69,8 @@ liferea_bin_DEPENDENCIES = net/liblinet. + ui/libliui.a $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_1) + liferea_bin_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(liferea_bin_LDFLAGS) $(LDFLAGS) -o $@ +@@ -155,6 +156,8 @@ GNUTLS_LIBS = @GNUTLS_LIBS@ + GREP = @GREP@ + GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ + GTKHTML2_LIBS = @GTKHTML2_LIBS@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -360,7 +363,7 @@ liferea_bin_LDADD = net/liblinet.a \ + fl_sources/libliflsources.a \ + notification/liblinotification.a \ + ui/libliui.a \ +- $(PACKAGE_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS) $(DBUS_LIBS) $(NM_LIBS) $(INTLLIBS) $(GNUTLS_LIBS) ++ $(PACKAGE_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS) $(DBUS_LIBS) $(NM_LIBS) $(INTLLIBS) $(GNUTLS_LIBS) $(HILDON_LIBS) + + @WITH_DBUS_TRUE@EXTRA_DIST = $(srcdir)/liferea_dbus.xml + @WITH_DBUS_TRUE@BUILT_SOURCES = dbus_wrap.c +diff -ruNp liferea-1.4.23.orig/src/mozilla/Makefile.in liferea-1.4.23.new/src/mozilla/Makefile.in +--- liferea-1.4.23.orig/src/mozilla/Makefile.in 2008-12-12 00:16:26.000000000 +0100 ++++ liferea-1.4.23.new/src/mozilla/Makefile.in 2008-12-16 16:31:11.000000000 +0100 +@@ -153,6 +153,8 @@ GNUTLS_LIBS = @GNUTLS_LIBS@ + GREP = @GREP@ + GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ + GTKHTML2_LIBS = @GTKHTML2_LIBS@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff -ruNp liferea-1.4.23.orig/src/net/Makefile.in liferea-1.4.23.new/src/net/Makefile.in +--- liferea-1.4.23.orig/src/net/Makefile.in 2008-12-12 00:16:27.000000000 +0100 ++++ liferea-1.4.23.new/src/net/Makefile.in 2008-12-16 16:31:11.000000000 +0100 +@@ -123,6 +123,8 @@ GNUTLS_LIBS = @GNUTLS_LIBS@ + GREP = @GREP@ + GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ + GTKHTML2_LIBS = @GTKHTML2_LIBS@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff -ruNp liferea-1.4.23.orig/src/notification/Makefile.in liferea-1.4.23.new/src/notification/Makefile.in +--- liferea-1.4.23.orig/src/notification/Makefile.in 2008-12-12 00:16:27.000000000 +0100 ++++ liferea-1.4.23.new/src/notification/Makefile.in 2008-12-16 16:31:12.000000000 +0100 +@@ -145,6 +145,8 @@ GNUTLS_LIBS = @GNUTLS_LIBS@ + GREP = @GREP@ + GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ + GTKHTML2_LIBS = @GTKHTML2_LIBS@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff -ruNp liferea-1.4.23.orig/src/parsers/Makefile.in liferea-1.4.23.new/src/parsers/Makefile.in +--- liferea-1.4.23.orig/src/parsers/Makefile.in 2008-12-12 00:16:27.000000000 +0100 ++++ liferea-1.4.23.new/src/parsers/Makefile.in 2008-12-16 16:31:12.000000000 +0100 +@@ -134,6 +134,8 @@ GNUTLS_LIBS = @GNUTLS_LIBS@ + GREP = @GREP@ + GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ + GTKHTML2_LIBS = @GTKHTML2_LIBS@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff -ruNp liferea-1.4.23.orig/src/scripting/Makefile.in liferea-1.4.23.new/src/scripting/Makefile.in +--- liferea-1.4.23.orig/src/scripting/Makefile.in 2008-12-12 00:16:27.000000000 +0100 ++++ liferea-1.4.23.new/src/scripting/Makefile.in 2008-12-16 16:31:12.000000000 +0100 +@@ -129,6 +129,8 @@ GNUTLS_LIBS = @GNUTLS_LIBS@ + GREP = @GREP@ + GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ + GTKHTML2_LIBS = @GTKHTML2_LIBS@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff -ruNp liferea-1.4.23.orig/src/ui/Makefile.in liferea-1.4.23.new/src/ui/Makefile.in +--- liferea-1.4.23.orig/src/ui/Makefile.in 2008-12-12 00:16:28.000000000 +0100 ++++ liferea-1.4.23.new/src/ui/Makefile.in 2008-12-16 16:31:12.000000000 +0100 +@@ -130,6 +130,8 @@ GNUTLS_LIBS = @GNUTLS_LIBS@ + GREP = @GREP@ + GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ + GTKHTML2_LIBS = @GTKHTML2_LIBS@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -282,7 +284,7 @@ INCLUDES = \ + -I$(top_srcdir)/src + + noinst_LIBRARIES = libliui.a +-libliui_a_CFLAGS = $(PACKAGE_CFLAGS) $(DBUS_CFLAGS) ++libliui_a_CFLAGS = $(PACKAGE_CFLAGS) $(DBUS_CFLAGS) $(HILDON_CFLAGS) + libliui_a_SOURCES = \ + eggtrayicon.c eggtrayicon.h \ + ui_auth.c ui_auth.h \ +diff -ruNp liferea-1.4.23.orig/src/webkit/Makefile.in liferea-1.4.23.new/src/webkit/Makefile.in +--- liferea-1.4.23.orig/src/webkit/Makefile.in 2008-12-12 00:16:29.000000000 +0100 ++++ liferea-1.4.23.new/src/webkit/Makefile.in 2008-12-16 16:31:12.000000000 +0100 +@@ -131,6 +131,8 @@ GNUTLS_LIBS = @GNUTLS_LIBS@ + GREP = @GREP@ + GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ + GTKHTML2_LIBS = @GTKHTML2_LIBS@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff -ruNp liferea-1.4.23.orig/xslt/Makefile.in liferea-1.4.23.new/xslt/Makefile.in +--- liferea-1.4.23.orig/xslt/Makefile.in 2008-12-12 00:16:29.000000000 +0100 ++++ liferea-1.4.23.new/xslt/Makefile.in 2008-12-16 16:31:12.000000000 +0100 +@@ -107,6 +107,8 @@ GNUTLS_LIBS = @GNUTLS_LIBS@ + GREP = @GREP@ + GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ + GTKHTML2_LIBS = @GTKHTML2_LIBS@ ++HILDON_CFLAGS = @HILDON_CFLAGS@ ++HILDON_LIBS = @HILDON_LIBS@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ --- liferea-1.4.23.orig/debian/patches/libtool-dont-rearange-as-needed +++ liferea-1.4.23/debian/patches/libtool-dont-rearange-as-needed @@ -0,0 +1,36 @@ +Patch by Josselin Mouette to keep libtool from moving +-W,--as-needed to the end of the linker command line, making it useless. +Posted by him to #347650- + +Index: b/ltmain.sh +=================================================================== +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -1794,6 +1794,11 @@ + arg=`$echo "X$arg" | $Xsed -e "s/^ //"` + ;; + ++ -Wl,--as-needed) ++ deplibs="$deplibs $arg" ++ continue ++ ;; ++ + -Wl,*) + args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` + arg= +@@ -2137,6 +2142,15 @@ + lib= + found=no + case $deplib in ++ -Wl,--as-needed) ++ if test "$linkmode,$pass" = "prog,link"; then ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ else ++ deplibs="$deplib $deplibs" ++ fi ++ continue ++ ;; + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" --- liferea-1.4.23.orig/debian/patches/lua5.1.pc +++ liferea-1.4.23/debian/patches/lua5.1.pc @@ -0,0 +1,61 @@ +Debian's package config file for lua 5.1 is lua5.1.pc, not lua.pc + +Index: b/configure +=================================================================== +--- a/configure ++++ b/configure +@@ -24405,11 +24405,11 @@ + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"lua \"") >&5 +- ($PKG_CONFIG --exists --print-errors "lua ") 2>&5 ++ ($PKG_CONFIG --exists --print-errors "lua5.1 ") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_LUA51_CFLAGS=`$PKG_CONFIG --cflags "lua " 2>/dev/null` ++ pkg_cv_LUA51_CFLAGS=`$PKG_CONFIG --cflags "lua5.1 " 2>/dev/null` + else + pkg_failed=yes + fi +@@ -24422,12 +24422,12 @@ + pkg_cv_LUA51_LIBS="$LUA51_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"lua \"") >&5 +- ($PKG_CONFIG --exists --print-errors "lua ") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"lua5.1 \"") >&5 ++ ($PKG_CONFIG --exists --print-errors "lua5.1 ") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_LUA51_LIBS=`$PKG_CONFIG --libs "lua " 2>/dev/null` ++ pkg_cv_LUA51_LIBS=`$PKG_CONFIG --libs "lua5.1 " 2>/dev/null` + else + pkg_failed=yes + fi +@@ -24446,9 +24446,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- LUA51_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua "` ++ LUA51_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua5.1 "` + else +- LUA51_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua "` ++ LUA51_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.1 "` + fi + # Put the nasty error message in config.log where it belongs + echo "$LUA51_PKG_ERRORS" >&5 +Index: b/configure.ac +=================================================================== +--- a/configure.ac ++++ b/configure.ac +@@ -141,7 +141,7 @@ + dnl Lua 5.1 does include a lua.pc file, so it shouldn't be distribution specific + dnl However, the presence of lua.pc is certainly not a good indicator of lua version... + PKG_CHECK_MODULES([LUA50], [lua50 lualib50] ,has_lua50=yes,has_lua50=no) +- PKG_CHECK_MODULES([LUA51], [lua] ,has_lua51=yes,has_lua51=no) ++ PKG_CHECK_MODULES([LUA51], [lua5.1] ,has_lua51=yes,has_lua51=no) + + if test "x$has_lua51" = "xyes" ; then + LUA_CFLAGS="$LUA51_CFLAGS" --- liferea-1.4.23.orig/debian/patches/series +++ liferea-1.4.23/debian/patches/series @@ -0,0 +1,8 @@ +libtool-dont-rearange-as-needed +www-browser +xulrunner-1.9 +load_proper_xulrunner +01_ubuntu_feedlists +fix_systray_behavior +hildon_frothing +90_autoreconf --- liferea-1.4.23.orig/debian/patches/load_proper_xulrunner +++ liferea-1.4.23/debian/patches/load_proper_xulrunner @@ -0,0 +1,16 @@ +Ubuntu: http://launchpad.net/bugs/309108 +Also see 295490 + +This won't be necessary for Liferea >= 1.5.6 + +--- liferea/src/mozilla/mozsupport.cpp.orig 2008-12-17 21:09:12.000000000 +0100 ++++ liferea/src/mozilla/mozsupport.cpp 2008-12-17 21:09:29.000000000 +0100 +@@ -325,7 +325,7 @@ + { + static const GREVersionRange greVersion = { + "1.9a", PR_TRUE, +- "1.9.*", PR_TRUE ++ "1.9.0.*", PR_TRUE + }; + char xpcomLocation[4096]; + nsresult rv = GRE_GetGREPathWithProperties (&greVersion, 1, nsnull, 0, xpcomLocation, 4096); --- liferea-1.4.23.orig/debian/patches/xulrunner-1.9 +++ liferea-1.4.23/debian/patches/xulrunner-1.9 @@ -0,0 +1,12 @@ +diff -ruNp liferea-1.4.23.orig/configure.ac liferea-1.4.23.new/configure.ac +--- liferea-1.4.23.orig/configure.ac 2008-11-29 22:43:57.000000000 +0100 ++++ liferea-1.4.23.new/configure.ac 2008-12-16 14:50:10.000000000 +0100 +@@ -190,7 +190,7 @@ AM_CONDITIONAL(WITH_XULRUNNER, test "x$i + AM_CONDITIONAL(WITH_MOZILLA, test "x$is_mozilla" = "xyes") + + if test "x$is_xulrunner" = "xyes"; then +- PKG_CHECK_MODULES([XULRUNNER],[libxul-embedding $gecko_cv_extra_pkg_dependencies]) ++ PKG_CHECK_MODULES([XULRUNNER],[libxul-embedding-unstable $gecko_cv_extra_pkg_dependencies]) + XULRUNNER_CFLAGS="$XULRUNNER_CFLAGS `$PKG_CONFIG --cflags ${gecko_cv_gecko}` `$PKG_CONFIG --define-variable=includetype=unstable --cflags ${gecko_cv_gecko}`" + fi + if test "x$is_mozilla" = "xyes"; then --- liferea-1.4.23.orig/debian/patches/www-browser +++ liferea-1.4.23/debian/patches/www-browser @@ -0,0 +1,22 @@ +www-browser by Franz Pletz +Add Debian's x-www-browser as external browser option. +(Closes: 415314) + +Index: b/src/ui/ui_prefs.c +=================================================================== +--- a/src/ui/ui_prefs.c ++++ b/src/ui/ui_prefs.c +@@ -119,6 +119,13 @@ + NULL, NULL, + FALSE + }, ++ { ++ "x-www-browser", "x-www-browser", "x-www-browser \"%s\"", ++ NULL, NULL, ++ NULL, NULL, ++ NULL, NULL, ++ FALSE ++ }, + { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, FALSE } + }; +