Added -nv to wget to avoid wget complaints

git-svn-id: http://abcde.googlecode.com/svn/trunk@225 a0fa61bc-5347-0410-a1a9-7f54aa4e1825

diff --git a/abcde b/abcde
index 660244f..b84d1f0 100755 (executable)
--- a/abcde
+++ b/abcde
@@ -3065,7 +3065,7 @@ fi
 
 if [ "$HTTPGETOPTS" = "" ] ; then
        case $HTTPGET in
 
 if [ "$HTTPGETOPTS" = "" ] ; then
        case $HTTPGET in

-               wget) HTTPGETOPTS="-q -O -";;
+               wget) HTTPGETOPTS="-q -nv -O -";;

                curl) HTTPGETOPTS="-f -s";;
                fetch)HTTPGETOPTS="-q -o -";;
                ftp)  HTTPGETOPTS="-a -V -o - ";;
                curl) HTTPGETOPTS="-f -s";;
                fetch)HTTPGETOPTS="-q -o -";;
                ftp)  HTTPGETOPTS="-a -V -o - ";;

diff --git a/abcde.conf b/abcde.conf
index 7ec40d1..7473bda 100644 (file)
--- a/abcde.conf
+++ b/abcde.conf
@@ -153,7 +153,7 @@
 # if HTTPGETOPTS is empty or not defined.
 #HTTPGET=wget
 # for fetch (FreeBSD): HTTPGETOPTS="-q -o -"
 # if HTTPGETOPTS is empty or not defined.
 #HTTPGET=wget
 # for fetch (FreeBSD): HTTPGETOPTS="-q -o -"

-# for wget: HTTPGETOPTS="-q -O -"
+# for wget: HTTPGETOPTS="-q -nv -O -"

 # for curl (MacOSX): HTTPGETOPTS="-f -s"
 #HTTPGETOPTS="-q -O -"
 
 # for curl (MacOSX): HTTPGETOPTS="-f -s"
 #HTTPGETOPTS="-q -O -"
 

diff --git a/cddb-tool b/cddb-tool
index 2ff417b..5e365b5 100755 (executable)
--- a/cddb-tool
+++ b/cddb-tool
@@ -44,7 +44,7 @@ if [ "$HTTPGET" = "" ]; then
                HTTPGETOPTS=${HTTPGETOPTS:="-f -s"}
        else
                HTTPGET=wget
                HTTPGETOPTS=${HTTPGETOPTS:="-f -s"}
        else
                HTTPGET=wget

-               HTTPGETOPTS=${HTTPGETOPTS:="-q -O -"}
+               HTTPGETOPTS=${HTTPGETOPTS:="-q -nv -O -"}

        fi
 fi
 
        fi
 fi
 

diff --git a/debian/changelog b/debian/changelog
index 5b67565..74f9269 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+abcde (2.3.99.7-1) unstable; urgency=low
+
+  * Corrected debian/changelog.
+  * Added -nv for "no verbose" output, to avoid wget complaining it cannot be
+    quiet and verbose at the same time if "verbose = on" is set in ~/.wgetrc
+    (Closes: #388715).
+
+ -- Jesus Climent <jesus.climent@hispalinux.es>  Fri, 22 Sep 2006 12:47:06 +0300
+

 abcde (2.3.99.6-1) unstable; urgency=low
 
   * Default to UNICODE (UTF8) tags and comments (Closes: #282332).
 abcde (2.3.99.6-1) unstable; urgency=low
 
   * Default to UNICODE (UTF8) tags and comments (Closes: #282332).


@@ -21,15 +30,15 @@ abcde (2.3.99.6-1) unstable; urgency=low
     - Use IFS to preserve spaces when adding metadata to a cuefile
   * Small documentation changes:
     - abcde.1 (Closes: #364978)
     - Use IFS to preserve spaces when adding metadata to a cuefile
   * Small documentation changes:
     - abcde.1 (Closes: #364978)

-  * The dollowing entries have in commong that both add an internal cue2discid
+  * The following entries have in common that both add an internal cue2discid

     function. I will evaluate which one is more accurate and decide which one
     function. I will evaluate which one is more accurate and decide which one

-    to use. Right now they are not conflicting.
-  * Added internal mkcue and cue2discid functions (Charles Steinkuehler) and
-    add a check for internal abcde.<function> to make sure we are using the
-    correct version (not sure if needed ;)
-  * Added an internal implementation of cue2discid, so there is no need for an
-    external program to do the conversion. Thanks to Michael (sorry, his mail
-    does not have a surname).
+    to use. Right now they are not conflicting:
+    - Added internal mkcue and cue2discid functions (Charles Steinkuehler) and
+      add a check for internal abcde.<function> to make sure we are using the
+      correct version (not sure if needed ;)
+    - Added an internal implementation of cue2discid, so there is no need for
+      an external program to do the conversion. Thanks to Michael (sorry, his
+      mail does not have a surname).

   * cue2discid is now an internal function, so no need for including the
     python script in the path (Closes: #378407)
   * cddb-tool.1 typo (Thanks to A. Costa) (Closes: #351775)
   * cue2discid is now an internal function, so no need for including the
     python script in the path (Closes: #378407)
   * cddb-tool.1 typo (Thanks to A. Costa) (Closes: #351775)