[Pkg-ocaml-maint-commits] [SCM] advi packaging branch, master, updated. debian/1.9.0-1-1-gf6ecf83

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 3435b7fd1f07823b02696891b607f8611084b35d
Author: Ralf Treinen <treinen at free.fr>
Date:   Sun Apr 4 19:49:33 2010 +0200

    simplifi debian/rules (no strip)

diff --git a/debian/changelog b/debian/changelog
index 980eea4..afc90fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,7 +12,7 @@ advi (1.9.0~rc2-1) UNRELEASED; urgency=low
     an entry about this in debian/NEWS.
   * Removed patches use-data-dir, examples-phony-targets, and
     doc-without-htmlc as upstream has fixed his build system.
-  * Removed patch japanes-fonts as upstream has fixed this.y
+  * Removed patch japanese-fonts as upstream has fixed this.
 
  -- Ralf Treinen <treinen at debian.org>  Sun, 04 Apr 2010 19:41:22 +0200
 
diff --git a/debian/rules b/debian/rules
index b639fe3..e79687e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,12 +10,6 @@ DEB_BUILD_ARCH      ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 # determine what kind of ocaml compiler we have
 OPT    = $(shell test -x /usr/bin/ocamlopt && echo true)
 
-# when compiling to bytecode then do not strip the executable (bug #500286).
-# This should be dropped as soon as bytecode compilation can be done without
-# using the -custom option (see bug #517546).
-ifneq ($(OPT),true)
-	export DEB_BUILD_OPTIONS:=$(DEB_BUILD_OPTIONS),nostrip
-endif
 
 %:
 	dh $@ --with tex,ocaml
@@ -40,8 +34,7 @@ else
 	cd $(CURDIR)/debian/advi/usr/bin && mv -f advi.byt advi
 endif
 
-#override_dh_auto_clean:
-#	if [ -f Makefile ]; then $(MAKE) clean; fi
-#	cd doc && rm -f $(DVIS) \
-#		${DVIS:.dvi=.log} ${DVIS:.dvi=.aux} ${DVIS:.dvi=.out}
-#	dh_clean
+# when compiling to bytecode then do not strip the executable (bug #500286).
+# This should be dropped as soon as bytecode compilation can be done without
+# using the -custom option (see bug #517546).
+override_dh_strip:

-- 
advi packaging