[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, 312/master, updated. debian/3.11.2-1-27-gfa428fd
Stephane Glondu
steph at glondu.net
Thu Jun 17 05:36:04 UTC 2010
The following commit has been merged in the 312/master branch:
commit 46ff8a912ec714243a1d3b46581a4bcf6863db48
Author: Stephane Glondu <steph at glondu.net>
Date: Tue Jun 8 11:31:10 2010 +0200
New upstream beta release
diff --git a/debian/changelog b/debian/changelog
index 3e971ee..fe490b0 100644
--- 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 at debian.org> Sun, 16 May 2010 00:12:15 +0200
+ -- Stéphane Glondu <glondu at 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 670639d..acd2f18 100644
--- 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 9a4066e..12e121d 100644
--- 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 a690a33..7729b6f 100644
--- 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 fdc14a6..c879d28 100644
--- 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 58deb6f..7ba75ff 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 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 39cb0ad..6fd13d0 100644
--- 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
index 442b723..0000000
--- a/debian/patches/0007-Set-version-number.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Stephane Glondu <steph at 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 507f0c2..e66568a 100644
--- 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 4a51739..da7531d 100755
--- 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)
--
OCaml packaging
More information about the Pkg-ocaml-maint-commits
mailing list