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

glondu pushed a commit to branch master
in repository oasis.

commit aa21dfa95ff74e87ddd92ead1e1d92cbbd6b3eb2
Merge: d5c631a 4905415
Author: Stephane Glondu <st...@glondu.net>
Date:   Thu Jun 12 15:21:12 2014 +0200

    Merge tag 'debian/0.3.0-5'
    
    Debian release 0.3.0-5
    
    Conflicts:
        debian/changelog
        debian/patches/series

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

diff --cc debian/changelog
index 16b9b63,1e3c4ec..59c9740
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,11 +1,23 @@@
 +oasis (0.4.4-1) UNRELEASED; urgency=low
 +
 +  [ Sylvain Le Gall ]
 +  * Imported Upstream version 0.4.2.
 +  * Remove most of the patches, they have been applied upstream.
 +
 +  [ Stéphane Glondu ]
 +  * Imported upstream version 0.4.4
 +  * Remove last patch, it has been applied upstream
 +
 + -- Sylvain Le Gall <sylv...@le-gall.net>  Thu, 27 Feb 2014 22:12:18 +0100
 +
+ oasis (0.3.0-5) unstable; urgency=medium
+ 
+   * Team upload.
+   * text.byte requires Extlib through TestCommon. Fixes "FTBFS: Error:
+     Unbound module ExtString" (Closes: #746095)
+ 
+  -- Mehdi Dogguy <me...@debian.org>  Sat, 10 May 2014 12:45:28 +0200
+ 
  oasis (0.3.0-4) unstable; urgency=low
  
    * Team upload

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/oasis.git

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to