--- gkrellweather-2.0.8.orig/GrabWeather +++ gkrellweather-2.0.8/GrabWeather @@ -40,12 +40,13 @@ # Is LWP installed? eval { require LWP::UserAgent }; if ($@) { - my $cmd = qq{wget --proxy=off --passive-ftp --tries=0 --quiet } . + my $cmd = qq{wget --cache=off --passive-ftp --tries=0 --quiet } . qq{--output-document=$home/$ReportDir/$HTMLFileName $URL}; `$cmd` == 0 or die "unable to fetch weather: $?"; } else { $ENV{FTP_PASSIVE} = 1; # LWP uses Net::FTP internally. my $ua = new LWP::UserAgent; + $ua->env_proxy(); my $req = new HTTP::Request( GET => $URL ); my $rsp = $ua->request( $req ); die $rsp->status_line unless $rsp->is_success; --- gkrellweather-2.0.8.orig/Makefile +++ gkrellweather-2.0.8/Makefile @@ -32,11 +32,11 @@ install: (cd po && ${MAKE} install ) if [ -d /usr/lib/gkrellm2/plugins/ ] ; then \ - install -c -s -m 644 gkrellweather.so /usr/lib/gkrellm2/plugins/ ; \ + install -c -m 644 gkrellweather.so /usr/lib/gkrellm2/plugins/ ; \ elif [ -d $(PREFIX)/lib/gkrellm2/plugins/ ] ; then \ - install -c -s -m 644 gkrellweather.so $(PREFIX)/lib/gkrellm2/plugins/ ; \ + install -c -m 644 gkrellweather.so $(PREFIX)/lib/gkrellm2/plugins/ ; \ else \ - install -D -c -s -m 644 gkrellweather.so $(PREFIX)/lib/gkrellm2/plugins/gkrellweather.so ; \ + install -D -c -m 644 gkrellweather.so $(PREFIX)/lib/gkrellm2/plugins/gkrellweather.so ; \ fi install -c -m 755 GrabWeather $(PREFIX)/bin --- gkrellweather-2.0.8.orig/gkrellweather.c +++ gkrellweather-2.0.8/gkrellweather.c @@ -721,7 +721,7 @@ options.station[1] = c[1]; options.station[2] = c[2]; options.station[3] = c[3]; - snprintf(options.command, 512, PREFIX "/bin/GrabWeather %s", options.station); + snprintf(options.command, 512, PREFIX "/share/gkrellm/GrabWeather %s", options.station); options.command[511] = 0; snprintf(options.filename, 512, "%s/.wmWeatherReports/%s.dat", getenv("HOME"), options.station); @@ -986,7 +986,7 @@ options.windspeed_unit = 1; options.pressure_unit = 1; strcpy(options.station, DEFAULT_STATION_ID); - snprintf(options.command, 512, "/usr/share/gkrellm/GrabWeather %s", options.station); + snprintf(options.command, 512, PREFIX "/share/gkrellm/GrabWeather %s", options.station); options.command[511] = 0; snprintf(options.filename, 512, "%s/.wmWeatherReports/%s.dat", getenv("HOME"), options.station); --- gkrellweather-2.0.8.orig/debian/changelog +++ gkrellweather-2.0.8/debian/changelog @@ -0,0 +1,183 @@ +gkrellweather (2.0.8-2) unstable; urgency=low + + * Updated download location in copyright file + * Fixed path to GrabWeather + Closes: #524211 + * Removed libxaw7-dev from build depends and switched from libglib1.2-dev + to libglib2.0-dev + * Explained how to reset configuration in README.Debian + + -- Norbert Veber Tue, 19 May 2009 12:28:42 -0400 + +gkrellweather (2.0.8-1) unstable; urgency=high + + * New upstream release + * This version fixes the security hole described here + http://www.juniper.net/security/auto/vulnerabilities/vuln27744.html + http://seclists.org/bugtraq/2008/Feb/0151.html + * The correct temperature is now displayed + Closes: #511105, #295784 + * Incorporated changes from NMU + Closes: #395688, #455849, #363607, #437042 + + -- Norbert Veber Wed, 21 Jan 2009 14:29:00 -0500 + +gkrellweather (2.0.7-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Add binary-indep target. (Closes: #395688). + * Remove unnecessary build-dep on gdk-imlib11. (Closes: #455849). + * Fix spelling errors in package description. (Closes: #363607). + * Makefile: Remove -s from install. (Closes: #437042). + * Make clean not ignore errors. + * Bump Standards Version to 3.8.0. + + -- Barry deFreese Mon, 08 Dec 2008 22:23:11 -0500 + +gkrellweather (2.0.7-2) unstable; urgency=low + + * Build depend on libxaw7-dev instead of the depreciated xlibs-dev + Closes: #346704 + + -- Norbert Veber Thu, 19 Jan 2006 21:17:00 -0500 + +gkrellweather (2.0.7-1) unstable; urgency=low + + * New upstream release + * Build depend on gdk-imlib11-dev instead of gdk-imlib1-dev + + -- Norbert Veber Tue, 29 Nov 2005 21:31:53 -0500 + +gkrellweather (2.0.6-5) unstable; urgency=low + + * Added patch to enable proxy support (using http_proxy environment + variable). + Closes: #115897 + + -- Norbert Veber Tue, 23 Mar 2004 16:00:41 -0500 + +gkrellweather (2.0.6-4) unstable; urgency=low + + * Changed debhelper compatibility level to 4, and install directory to + debian/gkrellweather instead of debian/tmp. + * Removed unused targets in debian/rules + * Removed prerm script + + -- Norbert Veber Wed, 17 Sep 2003 23:45:17 -0400 + +gkrellweather (2.0.6-3) unstable; urgency=low + + * New maintainer (Closes: #210872) + * Updated to standards version 3.6.1, changelog is now in UTF-8 + encoding. + + -- Norbert Veber Wed, 17 Sep 2003 22:38:38 -0400 + +gkrellweather (2.0.6-2) unstable; urgency=low + + * GrabWeather obviously isn't in /usr/local/bin, so fix path + (closes: Bug#191315). + + -- Søren Boll Overgaard Wed, 30 Apr 2003 12:26:43 +0000 + +gkrellweather (2.0.6-1) unstable; urgency=low + + * New upstream version. + + -- Søren Boll Overgaard Wed, 23 Apr 2003 15:07:00 +0000 + +gkrellweather (2.0.5-4) unstable; urgency=low + + * Add README.Debian + + -- Søren Boll Overgaard Wed, 5 Mar 2003 15:04:17 +0000 + +gkrellweather (2.0.5-3) unstable; urgency=low + + * Fix path to GrabWeather. + + -- Søren Boll Overgaard Wed, 15 Jan 2003 19:50:48 +0000 + +gkrellweather (2.0.5-2) unstable; urgency=low + + * Move .so to the correct plugin dir. + * Now works with gkrellm2 (Closes: Bug#175976). + + -- Søren Boll Overgaard Wed, 15 Jan 2003 19:43:58 +0000 + +gkrellweather (2.0.5-1) unstable; urgency=low + + * Move to gkrellm2 API. + * Upstream switched to another author. + + -- Søren Boll Overgaard Wed, 15 Jan 2003 19:21:34 +0000 + +gkrellweather (0.2.7-4) unstable; urgency=low + + * Change build-depends away from xlib6g (closes: Bug#170190). + * Bump standards version 3.5.8.0 + + -- Søren Boll Overgaard Tue, 26 Nov 2002 17:58:01 +0000 + +gkrellweather (0.2.7-3) unstable; urgency=low + + * Build-depend on gdk-imlib1-dev, rather than gdk-imlib-dev. + + -- Søren Boll Overgaard Mon, 2 Sep 2002 08:36:30 +0200 + +gkrellweather (0.2.7-2) unstable; urgency=low + + * New maintainer. + * Remove symlink fun (closes: Bug#153437, closes: Bug#116848). + * Fix speeling errors (closes: Bug#124675). + * Change GrabWeather to try http and ftp when looking for weather + information (closes: Bug#147125). Patch dispatched to upstream. + * Remove emacs stuff from Debian changelog. + * Set/Remove /usr/doc symlinks as per policy. + * Fix deprecated arguments to install(1). + * Make lintian clean. + + -- Søren Boll Overgaard Tue, 13 Aug 2002 12:16:14 +0200 + +gkrellweather (0.2.7-1) unstable; urgency=low + + * New upstream release + + -- An Thi-Nguyen Le Tue, 19 Jun 2001 16:38:27 -0500 + +gkrellweather (0.2.6-1) unstable; urgency=low + + * New upstream release + + -- An Thi-Nguyen Le Thu, 17 May 2001 13:40:50 -0500 + +gkrellweather (0.2.5-2) unstable; urgency=low + + * debian/control: removed dependency for perl-base and perl-version, in + exchange for just perl; oops. (closes: #95083) + + -- An Thi-Nguyen Le Mon, 30 Apr 2001 17:14:21 -0500 + +gkrellweather (0.2.5-1) unstable; urgency=low + + * New upstream release + * debian/control: Removed perl-5.005 dependency; added versioned + dependency for perl-base + + -- An Thi-Nguyen Le Mon, 30 Apr 2001 02:57:25 -0500 + +gkrellweather (0.2.3a-2) unstable; urgency=low + + * Really modified gkrellweather.c to reflect movement of GrabWeather to + /usr/share/gkrellm (Closes: #86983). + + -- An Thi-Nguyen Le Fri, 23 Feb 2001 19:53:11 +0000 + +gkrellweather (0.2.3a-1) unstable; urgency=low + + * Initial Release (Closes: #78775). + * Moved GrabWeather to /usr/share/gkrellm, modified gkrellweather.c to + reflect this. + + -- An Thi-Nguyen Le Sun, 21 Jan 2001 03:47:32 +0000 + --- gkrellweather-2.0.8.orig/debian/docs +++ gkrellweather-2.0.8/debian/docs @@ -0,0 +1 @@ +README --- gkrellweather-2.0.8.orig/debian/compat +++ gkrellweather-2.0.8/debian/compat @@ -0,0 +1 @@ +4 --- gkrellweather-2.0.8.orig/debian/dirs +++ gkrellweather-2.0.8/debian/dirs @@ -0,0 +1 @@ +usr/share/gkrellm --- gkrellweather-2.0.8.orig/debian/substvars +++ gkrellweather-2.0.8/debian/substvars @@ -0,0 +1 @@ +shlibs:Depends=libatk1.0-0 (>= 1.2.4), libc6 (>= 2.3.2-1), libglib2.0-0 (>= 2.2.3), libgtk2.0-0 (>= 2.2.1), libpango1.0-0 (>= 1.2.1) --- gkrellweather-2.0.8.orig/debian/copyright +++ gkrellweather-2.0.8/debian/copyright @@ -0,0 +1,18 @@ +This package was debianized by An Thi-Nguyen Le on +Sun, 21 Jan 2001 03:47:32 +0000. + +It was downloaded from: +http://sites.google.com/site/makovick/gkrellm-plugins + +Upstream Author: Franky Lam (For gkrellm1) + Jindrich Makovicka (For gkrellm2) + + +Copyright: + +This software is copyright (c) 2000 by Franky Lam. + +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 Licence can +be found in the /usr/share/common-licenses/GPL file. --- gkrellweather-2.0.8.orig/debian/control +++ gkrellweather-2.0.8/debian/control @@ -0,0 +1,18 @@ +Source: gkrellweather +Section: x11 +Priority: optional +Build-Depends: debhelper (>= 4), gkrellm (>= 2.1.4), libglib2.0-dev, libgtk2.0-dev +Maintainer: Norbert Veber +Standards-Version: 3.8.0 + +Package: gkrellweather +Architecture: any +Depends: gkrellm (>= 1.0.2), perl, wget | libwww-perl, ${shlibs:Depends}, ${misc:Depends} +Description: A weather monitor plugin for GKrellM + GKrellWeather is a plugin for GKrellM that monitors the weather information + given a METAR station identification code. Features include: + - Temperature, dew point, pressure, relative humidity, sky condition, + wind direction and speed. + - Temperatures in degrees Fahrenheit or Celsius + - Pressure in kPa, hPa or mmHg + - Wind speeds in kmph, mps or Beaufort scale --- gkrellweather-2.0.8.orig/debian/rules +++ gkrellweather-2.0.8/debian/rules @@ -0,0 +1,67 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +build: build-stamp +build-stamp: + dh_testdir + + $(MAKE) PREFIX=/usr + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + [ ! -f Makefile ] || $(MAKE) clean + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + install -D -s -m 755 gkrellweather.so $(CURDIR)/debian/gkrellweather/usr/lib/gkrellm2/plugins/gkrellweather.so + install -D -m 755 GrabWeather $(CURDIR)/debian/gkrellweather/usr/share/gkrellm/GrabWeather + +# Build architecture-independent files here. +binary-indep: +#Nothing to do here + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot +# dh_installdebconf + dh_installdocs +# dh_installexamples +# dh_installmenu +# dh_installemacsen +# dh_installpam +# dh_installinit +# dh_installcron +# dh_installmanpages +# dh_installinfo +# dh_undocumented + dh_installchangelogs ChangeLog +# dh_link /usr/lib/gkrellm/plugins/gkrellweather.so /usr/share/gkrellm/plugins/gkrellweather.so + dh_strip + dh_compress + dh_fixperms + # You may want to make some executables suid here. +# dh_suidregister +# dh_makeshlibs + dh_installdeb +# dh_perl + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-arch +.PHONY: build clean binary-arch binary install --- gkrellweather-2.0.8.orig/debian/README.Debian +++ gkrellweather-2.0.8/debian/README.Debian @@ -0,0 +1,10 @@ +If you get errors on the console involving something like this: + +sh: line 1: /usr/local/bin/GrabWeather: + +You will have to edit ~/.gkrellm2/user-config, and change the +line that sets gkrellweather command to: + +gkrellweather command /usr/share/gkrellm/GrabWeather STATION + +Replace STATION with your station id Ie. CYKF