[Pkg-ocaml-maint-commits] [SCM] galax packaging branch, master, updated. debian/1.1-6-12-gd87eb43

[Stephane Glondu]

The following commit has been merged in the master branch:
commit e36451e7a0847c19421e4f17e5877fbd61a50d0f
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue May 18 22:28:27 2010 +0200

    Use up-to-date config.{sub,guess}

diff --git a/debian/control b/debian/control
index 018f5d3..696ed7c 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Build-Depends:
  debhelper (>= 7.0.50~),
  dh-ocaml (>= 0.9~),
  ocaml-nox (>= 3.11.1-3~),
+ autotools-dev,
  camlp4,
  libpcre-ocaml-dev,
  libocamlnet-ocaml-dev (>= 2.2.9-6~),
diff --git a/debian/rules b/debian/rules
index a0fc4ac..b6d832e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,13 @@ include /usr/share/ocaml/ocamlvars.mk
 	dh --with ocaml $@
 
 override_dh_auto_configure:
+	for ext in sub guess; do \
+	  if [ -f /usr/share/misc/config.$$ext ] && \
+	    ! [ -f debian/config.orig.$$ext ]; then \
+	    mv config/config.$$ext debian/config.orig.$$ext; \
+	    cp -f /usr/share/misc/config.$$ext config/config.$$ext; \
+	  fi; \
+	done
 	./configure -galax-camllib $(OCAML_STDLIB_DIR)/galax			\
 		-galax-camllib $(OCAML_STDLIB_DIR)/galax -galax-home /usr	\
 		-galax-lib /usr/lib/galax -galax-man /usr/share/man		\
@@ -23,6 +30,11 @@ override_dh_auto_clean:
 	if [ -d doc ]; then mv doc doc.backup; fi
 	$(MAKE) clean
 	if [ -d doc.backup ]; then mv doc.backup doc; fi
+	for ext in sub guess; do \
+	  if [ -f debian/config.orig.$$ext ] ; then \
+	    mv -f debian/config.orig.$$ext config/config.$$ext; \
+	  fi; \
+	done
 
 override_dh_auto_install:
 	# $(LN) override so that we only install the best binary, instead of

-- 
galax packaging