[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, master, updated. debian/3.11.0-5-23-g8aa146a

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 8aa146abf49becbceff98cf74639b56dc5dac992
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Jun 12 15:50:56 2009 +0200

    New upstream release, refresh patches

diff --git a/debian/changelog b/debian/changelog
index 671b3a2..6d46116 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ocaml (3.11.1~rc1-1) UNRELEASED; urgency=low
+ocaml (3.11.1-1) UNRELEASED; urgency=low
 
   [ Samuel Mimram ]
   * Add kfreebsd-amd64 to the list of supported native architectures.
@@ -9,7 +9,7 @@ ocaml (3.11.1~rc1-1) UNRELEASED; urgency=low
     - remove recommends to ledit from ocaml-nox (does not ship "ocaml")
 
   [ Stephane Glondu ]
-  * New upstream release candidate:
+  * New upstream release:
     - remove dbm_ldopts.dpatch (merged upstream)
     - switch patch system to quilt
   * debian/control:
@@ -19,7 +19,7 @@ ocaml (3.11.1~rc1-1) UNRELEASED; urgency=low
       ocaml-interp
     - remove various obsolete Conflicts and Replaces
 
- -- Stephane Glondu <steph at glondu.net>  Sun, 07 Jun 2009 16:07:40 +0200
+ -- Stephane Glondu <steph at glondu.net>  Fri, 12 Jun 2009 15:50:22 +0200
 
 ocaml (3.11.0-5) unstable; urgency=low
 
diff --git a/debian/patches/0005-Patch-config.sh-for-installation.patch b/debian/patches/0005-Patch-config.sh-for-installation.patch
index 75c0e51..33885ce 100644
--- a/debian/patches/0005-Patch-config.sh-for-installation.patch
+++ b/debian/patches/0005-Patch-config.sh-for-installation.patch
@@ -9,7 +9,7 @@ Use for installatation a patched config.sh (created by debian/rules).
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/build/install.sh b/build/install.sh
-index 34d6384..c57bcdb 100755
+index 5093f31..d4f5804 100755
 --- a/build/install.sh
 +++ b/build/install.sh
 @@ -18,7 +18,7 @@ set -e
diff --git a/debian/rules b/debian/rules
index a478a76..91a6db3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/quilt/quilt.make
 PACKAGE := ocaml
 ALL_PACKAGES := $(shell sed -ne 's/^Package: //p' debian/control)
 OCAMLMAJOR := 3.11
-OCAMLMINOR := 1+rc0
+OCAMLMINOR := 1
 
 # Build cache (for Debian debugging)
 BUILDCACHE := $(wildcard ../ocaml.cache)

-- 
OCaml packaging