dselect: Remove long obsolete floppy method

9 files changed, 2 insertions, 309 deletions

diff --git a/TODO b/TODO
index 0ea9a69bc..bc2dee0a9 100644
--- a/TODO
+++ b/TODO
@@ -144,7 +144,6 @@ other stuff unlikely to get done soon
  * dselect per-half focus and keybindings improvements.
    !missing bug report #1555!
 
- * floppy map (where are the files)
  * how to change case of package names
  * 'fake' or 'null' packages
  * dpkg --query | -Q
diff --git a/debian/changelog b/debian/changelog
index 12c606539..1addd4564 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ dpkg (1.19.0) UNRELEASED; urgency=medium
     Rules-Requires-Root (R³) field.
   * Add new dpkg-buildflags --query command, which is like --status but in
     deb822 format.
+  * Remove long obsolete dselect floppy method.
   * Perl modules:
     - Switch from Dpkg::Util to List::Util, now that the module in the
       new required Perl contains the needed functions.
diff --git a/dselect/methods/Makefile.am b/dselect/methods/Makefile.am
index 3a2c3be08..74c8be2ce 100644
--- a/dselect/methods/Makefile.am
+++ b/dselect/methods/Makefile.am
@@ -8,8 +8,6 @@ nobase_dist_methods_DATA = \
 	disk/desc.nfs \
 	disk/desc.harddisk \
 	disk/desc.mounted \
-	floppy/names \
-	floppy/desc.floppy \
 	ftp/names \
 	ftp/desc.ftp \
 	multicd/names \
@@ -27,9 +25,6 @@ nobase_dist_methods_SCRIPTS = \
 	disk/setup \
 	disk/update \
 	disk/install \
-	floppy/setup \
-	floppy/update \
-	floppy/install \
 	multicd/setup \
 	multicd/update \
 	multicd/install
@@ -60,6 +55,5 @@ SUFFIXES = .pl
 install-data-local:
 	$(MKDIR_P) $(DESTDIR)$(admindir)/methods/mnt
 	$(MKDIR_P) $(DESTDIR)$(admindir)/methods/disk
-	$(MKDIR_P) $(DESTDIR)$(admindir)/methods/floppy
 	$(MKDIR_P) $(DESTDIR)$(admindir)/methods/ftp
 	$(MKDIR_P) $(DESTDIR)$(admindir)/methods/multicd
diff --git a/dselect/methods/floppy/desc.floppy b/dselect/methods/floppy/desc.floppy
deleted file mode 100644
index 1880ea66b..000000000
--- a/dselect/methods/floppy/desc.floppy
+++ /dev/null
@@ -1,9 +0,0 @@
-Installation using a pile of floppies, at least one of which (usually
-the first) contains the Packages file, and the rest of which contain
-the binary *.deb files.
-
-If you are installing software from the 'non-free' or 'contrib'
-directories as well as the main Debian distribution you must have the
-Packages files for those areas on separate floppies.  The usual way to
-do this is to put each Packages file on the first floppy which contains
-packages from the relevant area.
diff --git a/dselect/methods/floppy/install b/dselect/methods/floppy/install
deleted file mode 100755
index b3ca411a8..000000000
--- a/dselect/methods/floppy/install
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/bin/sh
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-set -e
-vardir="$1"
-method=$2
-option=$3
-
-cd "$vardir/methods/floppy"
-
-mountpoint="$vardir/methods/mnt"
-
-. ./shvar.$option
-
-help () {
-	echo '
-Now I need the disks containing the packages to be installed.
-I shall keep telling you what is left to be done, in case that
-is helpful deciding which floppy to use.'
-}
-
-help
-
-xit=1
-trap '
-	if [ -n "$umount" ]
-	then
-		umount "$umount"
-	fi
-	exit $xit
-' 0
-
-while [ -z "$goconfigure" ]
-do
-	yet="`dpkg --admindir $vardir --yet-to-unpack`"
-	if [ -z "$yet" ]
-	then
-		echo '
-All packages unpacked, going on to configure them.
-'
-		goconfigure=1
-		continue
-	fi
-	echo '
-Packages yet to be unpacked:'
-	echo "$yet"
-	dpkg-split -l
-
-	echo -n '
-Insert a disk containing *.deb files, or type q to quit.  '
-	read response
-	case "$response" in
-	[Qq] | [Qq][Uu][Ii][Tt] )
-		goconfigure=1
-		;;
-	* )
-		umount="$defaultfloppy"
-		if mount -rt "$defaultfstype" "$defaultfloppy" "$mountpoint"
-		then
-			echo
-			dpkg --admindir $vardir --unpack -GROEB "$mountpoint" || true
-			umount "$defaultfloppy"
-		fi
-		umount=""
-		;;
-	esac
-done
-
-if ! [ -z "$yet" ]
-then
-	response=""
-	while [ -z "$response" ]
-	do
-		echo -n '
-Not all the packages have yet been unpacked.  Shall I try to
-proceed with configuration anyay ?  If any of the packages which
-have been unpacked so far depend on any that haven'\''t then you'\''ll
-see error messages; on the other hand if you say no those packages that
-could have been configured will not be.   (y/n)  '
-		read response
-		case "$response" in
-		[Nn]* )
-			echo '
-OK.  Be sure to come back to this, because unpacked-but-not-configured
-packages are not in general useable.  Alternatively, use the Configure
-option on the dselect menu.
-'
-			exit 1
-			;;
-		[Yy]* )
-			;;
-		* )
-			response=""
-			;;
-		esac
-	done
-fi
-
-dpkg --admindir $vardir --configure --pending
-
-xit=0
diff --git a/dselect/methods/floppy/names b/dselect/methods/floppy/names
deleted file mode 100644
index 72b189a1c..000000000
--- a/dselect/methods/floppy/names
+++ /dev/null
@@ -1 +0,0 @@
-50 floppy Install from a pile of floppy disks.
diff --git a/dselect/methods/floppy/setup b/dselect/methods/floppy/setup
deleted file mode 100755
index ef84293ba..000000000
--- a/dselect/methods/floppy/setup
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/sh
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-set -e
-vardir="$1"
-method=$2
-option=$3
-
-cd "$vardir/methods/floppy"
-
-defaultfloppy=fd0
-defaultfstype=msdos
-if [ -f shvar.$option ]
-then
-	. ./shvar.$option
-	defaultfloppy="`echo \"$defaultfloppy\" | sed -e 's,^/dev/,,'`"
-fi
-
-while [ -z "$floppy" ]
-do
-	echo -n '
-Which floppy disk drive do you wish to use ?  Give the name in
-/dev (eg fd0) or the MSDOS drive letter (eg A).  ['$defaultfloppy']  '
-	read floppy
-	if [ -z "$floppy" ]
-	then
-		floppy="$defaultfloppy"
-	fi
-	case "$floppy" in
-	[ABab] | [ABab]: )
-		floppy="`echo $floppy | \
-			sed -e 's/:$//; s,^[Aa],/dev/fd0,; s,^[Bb],/dev/fd1,'`"
-		;;
-	/* )
-		;;
-	* )
-		floppy="/dev/$floppy"
-		;;
-	esac
-	if ! [ -b "$floppy" ]
-	then
-		echo "$floppy is not a block device."
-		floppy=""
-	fi
-done
-
-while [ -z "$fstype" ]
-do
-	echo -n '
-What kind of filesystem is on the floppies ?  ['$defaultfstype']  '
-	read fstype
-	if [ -z "$fstype" ]
-	then
-		fstype="$defaultfstype"
-	fi
-	if ! grep "	$fstype$" /proc/filesystems >/dev/null
-	then
-		echo \
-	"Your kernel does not appear to support that filesystem type."
-		fstype=""
-	fi
-done
-
-echo
-
-outputparam () {
-	echo "$2" | sed -e "s/'/'\\\\''/; s/^/$1='/; s/$/'/" >&3
-}
-
-exec 3>shvar.$option.new
-
-outputparam defaultfloppy "$floppy"
-outputparam defaultfstype "$fstype"
-
-mv shvar.$option.new shvar.$option
-
-exit 0
diff --git a/dselect/methods/floppy/update b/dselect/methods/floppy/update
deleted file mode 100755
index 890ea1519..000000000
--- a/dselect/methods/floppy/update
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/sh
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-set -e
-vardir="$1"
-method=$2
-option=$3
-
-cd "$vardir/methods/floppy"
-
-mountpoint="$vardir/methods/mnt"
-
-. ./shvar.$option
-
-help () {
-	echo '
-First I need the disk(s) which contain the Packages file(s) for
-the parts of the archive you wish to be able to install.  If you
-want to install packages from the non-free and contrib areas of
-the FTP site you need a floppy with a Packages file for each of
-those, in addition to the main Packages file for the main Debian
-distribution.  If you don'\''t then you just need one Packages file.'
-}
-
-help
-
-xit=1
-trap '
-	if [ -n "$umount" ]
-	then
-		umount "$umount"
-	fi
-	exit $xit
-' 0
-
-tryupdate () {
-	if [ $success = 1 ]; then return; fi
-	if [ ! -f "$mountpoint/Packages" ]; then
-		echo "$mountpoint/Packages does not exist.";
-		return
-	fi
-	if dpkg --admindir $vardir --merge-avail "$mountpoint/Packages"
-	then
-		success=1
-		echo '
-You may incorporate another Packages file from another floppy if you wish.'
-	fi
-}
-
-while [ $xit = 1 ]
-do
-	echo -n '
-Insert a disk containing a Packages file, or type q to quit.  '
-	read response
-	case "$response" in
-	[Qq] | [Qq][Uu][Ii][Tt] )
-		xit=0
-		;;
-	* )
-		umount="$defaultfloppy"
-		if mount -rt "$defaultfstype" "$defaultfloppy" "$mountpoint"
-		then
-			success=0
-			tryupdate Packages
-			tryupdate packages
-			tryupdate PACKAGES
-			umount "$defaultfloppy"
-		fi
-		umount=""
-		;;
-	esac
-done
-
-echo '
-OK, continuing with installation.'
-
-xit=0
diff --git a/man/dselect.man b/man/dselect.man
index 6fb6593e2..206caa3b1 100644
--- a/man/dselect.man
+++ b/man/dselect.man
@@ -152,7 +152,7 @@ Choose and configure an access method to access package repositories.
 .sp
 By default, \fBdselect\fP provides several methods such
 as \fIcdrom\fP, \fImulti_cd\fP, \fInfs\fP, \fImulti_nfs\fP, \fIharddisk\fP,
-\fImounted\fP, \fImulti_mount\fP, \fIfloppy\fP or \fIftp\fP, but other
+\fImounted\fP, \fImulti_mount\fP or \fIftp\fP, but other
 packages may provide additional methods, eg. the \fIapt\fP access method
 provided by the \fBapt\fP package.
 .sp