[viennacl] 04/04: Merge branch 'master' of git+ssh://git.debian.org/git/debian-science/packages/viennacl

[Toby St Clere Smithe]

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

tsmithe-guest pushed a commit to branch master
in repository viennacl.

commit 11964e26e18f9073cbb726357ee27762552607b6
Merge: 95a25d2 036abb3
Author: Toby Smithe <git at tsmithe.net>
Date:   Fri May 16 12:41:15 2014 +0100

    Merge branch 'master' of git+ssh://git.debian.org/git/debian-science/packages/viennacl

 debian/changelog               | 22 ++++++++++++++++++----
 debian/compat                  |  2 +-
 debian/control                 |  2 +-
 debian/copyright               |  2 +-
 debian/libviennacl-dev.install |  2 +-
 debian/rules                   |  2 +-
 6 files changed, 23 insertions(+), 9 deletions(-)

diff --cc debian/changelog
index 75dd73b,0f277c1..87f0db8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,7 +1,14 @@@
 +viennacl (1.5.2-1) unstable; urgency=medium
 +
 +  * [15d0b5a] New upstream version 1.5.2
 +    + bug fixes and performance improvements
 +
 + -- Toby Smithe <tsmithe at ubuntu.com>  Fri, 16 May 2014 11:43:59 +0100
 +
  viennacl (1.5.1-1) unstable; urgency=medium
  
+   [ Toby Smithe ]
+ 
    * [d19020e] New upstream version 1.5.1
    * Update debian/control:
      + add myself to Uploaders;

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