From 53c1bedc0071cce940f0a5bbf4070455fa9b4ceb Mon Sep 17 00:00:00 2001
From: gobo72 <gobo72@364a67c3-989e-7be9-548d-dae8560ea662>
Date: Sat, 10 Sep 2011 05:04:07 +0000
Subject: [PATCH] =?utf8?q?Mise=20=C3=A0=20jour=20avec=20ma=20version=20d?=
 =?utf8?q?=C3=A9-gnomifi=C3=A9e=20de=20Grip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 config/dependencies    | 2 +-
 config/packages-list   | 4 ++--
 stage5/hv-install-1    | 3 ++-
 stage5/packages-update | 1 +
 stage6/hv-install-1    | 1 -
 stage6/packages-update | 1 -
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/dependencies b/config/dependencies
index cfa5ee1..115a983 100644
--- a/config/dependencies
+++ b/config/dependencies
@@ -12,7 +12,7 @@ ${RHYTHMBOX}: ${LIBID3TAG}
 # Easytag requiert id3lib pour les MP3
 ${EASYTAG}: id3lib OR ${LIBID3TAG}
 ${AUDACIOUS}: taglib, libmowgli, mcs
-${GRIP}: id3lib
+${GRIP}: ${VTE} id3lib
 
 ${GOFFICE}: ${LIBGSF} ${PCRE} ${PANGO}
 ${GNUMERIC}: ${GOFFICE}
diff --git a/config/packages-list b/config/packages-list
index 699aa5c..2fbffaa 100644
--- a/config/packages-list
+++ b/config/packages-list
@@ -148,7 +148,7 @@ GNOME_DESKTOP="gnome-desktop-2.28.0"
 GNOME_BACKGROUNDS="gnome-backgrounds-2.28.0"
 GNOME_MENUS="gnome-menus-2.28.0.1"
 GNOME_PANEL="gnome-panel-2.28.0"
-VTE="vte-0.22.2"
+VTE="vte-0.28.2"
 GNOME_TERMINAL="gnome-terminal-2.28.1"
 LIBGTOP="libgtop-2.28.0"
 LIBGNOMEKBD="libgnomekbd-2.28.0"
@@ -198,7 +198,7 @@ GOFFICE="goffice-0.8.17"
 GNUMERIC="gnumeric-1.10.17"
 GNUPG="gnupg-1.4.11"
 GREP="grep-2.6.3"
-GRIP="grip-3.3.1"
+GRIP="grip-3.4.0"
 GROFF="groff-1.20.1"
 GRUB="grub-1.99"
 GSL="gsl-1.15"
diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index 33108ed..0e6ea3f 100755
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -107,7 +107,8 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
         ipkg ${LIBOIL}
 
         # Audio applications
-	###ipkg -m acnb ${GRIP} "--disable-id3"
+        ipkg ${VTE} "--libexecdir=/usr/lib/vte --disable-gtk-doc"
+        ipkg -m acnb ${GRIP} "--disable-id3"
         ipkg -m acnb ${CDRDAO}
         ipkg -m acnb ${EASYTAG}
         ipkg -m acnb ${FONTFORGE}
diff --git a/stage5/packages-update b/stage5/packages-update
index 87f7323..2f76d93 100755
--- a/stage5/packages-update
+++ b/stage5/packages-update
@@ -91,6 +91,7 @@ fpkg -m gnome ${GNOME_ICON_THEME}
 fpkg -m gnome ${EVINCE}
 
 fpkg -e "tar.gz" ${LIBOIL} "http://liboil.freedesktop.org/download"
+fpkg -m gnome ${VTE}
 fpkg -m sf ${GRIP}
 fpkg -m sf -e "tar.bz2" ${CDRDAO}
 fpkg -m sf -e "tar.bz2" ${EASYTAG}
diff --git a/stage6/hv-install-1 b/stage6/hv-install-1
index e78f747..6e47919 100755
--- a/stage6/hv-install-1
+++ b/stage6/hv-install-1
@@ -21,7 +21,6 @@ ipkg_gnome ${GNOME_DESKTOP}
 ipkg_gnome ${GNOME_BACKGROUNDS}
 ipkg_gnome ${GNOME_MENUS}
 ipkg_gnome ${GNOME_PANEL}
-ipkg    ${VTE} "--libexecdir=/usr/sbin --disable-gtk-doc"
 ipkg_gnome ${GNOME_TERMINAL}
 ipkg_gnome ${LIBGTOP}
 ipkg_gnome ${LIBGNOMEKBD}
diff --git a/stage6/packages-update b/stage6/packages-update
index db8583e..a850c90 100755
--- a/stage6/packages-update
+++ b/stage6/packages-update
@@ -26,7 +26,6 @@ fpkg -m gnome ${GNOME_BACKGROUNDS}
 fpkg -m gnome ${GNOME_MENUS}
 fpkg -m gnome ${GNOME_PANEL}
 fpkg -m gnome ${GNOME_SESSION}
-fpkg -m gnome ${VTE}
 fpkg -m gnome ${GNOME_TERMINAL}
 fpkg -m gnome ${LIBGTOP}
 fpkg -m gnome ${LIBGNOMEKBD}
-- 
2.20.1