Bug#478217: sf-get-source.mk: wget Cannot specify -r, -p or -N if -O is given.

[Mark Purcell]

Package: gnome-pkg-tools
Version: 0.13.5
Severity: important
Tags: patch

Hi Gnome guys,

Thanks for your sf-get-source.mk script.

Unfortunatly for me it doesn't work with wget and produces the error:
Cannot specify -r, -p or -N if -O is given.
Usage: wget [OPTION]... [URL]...

I think this is a recent change with wget as a lot of get-orig-source scripts
do use this.

$ dpkg -l wget
ii  wget                  1.11.1-1              retrieves files from the web

I just got rid of the -N, but you may decide to change.

--- /usr/share/gnome-pkg-tools/1/rules/sf-get-source.mk.orig	2008-04-28 15:31:25.000000000 +1000
+++ /usr/share/gnome-pkg-tools/1/rules/sf-get-source.mk	2008-04-28 15:31:32.000000000 +1000
@@ -13,7 +13,7 @@
 SF_TARBALL ?= $(SF_MODULE)-$(DEB_UPSTREAM_VERSION).$(TARBALL_EXT)
 SF_DOWNLOAD_URL ?= http://$$sf_mirror.dl.sourceforge.net/$(SF_PROJECT)/$(SF_TARBALL)
 SF_MIRRORS ?= belnet easynews heanet internap jaist kent mesh nchc optusnet ovh puzzle superb-east superb-west surfnet switch ufpr umn
-SF_DOWNLOAD_COMMAND ?= for sf_mirror in $(SF_MIRRORS); do wget -N -nv -T10 -t1 -O $(DEB_TARBALL_DOWNLOAD_DIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.$(TARBALL_EXT) $(SF_DOWNLOAD_URL) && break; done
+SF_DOWNLOAD_COMMAND ?= for sf_mirror in $(SF_MIRRORS); do wget -nv -T10 -t1 -O $(DEB_TARBALL_DOWNLOAD_DIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.$(TARBALL_EXT) $(SF_DOWNLOAD_URL) && break; done
 
 get-orig-source:
 	dh_testdir

Mark

-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: powerpc (ppc)

Kernel: Linux 2.6.18-5-powerpc
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

gnome-pkg-tools depends on no packages.

Versions of packages gnome-pkg-tools recommends:
ii  svn-buildpackage              0.6.23     helper programs to maintain Debian

-- no debconf information