Browse Source

* Switched from emacs20 to emacs21. Closes: #152018

* Added Danish language task by Claus Hindsgaul <claus_h@image.dk>.
   * Fixed OOo name. Closes: #158936
   * Patch from Jeff Licquia <licquia@progeny.com> to make tasksel use all
     *.desc files in /usr/share/tasksel, to allow third parties to drop in
      their own additional tasks.
   * This build, at least, will not contain CVS dirs in the source package
     (because I build with DH_ALWAYS_EXCLUDE=CVS set, and pass -ICVS to
     dpkg-buildpackage. Closes: #148759
   * Added wireless-tools to the laptop task as laptops increasingly use
     wireless cards. I think adding wavemon too is a bit too much.
     Closes: #168948
   * Make the tasksel menu entry work as non-root. Closes: #144340
tags/debian_version_1_22
Joey Hess 19 years ago
parent
commit
23fe9848e0
9 changed files with 181 additions and 112 deletions
  1. +4
    -3
      Makefile
  2. +18
    -0
      debian/changelog
  3. +1
    -1
      debian/control
  4. +1
    -1
      debian/menu
  5. +19
    -0
      tasks/danish
  6. +56
    -52
      tasks/desktop
  7. +1
    -0
      tasks/laptop
  8. +56
    -52
      tasks/office
  9. +25
    -3
      tasksel.c

+ 4
- 3
Makefile View File

@@ -1,15 +1,16 @@
PROGRAM=tasksel
TASKDESC=debian-tasks.desc
TASKDIR=/usr/share/tasksel
DESCDIR=tasks/
CC=gcc
CFLAGS=-g -Wall #-Os
DEBUG=1
ifeq (0,$(DEBUG))
DEFS=-DVERSION=\"$(VERSION)\" -DPACKAGE=\"$(PROGRAM)\" -DLOCALEDIR=\"/usr/share/locale\" \
-DTASKDESC=\"/usr/share/tasksel/$(TASKDESC)\"
-DTASKDIR=\"$(TASKDIR)\"
else
DEFS=-DVERSION=\"$(VERSION)\" -DPACKAGE=\"$(PROGRAM)\" -DLOCALEDIR=\"/usr/share/locale\" \
-DTASKDESC=\"$(TASKDESC)\" -DDEBUG
-DTASKDIR=\".\" -DDEBUG
endif
VERSION=$(shell expr "`dpkg-parsechangelog 2>/dev/null |grep Version:`" : '.*Version: \(.*\)' | cut -d - -f 1)
LIBS=-lslang #-lccmalloc -ldl
@@ -36,7 +37,7 @@ $(PROGRAM): $(OBJS) po/build_stamp

install:
install -m 755 tasksel $(DESTDIR)/usr/bin
install -m 0644 $(TASKDESC) $(DESTDIR)/usr/share/tasksel
install -m 0644 $(TASKDESC) $(DESTDIR)$(TASKDIR)
pod2man --center "Debian specific manpage" --release $(VERSION) tasksel.pod | gzip -9c > $(DESTDIR)/usr/share/man/man8/tasksel.8.gz
for lang in $(LANGS); do \
[ ! -d $(LOCALEDIR)/$$lang/LC_MESSAGES/ ] && mkdir -p $(LOCALEDIR)/$$lang/LC_MESSAGES/; \


+ 18
- 0
debian/changelog View File

@@ -1,3 +1,21 @@
tasksel (1.22) unstable; urgency=low

* Switched from emacs20 to emacs21. Closes: #152018
* Added Danish language task by Claus Hindsgaul <claus_h@image.dk>.
* Fixed OOo name. Closes: #158936
* Patch from Jeff Licquia <licquia@progeny.com> to make tasksel use all
*.desc files in /usr/share/tasksel, to allow third parties to drop in
their own additional tasks.
* This build, at least, will not contain CVS dirs in the source package
(because I build with DH_ALWAYS_EXCLUDE=CVS set, and pass -ICVS to
dpkg-buildpackage. Closes: #148759
* Added wireless-tools to the laptop task as laptops increasingly use
wireless cards. I think adding wavemon too is a bit too much.
Closes: #168948
* Make the tasksel menu entry work as non-root. Closes: #144340

-- Joey Hess <joeyh@debian.org> Thu, 5 Dec 2002 13:44:43 -0500

tasksel (1.21) unstable; urgency=low

* This is aimed at sid, not woody.


+ 1
- 1
debian/control View File

@@ -3,7 +3,7 @@ Section: base
Priority: optional
Maintainer: Randolph Chung <tausq@debian.org>
Uploaders: Joey Hess <joeyh@debian.org>
Standards-Version: 3.5.6.1
Standards-Version: 3.5.8.0
Build-Depends: debhelper (>= 4), slang1-dev, gettext, dpkg-dev (>= 1.9.0)

Package: tasksel


+ 1
- 1
debian/menu View File

@@ -1,3 +1,3 @@
?package(tasksel):needs="text" section="Apps/System"\
title="Task selector"\
command="su-to-root /usr/bin/tasksel"
command="su-to-root -c /usr/bin/tasksel"

+ 19
- 0
tasks/danish View File

@@ -0,0 +1,19 @@
Task: danish
Section: l10n
Description: Danish environment
This task installs packages and documentation in Danish
to help Danish speaking people use Debian.
Essential:
locales
language-env
Packages:
locales
language-env
aspell-da
idanish
wdanish
kde-i18n-da
util-linux-locales
openoffice.org-l10n-da
openoffice.org-spellcheck-da
openoffice.org-help-da

+ 56
- 52
tasks/desktop View File

@@ -62,32 +62,34 @@ Essential:
#endinclude
#include gnome
#Automatically added by doincludes.pl; do not edit.
gnome-utils
evolution
sawfish-gnome
gedit
nautilus
gimp
pan
galeon
gftp
xchat-gnome
gnome-admin
gnome-terminal
gnome-media
gnome-audio
gnome-session
gnome-panel
gnome-control-center
imlib-base
gnome-applets
gmc
esound
gnome-help
eog
gconf
gnome-bin
gnome-core
bug-buddy
gnome-control-center
libeel2-2
eog
gconf-editor
gnome-applets
gnome-panel
gnome-session
gnome-system-monitor
gnome-terminal
gnome2-user-guide
gnome-utils
libgail-gnome0
libgnomeprint2-0
libgnomeprintui-0
libgtkhtml2-0
libgtop2
librsvg2-2
libwnck4
libzvt2
nautilus
metacity
scrollkeeper
yelp
gnome-media
gedit
file-roller
system-tray-applet
gnome
#endinclude
Packages:
@@ -101,32 +103,34 @@ Packages:
gimp1.2
#include gnome
#Automatically added by doincludes.pl; do not edit.
gnome-utils
evolution
sawfish-gnome
gedit
nautilus
gimp
pan
galeon
gftp
xchat-gnome
gnome-admin
gnome-terminal
gnome-media
gnome-audio
gnome-session
gnome-panel
gnome-control-center
imlib-base
gnome-applets
gmc
esound
gnome-help
eog
gconf
gnome-bin
gnome-core
bug-buddy
gnome-control-center
libeel2-2
eog
gconf-editor
gnome-applets
gnome-panel
gnome-session
gnome-system-monitor
gnome-terminal
gnome2-user-guide
gnome-utils
libgail-gnome0
libgnomeprint2-0
libgnomeprintui-0
libgtkhtml2-0
libgtop2
librsvg2-2
libwnck4
libzvt2
nautilus
metacity
scrollkeeper
yelp
gnome-media
gedit
file-roller
system-tray-applet
gnome
#endinclude
#include kde


+ 1
- 0
tasks/laptop View File

@@ -15,3 +15,4 @@ Packages:
irda-common
toshutils
noflushd
wireless-tools

+ 56
- 52
tasks/office View File

@@ -9,32 +9,34 @@ Essential:
x-window-system-core
#include gnome-office
#Automatically added by doincludes.pl; do not edit.
gnome-utils
evolution
sawfish-gnome
gedit
nautilus
gimp
pan
galeon
gftp
xchat-gnome
gnome-admin
gnome-terminal
gnome-media
gnome-audio
gnome-session
gnome-panel
gnome-control-center
imlib-base
gnome-applets
gmc
esound
gnome-help
eog
gconf
gnome-bin
gnome-core
bug-buddy
gnome-control-center
libeel2-2
eog
gconf-editor
gnome-applets
gnome-panel
gnome-session
gnome-system-monitor
gnome-terminal
gnome2-user-guide
gnome-utils
libgail-gnome0
libgnomeprint2-0
libgnomeprintui-0
libgtkhtml2-0
libgtop2
librsvg2-2
libwnck4
libzvt2
nautilus
metacity
scrollkeeper
yelp
gnome-media
gedit
file-roller
system-tray-applet
gnome
#endinclude
Packages:
@@ -42,31 +44,33 @@ Packages:
openoffice.org
#include gnome-office
#Automatically added by doincludes.pl; do not edit.
gnome-utils
evolution
sawfish-gnome
gedit
nautilus
gimp
pan
galeon
gftp
xchat-gnome
gnome-admin
gnome-terminal
gnome-media
gnome-audio
gnome-session
gnome-panel
gnome-control-center
imlib-base
gnome-applets
gmc
esound
gnome-help
eog
gconf
gnome-bin
gnome-core
bug-buddy
gnome-control-center
libeel2-2
eog
gconf-editor
gnome-applets
gnome-panel
gnome-session
gnome-system-monitor
gnome-terminal
gnome2-user-guide
gnome-utils
libgail-gnome0
libgnomeprint2-0
libgnomeprintui-0
libgtkhtml2-0
libgtop2
librsvg2-2
libwnck4
libzvt2
nautilus
metacity
scrollkeeper
yelp
gnome-media
gedit
file-roller
system-tray-applet
gnome
#endinclude

+ 25
- 3
tasksel.c View File

@@ -1,4 +1,4 @@
/* $Id: tasksel.c,v 1.14 2001/11/22 17:53:48 tausq Rel $ */
/* $Id: tasksel.c,v 1.15 2002/12/05 18:49:07 joeyh Rel $ */
#include "tasksel.h"

#include <stdio.h>
@@ -8,6 +8,8 @@
#include <locale.h>
#include <stdlib.h>
#include <unistd.h>
#include <sys/types.h>
#include <dirent.h>

#include "slangui.h"
#include "data.h"
@@ -131,6 +133,10 @@ int main(int argc, char * const argv[])
struct tasks_t tasks;
struct package_t **pkglist;
struct task_t **tasklist;
struct dirent *taskdirentry;
DIR *taskdir;
char desc_path[PATH_MAX];
char *extension;
signal(SIGWINCH, tasksel_signalhandler);
@@ -161,8 +167,24 @@ int main(int argc, char * const argv[])
/* Must read packages first. */
packages_readlist(&tasks, &packages);
/* TODO: should probably read in all files in a directory. */
taskfile_read(TASKDESC, &tasks, &packages, showempties);
/* Read in all task description files in the TASKDIR directory. */
taskdir = opendir(TASKDIR);
for (taskdirentry = readdir(taskdir); taskdirentry != NULL;
taskdirentry = readdir(taskdir)) {
for (extension = taskdirentry->d_name; *extension != '\0'; extension++) ;
extension -= 5;
if (extension <= taskdirentry->d_name)
continue;
if (strcmp(extension, ".desc") != 0)
continue;

strncpy(desc_path, TASKDIR, sizeof(desc_path) - 1);
strncat(desc_path, "/", sizeof(desc_path) - 2);
strncat(desc_path, taskdirentry->d_name,
sizeof(desc_path) - strlen(taskdirentry->d_name) - 2);
taskfile_read(desc_path, &tasks, &packages, showempties);
}
closedir(taskdir);

if (tasks.count == 0) {
fprintf(stderr, _("No tasks found on this system.\nDid you update your available file?\n"));


Loading…
Cancel
Save