--- yarssr-0.2.2.orig/debian/docs +++ yarssr-0.2.2/debian/docs @@ -0,0 +1 @@ +README --- yarssr-0.2.2.orig/debian/yarssr.manpages +++ yarssr-0.2.2/debian/yarssr.manpages @@ -0,0 +1 @@ +debian/yarssr.1 --- yarssr-0.2.2.orig/debian/rules +++ yarssr-0.2.2/debian/rules @@ -0,0 +1,66 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# debian/rules fily for yarssr +# (c) 2004 by Joachim Breitner +# Based upon sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/dpatch/dpatch.make + +build: build-stamp + +build-stamp: patch + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + + touch build-stamp + +clean: clean-patched unpatch + +clean-patched: + dh_testdir + dh_testroot + rm -f build-stamp + + # Add here commands to clean up after the build process. + -$(MAKE) clean + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/yarssr. + $(MAKE) install DESTDIR=$(CURDIR)/debian/yarssr + + +# 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 + dh_installdocs + dh_installmenu + dh_installman + dh_compress + dh_fixperms + dh_perl + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- yarssr-0.2.2.orig/debian/control +++ yarssr-0.2.2/debian/control @@ -0,0 +1,15 @@ +Source: yarssr +Section: net +Priority: optional +Maintainer: Joachim Breitner +Build-Depends-Indep: debhelper (>= 4.0.0), dpatch +Standards-Version: 3.6.1 + +Package: yarssr +Architecture: all +Depends: ${perl:Depends}, libgtk2-perl, libgtk2-gladexml-perl, libgtk2-trayicon-perl, libgnome2-vfs-perl, libgnome2-perl (>= 0.94), libxml-rss-perl +Description: RSS reader for the notification area + Yet Another RSS Reader is an RSS aggregator and reader that displays its + results in the GNOME or KDE system tray (notification area). To view the + contents of the feed just click the menu-item and it will launch in your + favorite browser. --- yarssr-0.2.2.orig/debian/changelog +++ yarssr-0.2.2/debian/changelog @@ -0,0 +1,82 @@ +yarssr (0.2.2-1ubuntu0.6.06.1) dapper-security; urgency=low + + * Don't quote URLs when passing them to browsers. (LP: #172667) + + -- William Grant Sun, 16 Dec 2007 16:24:47 +1100 + +yarssr (0.2.2-1ubuntu0.6.06) dapper-security; urgency=low + + * SECURITY UPDATE: code execution through malicious URLs (LP: #162351) + * Add debian/patches/code-injection-fix.dpatch: Thanks to Debian. + * References + CVE-2007-5837 + + -- William Grant Tue, 13 Nov 2007 18:17:17 +1100 + +yarssr (0.2.2-1) unstable; urgency=low + + * New upstream release + + Closes: #293245: yarssr leaves zombie processes + * Created and included German translation + + -- Joachim Breitner Tue, 22 Mar 2005 18:27:20 +0100 + +yarssr (0.2.0-1) unstable; urgency=low + + * New upstream release + * Removed some dpatches because included upstream + + -- Joachim Breitner Thu, 13 Jan 2005 22:29:06 +0100 + +yarssr (0.2+rc2-1) UNRELEASED; urgency=low + + * New upstream release + + -- Joachim Breitner Fri, 3 Dec 2004 00:15:56 +0100 + +yarssr (0.2+rc1-1) UNRELEASED; urgency=low + + * New upstream release + + -- Joachim Breitner Mon, 18 Oct 2004 00:17:49 +0200 + +yarssr (0.1.8-5) UNRELEASED; urgency=low + + * no warnings when no connection available + + -- Joachim Breitner Sat, 16 Oct 2004 15:47:29 +0200 + +yarssr (0.1.8-4) unstable; urgency=low + + * make sure dpatches are really applied + + -- Joachim Breitner Fri, 8 Oct 2004 21:29:17 +0200 + +yarssr (0.1.8-3) unstable; urgency=low + + * disabled dialogs for connection problems (for laptop users) + * fixed problem with file reading code (Big thx to HE for helping!) + + -- Joachim Breitner Sun, 26 Sep 2004 15:29:20 +0200 + +yarssr (0.1.8-2) unstable; urgency=low + + * Using dpatch + * Added patch by myself to mark entries that existed when starting as + "read" + + -- Joachim Breitner Tue, 13 Jul 2004 13:11:37 +0200 + +yarssr (0.1.8-1) unstable; urgency=low + + * New upstream release + + Closes: #246644: configured informations are not saved + + -- Joachim Breitner Thu, 1 Jul 2004 13:27:56 +0200 + +yarssr (0.1.5-1) unstable; urgency=low + + * Initial Release. (Closes: Bug#243491) + + -- Joachim Breitner Tue, 13 Apr 2004 13:51:14 +0200 + --- yarssr-0.2.2.orig/debian/menu +++ yarssr-0.2.2/debian/menu @@ -0,0 +1,2 @@ +?package(yarssr):needs="X11" section="Apps/Net"\ + title="yarssr" command="/usr/bin/yarssr" --- yarssr-0.2.2.orig/debian/copyright +++ yarssr-0.2.2/debian/copyright @@ -0,0 +1,14 @@ +This package was debianized by Joachim Breitner on +Tue, 13 Apr 2004 13:51:14 +0200. + +It was downloaded from http://yarssr.sourceforge.net/ + +Upstream Author: Lee Aylward + +Copyright: 2004 Lee Aylward + +You are free to distribute this software under the terms of +the GNU General Public License. +On Debian systems, the complete text of the GNU General Public +License can be found in /usr/share/common-licenses/GPL file. + --- yarssr-0.2.2.orig/debian/dirs +++ yarssr-0.2.2/debian/dirs @@ -0,0 +1 @@ +usr/bin --- yarssr-0.2.2.orig/debian/compat +++ yarssr-0.2.2/debian/compat @@ -0,0 +1 @@ +4 --- yarssr-0.2.2.orig/debian/patches/00list +++ yarssr-0.2.2/debian/patches/00list @@ -0,0 +1,7 @@ +#maintainer-credits.dpatch +#read-first-entries.dpatch +#gnome-vfs-fix.dpatch +#disable-connection-warning.dpatch +adjust-makefile +german-translation +code-injection-fix --- yarssr-0.2.2.orig/debian/patches/disable-connection-warning.dpatch +++ yarssr-0.2.2/debian/patches/disable-connection-warning.dpatch @@ -0,0 +1,51 @@ +#! /bin/sh -e +## disable-connection-warning.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +if [ $# -lt 1 ]; then + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" + +case "$1" in + -patch) patch -p1 ${patch_opts} < $0;; + -unpatch) patch -R -p1 ${patch_opts} < $0;; + *) + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad yarssr-0.1.8/yarssr.pl /tmp/dpep.zxVJMr/yarssr-0.1.8/yarssr.pl +--- yarssr-0.1.8/yarssr.pl 2004-10-16 15:45:24.000000000 +0200 ++++ /tmp/dpep.zxVJMr/yarssr-0.1.8/yarssr.pl 2004-10-16 15:46:40.000000000 +0200 +@@ -401,13 +401,15 @@ + eval {parse_feed($content,$url);}; + return; + } +- else +- { +- # Failed dialog +- warn "Encountered problems downloading $url\n"; +- get_feed_failed($url,"An error occured while connecting to $url"); +- return; +- } ++ # No act on no connection, for users with non-permanent connection ++ # ++ #else ++ #{ ++ # # Failed dialog ++ # warn "Encountered problems downloading $url\n"; ++ # get_feed_failed($url,"An error occured while connecting to $url"); ++ # return; ++ #} + } + + sub get_file --- yarssr-0.2.2.orig/debian/patches/gnome-vfs-fix.dpatch +++ yarssr-0.2.2/debian/patches/gnome-vfs-fix.dpatch @@ -0,0 +1,52 @@ +#! /bin/sh -e +## gnome-vfs-fix.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +if [ $# -lt 1 ]; then + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" + +case "$1" in + -patch) patch -p1 ${patch_opts} < $0;; + -unpatch) patch -R -p1 ${patch_opts} < $0;; + *) + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad yarssr-0.1.8/yarssr.pl /tmp/dpep.Zq3nTU/yarssr-0.1.8/yarssr.pl +--- yarssr-0.1.8/yarssr.pl 2004-10-16 15:41:02.000000000 +0200 ++++ /tmp/dpep.Zq3nTU/yarssr-0.1.8/yarssr.pl 2004-10-16 15:41:09.000000000 +0200 +@@ -421,14 +421,17 @@ + my $content = ''; + my $bytes_per_iteration = 1024; + +- do { ++ while (TRUE) { + Gtk2->main_iteration while Gtk2->events_pending; +- my ($tmp_buffer, $tmp_bytes_read); +- ($result, $tmp_bytes_read, $tmp_buffer) = ++ my ($tmp_buffer); ++ ($result, undef, $tmp_buffer) = + $handle->read($bytes_per_iteration); +- +- $content .= $tmp_buffer; +- } while ($result eq 'ok'); ++ if ($result eq 'ok') { ++ $content .= $tmp_buffer; ++ } else { ++ last; ++ } ++ } + + # Get mime type + ($result,$info) = $handle->get_file_info('default'); --- yarssr-0.2.2.orig/debian/patches/adjust-makefile.dpatch +++ yarssr-0.2.2/debian/patches/adjust-makefile.dpatch @@ -0,0 +1,30 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Makefile adjustment + +@DPATCH@ +diff -urNad yarssr-0.2+rc2/Makefile /tmp/dpep.HiUDVR/yarssr-0.2+rc2/Makefile +--- yarssr-0.2+rc2/Makefile 2004-12-03 00:22:40.000000000 +0100 ++++ /tmp/dpep.HiUDVR/yarssr-0.2+rc2/Makefile 2004-12-03 00:23:28.000000000 +0100 +@@ -1,6 +1,6 @@ +-PREFIX=/usr/local ++PREFIX=/usr + BINDIR=$(PREFIX)/bin +-LIBDIR=$(PREFIX)/lib/yarssr ++LIBDIR=$(PREFIX)/share/yarssr + DATADIR=$(PREFIX)/share + + all: yarssr +@@ -20,8 +20,8 @@ + @echo Copying share files to $(DESTDIR)/$(DATADIR): + @cp -Rp share/* $(DESTDIR)/$(DATADIR)/ + +- find $(DESTDIR)/$(DATADIR) -type f -exec chmod 755 "{}" \; +- find $(DESTDIR)/$(LIBDIR) -type f -exec chmod 755 "{}" \; ++ find $(DESTDIR)/$(DATADIR) -type f -exec chmod 644 "{}" \; ++ find $(DESTDIR)/$(LIBDIR) -type f -exec chmod 644 "{}" \; + + install -m 0755 build/yarssr $(DESTDIR)/$(BINDIR) + --- yarssr-0.2.2.orig/debian/patches/code-injection-fix.dpatch +++ yarssr-0.2.2/debian/patches/code-injection-fix.dpatch @@ -0,0 +1,29 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## code-injection-fix.dpatch by William Grant +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad yarssr-0.2.2~/lib/Yarssr/GUI.pm yarssr-0.2.2/lib/Yarssr/GUI.pm +--- yarssr-0.2.2~/lib/Yarssr/GUI.pm 2007-12-04 12:09:40.000000000 +1100 ++++ yarssr-0.2.2/lib/Yarssr/GUI.pm 2007-12-04 12:11:21.000000000 +1100 +@@ -162,9 +162,15 @@ + ); + } + else { +- my $b = Yarssr::Config->get_browser; +- $b .= " \"$url\"" unless $b =~ s/\%s/"$url"/; +- exec($b) or warn "unable to launch browser\n"; ++ my @b = split(' ', Yarssr::Config->get_browser); ++ if (grep(/\%s/, @b)) ++ { ++ map {grep(s/\%s/$url/, $_) => $_} @b; ++ } ++ else { ++ push(@b, $url); ++ } ++ exec(@b) or warn "unable to launch browser\n"; + exit; + } + } --- yarssr-0.2.2.orig/debian/patches/read-first-entries.dpatch +++ yarssr-0.2.2/debian/patches/read-first-entries.dpatch @@ -0,0 +1,61 @@ +#! /bin/sh -e +## read-first-entries.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: When starting up, no entries shall be marked as unread + +if [ $# -lt 1 ]; then + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" + +case "$1" in + -patch) patch -p1 ${patch_opts} < $0;; + -unpatch) patch -R -p1 ${patch_opts} < $0;; + *) + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad /home/jojo/debian/debs/official/yarssr/yarssr-0.1.8/yarssr.pl yarssr-0.1.8/yarssr.pl +--- /home/jojo/debian/debs/official/yarssr/yarssr-0.1.8/yarssr.pl 2004-07-13 13:32:54.000000000 +0200 ++++ yarssr-0.1.8/yarssr.pl 2004-07-13 13:33:23.000000000 +0200 +@@ -59,6 +59,9 @@ + my $browser = '/usr/bin/mozilla'; + my $usegnome; + ++# Mark entries as new (false at first) ++my $marknew = FALSE; ++ + # Gtk 2 stuff + Gtk2->init; + Gnome2::VFS->init; +@@ -294,6 +297,9 @@ + read_config(); + update_feed_all(); + ++# Now mark them as new ++$marknew = TRUE; ++ + # Create timer with specified interval + my $timer = Glib::Timeout->add($interval,\&update_feed_all); + +@@ -455,7 +461,11 @@ + + unless (exists $feeds{$url}->{'contents'}{$item->{'title'}}{'read'}) + { +- $feeds{$url}->{'contents'}{$item->{'title'}}{'read'} = FALSE; ++ if ($marknew == TRUE) { ++ $feeds{$url}->{'contents'}{$item->{'title'}}{'read'} = FALSE; ++ } else { ++ $feeds{$url}->{'contents'}{$item->{'title'}}{'read'} = TRUE; ++ } + } + + @{$feeds{$url}->{'order'}}[$count] = $feeds{$url}{'contents'}{$item->{'title'}}; --- yarssr-0.2.2.orig/debian/patches/german-translation.dpatch +++ yarssr-0.2.2/debian/patches/german-translation.dpatch @@ -0,0 +1,201 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## german-translation.dpatch by Joachim Breitner +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad yarssr-0.2.2/lib/Yarssr/GUI.pm /tmp/dpep.jWnCiy/yarssr-0.2.2/lib/Yarssr/GUI.pm +--- yarssr-0.2.2/lib/Yarssr/GUI.pm 2005-03-19 03:52:35.000000000 +0100 ++++ /tmp/dpep.jWnCiy/yarssr-0.2.2/lib/Yarssr/GUI.pm 2005-03-22 18:26:25.146725616 +0100 +@@ -631,7 +631,7 @@ + $author .= "\n$_" for @Yarssr::TESTERS; + my $about = Gnome2::About->new( + $Yarssr::NAME,$Yarssr::VERSION,$Yarssr::LICENSE, +- $Yarssr::URL,$author,undef,undef,$logo); ++ $Yarssr::URL,$author,undef,'German Translation: Joachim Breitner ',$logo); + $about->show; + } + +diff -urNad yarssr-0.2.2/lib/Yarssr.pm /tmp/dpep.jWnCiy/yarssr-0.2.2/lib/Yarssr.pm +--- yarssr-0.2.2/lib/Yarssr.pm 2005-03-22 18:24:47.734534520 +0100 ++++ /tmp/dpep.jWnCiy/yarssr-0.2.2/lib/Yarssr.pm 2005-03-22 18:24:48.266453656 +0100 +@@ -26,13 +26,13 @@ + my $feeds = (); + $0 = $NAME; + +-# il8n stuff +-my $locale = (defined($ENV{LC_MESSAGES}) ? $ENV{LC_MESSAGES} : $ENV{LANG}); +-setlocale(LC_ALL, $locale); +-bindtextdomain(lc($NAME), sprintf('%s/share/locale', $PREFIX)); +-textdomain(lc($NAME)); +- + sub init { ++ # il8n stuff ++ my $locale = (defined($ENV{LC_MESSAGES}) ? $ENV{LC_MESSAGES} : $ENV{LANG}); ++ setlocale(LC_ALL, $locale); ++ bindtextdomain(lc($NAME), sprintf('%s/share/locale', $PREFIX)); ++ textdomain(lc($NAME)); ++ + # Wait 2 seconds before loading config and begining downloads + Gnome2::Program->init($0,$VERSION); + Glib::Timeout->add(1000,\&initial_launch); +diff -urNad yarssr-0.2.2/Makefile /tmp/dpep.jWnCiy/yarssr-0.2.2/Makefile +--- yarssr-0.2.2/Makefile 2005-03-22 18:24:48.151471136 +0100 ++++ /tmp/dpep.jWnCiy/yarssr-0.2.2/Makefile 2005-03-22 18:24:48.266453656 +0100 +@@ -15,12 +15,15 @@ + + mkdir -p build/locale/en/$(LC_CATEGORY) + msgfmt -o build/locale/en/$(LC_CATEGORY)/yarssr.mo src/po/en.po ++ mkdir -p build/locale/de/$(LC_CATEGORY) ++ msgfmt -o build/locale/de/$(LC_CATEGORY)/yarssr.mo src/po/de.po + + install: + mkdir -p $(DESTDIR)/$(BINDIR) \ + $(DESTDIR)/$(DATADIR) \ + $(DESTDIR)/$(LIBDIR) \ +- $(DESTDIR)/$(LOCALEDIR)/en/$(LC_CATEGORY) ++ $(DESTDIR)/$(LOCALEDIR)/en/$(LC_CATEGORY) \ ++ $(DESTDIR)/$(LOCALEDIR)/de/$(LC_CATEGORY) + + @echo Copying lib files to $(DESTDIR)/$(DATADIR): + @cp -Rp lib/* $(DESTDIR)/$(LIBDIR)/ +@@ -31,6 +34,7 @@ + find $(DESTDIR)/$(LIBDIR) -type f -exec chmod 644 "{}" \; + + install -m 0644 build/locale/en/$(LC_CATEGORY)/yarssr.mo $(DESTDIR)/$(LOCALEDIR)/en/$(LC_CATEGORY)/ ++ install -m 0644 build/locale/de/$(LC_CATEGORY)/yarssr.mo $(DESTDIR)/$(LOCALEDIR)/de/$(LC_CATEGORY)/ + install -m 0755 build/yarssr $(DESTDIR)/$(BINDIR) + + clean: +diff -urNad yarssr-0.2.2/src/po/de.po /tmp/dpep.jWnCiy/yarssr-0.2.2/src/po/de.po +--- yarssr-0.2.2/src/po/de.po 1970-01-01 01:00:00.000000000 +0100 ++++ /tmp/dpep.jWnCiy/yarssr-0.2.2/src/po/de.po 2005-03-22 18:24:58.754859176 +0100 +@@ -0,0 +1,127 @@ ++# German translation of yarssr. ++# Joachim Breitner , 2005 ++# ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: yarssr 0.2.2\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2005-03-01 22:42-0500\n" ++"PO-Revision-Date: 2005-03-22 17:55+0100\n" ++"Last-Translator: Joachim Breitner \n" ++"Language-Team: German\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=iso-8859-15\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: " ++ ++msgid "Loading state for {feed}" ++msgstr "Lade Zustand von {feed}" ++ ++msgid "Downloading {feed}" ++msgstr "Lade {feed} herunter" ++ ++msgid "Writing state for {feed}" ++msgstr "Speichere den Zustand von {feed}" ++ ++# debug messages ++msgid "Loading previous session" ++msgstr "Lade letzte Sitzung" ++ ++msgid "Successfully loaded previous session" ++msgstr "Erfolgreich letzte Sitzung geladen" ++ ++msgid "Successfully loaded config" ++msgstr "Konfiguration erfolgreich geladen" ++ ++msgid "Rebuilding menu" ++msgstr "Baue Menü neu auf" ++ ++msgid "Parsing" ++msgstr "Einlesen" ++ ++msgid "Writing config" ++msgstr "Schreibe Einstellungen" ++ ++# Prefs menu ++msgid "Go _Online" ++msgstr "Gehe _Online" ++ ++msgid "Go _Offline" ++msgstr "Gehe _Offline" ++ ++msgid "_About" ++msgstr "_Info" ++ ++# Feeds menu ++msgid "updating..." ++msgstr "aktualisieren..." ++ ++msgid "_Unmark new" ++msgstr "_Neue als alt markieren" ++ ++msgid "Update this feed" ++msgstr "Aktualisiere diesen Feed" ++ ++# Prefs window ++msgid "Name" ++msgstr "Name" ++ ++msgid "Enabled" ++msgstr "Aktiv" ++ ++msgid "Address" ++msgstr "Adresse" ++ ++msgid "Properties" ++msgstr "Eigenschaften" ++ ++msgid "Delete" ++msgstr "Löschen" ++ ++msgid "New" ++msgstr "Neu" ++ ++msgid "Import OPML" ++msgstr "Importiere OPML" ++ ++msgid "Update Interval (min)" ++msgstr "Aktualisierungsinterval (min)" ++ ++msgid "Start Online" ++msgstr "Starte online" ++ ++msgid "Headings Displayed" ++msgstr "Angezeigte Kopfzeilen" ++ ++msgid "Browser Command:\n (%s for URL)" ++msgstr "Browserbefehl:\n" ++"(%s für den URL)" ++ ++msgid "Gnome Default" ++msgstr "Gnome-Standard" ++ ++msgid "Cancel" ++msgstr "Abbrechen" ++ ++msgid "OK" ++msgstr "OK" ++ ++msgid "Name:" ++msgstr "Name:" ++ ++msgid "Address:" ++msgstr "Adresse:" ++ ++msgid "Options" ++msgstr "Optionen" ++ ++msgid "Username:" ++msgstr "Benutzername" ++ ++msgid "Password:" ++msgstr "Passwort:" ++ ++msgid "Path or URL" ++msgstr "Pfad oder URL" ++ --- yarssr-0.2.2.orig/debian/patches/maintainer-credits.dpatch +++ yarssr-0.2.2/debian/patches/maintainer-credits.dpatch @@ -0,0 +1,80 @@ +#! /bin/sh -e +## maintainer-credits.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Adds me to the credits + +if [ $# -lt 1 ]; then + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" + +case "$1" in + -patch) patch -p1 ${patch_opts} < $0;; + -unpatch) patch -R -p1 ${patch_opts} < $0;; + *) + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad yarssr-2.0.0/lib/Yarssr/GUI.pm.rej /tmp/dpep.tUuGi5/yarssr-2.0.0/lib/Yarssr/GUI.pm.rej +--- yarssr-2.0.0/lib/Yarssr/GUI.pm.rej 2005-01-13 22:30:20.000000000 +0100 ++++ /tmp/dpep.tUuGi5/yarssr-2.0.0/lib/Yarssr/GUI.pm.rej 2005-01-13 22:30:20.000000000 +0100 +@@ -1,16 +1,16 @@ + *************** +-*** 482,488 **** ++*** 482,487 **** + my $logo = $paper_grey_pixbuf->scale_simple(64,64,'tiles'); + my $author = "$Yarssr::AUTHOR\n\n Patches from:\n"; + $author .= "\t$_\n" for @Yarssr::COAUTHORS; +-- $author .= "\n\n Debian Package maintained by\n$PKG_MAINT\n"; + my $about = Gnome2::About->new( + $Yarssr::NAME,$Yarssr::VERSION,$Yarssr::LICENSE, + $Yarssr::URL,$author,undef,undef,$logo); +---- 482,487 ---- ++--- 482,488 ---- + my $logo = $paper_grey_pixbuf->scale_simple(64,64,'tiles'); + my $author = "$Yarssr::AUTHOR\n\n Patches from:\n"; + $author .= "\t$_\n" for @Yarssr::COAUTHORS; +++ $author .= "\n\n Debian Package maintained by\n$PKG_MAINT\n"; + my $about = Gnome2::About->new( + $Yarssr::NAME,$Yarssr::VERSION,$Yarssr::LICENSE, + $Yarssr::URL,$author,undef,undef,$logo); +diff -urNad yarssr-2.0.0/lib/Yarssr.pm /tmp/dpep.tUuGi5/yarssr-2.0.0/lib/Yarssr.pm +--- yarssr-2.0.0/lib/Yarssr.pm 2005-01-13 22:30:20.000000000 +0100 ++++ /tmp/dpep.tUuGi5/yarssr-2.0.0/lib/Yarssr.pm 2005-01-13 22:30:20.000000000 +0100 +@@ -4,7 +4,7 @@ + use Yarssr::GUI; + use Yarssr::Config; + +-use vars qw($LIBDIR $PREFIX $NAME $VERSION $AUTHOR @CO_AUTHORS $URL ++use vars qw($LIBDIR $PREFIX $NAME $VERSION $AUTHOR @CO_AUTHORS $PKG_MAINT $URL + $LICENSE); + + our $NAME = 'yarssr'; +diff -urNad yarssr-2.0.0/lib/Yarssr.pm.rej /tmp/dpep.tUuGi5/yarssr-2.0.0/lib/Yarssr.pm.rej +--- yarssr-2.0.0/lib/Yarssr.pm.rej 2005-01-13 22:30:20.000000000 +0100 ++++ /tmp/dpep.tUuGi5/yarssr-2.0.0/lib/Yarssr.pm.rej 1970-01-01 01:00:00.000000000 +0100 +@@ -1,16 +0,0 @@ +-*************** +-*** 13,19 **** +- our $URL = 'http://yarssr.sf.net'; +- our $AUTHOR = "Lee Aylward"; +- our @COAUTHORS = ("James Curbo","Dan Leski"); +-- our $PKG_MAINT = 'Joachim Breitner '; +- our $debug = 0; +- +- my $feeds = (); +---- 13,18 ---- +- our $URL = 'http://yarssr.sf.net'; +- our $AUTHOR = "Lee Aylward"; +- our @COAUTHORS = ("James Curbo","Dan Leski"); +- our $debug = 0; +- +- my $feeds = (); --- yarssr-0.2.2.orig/debian/yarssr.1 +++ yarssr-0.2.2/debian/yarssr.1 @@ -0,0 +1,9 @@ +.TH yarssr 1 "April 13, 2004" "version 0.1.8" "USER COMMANDS" +.SH NAME +yarssr \- get RSS feeds in your GNOME notification area +.SH SYNOPSIS +.B yarssr +.SH DESCRIPTION +YARSSR is an RSS aggregator that displays it's results in the GNOME notification area (tray). YARSSR aims to be small and unobtrusive to the user. To view the contents of a feed, click the menu-item and it will launch in the specified browser, or in the GNOME default browser. +.SH AUTHOR +Lee Aylward (lee@laylward.com) --- yarssr-0.2.2.orig/Makefile +++ yarssr-0.2.2/Makefile @@ -27,8 +27,8 @@ @echo Copying share files to $(DESTDIR)/$(DATADIR): @cp -Rp share/* $(DESTDIR)/$(DATADIR)/ - find $(DESTDIR)/$(DATADIR) -type f -exec chmod 644 "{}" \; - find $(DESTDIR)/$(LIBDIR) -type f -exec chmod 644 "{}" \; + find $(DESTDIR)/$(DATADIR) -type f -exec chmod 755 "{}" \; + find $(DESTDIR)/$(LIBDIR) -type f -exec chmod 755 "{}" \; install -m 0644 build/locale/en/$(LC_CATEGORY)/yarssr.mo $(DESTDIR)/$(LOCALEDIR)/en/$(LC_CATEGORY)/ install -m 0755 build/yarssr $(DESTDIR)/$(BINDIR)