From cf85ac0edf080d2b0a0747e9d0411b2831a11b5e Mon Sep 17 00:00:00 2001
From: gobo72 <gobo72@364a67c3-989e-7be9-548d-dae8560ea662>
Date: Tue, 6 Sep 2011 04:05:45 +0000
Subject: [PATCH] =?utf8?q?Mises=20=C3=A0=20jour=20paquets=20sane=20et=20au?=
 =?utf8?q?toconf?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 config/packages-list   |  4 ++--
 stage5/hv-install-1    |  2 +-
 stage5/packages-update |  3 ++-
 stage5/pkg/xsane       | 10 ++--------
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/config/packages-list b/config/packages-list
index 9e710a6..699aa5c 100644
--- a/config/packages-list
+++ b/config/packages-list
@@ -16,7 +16,7 @@ AVRDUDE="avrdude-5.1"
 ATK="atk-1.32.0"
 ATKMM="atkmm-2.22.5"
 AUDIOFILE="audiofile-0.2.6"
-AUTOCONF="autoconf-2.67"
+AUTOCONF="autoconf-2.68"
 AUTOMAKE="automake-1.11.1"
 
 BABL="babl-0.1.2"
@@ -380,7 +380,7 @@ RSYNC="rsync-3.0.7"
 
 SAMBA="samba-3.0.21c"
 SANE_BACKENDS="sane-backends-1.0.22"
-XSANE="xsane-0.996"
+XSANE="xsane-0.998"
 SASL2="cyrus-sasl-2.1.23"
 SDL="SDL-1.2.14"
 SED="sed-4.2.1"
diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index 536af9c..33108ed 100755
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -82,7 +82,7 @@ fi
 
 if [ "x${SANE_SUPPORT}" = "xyes" ]; then
     ipkg -m acnb ${SANE_BACKENDS}
-    ipkg ${XSANE}
+    ipkg -m acnb ${XSANE}
 fi
 
 ipkg -m pm ${PERL_MOD_XML_SIMPLE}
diff --git a/stage5/packages-update b/stage5/packages-update
index 19b68e4..87f7323 100755
--- a/stage5/packages-update
+++ b/stage5/packages-update
@@ -78,7 +78,8 @@ fpkg -e "tar.gz" ${DVDFS} "http://jspenguin.org:81/dvdfs"
 fpkg -e "tar.xz" ${TEXLIVE} "ftp://tug.org/texlive/historic/2010"
 fpkg -e "tar.xz" ${TEXLIVE_TEXMF} "ftp://tug.org/texlive/historic/2010"
 
-fpkg -e "tar.gz" ${SANE_BACKENDS} "http://alioth.debian.org/download.php/2318"
+fpkg -e "tar.gz" ${SANE_BACKENDS} \
+    "ftp://ftp2.sane-project.org/pub/sane/${SANE_BACKENDS}"
 fpkg -e "tar.gz" ${XSANE} "ftp://ftp2.sane-project.org/pub/sane/xsane"
 
 fpkg ${ICON_NAMING_UTILS} "http://tango.freedesktop.org/releases"
diff --git a/stage5/pkg/xsane b/stage5/pkg/xsane
index fd57226..d10b16a 100644
--- a/stage5/pkg/xsane
+++ b/stage5/pkg/xsane
@@ -1,14 +1,8 @@
 #!/bin/bash
 
-hvconfig()
-{
-    cd ${LFS_TMP}/${PACKAGE}
-    ./configure \
-        --prefix=/usr
-}
-
 hvbuild_post()
 {
     # Adding link for GIMP plugin (Base GIMP version hardcoded for now)
-    ln -v -s ../../../../bin/xscanimage /usr/lib/gimp/2.0/plug-ins
+    rm -f /usr/lib/gimp/2.0/plug-ins/xsane
+    ln -sv /usr/bin/xsane /usr/lib/gimp/2.0/plug-ins
 }
-- 
2.20.1