[SCM] Implementation of the FITS WCS standard branch, ubuntu, updated. upstream/4.8.2-25-g3adbe3b

[Ole Streicher]

The following commit has been merged in the ubuntu branch:
commit 3adbe3bed36895b3ea88dd9633cc5fd3b0d08f89
Merge: fe1f5519bca783ff731035ff47a446f011564031 e91c916a90fd57c9e536b61dc89d20437b3a9a7f
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Feb 10 20:02:24 2012 +0100

    Merge branch 'debian' into ubuntu
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 87980c1,2f9e973..e6ae4a2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,18 +1,18 @@@
- wcslib (4.8.4-1~ubuntu1) oneiric; urgency=low
 -wcslib (4.10-1) unstable; urgency=low
++wcslib (4.10-1~ubuntu1) oneiric; urgency=low
  
    * New upstream version
--  * Add wcslib.pc to dev package. Closes: #650602
++  * Add wcslib.pc to dev package
  
-  -- Ole Streicher <launchpad-cpl at ole.ath.cx>  Mon, 05 Dec 2011 12:20:00 +0100
 - -- Ole Streicher <debian at liska.ath.cx>  Fri, 10 Feb 2012 16:33:25 +0100
++ -- Ole Streicher <launchpad-cpl at ole.ath.cx>  Fri, 10 Feb 2012 16:33:25 +0100
  
 -wcslib (4.8.3-1) unstable; urgency=low
 +wcslib (4.8.3-1~ubuntu1) oneiric; urgency=low
  
    * New upstream version
    * Fix "suggest" dependency for wcslib-doc
    * Remove "help2man" build dependency
    * Add format version information to copyright file
  
 - -- Ole Streicher <debian at liska.ath.cx>  Mon, 21 Nov 2011 16:40:00 +0200
 + -- Ole Streicher <launchpad-cpl at ole.ath.cx>  Mon, 21 Nov 2011 16:40:00 +0200
  
  wcslib (4.8.2-1) unstable; urgency=low
  

-- 
Implementation of the FITS WCS standard