Drop patches which are part of FAI, depend on FAI 3.2.3

diff --git a/debian/changelog b/debian/changelog
index b0b290b..3a5f5df 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 grml-live (0.0.10) unstable; urgency=low
 
+  * Drop patches which are part of FAI 3.2.3 now. Depend on
+    FAI version 3.2.3 therefor.
   * Do not enable apt-listbugs if the binary is not available.
     [Testing: issue340]
   * Add keychain package to GRML_MEDIUM.

diff --git a/debian/control b/debian/control
index e5e1844..b3714a6 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ XS-Vcs-Browser: http://hg.grml.org/grml-live/
 
 Package: grml-live
 Architecture: all
-Depends: fai-client (>= 3.2), fai-server (>= 3.2), memtest86+ [i386 amd64], mkisofs, squashfs-tools, syslinux [i386 amd64], wget
+Depends: fai-client (>= 3.2.3), fai-server (>= 3.2.3), memtest86+ [i386 amd64], mkisofs, squashfs-tools, syslinux [i386 amd64], wget
 Suggests: fai-doc
 Description: build system for creating a grml (based) live-cd
  This package provides the build system for creating

diff --git a/debian/rules b/debian/rules
index b6f13d9..971a44a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,6 @@ install: build
        cp -a examples    debian/grml-live/usr/share/doc/grml-live/
        cp -a templates   debian/grml-live/usr/share/grml-live/
        cp -a scripts     debian/grml-live/usr/share/grml-live/
-       cp -a patches     debian/grml-live/usr/share/grml-live/
        cp -a buildd/*.sh debian/grml-live/usr/share/grml-live/buildd/
        install -o root -m 640 buildd/grml-buildd.conf debian/grml-live/etc/grml/grml-buildd.conf
        install -o root -m 755 grml-live debian/grml-live/usr/sbin/grml-live

diff --git a/patches/fai_fix_debopts_vs_debopt.patch b/patches/fai_fix_debopts_vs_debopt.patch
deleted file mode 100644 (file)
index aab6cc0..0000000
--- a/patches/fai_fix_debopts_vs_debopt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /usr/sbin/fai      2007-10-17 21:20:47.000000000 +0000
-+++ /usr/sbin/fai      2007-10-17 21:20:50.000000000 +0000
-@@ -223,7 +223,7 @@
- 
-     export NFSROOT=$(source $FAI_ETC_DIR/make-fai-nfsroot.conf; echo $NFSROOT)
-     export FAI_DEBOOTSTRAP=$(source $FAI_ETC_DIR/make-fai-nfsroot.conf; echo $FAI_DEBOOTSTRAP)
--    export FAI_DEBOOTSTRAP_OPT=$(source $FAI_ETC_DIR/make-fai-nfsroot.conf; echo $FAI_DEBOOTSTRAP_OPT)
-+    export FAI_DEBOOTSTRAP_OPTS=$(source $FAI_ETC_DIR/make-fai-nfsroot.conf; echo $FAI_DEBOOTSTRAP_OPTS)
- 
- fi
- 

diff --git a/patches/fai_mention_debopts.patch b/patches/fai_mention_debopts.patch
deleted file mode 100644 (file)
index 1b99543..0000000
--- a/patches/fai_mention_debopts.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /usr/lib/fai/subroutines-linux     2007-10-17 21:21:11.000000000 +0000
-+++ /usr/lib/fai/subroutines-linux     2007-10-17 21:21:03.000000000 +0000
-@@ -124,7 +124,7 @@
-     
-     local dversion=$(dpkg -l debootstrap | grep debootstrap | cut -f7 -d' ')
-     echo "Creating base system using debootstrap version $dversion"
--    echo "Calling debootstrap $1 $FAI_ROOT $2"
-+    echo "Calling debootstrap $1 $FAI_DEBOOTSTRAP_OPTS $FAI_ROOT $2"
-     yes '' | LC_ALL=C debootstrap $FAI_DEBOOTSTRAP_OPTS $1 $FAI_ROOT $2
- }
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

diff --git a/patches/fai_support_aptitude_in_updatebase b/patches/fai_support_aptitude_in_updatebase
deleted file mode 100644 (file)
index 173c4cf..0000000
--- a/patches/fai_support_aptitude_in_updatebase
+++ /dev/null
@@ -1,14 +0,0 @@
---- /usr/lib/fai/updatebase.orig       2007-10-29 00:12:49.000000000 +0100
-+++ /usr/lib/fai/updatebase    2007-10-29 00:13:27.000000000 +0100
-@@ -31,7 +31,11 @@
- [ $? -ne 0 ] && yes '' | $ROOTCMD dpkg --configure -a 
- # using the above value, causes an error: "dpkg need action"
- export aptopt=
-+if [ -x /usr/bin/aptitude ] ; then
-+$ROOTCMD aptitude $aptopt -f -y dist-upgrade </dev/null
-+else
- $ROOTCMD apt-get $aptopt -f -y dist-upgrade </dev/null
-+fi
- # update dpkg info which packages are available
- tmp=$($ROOTCMD mktemp)
- $ROOTCMD apt-cache dumpavail > $FAI_ROOT/$tmp