[Pkg-ocaml-maint-commits] [SCM] ocaml-batteries packaging branch, master, updated. upstream/0.20081011-229-ge5b9b45

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 6596069ce479b3ed8ad99ec937291458f3895d15
Merge: 881bbff6afaac7e09420c819e81f2797ae4126f8 fed989b383a52c01e18cdcda976a2a297eb2a679
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Tue Nov 11 12:34:59 2008 +0100

    new upstream release: alpha 2
    
    Merge commit 'upstream/master'
    
    Conflicts:
    
    	.gitignore

diff --combined .gitignore
index a28f8fe,cb91133..e4ca5b7
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,11 +1,12 @@@
 +debian/patches/
+ _build/
+ Makefile
+ autom4te.cache/
+ configure
+ config.ml
+ config.log
+ config.status
+ build/META
+ build/threaded/META
+ build/nothreads/META
+ src/batteries_toolchain/ocaml
diff --combined debian/changelog
index ffe1dcb,0000000..e4afbc0
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,0 +1,16 @@@
- ocaml-batteries (0.20081131-1) UNRELEASED; urgency=low
++ocaml-batteries (0.20081111-1) UNRELEASED; urgency=low
 +
-   * new snapshot, now following upstream Git (commit 3978b60)
++  * new snapshot, now following upstream Git
++    (commit fed989b, i.e., alpha 2)
 +  * debian/patches:
 +    - remote patch features/flexi-build (integrated upstream)
 +  * debian/control: correct spelling of "metapackage"
 +  * debian/control: fix sections: -dev in libdevel, -doc in doc
 +
 + -- Stefano Zacchiroli <zack at debian.org>  Mon, 13 Oct 2008 22:11:31 +0200
 +
 +ocaml-batteries (0.20081011-1) experimental; urgency=low
 +
 +  * Initial release (Closes: #501914)
 +
 + -- Stefano Zacchiroli <zack at debian.org>  Mon, 13 Oct 2008 18:55:31 +0200

-- 
ocaml-batteries packaging