[Pkg-ocaml-maint-commits] [SCM] advi packaging branch, experimental, updated. debian/1.6.0-13-62-g0a6f1ff

[Ralf Treinen]

The following commit has been merged in the experimental branch:
commit 0a6f1ff841c20a3187dea8b0517d17943ea4bc25
Author: Ralf Treinen <treinen at free.fr>
Date:   Mon Mar 8 20:47:27 2010 +0100

    do not load local .advirc file

diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian
new file mode 100644
index 0000000..bfcddeb
--- /dev/null
+++ b/debian/NEWS.Debian
@@ -0,0 +1,7 @@
+advi (1.8-1) unstable; urgency=low
+
+The debian version of advi does not load the .advirc file from the
+current directory.
+
+ -- Ralf Treinen <treinen at debian.org>  Mon, 08 Mar 2010 20:45:54 +0100
+
diff --git a/debian/README.Debian b/debian/README.Debian
index 256665f..7f9364c 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,6 +1,11 @@
 advi for Debian
 ---------------
 
+  * The debian version of advi does not load the .advirc from the current
+    directory.
+
+ -- Ralf Treinen <treinen at debian.org>, Mon,  8 Mar 2010 20:44:49 +0100
+
   * Advi does not (yet) support postscript fonts. It may be possible to do so,
     by either writing a full postscript rasterizer, or, like xdvi does, use
     gsftopk to transfrom ps fonts to pk ones. In both case a virtual font
diff --git a/debian/changelog b/debian/changelog
index e8c534a..3f61f4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,8 @@ advi (1.8-1) experimental; urgency=low
   * The directories examples/ and test/ are gone from upstream. We put
     these directories from advi-1.6 into debian/examples-source. This
     directory has the relevant debian patches from 1.6.0 applied.
+  * New patch:
+    - no-local-advirc: do not load .advirc from the working direcory
   * Old patches:
     - 0004-Japanese-fonts: jpfonts.config is no longer in upstream, put it
       into debian/. Patch renamed to japanese-fonts
diff --git a/debian/patches/no-local-advirc b/debian/patches/no-local-advirc
new file mode 100644
index 0000000..0f85de2
--- /dev/null
+++ b/debian/patches/no-local-advirc
@@ -0,0 +1,19 @@
+Author: Ralf Treinen <treinen at debian.org>
+Description: do not load .advirc from the working directory
+
+--- advi.orig/src/userfile.ml	2010-03-08 20:38:03.000000000 +0100
++++ advi/src/userfile.ml	2010-03-08 20:40:38.000000000 +0100
+@@ -148,13 +148,11 @@
+ let default_init_file1 = Filename.concat user_home_dir ".advirc";;
+ let default_init_file2 =
+   tilde_subst (Filename.concat default_user_advi_dir "advirc");;
+-let default_init_file3 = ".advirc";;
+ 
+ let init_files = [
+   default_init_file0;
+   default_init_file1;
+   default_init_file2;
+-  default_init_file3;
+ ];;
+ 
+ let load_options_file options set_dvi_filename usage_msg fname =
diff --git a/debian/patches/series b/debian/patches/series
index 41f2a86..b6e189f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ japanese-fonts
 cache-dir-tilde-expansion
 # byte-compilation-no-custom
 manpage
+no-local-advirc
diff --git a/debian/rules b/debian/rules
index 570e83c..c809835 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,6 @@ endif
 	dh $@ --with tex,ocaml
 
 override_dh_auto_configure:
-	@echo $$DEB_BUILD_OPTIONS
 	./configure --host=$(DEB_HOST_GNU_TYPE) \
 			--build=$(DEB_BUILD_GNU_TYPE) \
 			--prefix=/usr \

-- 
advi packaging