From 5c6be2fff28fe304eb8cc75752856a0f12ed2b6e Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Sun, 17 May 2009 12:27:36 +0200
Subject: [PATCH] Replace dillo with links2, drop gcc-4.1/g++-4.1 and bzr

---
 debian/changelog                               | 12 ++++++++++++
 etc/grml/fai/config/package_config/GRML_FULL   |  4 ----
 etc/grml/fai/config/package_config/GRML_MEDIUM |  3 +--
 etc/grml/fai/config/package_config/XORG        |  4 ++--
 grml-live                                      |  2 +-
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index adcb993..4f31ed1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+grml-live (0.9.15) unstable; urgency=low
+
+  * As dillo isn't available in Debian/unstable due to removal
+    of libgtk1.2 we'll replace it with xlinks2 from package links2:
+    - GRML_FULL: drop dillo
+    - GRML_MEDIUM: replace links with links2 and drop dillo
+    - XORG: replace dillo with links2
+  * Drop cpp-4.1 and g++-4.1 from GRML_FULL.
+  * Drop bzr from GRML_FULL (19MB is just too much).
+
+ -- Michael Prokop <mika@grml.org>  Sun, 17 May 2009 12:26:41 +0200
+
 grml-live (0.9.14) unstable; urgency=low
 
   The "hey, let's have a post-lenny drop-party" Release.
diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index cb81688..56600ec 100644
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -328,7 +328,6 @@ busybox
 bvi
 bwm-ng
 bzip2
-bzr
 c3270
 cabber
 cabextract
@@ -406,7 +405,6 @@ cpio
 cpipe
 cplay
 cpp
-cpp-4.1
 cproto
 cpu
 cpuburn
@@ -507,7 +505,6 @@ dietlibc
 dietlibc-dev
 diff
 diffstat
-dillo
 ding
 dir2ogg
 dirdiff
@@ -704,7 +701,6 @@ fvwm
 fwlogwatch
 fxload
 g++
-g++-4.1
 gaffitter
 gamin
 gawk
diff --git a/etc/grml/fai/config/package_config/GRML_MEDIUM b/etc/grml/fai/config/package_config/GRML_MEDIUM
index 7d9ae16..78ae71f 100644
--- a/etc/grml/fai/config/package_config/GRML_MEDIUM
+++ b/etc/grml/fai/config/package_config/GRML_MEDIUM
@@ -43,7 +43,6 @@ deborphan
 dhcp3-client
 dialog
 diff
-dillo
 dmidecode
 dmraid
 dmsetup
@@ -128,7 +127,7 @@ laptop-detect
 latencytop
 less
 lilo
-links
+links2
 live-initramfs
 localepurge
 locales
diff --git a/etc/grml/fai/config/package_config/XORG b/etc/grml/fai/config/package_config/XORG
index dec91c0..3385712 100644
--- a/etc/grml/fai/config/package_config/XORG
+++ b/etc/grml/fai/config/package_config/XORG
@@ -68,7 +68,7 @@ xosd-bin
 eterm
 # x-terminal:
 xterm
-# small X browser:
-dillo
+# links2 provides a small X browser named xlinks2:
+links2
 # smooth cursor themes:
 xcursor-themes
diff --git a/grml-live b/grml-live
index 556425a..dbe68a8 100755
--- a/grml-live
+++ b/grml-live
@@ -14,7 +14,7 @@ export LC_ALL=C
 # exit on any error:
 set -e
 
-GRML_LIVE_VERSION='0.9.14'
+GRML_LIVE_VERSION='0.9.15'
 PN="$(basename $0)"
 CMDLINE="$0 $@"
 ISO_DATE="$(date +%Y-%m-%d)"
-- 
2.1.4