Browse Source

* xserver-xorg has been changed in version 7.1.0-5 to do all hardware


			
			
				keep-around/43e990ab3f4cc50982f8dbc32e3465ca7c827876
			
			
		
Joey Hess 16 years ago
parent
commit
73f589b110
  1. 4
      Makefile
  2. 5
      README
  3. 15
      debian/changelog
  4. 13
      info/desktop.preinst

4
Makefile

@ -49,7 +49,6 @@ install:
install-data:
install -d $(DESTDIR)$(TASKDIR) \
$(DESTDIR)/usr/lib/tasksel/tests \
$(DESTDIR)/usr/lib/tasksel/info \
$(DESTDIR)/usr/lib/tasksel/packages
install -m 0644 $(TASKDESC) $(DESTDIR)$(TASKDIR)
for test in tests/*; do \
@ -58,9 +57,6 @@ install-data:
[ "$$test" = "tests/lang" ] && continue; \
install -m 755 $$test $(DESTDIR)/usr/lib/tasksel/tests/; \
done
for script in info/*; do \
install -m 755 $$script $(DESTDIR)/usr/lib/tasksel/info/; \
done
for package in packages/*; do \
[ "$$package" = "packages/list" ] && continue; \
install -m 755 $$package $(DESTDIR)/usr/lib/tasksel/packages/; \

5
README

@ -96,4 +96,7 @@ tasks. These are run before a task is installed, and after it is removed as
with the dpkg scripts. These scripts sould be installed in
/usr/lib/tasksel/info/, for example, /usr/lib/tasksel/info/desktop.preinst.
Currently they are passed no parameters, but this might change later. These
scripts should take care not to output anything to stdout.
scripts should take care not to output anything to stdout. You are not
encouraged to use these scripts to install any packages, as in some
situations apt can hang prompting for a CD switch if run from one of these
scripts.

15
debian/changelog

@ -52,13 +52,24 @@ tasksel (2.58) UNRELEASED; urgency=low
* add openoffice.org-gtk to xfce-desktop since -gtk also has an
effect on Xfce. Makes OOo look better and be able to use native
Gtk file dialogs.
[ Per Olofsson ]
* Add bluetooth to laptop task. Closes: #381914.
* Add british language task. Closes: #305132.
* Add wpasupplicant to laptop task. Closes: #394678.
-- Bart Cornelis (cobaco) <cobaco@linux.be> Fri, 27 Oct 2006 09:27:15 +0200
[ Joey Hess ]
* xserver-xorg has been changed in version 7.1.0-5 to do all hardware
detection in its postinst, and so the desktop.preinst script to
pre-install those tools is no longer necessary. Thanks to the X Strike
Force for finally ending this special case.
* Hangs during standalone tasksel runs due to apt prompting for a CD
switch when installing packages in desktop.preinst are therefore no longer
a problem. Closes: #386244
* However, this problem can still occur if third-party task scripts try to
install packages. Document that.
-- Joey Hess <joeyh@debian.org> Fri, 27 Oct 2006 15:54:38 -0400
tasksel (2.57) unstable; urgency=low

13
info/desktop.preinst

@ -1,13 +0,0 @@
#!/bin/sh
set -e
# None of these packages are strictly needed, but they make X
# autoconfiguration work better. Need to install them before X is
# preconfigured. Note that they are also listed as part of the task, which
# will take care of their removal when the task is removed.
for pkg in discover1 xresprobe prtconf; do
if apt-cache show "$pkg" >/dev/null 2>&1 &&
! dpkg --get-selections | grep "$pkg" | grep -q install; then
apt-get -q -y -f install $pkg >/dev/null || true
fi
done
Loading…
Cancel
Save