[libpdl-linearalgebra-perl] 03/03: Merge remote-tracking branch 'origin/master'

[Dima Kogan]

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

dkogan-guest pushed a commit to branch master
in repository libpdl-linearalgebra-perl.

commit c24d88ea7972cf014cc6bfafd0d28647b09fa36a
Merge: dd41988 5df7443
Author: Dima Kogan <dima at secretsauce.net>
Date:   Sun Aug 30 23:58:13 2015 -0700

    Merge remote-tracking branch 'origin/master'
    
    Conflicts:
    	debian/changelog

 debian/changelog | 17 +++++++++++++++--
 debian/control   |  4 ++--
 debian/copyright |  2 +-
 debian/watch     |  2 +-
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index 1df785d,8573a2f..023d51c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,17 +1,24 @@@
 +libpdl-linearalgebra-perl (0.12-1) unstable; urgency=medium
 +
 +  * Imported Upstream version 0.12
 +  * Patch: don't link with gfortran explicitly. Not needed on sid
 +
 + -- Dima Kogan <dima at secretsauce.net>  Tue, 25 Aug 2015 11:49:53 -0700
 +
+ libpdl-linearalgebra-perl (0.08-2) UNRELEASED; urgency=medium
+ 
+   * Update Vcs-Browser URL to cgit web frontend
+ 
+  -- Salvatore Bonaccorso <carnil at debian.org>  Sat, 16 Aug 2014 09:34:14 +0200
+ 
  libpdl-linearalgebra-perl (0.08-1) unstable; urgency=low
  
+   * Team upload
+ 
    [ Dima Kogan ]
-   * New upstream release. (Closes: #730909) Main changes:
+   * New upstream release. (Closes: #730909 -- FTBFS - test failures)
+ 
+     Main changes:
  
      - license updated to Artistic 2.0
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libpdl-linearalgebra-perl.git