[Pkg-ocaml-maint-commits] [SCM] advi packaging branch, master, updated. debian/1.9.0-4-7-g86f7bbe

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 79b142c2c525c30d667666660d0759716c92b13f
Author: Ralf Treinen <treinen at free.fr>
Date:   Sun Jul 3 12:59:31 2011 +0200

    configure with explicit --sysconfdir in order to fix inclusion of
    the system-wide japanese font onfiguration file.

diff --git a/debian/changelog b/debian/changelog
index 2edcb0e..58794a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
 advi (1.9.0-5) UNRELEASED; urgency=low
 
+  [ Stéphane Glondu ]
   * Adapt to camlimages 4.0.1
   * Remove Stefano from Uploaders
 
- -- Stéphane Glondu <glondu at debian.org>  Sat, 02 Jul 2011 18:14:37 +0200
+  [ Ralf Treinen ]
+  * debian/rules: configure with --sysconfdir=/etc. This fixes a bug 
+    where advi did not find the system configuration file for japanese
+    fonts (closes: 631811).
+
+ -- Ralf Treinen <treinen at debian.org>  Sat, 02 Jul 2011 22:22:52 +0200
 
 advi (1.9.0-4) unstable; urgency=low
 
diff --git a/debian/patches/series b/debian/patches/series
index 466fcee..3c8a5d2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,4 @@ examples-distclean
 linker_as_needed
 examples-makefiles
 examples-scripts
-camlimages-4.0.1
+# camlimages-4.0.1
diff --git a/debian/rules b/debian/rules
index 325c37c..1a9b5a1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,9 @@ override_dh_auto_configure:
 			--prefix=/usr \
 			--mandir=\$${prefix}/share/man \
 			--infodir=\$${prefix}/share/info \
-			--with-gs=/usr/bin/ghostscript
+			--with-gs=/usr/bin/ghostscript \
+			--sysconfdir=/etc \
+			--enable-native-program
 
 override_dh_auto_install:
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/advi
@@ -38,3 +40,5 @@ endif
 
 override_dh_compress:
 	dh_compress --exclude=usr/share/doc/advi/splash.dvi
+
+override_dh_autotest:

-- 
advi packaging