[SCM] Position Astronomy Library branch, ubuntu, updated. 2a59ba8278e1d302979333d0113b7d7a7a6e2049

[Ole Streicher]

The following commit has been merged in the ubuntu branch:
commit 2a59ba8278e1d302979333d0113b7d7a7a6e2049
Merge: 6dcfd7b3ee34fc1f68ade2b6dac8f76d062a65e9 b05f48083c1487ebf0a47abe8e0ad6ec32ed35c9
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Jun 28 23:10:45 2012 +0200

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

diff --combined debian/changelog
index 7c8948f,506dae3..78478d5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,12 +1,12 @@@
- starlink-pal (0.1.4-1~ubuntu1) precise; urgency=low
 -starlink-pal (0.1.5-1) unstable; urgency=low
++starlink-pal (0.1.5-1~ubuntu1) precise; urgency=low
  
    * New upstream version
    * Add DM-Upload-Allowed: yes
-   * Add -lm to LDADD
  
-  -- Ole Streicher <debian at liska.ath.cx>  Thu, 28 Jun 2012 15:54:14 +0200
+  -- Ole Streicher <debian at liska.ath.cx>  Thu, 28 Jun 2012 22:54:14 +0200
  
  starlink-pal (0.1.0-1) unstable; urgency=low
  
    * Initial release. Closes: #659984
  
 - -- Ole Streicher <debian at liska.ath.cx>  Wed, 28 Mar 2012 11:00:00 +0200
 + -- Ole Streicher <launchpad-cpl at ole.ath.cx>  Wed, 28 Mar 2012 11:00:00 +0200

-- 
Position Astronomy Library