[Pkg-ocaml-maint-commits] [SCM] advi packaging branch, experimental, updated. debian/1.8-1-37-gb52324d

[Ralf Treinen]

The following commit has been merged in the experimental branch:
commit 23e68e0c86204e40250153e9c35dd571c24192a6
Author: Ralf Treinen <treinen at free.fr>
Date:   Tue Mar 9 23:11:28 2010 +0100

    make configure belive ghostscript where installed

diff --git a/debian/changelog b/debian/changelog
index 6bdfcd1..3d85dc9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+advi (1.8-3) experimental; urgency=low
+
+  * Dependency on ghostscript: >= 7.05
+  * patch use-ghostscript: make configure believe that ghostscript is installed
+    at compilation time.
+
+ -- Ralf Treinen <treinen at debian.org>  Tue, 09 Mar 2010 23:09:20 +0100
+
 advi (1.8-2) experimental; urgency=low
 
   * Bring back changes from 1.6.0-14 and 1.6.0-15 that were accidentially
diff --git a/debian/control b/debian/control
index 5c7d579..0f628b7 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Homepage: http://pauillac.inria.fr/advi/
 Package: advi
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends},
- texlive-base-bin, texlive-base, ghostscript
+ texlive-base-bin, texlive-base, ghostscript (>= 7.05)
 Suggests: ttf-kochi-gothic, ttf-kochi-mincho, bzip2
 Replaces: mldvi, activedvi
 Description: an active DVI previewer and presenter
diff --git a/debian/patches/series b/debian/patches/series
index b6e189f..cb9ddbf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ cache-dir-tilde-expansion
 # byte-compilation-no-custom
 manpage
 no-local-advirc
+use-ghostscript
diff --git a/debian/patches/use-ghostscript b/debian/patches/use-ghostscript
new file mode 100644
index 0000000..18edfc5
--- /dev/null
+++ b/debian/patches/use-ghostscript
@@ -0,0 +1,40 @@
+Author: Ralf Treinen <treinen at debian.org>
+Description: Let configure behave as if ghostscript where installed at 
+  compilation time.
+
+Index: advi/configure
+===================================================================
+--- advi.orig/configure	2010-03-09 23:04:50.000000000 +0100
++++ advi/configure	2010-03-09 23:07:21.000000000 +0100
+@@ -6698,30 +6698,7 @@
+ 
+ 
+ 
+-if test -n "$GS" ; then
+-    { echo "$as_me:$LINENO: checking if gs version >= 6.52" >&5
+-echo $ECHO_N "checking if gs version >= 6.52... $ECHO_C" >&6; }
+-    gs_version=`$GS -v | awk '/Ghostscript/ {print $3}'`
+-    gs_major_version=`echo $gs_version | cut -d. -f1`
+-    gs_minor_version=`echo $gs_version | cut -d. -f2`
+-
+-    if expr                                \
+-	\( $gs_major_version \> 6 \)       \
+-	\|                                 \
+-	\(                                 \
+-	    \( $gs_major_version \= 6 \)   \
+-	    \&                             \
+-	    \( $gs_minor_version \>= 52 \) \
+-	\) > /dev/null; then
+-	{ echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+-	HAVE_GS="true"
+-    else
+-	{ echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-	GS=""
+-    fi
+-fi
++HAVE_GS="true"
+ 
+ 
+ ac_config_files="$ac_config_files Makefile src/Makefile doc/Makefile doc/pngs/Makefile tex/Makefile"

-- 
advi packaging