[SCM] Create, display and manipulate the world coordinate system branch, ubuntu, updated. ac172808ff7e963724568c29cf0bb64321da60f3

[Ole Streicher]

The following commit has been merged in the ubuntu branch:
commit ac172808ff7e963724568c29cf0bb64321da60f3
Merge: 2475a4d1981a568a9e1d759862085ed3f65c03ca d50b473b2abc8e31c7a3c7196f95ce7f82e97b46
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Jul 6 16:02:26 2012 +0200

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

diff --combined debian/changelog
index 20099a3,1eafe57..de79e2c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,30 -1,27 +1,27 @@@
- wcstools (3.8.5-1~ubuntu2) precise; urgency=low
 -wcstools (3.8.5-2) UNRELEASED; urgency=low
++wcstools (3.8.5-2~ubuntu1) precise; urgency=low
  
-   * Remove -O flag
+   * Multiarch support
  
-  -- Ole Streicher <debian at liska.ath.cx>  Sun, 13 May 2012 14:30:00 +0200
+  -- Ole Streicher <debian at liska.ath.cx>  Fri, 06 Jul 2012 15:32:28 +0200
  
- wcstools (3.8.5-1~ubuntu1) precise; urgency=low
+ wcstools (3.8.5-1) unstable; urgency=low
  
    * New upstream version.
    * Bump Standards version to 3.9.3.
+   * Set DM-Upload-Allowed: yes
+   * Fix a crash that appears in saods9
  
-  -- Ole Streicher <launchpad-cpl at ole.ath.cx>  Tue, 09 May 2012 10:00:00 +0200
+  -- Ole Streicher <debian at liska.ath.cx>  Mon, 04 Jun 2012 08:30:00 +0200
  
- wcstools (3.8.4-1~ubuntu2) oneiric; urgency=low
+ wcstools (3.8.4-2) unstable; urgency=low
  
-   * Oops. Forgot renaming libwcstools-dev.
+   * Rename remap to wcsremap. Closes: #657644
+   * Rename imcat to imcatalog. Closes: #657645
  
-  -- Ole Streicher <launchpad-cpl at ole.ath.cx>  Thu, 26 Jan 2012 09:50:00 +0100
+  -- Ole Streicher <debian at liska.ath.cx>  Fri, 27 Jan 2012 20:26:17 +0100
  
- wcstools (3.8.4-1~ubuntu1) oneiric; urgency=low
- 
-   * Debian release 1
- 
-  -- Ole Streicher <launchpad-cpl at ole.ath.cx>  Thu, 26 Jan 2012 09:40:00 +0100
- 
- wcstools (3.8.4-0~ubuntu1) oneiric; urgency=low
+ wcstools (3.8.4-1) unstable; urgency=low
  
    * Initial release. (Closes: #655695)
  
-  -- Ole Streicher <launchpad-cpl at ole.ath.cx>  Fri, 13 Jan 2012 17:11:08 +0100
+  -- Ole Streicher <debian at liska.ath.cx>  Fri, 13 Jan 2012 17:11:08 +0100

-- 
Create, display and manipulate the world coordinate system