diff -Nru cfitsio3-3.300/debian/changelog cfitsio3-3.300/debian/changelog
--- cfitsio3-3.300/debian/changelog	2012-04-23 18:48:02.000000000 +0200
+++ cfitsio3-3.300/debian/changelog	2012-05-19 11:53:11.000000000 +0200
@@ -1,3 +1,10 @@
+cfitsio3 (3.300-1ubuntu1) quantal; urgency=low
+
+  * Merge from Debian testing. (LP: #1001572) Remaining changes:
+    - Drop cfortran build dependency, use the included cfortran header (universe).
+
+ -- Angel Abad <angelabad@ubuntu.com>  Sat, 19 May 2012 11:38:23 +0200
+
 cfitsio3 (3.300-1) unstable; urgency=low
 
   * New upstream version:
@@ -7,6 +14,13 @@
 
  -- Aurelien Jarno <aurel32@debian.org>  Mon, 23 Apr 2012 18:47:57 +0200
 
+cfitsio3 (3.290-1ubuntu1) precise; urgency=low
+
+  * Merge from Debian testing. (LP: #906883) Remaining changes:
+    - Drop cfortran build dependency, use the included cfortran header (universe).
+
+ -- Angel Abad <angelabad@gmail.com>  Tue, 20 Dec 2011 14:30:07 +0100
+
 cfitsio3 (3.290-1) unstable; urgency=low
 
   * New upstream version: 
@@ -15,6 +29,13 @@
 
  -- Aurelien Jarno <aurel32@debian.org>  Wed, 07 Dec 2011 22:01:57 +0100
 
+cfitsio3 (3.280-2ubuntu1) precise; urgency=low
+
+  * Merge from debian unstable. (LP: #817067) Remaining changes:
+    - Drop cfortran build dependency, use the included cfortran header (universe).
+
+ -- Angel Abad <angelabad@ubuntu.com>  Wed, 27 Jul 2011 17:26:36 +0200
+
 cfitsio3 (3.280-2) unstable; urgency=low
 
   * Convert to multiarch:
@@ -25,6 +46,13 @@
 
  -- Aurelien Jarno <aurel32@debian.org>  Fri, 17 Jun 2011 07:35:13 +0200
 
+cfitsio3 (3.280-1ubuntu1) oneiric; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - Drop cfortran build dependency, use the included cfortran header (universe).
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 07 Jun 2011 18:01:40 +0200
+
 cfitsio3 (3.280-1) unstable; urgency=low
 
   * New upstream version. 
@@ -32,6 +60,12 @@
 
  -- Aurelien Jarno <aurel32@debian.org>  Sat, 04 Jun 2011 19:19:55 +0200
 
+cfitsio3 (3.260-1ubuntu2) oneiric; urgency=low
+
+  * Drop cfortran build dependency, use the included cfortran header (universe).
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 20 May 2011 14:56:09 +0200
+
 cfitsio3 (3.260-1) unstable; urgency=low
 
   * New upstream version.  Closes: #615612.
diff -Nru cfitsio3-3.300/debian/control cfitsio3-3.300/debian/control
--- cfitsio3-3.300/debian/control	2012-04-23 14:33:21.000000000 +0200
+++ cfitsio3-3.300/debian/control	2012-05-19 11:35:10.000000000 +0200
@@ -1,8 +1,9 @@
 Source: cfitsio3
 Section: devel
 Priority: optional
-Maintainer: Aurelien Jarno <aurel32@debian.org>
-Build-Depends: debhelper (>= 8.1.3), texlive, gfortran, cfortran, zlib1g-dev, hevea, texlive
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Aurelien Jarno <aurel32@debian.org>
+Build-Depends: debhelper (>= 8.1.3), texlive, gfortran, zlib1g-dev, hevea, texlive
 Standards-Version: 3.9.3
 
 Package: libcfitsio3-dev
diff -Nru cfitsio3-3.300/debian/patches/series cfitsio3-3.300/debian/patches/series
--- cfitsio3-3.300/debian/patches/series	2011-06-04 20:23:18.000000000 +0200
+++ cfitsio3-3.300/debian/patches/series	2012-05-19 11:33:12.000000000 +0200
@@ -3,6 +3,6 @@
 03-ftexest.patch
 04-pthread-mutex.patch
 05-system-zlib.patch
-06-system-cfortran.patch
+#06-system-cfortran.patch
 07-dont-export-constants.patch
 08-fits_compress_img.patch