[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 7bb28c723df8b017587366d66689cf7cdffe8ae1
Author: Ralf Treinen <treinen at free.fr>
Date:   Mon Apr 5 11:16:40 2010 +0200

    fix condition in dh_strip override, fix filenme in dh_compress exclude

diff --git a/debian/changelog b/debian/changelog
index d5aa3d7..5b14103 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ advi (1.9.0-1) unstable; urgency=low
 
   * New upstream version.
   * Compress installed dvi documents, except splash.dvi.
+  * Fix dh_strip override: do not strip when non-native architecture.
 
- -- Ralf Treinen <treinen at debian.org>  Mon, 05 Apr 2010 11:07:02 +0200
+ -- Ralf Treinen <treinen at debian.org>  Mon, 05 Apr 2010 11:13:06 +0200
 
 advi (1.9.0~rc2-1) experimental; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 7aae450..faf93a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,7 @@
 
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+OPT                 = false
 OPT                 = $(shell test -x /usr/bin/ocamlopt && echo true)
 
 %:
@@ -26,10 +27,10 @@ endif
 # Do not strip the executable when compiling to bytecode (bug #500286).
 # This should be dropped as soon as bytecode compilation can be done without
 # using the -custom option (see bug #517546).
-ifeq ($(OPT),true)
+ifeq ($(OPT),false)
 override_dh_strip:
 	dh_strip
 endif
 
 override_dh_compress:
-	dh_compress --exclude=usr/share/doc/splash.dvi
+	dh_compress --exclude=usr/share/doc/advi/splash.dvi

-- 
advi packaging