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

[Ole Streicher]

The following commit has been merged in the ubuntu branch:
commit ae0826c8994c8ea9f7a0f8ac0f372ca405d818cd
Merge: 3adbe3bed36895b3ea88dd9633cc5fd3b0d08f89 20d22033b6d79dd0a21fb0705d8b5a0d19354bf5
Author: Ole Streicher <github at liska.ath.cx>
Date:   Thu Feb 23 10:46:46 2012 +0100

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

diff --combined debian/changelog
index e6ae4a2,b4d55af..cde5d13
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,25 +1,25 @@@
 -wcslib (4.11-1) unstable; urgency=low
++wcslib (4.11-1~ubuntu1) oneiric; urgency=low
+ 
+   * New upstream version
+   * Include upstream changelog and THANKS file
+ 
 - -- Ole Streicher <debian at liska.ath.cx>  Thu, 23 Feb 2012 09:54:22 +0100
++ -- Ole Streicher <launchpad-cpl at ole.ath.cx>  Thu, 23 Feb 2012 09:54:22 +0100
+ 
 -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 <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