[Blends-commit] [SCM] med branch, historic, updated. 6c0b338c229d6163381015383ea1a8ab646c33e2

Andreas Tille tille at debian.org
Wed Feb 21 13:36:49 UTC 2018


The following commit has been merged in the historic branch:
commit 6c0b338c229d6163381015383ea1a8ab646c33e2
Author: Andreas Tille <tille at debian.org>
Date:   Wed Feb 21 14:36:11 2018 +0100

    Commit status of 0.8.9

diff --git a/VERSION b/VERSION
index ee94dd8..55485e1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.8.3
+0.8.9
diff --git a/common/control b/common/control
index e7ee8b3..ae08a83 100644
--- a/common/control
+++ b/common/control
@@ -1,6 +1,6 @@
 Package: med-common
 Architecture: all
-Depends: adduser, debconf (>= 1.2), menu, cdd-common (>= 0.3.2)
+Depends: adduser, debconf (>= 1.2), menu, cdd-common (>= 0.3.3)
 Description: Debian-Med Project common package
  This package builds the basic infra structure of all med-* packages.
  .
diff --git a/debian/changelog b/debian/changelog
index 95f3f6a..7100a02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debian-med (0.8.9) experimental; urgency=low
+
+  * New upstream version which now uses the features of cdd-dev 0.3.9
+  * Exclude .svn dirs in dist target of debian/rules
+
+ -- Andreas Tille <tille at debian.org>  Fri, 16 Jul 2004 11:33:21 +0200
+
 debian-med (0.8.3) unstable; urgency=high
 
   * Rebuilded again against cdd-dev 0.3.4 which really closes the
diff --git a/debian/control b/debian/control
index 9a567be..6faaf9f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: debian-med
 Section: misc
 Priority: extra
 Maintainer: Andreas Tille <tille at debian.org>
-Build-Depends-Indep: debhelper (>= 4), cdd-dev (>= 0.3.4)
+Build-Depends-Indep: debhelper (>= 4), cdd-dev (>= 0.3.9)
 Standards-Version: 3.6.1
 
 Package: med-common
 Architecture: all
-Depends: adduser, ${misc:Depends}, menu, cdd-common (>= 0.3.2)
+Depends: adduser, ${misc:Depends}, menu (>= 2.1.14), cdd-common (>= 0.3.9)
 Description: Debian-Med Project common package
  This package builds the basic infra structure of all med-* packages.
  .
@@ -18,7 +18,7 @@ Description: Debian-Med Project common package
 
 Package: med-bio
 Architecture: all
-Depends: blast2, boxshade, bugsx, fastdnaml, fastlink, garlic, ghemical, hmmer, loki, ncbi-epcr, ncbi-tools-bin, ncbi-tools-x11, njplot, pymol, r-cran-qtl, rasmol, readseq, tigr-glimmer, tree-puzzle, med-common (>= ${binary:Version})
+Depends: med-common (= ${binary:Version}), blast2, boxshade, bugsx, fastdnaml, fastlink, garlic, ghemical, hmmer, loki, ncbi-epcr, ncbi-tools-bin, ncbi-tools-x11, njplot, pymol, r-cran-qtl, rasmol, readseq, tigr-glimmer, tree-puzzle
 Suggests: clustalw, clustalw-mpi, clustalx, molphy, phylip, seaview, treetool
 Description: Debian-Med micro-biology packages
  This meta package will install micro-biology related Debian packages
@@ -26,30 +26,29 @@ Description: Debian-Med micro-biology packages
 
 Package: med-bio-dev
 Architecture: all
-Depends: bioperl, libncbi6-dev, libvibrant6-dev, mcl, med-common (>= ${binary:Version})
-Suggests: biomode, r-base-core
+Depends: med-common (= ${binary:Version}), bioperl, libncbi6-dev, libvibrant6-dev, mcl
+Suggests: biomode, r-base
 Description: Debian-Med packages for development of micro-biology applications
  This meta package will install Debian packages which might be helpful
  for development of applications for micro-biological research.
 
 Package: med-cms
 Architecture: all
-Depends: zope-zms, med-common (>= ${binary:Version})
+Depends: med-common (= ${binary:Version}), zope-zms
 Description: Debian-Med content management systems
  This meta package will install packages which are useful to build a
  content management system for medical care.
 
 Package: med-dent
 Architecture: all
-Depends: mozilla-browser, med-common (>= ${binary:Version})
-Suggests: debconf (>= 1.2), debianutils (>= 2.6.2), www-browser
+Depends: med-common (= ${binary:Version}), debconf (>= 1.2), debianutils (>= 2.6.2), mozilla-browser | www-browser
 Description: Debian-Med package for dental practice client
  This meta package will configure your system to act as client for the
  OdontoLinux server which provides a system for managing a dental practice.
 
 Package: med-imaging
 Architecture: all
-Depends: ctn, ctsim, medcon, minc-tools, paul, xmedcon, med-common (>= ${binary:Version})
+Depends: med-common (= ${binary:Version}), ctn, ctsim, medcon, minc-tools, paul, xmedcon
 Suggests: imagemagick
 Description: Debian-Med imaging packages
  This meta package will install Debian packages which might be useful in medical
@@ -57,14 +56,14 @@ Description: Debian-Med imaging packages
 
 Package: med-imaging-dev
 Architecture: all
-Depends: ctn-dev, libgtkimreg-dev, libmdc2-dev, libminc0-dev, med-common (>= ${binary:Version})
+Depends: med-common (= ${binary:Version}), ctn-dev, libgtkimreg-dev, libmdc2-dev, libminc0-dev
 Description: Debian-Med packages for medical image development
- This meta package will install Debian packages which might be useful
+ This meta package will install Debian packages which might be useful 
  for developing applications for medical image processing.
 
 Package: med-pharmacy
 Architecture: all
-Depends: chemtool, med-common (>= ${binary:Version})
+Depends: med-common (= ${binary:Version}), chemtool
 Description: Debian-Med packages for pharmaceutical research
  This meta package contains dependencies for a
  collection of software and documentation which is useful for
@@ -72,9 +71,9 @@ Description: Debian-Med packages for pharmaceutical research
 
 Package: med-physics
 Architecture: all
-Depends: octave, paw++, r-base, med-common (>= ${binary:Version})
-Recommends: paw
+Depends: med-common (= ${binary:Version}), octave, paw++, r-base
 Suggests: paw-demos
+Recommends: paw
 Description: Debian-Med packages for medical physicists
  This meta package contains dependencies for a
  collection of software and documentation which is useful for
@@ -83,7 +82,7 @@ Description: Debian-Med packages for medical physicists
 
 Package: med-tools
 Architecture: all
-Depends: mencal, med-common (>= ${binary:Version})
+Depends: med-common (= ${binary:Version}), mencal
 Description: Debian-Med several tools
  This meta package will install tools for several purposes in health care.
  Currently it just depends from mencal.
diff --git a/debian/control.stub b/debian/control.stub
index 1ee54b3..dca7381 100644
--- a/debian/control.stub
+++ b/debian/control.stub
@@ -2,7 +2,7 @@ Source: debian-med
 Section: misc
 Priority: extra
 Maintainer: Andreas Tille <tille at debian.org>
-Build-Depends-Indep: debhelper (>= 4), cdd-dev (>= 0.3.4)
+Build-Depends-Indep: debhelper (>= 4), cdd-dev (>= 0.3.9)
 Standards-Version: 3.6.1
 
 Package: med
diff --git a/debian/med-dent.config b/debian/med-dent.config
new file mode 100755
index 0000000..8f1843b
--- /dev/null
+++ b/debian/med-dent.config
@@ -0,0 +1,20 @@
+#!/bin/sh
+set -e
+
+CFGDIR=/etc/cdd/med/tasks/dent/
+CFG=${CFGDIR}/odontolinux.conf
+PKG=`basename $0 | sed -e 's/\.[^.]*$//'`
+
+DEBCONF_DEBUG=developer
+
+. /usr/share/debconf/confmodule
+db_version 2.0
+
+if [ -e ${CFG} ]; then
+        . ${CFG} || true
+        if [ "$SERVER" ] ; then
+                db_set ${PKG}/server $SERVER
+        fi
+fi
+db_input medium ${PKG}/server  || true
+db_go || true
diff --git a/debian/med-dent.install b/debian/med-dent.install
new file mode 100644
index 0000000..fa3372b
--- /dev/null
+++ b/debian/med-dent.install
@@ -0,0 +1 @@
+install/dent/dentalpractice usr/bin
diff --git a/debian/med-dent.manpages b/debian/med-dent.manpages
new file mode 100644
index 0000000..3794a60
--- /dev/null
+++ b/debian/med-dent.manpages
@@ -0,0 +1 @@
+install/dent/dentalpractice.1
diff --git a/debian/med-dent.postinst.stub b/debian/med-dent.postinst.stub
new file mode 100644
index 0000000..5495f68
--- /dev/null
+++ b/debian/med-dent.postinst.stub
@@ -0,0 +1,32 @@
+#!/bin/sh
+set -e
+
+CFGDIR=/etc/cdd/med/tasks/dent/
+CFG=${CFGDIR}/odontolinux.conf
+PKG=`basename $0 | sed -e 's/\.[^.]*$//'`
+
+DEBCONF_DEBUG=developer
+. /usr/share/debconf/confmodule
+db_version 2.0
+
+NEW=0
+if [ -e "${CONF}" ]; then
+   NEW=-1
+   . ${CFG} || true 
+fi
+
+# Handle server variable in config file
+db_get ${PKG}/server 
+if [ ${NEW} ] ; then
+    mkdir -p ${CFGDIR}
+    cat > ${CFG} <<EOT
+# Configuration for Odontolinux
+# SERVER is the host which is running the Odontolinux system.
+# The default host is localhost.
+SERVER=$RET
+EOT
+fi
+
+db_go
+
+#DEBHELPER#
diff --git a/debian/med-dent.templates b/debian/med-dent.templates
new file mode 100644
index 0000000..c91b024
--- /dev/null
+++ b/debian/med-dent.templates
@@ -0,0 +1,8 @@
+Template: med-dent/server
+Type: string
+Default: localhost
+_Description: On which host is the Odontolinux! server running?
+ Odontolinux is a dental office management software which runs on a
+ server and will be accessed by a web browser.  Please input the
+ host name on which the Odontolinux server is running.  If Odontolinux
+ is running on this host you can go with the defaul (localhost).
diff --git a/debian/med-templates b/debian/med-templates
deleted file mode 100644
index b2bdb66..0000000
--- a/debian/med-templates
+++ /dev/null
@@ -1,6 +0,0 @@
-Template: med-common/group
-Type: multiselect
-_Choices: ${users}
-_Description: Please specify the Debian-Med users!
- Here is a list of all normal users of the system.  Now you can select
- those users who should get a Debian-Med user menu.
diff --git a/debian/po.stub/POTFILES.in b/debian/po.stub/POTFILES.in
new file mode 100644
index 0000000..657e4d2
--- /dev/null
+++ b/debian/po.stub/POTFILES.in
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] med-dent.templates
diff --git a/debian/po.stub/de.po b/debian/po.stub/de.po
new file mode 100644
index 0000000..1a6922c
--- /dev/null
+++ b/debian/po.stub/de.po
@@ -0,0 +1,46 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: debian-med\n"
+"Report-Msgid-Bugs-To: Andreas Tille <tille at debian.org>\n"
+"POT-Creation-Date: 2004-07-09 17:42+0200\n"
+"PO-Revision-Date: 2004-07-09 17:42+0200\n"
+"Last-Translator: Andreas Tille <tille at debian.org>\n"
+"Language-Team: German <debian-l10n-french at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../med-dent.templates:4
+msgid "On which host is the Odontolinux! server running?"
+msgstr "Auf welchem Rechner läuft der Odontolinux! server?"
+
+#. Type: string
+#. Description
+#: ../med-dent.templates:4
+msgid ""
+"Odontolinux is a dental office management software which runs on a server "
+"and will be accessed by a web browser.  Please input the host name on which "
+"the Odontolinux server is running.  If Odontolinux is running on this host "
+"you can go with the defaul (localhost)."
+msgstr ""
+"Odontolinux ist ein Verwaltungssystem für die zahnärztliche Praxis, das "
+"auf einem Server läuft und über einen Web-Browser bedient wird.  Bitte "
+"geben Sie den Rechnernamen ein, auf dem der Odontolinux server läuft. "
+"Falls Odontolinux auf diesem Server läuft, kann der Standardwert "
+"(localhost) beibehalten werden."
diff --git a/debian/po.stub/templates.pot b/debian/po.stub/templates.pot
new file mode 100644
index 0000000..c9c6d30
--- /dev/null
+++ b/debian/po.stub/templates.pot
@@ -0,0 +1,41 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-07-09 17:42+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../med-dent.templates:4
+msgid "On which host is the Odontolinux! server running?"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../med-dent.templates:4
+msgid ""
+"Odontolinux is a dental office management software which runs on a server "
+"and will be accessed by a web browser.  Please input the host name on which "
+"the Odontolinux server is running.  If Odontolinux is running on this host "
+"you can go with the defaul (localhost)."
+msgstr ""
diff --git a/debian/rules b/debian/rules
index f6cd24d..7e8664b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,46 +8,29 @@
 cdd=med
 pkgsrc=debian-$(cdd)
 
-control: gen-control debian/control.stub tasks/* control-stamp
-control-stamp:
-	rm -f debian/control
-	cdd-gen-control -c -m -i
-
-	touch control-stamp
 
-build: control-stamp build-stamp
+build: build-stamp
 build-stamp:
-	# Fix *.dsc file to mention all binary targets
-	TASKS="" ; \
-	if [ -d common ] ; then TASKS="$(cdd)-common" ; fi ; \
-	for task in `ls -1 tasks | sort` ; do \
-		if [ "$${TASKS}" != "" ] ; then TASKS="$${TASKS}, " ; fi ; \
-		TASKS="$${TASKS}$(cdd)-$${task}" ; \
-	done ; \
-	sed "s/^\(Binary: \)$(cdd)/\1$${TASKS}/" ../$(pkgsrc)_*.dsc > tmp.dsc ; \
-	mv tmp.dsc ../$(pkgsrc)_*.dsc
 	dh_testdir
 
 	#/usr/bin/docbook-to-man debian/meta-$(cdd).sgml > meta-$(cdd).1
 
 	touch build-stamp
 
-clean: debian/control
+clean: debian/control tasks/* debian/control.stub
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp control-stamp
-	rm -rf tmp
-	rm -f tasks/*~
-	[ -d menu ] && rm -f debian/$(cdd)-*.post{inst,rm}
-	rm -f debian/$(cdd)-common.{templates,config,install} debian/90$(cdd)-common
-	rm -rf debian/po
+	rm -f build-stamp
+
+	cdd-clean-helper
 
 	if [ -f debian/control ] ; then dh_clean ; fi
 	rm -f debian/control
-	ln -s control.stub debian/control
+	# ln -s control.stub debian/control
+	cdd-gen-control -c -m -i
 
 
-install: control-stamp build
+install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k
@@ -93,7 +76,8 @@ dist:
 	rm -rf $${distdir} ; \
 	mkdir $${distdir} ; \
 	chmod 777 $${distdir} ; \
-	rsync -a --exclude $${distdir} --exclude CVS * $${distdir} ; \
+	rsync -a --exclude $${distdir} --exclude CVS --exclude .svn * $${distdir} ; \
+	ln -s control.stub $${distdir}/debian/control ; \
 	GZIP=-9 tar -czf ../$(pkgsrc)_`cat VERSION`.tar.gz $${distdir} ; \
 	rm -rf $${distdir}
 
diff --git a/debian/templates b/debian/templates
deleted file mode 100644
index b2bdb66..0000000
--- a/debian/templates
+++ /dev/null
@@ -1,6 +0,0 @@
-Template: med-common/group
-Type: multiselect
-_Choices: ${users}
-_Description: Please specify the Debian-Med users!
- Here is a list of all normal users of the system.  Now you can select
- those users who should get a Debian-Med user menu.
diff --git a/docs/bio/#biomode.txt b/docs/bio/#biomode.txt
deleted file mode 100644
index b0dd5cd..0000000
--- a/docs/bio/#biomode.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-BioMode: Emacs mode to edit genetic data
-
-Some information about Biomode from the Debian-Med project.
-
-    It provides you several interesting commands to take the antiparallel
-    of a region, convert it using readseq, runs blast on it, etc.
-
-This package is not really installed by the med-bio package but it is
-suggested.  That means if you are comfortable with the powerful editor
-Emacs you might wish to install also the biomode package and make use
-of it by typing "M-x biomode".
diff --git a/docs/bio/bioperl.txt b/docs/bio/bioperl.txt
deleted file mode 100644
index ecf4efb..0000000
--- a/docs/bio/bioperl.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Bioperl: Perl tools for computational molecular biology
-
-Some information about Bioperl from the Debian-Med project.
-
- The Bioperl project is a coordinated effort to collect computational methods
- routinely used in bioinformatics into a set of standard CPAN-style,
- well-documented, and freely available Perl modules.
-
-The Homepage is http://bio.perl.org/
-
-You can get a good overview by the main manpage:
-
-       man bioperl
diff --git a/docs/bio/blast2.txt b/docs/bio/blast2.txt
deleted file mode 100644
index 4b2d43f..0000000
--- a/docs/bio/blast2.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Blast2: Basic Local Alignment Search Tool
-
-Some information about Blast2 from the Debian-Med project.
-
- The famous sequence alignment program. This is "official" NCBI version, #2.
- The blastall executable allows you to give a nucleotide or protein
- sequence to the program. It is compared against databases and a summary of
- matches is returned to the user.
-
- The reference Web server is http://www.ncbi.nlm.nih.gov/BLAST/.  There you
- can obtain information about the databases to use which are not included
- in Debian and how they can be retrieved manually.
- 
- More infromation about the blast2 tools can be obtained from the following
- manpages:
- 
-   copymat.1 formatdb.1 makemat.1 blast.1 blastclust.1 fastacmd.1 seedtop.1
-   impala.1 bl2seq.1 blastpgp.1 blastcl3.1 blastall.1 rpsblast.1 megablast.1
- 
diff --git a/docs/bio/ncbi-tools-bin.txt b/docs/bio/ncbi-tools-bin.txt
deleted file mode 100644
index 425e6cf..0000000
--- a/docs/bio/ncbi-tools-bin.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-NCBI-Tools-bin: NCBI libraries for biology applications (text-based utilities)
-
-Some information about NCBI-Tools-Bin from the Debian-Med project.
-
- This package includes various utilities distributed with the NCBI C SDK.
- None of the programs in this package require X; you can find the X-based
- utilities in the ncbi-tools-x11 package.  BLAST and related tools are
- in a separate package (blast2).
-
- The reference Web server is http://www.ncbi.nlm.nih.gov/BLAST/.
- 
- You can easily use the programs contained in the ncbi-tools-bin package
- via the menu under Debian/Apps/Technical.
diff --git a/docs/bio/ncbi-tools-x11.txt b/docs/bio/ncbi-tools-x11.txt
deleted file mode 100644
index 4a0b70d..0000000
--- a/docs/bio/ncbi-tools-x11.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-NCBI-Tools-X11: NCBI libraries for biology applications (X-based utilities)
-
-Some information about NCBI-Tools-X11 from the Debian-Med project.
-
- This package includes some X-based utilities distributed with the
- NCBI C SDK: Cn3D, Network Entrez, Sequin, ddv, and udv.  These
- programs are not part of ncbi-tools-bin because they depend on
- several additional library packages.
-
- The reference Web server is http://www.ncbi.nlm.nih.gov/BLAST/.
- 
- You can easily use the programs contained in the ncbi-tools-x11 package
- via the menu under Debian/Apps/Technical.
diff --git a/install/dent/dentalpractice b/install/dent/dentalpractice
new file mode 100755
index 0000000..789f922
--- /dev/null
+++ b/install/dent/dentalpractice
@@ -0,0 +1,19 @@
+#!/bin/sh
+CFGDIR=/etc/cdd/med/tasks/dent/
+CFG=${CFGDIR}/odontolinux.conf
+
+if [ ! -d "$CFGDIR" ] ; then
+    echo "Config directory "$CFGDIR" is missing."
+    exit -1
+fi
+
+if [ ! -e "$CFG" ] ; then
+    echo "Config file "$CFG" is missing."
+    exit -1
+fi
+
+. $CFG
+
+URL=http://"${SERVER:-localhost}"/odontolinux/index.php
+
+sensible-browser "$URL"
diff --git a/install/dent/dentalpractice.1 b/install/dent/dentalpractice.1
new file mode 100644
index 0000000..0b90b0b
--- /dev/null
+++ b/install/dent/dentalpractice.1
@@ -0,0 +1,14 @@
+.TH dentalpractice 1 "May 24, 2002" "Debian-Med"
+.SH NAME
+.B dentalpractice
+\- call web browser pointing to Odontolinux! server
+
+.SH SYNOPSIS
+.B dentalpractice
+
+.SH DESCRIPTION
+Call the prefered browser and point the user directly to the configured
+server of the Odontolinux! dental practice management system.
+
+.SH AUTHOR
+Andreas Tille <tille at debian.org>.
diff --git a/menu/bio b/menu/bio
deleted file mode 100644
index ff200e9..0000000
--- a/menu/bio
+++ /dev/null
@@ -1,19 +0,0 @@
-?package(med-bio):needs="text" section="Med/Microbiology"\
-  title="Boxshade" command="/usr/bin/boxshade"
-?package(med-bio):needs="X11" section="Med/Microbiology"\
-  title="Bugsx"  command="/usr/bin/bugsx -g +0+0" hints="Evolve Biomorphs"
-?package(med-bio):needs="X11" section="Med/Microbiology"\
-  title="Garlic" command="/usr/bin/garlic" hints="Molecular Visualization"
-?package(med-bio):needs="X11" section="Med/Microbiology"\
-  title="ghemical" command="/usr/bin/ghemical"
-?package(med-bio):needs="X11" section="Med/Microbiology"\
-  title="NjPlot" command="/usr/bin/njplot" hints="Tree Drawing"
-?package(med-bio):needs="x11" section="Med/Microbiology" \
-  title="PyMOL" command="/usr/bin/pymol" \
-  hints="PyMOL Molecular Graphics System"
-?package(med-bio):needs="x11" section="Med/Microbiology" \
-  title="rasmol" command="/usr/bin/rasmol" \
-  hints="Molecule visualization and rendering"
-?package(med-bio):needs="text" section="Med/Microbiology"\
-  title="Tree-Puzzle" command="/usr/bin/tree-puzzle"\
-  hints="Reconstruction of Phylogenetic Trees"
diff --git a/menu/bio-dev b/menu/bio-dev
deleted file mode 100644
index 72f2f92..0000000
--- a/menu/bio-dev
+++ /dev/null
@@ -1,4 +0,0 @@
-?package(med-bio-dev):command="/usr/bin/vibrate /usr/bin/asntool" needs="X11" \
-	section="Med/Microbiology Development" title="asntool" hints="Biology" icon="/usr/share/pixmaps/asntool.xpm"
-?package(med-bio-dev):command="/usr/bin/vibrate /usr/bin/errhdr" needs="X11" \
-	section="Med/Microbiology Development" title="errhdr" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
diff --git a/docs/bio-dev/#biomode.txt b/menu/bio-dev/biomode.txt
similarity index 100%
rename from docs/bio-dev/#biomode.txt
rename to menu/bio-dev/biomode.txt
diff --git a/docs/bio-dev/bioperl.txt b/menu/bio-dev/bioperl.txt
similarity index 100%
rename from docs/bio-dev/bioperl.txt
rename to menu/bio-dev/bioperl.txt
diff --git a/menu/bio-dev/libncbi6-dev.menu b/menu/bio-dev/libncbi6-dev.menu
new file mode 100644
index 0000000..103e4d9
--- /dev/null
+++ b/menu/bio-dev/libncbi6-dev.menu
@@ -0,0 +1,4 @@
+?package(libncbi6-dev):command="/usr/bin/vibrate /usr/bin/asntool" needs="X11" \
+	section="Med/Biology development" title="asntool" hints="Biology" icon="/usr/share/pixmaps/asntool.xpm"
+?package(libncbi6-dev):command="/usr/bin/vibrate /usr/bin/errhdr" needs="X11" \
+	section="Med/Biology development" title="errhdr" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
diff --git a/docs/bio-dev/libvibrant6-dev.txt b/menu/bio-dev/libvibrant6-dev.txt
similarity index 100%
rename from docs/bio-dev/libvibrant6-dev.txt
rename to menu/bio-dev/libvibrant6-dev.txt
diff --git a/docs/bio-dev/mcl.txt b/menu/bio-dev/mcl.txt
similarity index 100%
rename from docs/bio-dev/mcl.txt
rename to menu/bio-dev/mcl.txt
diff --git a/menu/bio/blast2.menu b/menu/bio/blast2.menu
new file mode 100644
index 0000000..95384c4
--- /dev/null
+++ b/menu/bio/blast2.menu
@@ -0,0 +1,29 @@
+# The lot of entries just blast the menu to much
+?package(libvibrant6):command="/usr/bin/vibrate /usr/bin/bl2seq" needs="X11" \
+	section="Med/Biology/Blast2" title="bl2seq" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(libvibrant6):command="/usr/bin/vibrate /usr/bin/blast2" needs="X11" \
+	section="Med/Biology/Blast2" title="blast2" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(libvibrant6):command="/usr/bin/vibrate /usr/bin/blastall" needs="X11" \
+	section="Med/Biology/Blast2" title="blastall" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(libvibrant6):command="/usr/bin/vibrate /usr/bin/blastcl3" needs="X11" \
+	section="Med/Biology/Blast2" title="blastcl3" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(libvibrant6):command="/usr/bin/vibrate /usr/bin/blastclust" needs="X11" \
+	section="Med/Biology/Blast2" title="blastclust" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(libvibrant6):command="/usr/bin/vibrate /usr/bin/blastpgp" needs="X11" \
+	section="Med/Biology/Blast2" title="blastpgp" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(libvibrant6):command="/usr/bin/vibrate /usr/bin/copymat" needs="X11" \
+	section="Med/Biology/Blast2" title="copymat" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(libvibrant6):command="/usr/bin/vibrate /usr/bin/fastacmd" needs="X11" \
+	section="Med/Biology/Blast2" title="fastacmd" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(libvibrant6):command="/usr/bin/vibrate /usr/bin/formatdb" needs="X11" \
+	section="Med/Biology/Blast2" title="formatdb" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(libvibrant6):command="/usr/bin/vibrate /usr/bin/impala" needs="X11" \
+	section="Med/Biology/Blast2" title="impala" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(libvibrant6):command="/usr/bin/vibrate /usr/bin/makemat" needs="X11" \
+	section="Med/Biology/Blast2" title="makemat" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(libvibrant6):command="/usr/bin/vibrate /usr/bin/megablast" needs="X11" \
+	section="Med/Biology/Blast2" title="megablast" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(libvibrant6):command="/usr/bin/vibrate /usr/bin/rpsblast" needs="X11" \
+	section="Med/Biology/Blast2" title="rpsblast" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(libvibrant6):command="/usr/bin/vibrate /usr/bin/seedtop" needs="X11" \
+	section="Med/Biology/Blast2" title="seedtop" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
diff --git a/docs/bio/fastdnaml.txt b/menu/bio/fastdnaml.html
similarity index 59%
rename from docs/bio/fastdnaml.txt
rename to menu/bio/fastdnaml.html
index 76d1d1c..3995434 100644
--- a/docs/bio/fastdnaml.txt
+++ b/menu/bio/fastdnaml.html
@@ -1,9 +1,16 @@
-FastDNAml: Construction of Phylogenetic Trees
+<html>
+<head>
+<title>Construction of Phylogenetic Trees</title>
+<meta name="author" content="Andreas Tille" />
+</head>
+<body>
+<h2>FastDNAml: Construction of Phylogenetic Trees</h2>
 
-Some information about fastDNAml from the Debian-Med project.
+<h3>Some information about fastDNAml from the Debian-Med project.</h3>
 
- fastdnaml provides tools for construction of phylogenetic trees of DNA sequences 
+<h4>fastdnaml provides tools for construction of phylogenetic trees of DNA sequences</h4>
 
+<quote>
  fastDNAml is a program derived from Joseph Felsenstein's version 3.3 DNAML
  (part of his PHYLIP package).  Users should consult the documentation for
  DNAML before using this program.
@@ -11,17 +18,27 @@ Some information about fastDNAml from the Debian-Med project.
  faster and using less memory, so that larger trees and/or more bootstrap
  replicates become tractable.  Much of fastDNAml is merely a recoding of the
  PHYLIP 3.3 DNAML program from PASCAL to C.
+</quote>
 
- For more detailed information see
+<h4>For more detailed information see</h4>
 
+<example>
    man fastDNAml
    man fastDNAml-util
    view /usr/share/doc/fastdnaml/fastDNAml_doc_1.2.txt.gz
+</example>
 
  or test the examples under
 
+<example>
    /usr/share/doc/fastdnaml/examples
+</example>
 
  using the Makefile provided under
 
+<example>
    /usr/share/doc/fastdnaml/examples/tests
+</example>
+</body>
+</html>
+
diff --git a/docs/bio/fastlink.txt b/menu/bio/fastlink.txt
similarity index 100%
rename from docs/bio/fastlink.txt
rename to menu/bio/fastlink.txt
diff --git a/docs/bio/glimmer.txt b/menu/bio/glimmer.txt
similarity index 100%
rename from docs/bio/glimmer.txt
rename to menu/bio/glimmer.txt
diff --git a/docs/bio/hmmer.txt b/menu/bio/hmmer.txt
similarity index 100%
rename from docs/bio/hmmer.txt
rename to menu/bio/hmmer.txt
diff --git a/docs/bio/loki.txt b/menu/bio/loki.txt
similarity index 100%
rename from docs/bio/loki.txt
rename to menu/bio/loki.txt
diff --git a/menu/bio/molphy.txt b/menu/bio/molphy.txt
new file mode 100644
index 0000000..df7d402
--- /dev/null
+++ b/menu/bio/molphy.txt
@@ -0,0 +1,17 @@
+Some information about MolPhy from the Debian-Med project.
+
+Molphy is an extensive set of tools for MOLecular PHYlogenetics.  You can
+get a first overview by the two manpages
+
+   man protml
+   man mollist
+
+For further reading the files in 
+
+   /usr/share/doc/molphy
+
+are suggested.  Moreover you can find several examples in
+
+   /usr/share/doc/molphy/examples/tests/
+
+which contains a makefile to give you an idea how to call the MolPhy tools.
diff --git a/docs/bio/ncbi-epcr.txt b/menu/bio/ncbi-epcr.txt
similarity index 100%
rename from docs/bio/ncbi-epcr.txt
rename to menu/bio/ncbi-epcr.txt
diff --git a/menu/bio/ncbi-tools-bin.menu b/menu/bio/ncbi-tools-bin.menu
new file mode 100644
index 0000000..c03daae
--- /dev/null
+++ b/menu/bio/ncbi-tools-bin.menu
@@ -0,0 +1,43 @@
+# The lot of entries just blast the menu to much
+?package(libvibrant6):command="/usr/bin/vibrate /usr/bin/asn2asn" needs="X11" \
+	section="Med/Biology/ncbi-tools-bin" title="asn2asn" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(libvibrant6):command="/usr/bin/vibrate /usr/bin/asn2ff" needs="X11" \
+	section="Med/Biology/ncbi-tools-bin" title="asn2ff" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(libvibrant6):command="/usr/bin/vibrate /usr/bin/asn2gb" needs="X11" \
+	section="Med/Biology/ncbi-tools-bin" title="asn2gb" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(libvibrant6):command="/usr/bin/vibrate /usr/bin/asn2xml" needs="X11" \
+	section="Med/Biology/ncbi-tools-bin" title="asn2xml" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(libvibrant6):command="/usr/bin/vibrate /usr/bin/asndhuff" needs="X11" \
+	section="Med/Biology/ncbi-tools-bin" title="asndhuff" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(libvibrant6):command="/usr/bin/vibrate /usr/bin/checksub" needs="X11" \
+	section="Med/Biology/ncbi-tools-bin" title="checksub" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(libvibrant6):command="/usr/bin/vibrate /usr/bin/debruijn" needs="X11" \
+	section="Med/Biology/ncbi-tools-bin" title="debruijn" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(libvibrant6):command="/usr/bin/vibrate /usr/bin/entrcmd" needs="X11" \
+	section="Med/Biology/ncbi-tools-bin" title="entrcmd" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(libvibrant6):command="/usr/bin/vibrate /usr/bin/fa2htgs" needs="X11" \
+	section="Med/Biology/ncbi-tools-bin" title="fa2htgs" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(libvibrant6):command="/usr/bin/vibrate /usr/bin/fastamerge" needs="X11" \
+	section="Med/Biology/ncbi-tools-bin" title="fastamerge" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(libvibrant6):command="/usr/bin/vibrate /usr/bin/findspl" needs="X11" \
+	section="Med/Biology/ncbi-tools-bin" title="findspl" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(libvibrant6):command="/usr/bin/vibrate /usr/bin/gbseqget" needs="X11" \
+	section="Med/Biology/ncbi-tools-bin" title="gbseqget" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(libvibrant6):command="/usr/bin/vibrate /usr/bin/getfeat" needs="X11" \
+	section="Med/Biology/ncbi-tools-bin" title="getfeat" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(libvibrant6):command="/usr/bin/vibrate /usr/bin/getmesh" needs="X11" \
+	section="Med/Biology/ncbi-tools-bin" title="getmesh" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(libvibrant6):command="/usr/bin/vibrate /usr/bin/getpub" needs="X11" \
+	section="Med/Biology/ncbi-tools-bin" title="getpub" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(libvibrant6):command="/usr/bin/vibrate /usr/bin/gil2bin" needs="X11" \
+	section="Med/Biology/ncbi-tools-bin" title="gil2bin" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(libvibrant6):command="/usr/bin/vibrate /usr/bin/idfetch" needs="X11" \
+	section="Med/Biology/ncbi-tools-bin" title="idfetch" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(libvibrant6):command="/usr/bin/vibrate /usr/bin/indexpub" needs="X11" \
+	section="Med/Biology/ncbi-tools-bin" title="indexpub" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(libvibrant6):command="/usr/bin/vibrate /usr/bin/makeset" needs="X11" \
+	section="Med/Biology/ncbi-tools-bin" title="makeset" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(libvibrant6):command="/usr/bin/vibrate /usr/bin/tbl2asn" needs="X11" \
+	section="Med/Biology/ncbi-tools-bin" title="tbl2asn" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(libvibrant6):command="/usr/bin/vibrate /usr/bin/vecscreen" needs="X11" \
+	section="Med/Biology/ncbi-tools-bin" title="vecscreen" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
diff --git a/menu/bio/ncbi-tools-x11.menu b/menu/bio/ncbi-tools-x11.menu
new file mode 100644
index 0000000..ef4a0c7
--- /dev/null
+++ b/menu/bio/ncbi-tools-x11.menu
@@ -0,0 +1,14 @@
+?package(ncbi-tools-x11):command="/usr/bin/Cn3D-3.0" needs="X11" \
+	section="Med/Biology/ncbi-tools-x11" title="Cn3D-3.0" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(ncbi-tools-x11):command="/usr/bin/Nentrez" needs="X11" \
+	section="Med/Biology/ncbi-tools-x11" title="Entrez" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(ncbi-tools-x11):command="/usr/bin/Psequin" needs="X11" \
+	section="Med/Biology/ncbi-tools-x11" title="Sequin" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(ncbi-tools-x11):command="/usr/bin/ddv" needs="X11" \
+	section="Med/Biology/ncbi-tools-x11" title="ddv" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(ncbi-tools-x11):command="/usr/bin/entrez2" needs="X11" \
+	section="Med/Biology/ncbi-tools-x11" title="entrez2" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(ncbi-tools-x11):command="/usr/bin/netentcf" needs="X11" \
+	section="Med/Biology/ncbi-tools-x11" title="Entrez net config" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
+?package(ncbi-tools-x11):command="/usr/bin/udv" needs="X11" \
+	section="Med/Biology/ncbi-tools-x11" title="udv" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm"
diff --git a/menu/bio/phylip.txt b/menu/bio/phylip.txt
new file mode 100644
index 0000000..03b3959
--- /dev/null
+++ b/menu/bio/phylip.txt
@@ -0,0 +1,26 @@
+Some information about Phylip from the Debian-Med project.
+
+  A package of programs for inferring phylogenies.
+
+  The PHYLogeny Inference Package is a package of programs for inferring
+  phylogenies (evolutionary trees) from sequences.
+  Methods that are available in the package include parsimony, distance
+  matrix, and likelihood methods, including bootstrapping and consensus
+  trees. Data types that can be handled include molecular sequences, gene
+  frequencies, restriction sites, distance matrices, and 0/1 discrete
+  characters.
+
+If you call phylip in a text console you get some help:
+
+ Usage: /usr/bin/phylip <program>
+   Existing programs are:
+ clique	  dnacomp   dnamlk    dollop	drawtree  kitsch    penny     retree
+ consense  dnadist   dnamove   dolmove	factor	  mix	    protdist  seqboot
+ contml	  dnainvar  dnapars   dolpenny	fitch	  move	    protpars
+ contrast  dnaml     dnapenny  drawgram	gendist   neighbor  restml
+
+which is quite the same information as the Debian manpage of phylip
+contains.
+There is extensive documentation at /usr/share/doc/phylip and some
+examples in the examples dir at this location.
+            
\ No newline at end of file
diff --git a/docs/bio/r-cran-qtl.txt b/menu/bio/r-cran-qtl.txt
similarity index 100%
rename from docs/bio/r-cran-qtl.txt
rename to menu/bio/r-cran-qtl.txt
diff --git a/docs/bio/readseq.txt b/menu/bio/readseq.txt
similarity index 100%
rename from docs/bio/readseq.txt
rename to menu/bio/readseq.txt
diff --git a/docs/cms/zope-zms.txt b/menu/cms/zope-zms.txt
similarity index 100%
rename from docs/cms/zope-zms.txt
rename to menu/cms/zope-zms.txt
diff --git a/menu/imaging-dev b/menu/dent/mozilla-browser.menu
similarity index 100%
rename from menu/imaging-dev
rename to menu/dent/mozilla-browser.menu
diff --git a/menu/dent b/menu/dent/www-browser.menu
similarity index 75%
rename from menu/dent
rename to menu/dent/www-browser.menu
index b34ef08..0fe80c6 100644
--- a/menu/dent
+++ b/menu/dent/www-browser.menu
@@ -1,4 +1,4 @@
 ?package(med-dent):needs="X11" section="Med/Dent"\
   title="OdontoLinux"\
-  command="/usr/bin/med-dent"\
+  command="/usr/bin/dentalpractice"\
   hints="Web-Browser viewing OdontoLinux"
diff --git a/menu/imaging b/menu/imaging
deleted file mode 100644
index 5d7907f..0000000
--- a/menu/imaging
+++ /dev/null
@@ -1,10 +0,0 @@
-?package(med-imaging):needs="X11" section="Med/Imaging"\
-  title="Paul" icon="paul.xpm" command="/usr/bin/paul"\
-  hints="Imageviewer designed for image sequences"
-?package(med-imaging):needs="X11" section="Med/Imaging"\
-  title="CtSim" command="/usr/bin/ctsim"\
-  hints="Computed Tomograpy Simulator"
-?package(med-imaging):needs="X11" section="Med/Imaging"\
-  title="xmedcon" command="/usr/bin/xmedcon"\
-  icon="/usr/X11R6/include/X11/pixmaps/xmedcon.xpm"\
-  hints="Medical Image (DICOM, ECAT, ...) conversion tool"
diff --git a/docs/imaging-dev/ctn-dev.txt b/menu/imaging-dev/ctn-dev.txt
similarity index 100%
rename from docs/imaging-dev/ctn-dev.txt
rename to menu/imaging-dev/ctn-dev.txt
diff --git a/docs/imaging-dev/libgtkimreg-dev.txt b/menu/imaging-dev/libgtkimreg-dev.txt
similarity index 100%
rename from docs/imaging-dev/libgtkimreg-dev.txt
rename to menu/imaging-dev/libgtkimreg-dev.txt
diff --git a/docs/imaging-dev/libmdc2-dev.txt b/menu/imaging-dev/libmdc2-dev.txt
similarity index 100%
rename from docs/imaging-dev/libmdc2-dev.txt
rename to menu/imaging-dev/libmdc2-dev.txt
diff --git a/docs/imaging-dev/libminc0-dev.txt b/menu/imaging-dev/libminc0-dev.txt
similarity index 100%
rename from docs/imaging-dev/libminc0-dev.txt
rename to menu/imaging-dev/libminc0-dev.txt
diff --git a/docs/imaging/ctn.txt b/menu/imaging/ctn.txt
similarity index 100%
rename from docs/imaging/ctn.txt
rename to menu/imaging/ctn.txt
diff --git a/docs/imaging/medcon.txt b/menu/imaging/medcon.txt
similarity index 100%
rename from docs/imaging/medcon.txt
rename to menu/imaging/medcon.txt
diff --git a/docs/imaging/minc-tools.txt b/menu/imaging/minc-tools.txt
similarity index 100%
rename from docs/imaging/minc-tools.txt
rename to menu/imaging/minc-tools.txt
diff --git a/menu/pharmacy b/menu/pharmacy
deleted file mode 100644
index 3968454..0000000
--- a/menu/pharmacy
+++ /dev/null
@@ -1,3 +0,0 @@
-?package(med-pharmacy):needs="X11" section="Med/Pharmacy" \
-  title="chemtool" icon="/usr/share/pixmaps/chemtool.xpm" \
-  hints="Chemical Structure Editor" command="/usr/bin/chemtool"
diff --git a/menu/physics b/menu/physics
deleted file mode 100644
index 1497c48..0000000
--- a/menu/physics
+++ /dev/null
@@ -1,12 +0,0 @@
-?package(med-physics):needs="x11"	\
-	section="Med/Physics" 		\
-	title="Paw"			\
-	command="paw++.dynamic"
-?package(med-physics):needs="text"	\
-	section="Med/Physics"		\
-	title="GNU R"			\
-	command="/usr/bin/R"
-?package(med-physics):needs="text"	\
- 	 section="Med/Physics"		\
-	 title="Octave (2.1)"		\
-	 command="/usr/bin/octave2.1"
diff --git a/menu/physics/octave.menu b/menu/physics/octave.menu
new file mode 100644
index 0000000..87ecd6c
--- /dev/null
+++ b/menu/physics/octave.menu
@@ -0,0 +1,4 @@
+?package(octave2.1):needs="text"	\
+ 	 section="Med/Physics"		\
+	 title="Octave (2.1)"		\
+	 command="/usr/bin/octave2.1"
diff --git a/menu/physics/r-base.menu b/menu/physics/r-base.menu
new file mode 100644
index 0000000..875c8fe
--- /dev/null
+++ b/menu/physics/r-base.menu
@@ -0,0 +1,4 @@
+?package(r-base-core):needs="text"	\
+	section="Med/Physics"		\
+	title="GNU R"			\
+	command="/usr/bin/R"
diff --git a/menu/tools b/menu/tools/gnutrition.menu
similarity index 65%
rename from menu/tools
rename to menu/tools/gnutrition.menu
index e6e7980..7d620b0 100644
--- a/menu/tools
+++ b/menu/tools/gnutrition.menu
@@ -1,3 +1,3 @@
-?package(med-tools):needs="text" section="Med/Tools"\
+?package(gnutrition):needs="text" section="Med/Tools"\
   title="Nutrition analysis" command="/usr/bin/gnutrition"\
   hints="/usr/share/pixmaps/gnutrition.xpm"
diff --git a/docs/tools/mencal.txt b/menu/tools/mencal.txt
similarity index 100%
rename from docs/tools/mencal.txt
rename to menu/tools/mencal.txt
diff --git a/tasks/bio b/tasks/bio
index 277b9dd..2cc202d 100644
--- a/tasks/bio
+++ b/tasks/bio
@@ -1,4 +1,4 @@
-Architecture: all
+Task: Biology
 Description: Debian-Med micro-biology packages
  This meta package will install micro-biology related Debian packages
  for use in medical research.
diff --git a/tasks/bio-dev b/tasks/bio-dev
index 51edcd8..41017e6 100644
--- a/tasks/bio-dev
+++ b/tasks/bio-dev
@@ -1,7 +1,7 @@
-Architecture: all
+Task: Biology development
 Description: Debian-Med packages for development of micro-biology applications
  This meta package will install Debian packages which might be helpful
  for development of applications for micro-biological research.
 
 Depends: bioperl, libncbi6-dev, libvibrant6-dev, mcl
-Suggests: biomode, r-base-core
+Suggests: biomode, r-base
diff --git a/tasks/cms b/tasks/cms
index a39f0fd..65e5618 100644
--- a/tasks/cms
+++ b/tasks/cms
@@ -1,4 +1,4 @@
-Architecture: all
+Task: Content Management
 Description: Debian-Med content management systems
  This meta package will install packages which are useful to build a
  content management system for medical care.
diff --git a/tasks/dent b/tasks/dent
index 70bb264..3f06c1e 100644
--- a/tasks/dent
+++ b/tasks/dent
@@ -1,4 +1,4 @@
-Architecture: all
+Task: Dental
 Description: Debian-Med package for dental practice client
  This meta package will configure your system to act as client for the
  OdontoLinux server which provides a system for managing a dental practice.
diff --git a/tasks/imaging b/tasks/imaging
index 6f908f6..c4a8ddf 100644
--- a/tasks/imaging
+++ b/tasks/imaging
@@ -1,4 +1,4 @@
-Architecture: all
+Task: Imaging
 Description: Debian-Med imaging packages
  This meta package will install Debian packages which might be useful in medical
  image processing.
diff --git a/tasks/imaging-dev b/tasks/imaging-dev
index fb958f5..17658ed 100644
--- a/tasks/imaging-dev
+++ b/tasks/imaging-dev
@@ -1,4 +1,4 @@
-Architecture: all
+Task: Imaging Development
 Description: Debian-Med packages for medical image development
  This meta package will install Debian packages which might be useful 
  for developing applications for medical image processing.
diff --git a/tasks/pharmacy b/tasks/pharmacy
index 32209d3..c5a1646 100644
--- a/tasks/pharmacy
+++ b/tasks/pharmacy
@@ -1,4 +1,4 @@
-Architecture: all
+Task: Pharmacy
 Description: Debian-Med packages for pharmaceutical research
  This meta package contains dependencies for a
  collection of software and documentation which is useful for
diff --git a/tasks/physics b/tasks/physics
index 80e42c8..20996a1 100644
--- a/tasks/physics
+++ b/tasks/physics
@@ -1,4 +1,4 @@
-Architecture: all
+Task: Physics
 Description: Debian-Med packages for medical physicists
  This meta package contains dependencies for a
  collection of software and documentation which is useful for
diff --git a/tasks/tools b/tasks/tools
index 892882a..990b74b 100644
--- a/tasks/tools
+++ b/tasks/tools
@@ -1,4 +1,4 @@
-Architecture: all
+Task: Tools
 Description: Debian-Med several tools
  This meta package will install tools for several purposes in health care.
  Currently it just depends from mencal.

-- 
Debian Med metapackages



More information about the Blends-commit mailing list