diff -u fv-3.0/debian/changelog fv-3.0/debian/changelog
--- fv-3.0/debian/changelog
+++ fv-3.0/debian/changelog
@@ -1,3 +1,20 @@
+fv (3.0-17ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes (LP: #254319):
+    - Add icon and desktop files.
+  * Modify fv.desktop to validate with desktop-file-validate
+  * Bump Standards-Version to 3.8.0
+
+ -- Nathan Handler <nhandler@ubuntu.com>  Sat, 02 Aug 2008 19:56:10 -0500
+
+fv (3.0-17) unstable; urgency=low
+
+  * QA upload.
+  * Fix FTBFS, use gcc -dumpversion instead of gcc -v | grep version, thanks
+    Luca Bruno. (Closes: #479938)
+
+ -- Filippo Giunchedi <filippo@debian.org>  Mon, 07 Jul 2008 10:20:09 +0200
+
 fv (3.0-16ubuntu1) feisty; urgency=low
 
   * Merge from debian unstable, remaining changes:
diff -u fv-3.0/debian/control fv-3.0/debian/control
--- fv-3.0/debian/control
+++ fv-3.0/debian/control
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian QA Group <packages@qa.debian.org>
 Build-Depends: debhelper (>> 5), docbook-to-man, libcfitsio3-dev, itk3.1-dev, iwidgets3.1-doc, xutils, autotools-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.8.0
 
 Package: fv
 Architecture: any
diff -u fv-3.0/debian/fv.desktop fv-3.0/debian/fv.desktop
--- fv-3.0/debian/fv.desktop
+++ fv-3.0/debian/fv.desktop
@@ -1,6 +1,5 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 Name=fv FITS Editor
 GenericName=FITS Editor
 Comment=View and manipulate FITS-format files
@@ -11 +10 @@
-Categories=Application;Science;Astronomy;
+Categories=Science;Astronomy;
diff -u fv-3.0/fitsTcl/configure fv-3.0/fitsTcl/configure
--- fv-3.0/fitsTcl/configure
+++ fv-3.0/fitsTcl/configure
@@ -1794,7 +1794,7 @@
 
 case $CC in
 	gcc)
-		GCCVERSION="`gcc -v 2>&1 | grep version`"
+		GCCVERSION="`gcc -dumpversion`"
 		echo "cfitsio: == Using $GCCVERSION"
 		
 		;;
diff -u fv-3.0/fitsTcl/configure.in fv-3.0/fitsTcl/configure.in
--- fv-3.0/fitsTcl/configure.in
+++ fv-3.0/fitsTcl/configure.in
@@ -549,7 +549,7 @@
 
 case $CC in
 	gcc)
-		GCCVERSION="`gcc -v 2>&1 | grep version`"
+		GCCVERSION="`gcc -dumpversion`"
 		echo "cfitsio: == Using $GCCVERSION"
 		AC_SUBST(GCCVERSION)
 		;;
diff -u fv-3.0/pow/configure fv-3.0/pow/configure
--- fv-3.0/pow/configure
+++ fv-3.0/pow/configure
@@ -2196,7 +2196,7 @@
 
 case $CC in
 	gcc)
-		GCCVERSION="`gcc -v 2>&1 | grep version`"
+		GCCVERSION="`gcc -dumpversion`"
 		echo "cfitsio: == Using $GCCVERSION"
 		
 		;;
diff -u fv-3.0/pow/configure.in fv-3.0/pow/configure.in
--- fv-3.0/pow/configure.in
+++ fv-3.0/pow/configure.in
@@ -600,7 +600,7 @@
 
 case $CC in
 	gcc)
-		GCCVERSION="`gcc -v 2>&1 | grep version`"
+		GCCVERSION="`gcc -dumpversion`"
 		echo "cfitsio: == Using $GCCVERSION"
 		AC_SUBST(GCCVERSION)
 		;;
only in patch2:
unchanged:
--- fv-3.0.orig/fitsTcl/cfitsio/configure.in
+++ fv-3.0/fitsTcl/cfitsio/configure.in
@@ -123,7 +123,7 @@
 
 case $CC in
 	gcc)
-		GCCVERSION="`gcc -v 2>&1 | grep version`"
+		GCCVERSION="`gcc -dumpversion`"
 		echo "cfitsio: == Using $GCCVERSION"
 		AC_SUBST(GCCVERSION)
                 changequote(,)
only in patch2:
unchanged:
--- fv-3.0.orig/fitsTcl/cfitsio/configure
+++ fv-3.0/fitsTcl/cfitsio/configure
@@ -1081,7 +1081,7 @@
 
 case $CC in
 	gcc)
-		GCCVERSION="`gcc -v 2>&1 | grep version`"
+		GCCVERSION="`gcc -dumpversion`"
 		echo "cfitsio: == Using $GCCVERSION"