[Debian-astro-commits] [saods9] 01/01: Merge branch 'debian' into experimental

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch experimental
in repository saods9.

commit 8c33f5be05115f36fa44f627f9451e3ab3379e04
Merge: 690257f 9ad5d76
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Jul 17 13:30:12 2015 +0200

    Merge branch 'debian' into experimental
    
    Conflicts:
    	debian/changelog
    	debian/patches/ds9_support_blt.patch
    	debian/watch

 debian/changelog | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 83a308d,282c08b..982227f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,47 -1,10 +1,54 @@@
 -saods9 (7.3.2+repack-3) unstable; urgency=low
 +saods9 (7.4~b4+repack-4) UNRELEASED; urgency=low
  
 +  * New package saotk
 +
 + -- Ole Streicher <olebole at debian.org>  Tue, 07 Jul 2015 20:18:24 +0200
 +
 +saods9 (7.4~b4+repack-3) experimental; urgency=low
 +
 +  * Correct Breaks and Replaces for removed package
 +
 + -- Ole Streicher <olebole at debian.org>  Tue, 07 Jul 2015 17:48:42 +0200
 +
 +saods9 (7.4~b4+repack-2) experimental; urgency=low
 +
 +  * Merge saods9 and saods9-data
 +  * Create and use tcl packages for saotk, tcliis, tclcheckdns, tkmpeg
 +
 + -- Ole Streicher <olebole at debian.org>  Tue, 07 Jul 2015 14:53:05 +0200
 +
 +saods9 (7.4~b4+repack-1) experimental; urgency=low
 +
 +  * New upstream beta version
 +
 + -- Ole Streicher <olebole at debian.org>  Sat, 04 Jul 2015 14:11:18 +0200
 +
 +saods9 (7.4~b3+repack-1) experimental; urgency=low
 +
 +  * New upstream beta version
 +
 + -- Ole Streicher <olebole at debian.org>  Tue, 23 Jun 2015 14:43:50 +0200
 +
 +saods9 (7.4~b2+repack-1) experimental; urgency=low
 +
 +  * New upstream beta version
 +
 + -- Ole Streicher <olebole at debian.org>  Thu, 11 Jun 2015 10:10:28 +0200
 +
 +saods9 (7.4~b1+repack-1) unstable; urgency=low
 +
 +  * New upstream beta version
-   * Add CI tests (ds9 with and without XPA)
 +
 + -- Ole Streicher <olebole at debian.org>  Mon, 08 Jun 2015 16:51:46 +0200
 +
++saods9 (7.2.3+repack-3) unstable; urgency=low
++
++  * New upstream beta version
+   * Add CI tests (ds9 with and without XPA)
+   * Remove unuspported BLT calls. Closes: #792122
+ 
+  -- Ole Streicher <olebole at debian.org>  Sun, 12 Jul 2015 10:00:32 +0200
+ 
  saods9 (7.3.2+repack-2) unstable; urgency=low
  
    * Create upstream/metadata with bibliographic information

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/saods9.git