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

[Ole Streicher]

The following commit has been merged in the ubuntu branch:
commit 67e5f997ccf5aa61c395be419db6a1d296398100
Merge: ae0826c8994c8ea9f7a0f8ac0f372ca405d818cd 339ee16d0cee36afebe58fd4fe852cba6e995277
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sun Mar 4 17:34:58 2012 +0100

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

diff --combined debian/changelog
index cde5d13,41cba28..2d4d356
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,31 +1,37 @@@
- wcslib (4.11-1~ubuntu1) oneiric; urgency=low
++wcslib (4.12-1~ubuntu1) oneiric; urgency=low
++
++  * Ubuntu port
++
++ -- Ole Streicher <launchpad-cpl at ole.ath.cx>  Sun, 04 Mar 2012 17:00:00 +0100
++
+ wcslib (4.12-1) unstable; urgency=low
+ 
+   * New upstream version
+ 
+  -- Ole Streicher <debian at liska.ath.cx>  Sun, 04 Mar 2012 17:00:00 +0100
+ 
+ wcslib (4.11-1) unstable; 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~ubuntu1) oneiric; urgency=low
+ wcslib (4.10-1) unstable; 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~ubuntu1) oneiric; urgency=low
+ wcslib (4.8.3-1) unstable; 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