[SCM] image display tool for astronomy branch, ubuntu, updated. upstream/7.0.1+dfsg-210-g342195c

[Ole Streicher]

The following commit has been merged in the ubuntu branch:
commit 342195c32a69c91e38b2d5b097691c033ab1eca9
Merge: 80770536845fb1274744d73a5161b3c4cd1e4cf6 ecabe0307f751d1d2a999f09c6473aedd4760de8
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Jul 3 10:50:55 2012 +0200

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

diff --combined debian/changelog
index dc35873,eea9b84..3ba80be
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,14 +1,14 @@@
- saods9 (7.0.1+dfsg-1~ubuntu1) precise; urgency=low
 -saods9 (7.0.2+dfsg-1) UNRELEASED; urgency=low
++saods9 (7.0.2+dfsg-1~ubuntu1) precise; urgency=low
  
    * New upstream release
  
-  -- Ole Streicher <debian at liska.ath.cx>  Wed, 13 Jun 2012 15:10:00 +0200
+  -- Ole Streicher <debian at liska.ath.cx>  Tue, 03 Jul 2012 10:46:29 +0200
+ 
+ saods9 (7.0.1+dfsg-1) unstable; urgency=low
+ 
+   * New upstream release
+ 
+  -- Ole Streicher <debian at liska.ath.cx>  Sat, 16 Jun 2012 10:30:00 +0200
  
  saods9 (6.2+dfsg-2) unstable; urgency=low
  

-- 
image display tool for astronomy