[Pkg-ocaml-maint-commits] r4233 - in /trunk/packages/ocaml/trunk/debian: changelog patches/00list patches/not-native-no-aspp.dpatch rules

Thu Aug 30 23:28:27 UTC 2007

Author: gildor
Date: Thu Aug 30 23:28:27 2007
New Revision: 4233

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4233
Log:
* Add patches to prevent FTBFS on non-native arch
* Don't ignore make clean errors

Added:
    trunk/packages/ocaml/trunk/debian/patches/not-native-no-aspp.dpatch   (with props)
Modified:
    trunk/packages/ocaml/trunk/debian/changelog
    trunk/packages/ocaml/trunk/debian/patches/00list
    trunk/packages/ocaml/trunk/debian/rules

Modified: trunk/packages/ocaml/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/changelog?rev=4233&op=diff
==============================================================================

--- trunk/packages/ocaml/trunk/debian/changelog (original)
+++ trunk/packages/ocaml/trunk/debian/changelog Thu Aug 30 23:28:27 2007
@@ -1,8 +1,13 @@
 ocaml (3.10.0-7) UNRELEASED; urgency=low
 
+  [ Stefano Zacchiroli ]
   * NOT RELEASED YET
 
- -- Stefano Zacchiroli <zack at debian.org>  Thu, 30 Aug 2007 16:38:26 +0200
+  [ Sylvain Le Gall ]
+  * Add patches to workaround FTBFS, as described upstream in bug 4375
+  * Don't ignore make clean error
+
+ -- Sylvain Le Gall <gildor at debian.org>  Fri, 31 Aug 2007 01:27:19 +0200
 
 ocaml (3.10.0-6) unstable; urgency=low
 

Modified: trunk/packages/ocaml/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/patches/00list?rev=4233&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/patches/00list (original)
+++ trunk/packages/ocaml/trunk/debian/patches/00list Thu Aug 30 23:28:27 2007
@@ -9,3 +9,4 @@
 install_scripts_config.dpatch
 install_ocamlbuild.dpatch
 arm_ccheckbound_typo.dpatch
+not-native-no-aspp

Added: trunk/packages/ocaml/trunk/debian/patches/not-native-no-aspp.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/patches/not-native-no-aspp.dpatch?rev=4233&op=file
==============================================================================
--- trunk/packages/ocaml/trunk/debian/patches/not-native-no-aspp.dpatch (added)
+++ trunk/packages/ocaml/trunk/debian/patches/not-native-no-aspp.dpatch Thu Aug 30 23:28:27 2007
@@ -1,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## not-native-no-aspp.dpatch by Sylvain Le Gall <gildor at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad ocaml-3.10.0~/build/mkmyocamlbuild_config.sh ocaml-3.10.0/build/mkmyocamlbuild_config.sh
+--- ocaml-3.10.0~/build/mkmyocamlbuild_config.sh	2007-03-12 12:58:48.000000000 +0100
++++ ocaml-3.10.0/build/mkmyocamlbuild_config.sh	2007-08-31 00:59:56.671774840 +0200
+@@ -3,7 +3,8 @@
+ 
+ cd `dirname $0`/..
+ 
+-sed \
++(echo "AS="; cat config/Makefile) | \
++    sed \
+     -e 's/^#ml \(.*\)/\1/' \
+     -e 's/^\(#.*\)$/(* \1 *)/' \
+     -e 's/^\(.*\$([0-9]).*\)$/(* \1 *)/' \
+@@ -13,8 +14,8 @@
+     -e 's/\^""//g' \
+     -e 's/^let <:lower<\(MAKE\|DO\).*$//g' \
+     -e 's/"true"/true/g' \
+-    -e 's/"false"/false/g' \
+-    config/Makefile | \
++    -e 's/"false"/false/g' | \
+     sed -f build/tolower.sed | \
+     sed -f build/tolower.sed | \
+     sed -f build/tolower.sed > myocamlbuild_config.ml
++

Propchange: trunk/packages/ocaml/trunk/debian/patches/not-native-no-aspp.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/packages/ocaml/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/rules?rev=4233&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/rules (original)
+++ trunk/packages/ocaml/trunk/debian/rules Thu Aug 30 23:28:27 2007
@@ -119,28 +119,34 @@
 clean: abi-sed unpatch
 	dh_testdir
 	dh_testroot
-	rm -f build-arch-stamp build-indep-stamp config-stamp abi-sed
+	-$(RM) build-arch-stamp build-indep-stamp config-stamp abi-sed opt-built-stamp pre-config
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) clean
+	[ ! -f "$(CURDIR)/config/Makefile" ] || $(MAKE) clean
 	if test -d boot.debian; then	\
-		rm -rf boot;		\
+		$(RM) -r boot;		\
 		mv boot.debian boot;	\
 	fi
-	-$(MAKE) -C emacs clean
-	-$(MAKE) -C debian/ocaml-md5sums clean
-	-$(MAKE) -C debian/dh-ocaml clean
-	-$(MAKE) -C debian/policy clean
+	[ ! -f "$(CURDIR)/config/Makefile" ] || $(MAKE) -C emacs clean
+	$(MAKE) -C debian/ocaml-md5sums clean
+	$(MAKE) -C debian/dh-ocaml clean
+	$(MAKE) -C debian/policy clean
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	-cp -f /usr/share/misc/config.sub config/gnu/config.sub
 endif
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	-cp -f /usr/share/misc/config.guess config/gnu/config.guess
 endif
+	# File not cleaned by upstream
+	-$(RM) _boot_log1
+	-$(RM) _boot_log2
+	-$(RM) _log
+	-$(RM) myocamlbuild_config.ml
+	-$(RM) ocaml-$(OCAMLABI)
 
 	dh_clean debian/README.labltk camlp4/config/Makefile.cnf camlp4/config/Makefile config/m.h config/s.h config/Makefile emacs/ocamltags driver/ocamlcomp.sh
 	debian/rules abi-sed-clean
-	rm -f debian/$(SRCTARBALL)
+	-$(RM) debian/$(SRCTARBALL)
 
 install: install-indep install-arch
 install-indep: build-indep


