New upstream beta release

diff --git a/debian/changelog b/debian/changelog
index 3e971ee4aa17e2f8ddd1f1e93c4ea41159a893b7..fe490b0d94af8c98f9eed7bf060c86d5d3cf1f3f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
-ocaml (3.12.0~0dev23+10396-1) UNRELEASED; urgency=low
+ocaml (3.12.0~beta1-1) UNRELEASED; urgency=low
 
   [ Stéphane Glondu ]
-  * New upstream SVN snapshot (Closes: #255245, #570920)
+  * New upstream beta release (Closes: #255245, #570920)
     - add armel to native architectures
   * debian/rules: switch to dh with overrides
   * Switch source package format to 3.0 (quilt)
@@ -11,7 +11,7 @@ ocaml (3.12.0~0dev23+10396-1) UNRELEASED; urgency=low
   * debian/ocaml-mode.emacs-install: do not byte-compile camldebug.el
     and inf-caml.el for xemacs21 (Closes: #508813, LP: #464587).
 
- -- Stéphane Glondu <glondu@debian.org>  Sun, 16 May 2010 00:12:15 +0200
+ -- Stéphane Glondu <glondu@debian.org>  Wed, 16 Jun 2010 08:38:11 -0700
 
 ocaml (3.11.2-1) unstable; urgency=low
 

diff --git a/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch b/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch
index 670639d62e78a6de2ba241f43bcd7d8aacc9efa0..acd2f183ebe61a1886c7b48f4bfe2f9670a3efbc 100644 (file)
--- a/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch
+++ b/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch
@@ -9,7 +9,7 @@ code (bug#338437)
  1 files changed, 3 insertions(+), 1 deletions(-)
 
 diff --git a/configure b/configure
-index f21bca4..0c9f3c6 100755
+index 1a9d4b0..fb876d6 100755
 --- a/configure
 +++ b/configure
 @@ -284,7 +284,8 @@ case "$bytecc,$host" in
@@ -22,7 +22,7 @@ index f21bca4..0c9f3c6 100755
    cc,mips-*-irix6*)
      # Add -n32 flag to ensure compatibility with native-code compiler
      bytecccompopts="-n32"
-@@ -706,6 +707,7 @@ case "$arch,$nativecc,$system,$host_type" in
+@@ -732,6 +733,7 @@ case "$arch,$nativecc,$system,$host_type" in
                         nativecccompopts="$gcc_warnings -DSHRINKED_GNUC";;
    *,*,rhapsody,*)      nativecccompopts="$gcc_warnings -DDARWIN_VERSION_6 $dl_defs"
                         if $arch64; then partialld="ld -r -arch ppc64"; fi;;

diff --git a/debian/patches/0002-Call-ld-with-proper-flags.patch b/debian/patches/0002-Call-ld-with-proper-flags.patch
index 9a4066e82fe604cddda003d98efdd8c5ed6d9495..12e121d9e71d0df0b3baede771fbf2bb3159e1e3 100644 (file)
--- a/debian/patches/0002-Call-ld-with-proper-flags.patch
+++ b/debian/patches/0002-Call-ld-with-proper-flags.patch
@@ -10,10 +10,10 @@ gcc.
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/configure b/configure
-index 0c9f3c6..d4bef29 100755
+index fb876d6..32d754b 100755
 --- a/configure
 +++ b/configure
-@@ -1595,7 +1595,7 @@ echo "DEBUGGER=$debugger" >> Makefile
+@@ -1632,7 +1632,7 @@ echo "DEBUGGER=$debugger" >> Makefile
  echo "CC_PROFILE=$cc_profile" >> Makefile
  echo "SYSTHREAD_SUPPORT=$systhread_support" >> Makefile
  echo "PARTIALLD=$partialld" >> Makefile

diff --git a/debian/patches/0003-Don-t-use-rpath.patch b/debian/patches/0003-Don-t-use-rpath.patch
index a690a33b397a2f4ecb769e0cffb3e38ce894bc57..7729b6fe19050503d38531ca753733beae7a89eb 100644 (file)
--- a/debian/patches/0003-Don-t-use-rpath.patch
+++ b/debian/patches/0003-Don-t-use-rpath.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Don't use rpath
  1 files changed, 5 insertions(+), 0 deletions(-)
 
 diff --git a/tools/ocamlmklib.mlp b/tools/ocamlmklib.mlp
-index 80c1d9f..b6ed47a 100644
+index 6b78a68..95f5674 100644
 --- a/tools/ocamlmklib.mlp
 +++ b/tools/ocamlmklib.mlp
 @@ -37,6 +37,11 @@ and output_c = ref ""       (* Output name for C part of library *)

diff --git a/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch b/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch
index fdc14a623dacc337ffbccc51864d8d5c1504ed14..c879d28bcd55310ba34acf7e914209d356bfdb76 100644 (file)
--- a/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch
+++ b/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Put manpages in section 3o instead of 3
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/ocamldoc/Makefile b/ocamldoc/Makefile
-index a9ce895..0673c56 100644
+index 95b0f9d..978caed 100644
 --- a/ocamldoc/Makefile
 +++ b/ocamldoc/Makefile
 @@ -319,7 +319,7 @@ test_texi: dummy

diff --git a/debian/patches/0005-Patch-config.sh-for-installation.patch b/debian/patches/0005-Patch-config.sh-for-installation.patch
index 58deb6f455e89928325dc1c7682e42b16ce175a7..7ba75ff256c4c3347907aac73855af83095d236e 100644 (file)
--- 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 1a60a87..5a14765 100755
+index a7ab103..b42373d 100755
 --- a/build/install.sh
 +++ b/build/install.sh
 @@ -18,7 +18,7 @@ set -e
@@ -22,7 +22,7 @@ index 1a60a87..5a14765 100755
  not_installed=$PWD/_build/not_installed
  
 diff --git a/build/partial-install.sh b/build/partial-install.sh
-index 6199762..a88e668 100755
+index 56d3181..8e4fbd2 100755
 --- a/build/partial-install.sh
 +++ b/build/partial-install.sh
 @@ -22,7 +22,7 @@ set -e

diff --git a/debian/patches/0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch b/debian/patches/0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch
index 39cb0adf8df14d537518d7e64b324d086219bb86..6fd13d05571cbc53e0374c47b229c992633edf4d 100644 (file)
--- a/debian/patches/0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch
+++ b/debian/patches/0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Install ocamlbuild as a link on either .native or .byte
  1 files changed, 16 insertions(+), 1 deletions(-)
 
 diff --git a/build/partial-install.sh b/build/partial-install.sh
-index a88e668..a22da2c 100755
+index 8e4fbd2..ca66bc1 100755
 --- a/build/partial-install.sh
 +++ b/build/partial-install.sh
 @@ -60,6 +60,21 @@ installbestbin() {

diff --git a/debian/patches/0007-Set-version-number.patch b/debian/patches/0007-Set-version-number.patch
deleted file mode 100644 (file)
index 442b723..0000000
--- a/debian/patches/0007-Set-version-number.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Stephane Glondu <steph@glondu.net>
-Date: Sun, 18 Apr 2010 15:12:10 +0200
-Subject: [PATCH] Set version number
-
----
- VERSION |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/VERSION b/VERSION
-index 58fc0bd..af2edec 100644
---- a/VERSION
-+++ b/VERSION
-@@ -1,4 +1,4 @@
--3.12.0+dev23 (2010-05-12)
-+3.12.0+dev23+10396
- 
- # The version string is the first line of this file.
- # It must be in the format described in stdlib/sys.mli
--- 

diff --git a/debian/patches/series b/debian/patches/series
index 507f0c298860fd59c5bbd2ccee73188d7beb9ee1..e66568a4fbbf4f3d8c45241eccab9c6ad1412a66 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,3 @@
 0004-Put-manpages-in-section-3o-instead-of-3.patch
 0005-Patch-config.sh-for-installation.patch
 0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch
-0007-Set-version-number.patch

diff --git a/debian/rules b/debian/rules
index 4a51739822e8b2887da50064022b8423ee513af4..da7531d79ca6048274363b250a36f83ec9faa2d9 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 PACKAGE := ocaml
 ALL_PACKAGES := $(shell dh_listpackages)
 OCAMLMAJOR := 3.12
-OCAMLMINOR := 0+dev23+10396
+OCAMLMINOR := 0+beta1
 
 # Build cache (for Debian debugging)
 BUILDCACHE := $(wildcard ../ocaml.cache)