[med-svn] r2560 - in trunk/packages/agdbnet/trunk/debian: . po template
tille at alioth.debian.org
tille at alioth.debian.org
Tue Sep 30 08:22:04 UTC 2008
Author: tille
Date: 2008-09-30 08:22:03 +0000 (Tue, 30 Sep 2008)
New Revision: 2560
Modified:
trunk/packages/agdbnet/trunk/debian/config
trunk/packages/agdbnet/trunk/debian/po/templates.pot
trunk/packages/agdbnet/trunk/debian/postinst
trunk/packages/agdbnet/trunk/debian/template/agdbnet.xml
trunk/packages/agdbnet/trunk/debian/template/index.html
trunk/packages/agdbnet/trunk/debian/templates
Log:
According to upstream pathogen is not used any more if the description is set properly. So this paramater will not be handled by debconf because description is set.
Modified: trunk/packages/agdbnet/trunk/debian/config
===================================================================
--- trunk/packages/agdbnet/trunk/debian/config 2008-09-30 08:15:03 UTC (rev 2559)
+++ trunk/packages/agdbnet/trunk/debian/config 2008-09-30 08:22:03 UTC (rev 2560)
@@ -47,11 +47,12 @@
# Verify whether config file might contain values different from
# debconf database and set these values
if [ -s /etc/${pkg}/${XMLNAME}.xml ] ; then
- PATOGEN=`grep '</system>' /etc/${pkg}/${XMLNAME}.xml | sed 's?\([^>]\+\)</system>.*?\1?'`
- # verify whether Pathogen is set in config file
- if [ "$PATOGEN" != "##Pathogen##" -a "$PATOGEN" != "" ] ; then
- db_set ${pkg}/pathogen "$PATOGEN"
- fi
+ ## According to upstream pathogen is not used ... can be removed
+ ## PATOGEN=`grep '</system>' /etc/${pkg}/${XMLNAME}.xml | sed 's?\([^>]\+\)</system>.*?\1?'`
+ ## # verify whether Pathogen is set in config file
+ ## if [ "$PATOGEN" != "##Pathogen##" -a "$PATOGEN" != "" ] ; then
+ ## db_set ${pkg}/pathogen "$PATOGEN"
+ ## fi
DESCRIPTION=`grep 'description="' /etc/${pkg}/${XMLNAME}.xml | sed 's/.*description="\([^"]*\)".*/\1/'`
# verify whether description is set in config file
if [ "$DESCRIPTION" != "##Description##" -a "$DESCRIPTION" != "" ] ; then
@@ -69,7 +70,7 @@
fi
fi
-db_input high ${pkg}/pathogen || true
+## db_input high ${pkg}/pathogen || true
db_input high ${pkg}/description || true
db_input high ${pkg}/locusfullname || true
db_input high ${pkg}/locus || true
Modified: trunk/packages/agdbnet/trunk/debian/po/templates.pot
===================================================================
--- trunk/packages/agdbnet/trunk/debian/po/templates.pot 2008-09-30 08:15:03 UTC (rev 2559)
+++ trunk/packages/agdbnet/trunk/debian/po/templates.pot 2008-09-30 08:22:03 UTC (rev 2560)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: agdbnet at packages.debian.org\n"
-"POT-Creation-Date: 2008-09-25 08:22+0200\n"
+"POT-Creation-Date: 2008-09-30 10:20+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"
@@ -53,42 +53,13 @@
#. Type: string
#. Description
#: ../templates:2001
-msgid "Systematic name of pathogen:"
+msgid "Database description:"
msgstr ""
#. Type: string
#. Description
#: ../templates:2001
-msgid "The name of the pathogen that should be analysed."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:2001
msgid ""
-"Reasonable values for pathogen are things like: Campylobacter, Neisseria, "
-"Streptococcus, etc."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:2001
-msgid ""
-"More information is provided online at http://pubmlst.org/software/database/"
-"agdbnet/attributes.shtml . The value here corresponds to the man attribute "
-"of the \"<system>\" element."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:3001
-msgid "Database description:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:3001
-msgid ""
"Each agdbnet database should have a description of the pathogen that will be "
"analysed. The description will be stored in the configuration file in /etc/"
"agdbnet and can be changed there if needed."
@@ -96,7 +67,7 @@
#. Type: string
#. Description
-#: ../templates:3001
+#: ../templates:2001
msgid ""
"Resonable values for such a short description are something like:\n"
" * Campylobacter jejuni FlaA\n"
@@ -106,7 +77,7 @@
#. Type: string
#. Description
-#: ../templates:3001
+#: ../templates:2001
msgid ""
"More information is provided online at http://pubmlst.org/software/database/"
"agdbnet/attributes.shtml . See the description of the attribute \"description"
@@ -115,13 +86,13 @@
#. Type: string
#. Description
-#: ../templates:4001
+#: ../templates:3001
msgid "Full name of locus:"
msgstr ""
#. Type: string
#. Description
-#: ../templates:4001
+#: ../templates:3001
msgid ""
"The preconfiguration of this Debian package has a template for one <locus> "
"element which is the minimal required number. If you need more loci you have "
@@ -130,13 +101,13 @@
#. Type: string
#. Description
-#: ../templates:4001
+#: ../templates:3001
msgid "Reasonable values might be: variable region <number>."
msgstr ""
#. Type: string
#. Description
-#: ../templates:4001
+#: ../templates:3001
msgid ""
"More information is provided online at http://pubmlst.org/software/database/"
"agdbnet/attributes.shtml . See the description of the attribute \"fullname\" "
@@ -145,13 +116,13 @@
#. Type: string
#. Description
-#: ../templates:5001
+#: ../templates:4001
msgid "Locus abbreviation:"
msgstr ""
#. Type: string
#. Description
-#: ../templates:5001
+#: ../templates:4001
msgid ""
"Within the locus element you must have either a nucleotide or a peptide "
"element (or both if you have tables defined for both). The generated XML "
@@ -161,7 +132,7 @@
#. Type: string
#. Description
-#: ../templates:5001
+#: ../templates:4001
msgid ""
"Reasonable values might be: VR1 for \"variable region 1\" or also "
"Campylobacter jejuni flaA for \"Campylobacter jejuni FlaA\"."
@@ -169,7 +140,7 @@
#. Type: string
#. Description
-#: ../templates:5001
+#: ../templates:4001
msgid ""
"More information is provided online at http://pubmlst.org/software/database/"
"agdbnet/attributes.shtml . The value here corresponds to the man attribute "
@@ -178,13 +149,13 @@
#. Type: note
#. Description
-#: ../templates:6001
+#: ../templates:5001
msgid "Hint about configuration of the PubMed reference database"
msgstr ""
#. Type: note
#. Description
-#: ../templates:6001
+#: ../templates:5001
msgid ""
"You are now finished with the AgdbNet configuration. Please read more about "
"AgdbNet configuration at\n"
@@ -198,7 +169,7 @@
#. Type: note
#. Description
-#: ../templates:6001
+#: ../templates:5001
msgid ""
"The following questions concern the creation of the database for PubMed "
"references. It should be safe to use always default values (just <Enter>)."
@@ -206,7 +177,7 @@
#. Type: note
#. Description
-#: ../templates:6001
+#: ../templates:5001
msgid ""
"To enable daily updates of PubMed references you have to create\n"
" /etc/agdbnet/getrefs.conf\n"
@@ -217,13 +188,13 @@
#. Type: string
#. Description
-#: ../templates:7001
+#: ../templates:6001
msgid "Username of database curator:"
msgstr ""
#. Type: string
#. Description
-#: ../templates:7001
+#: ../templates:6001
msgid ""
"Curators of agdbnat are people who are allowed to insert new sequences into "
"the database which can be used to compare with user provided sequences in "
@@ -235,7 +206,7 @@
#. Type: string
#. Description
-#: ../templates:7001
+#: ../templates:6001
msgid ""
"Attention: The method currently used for authentication is insecure. Please "
"read /usr/share/doc/agdbnet/README.Debian how to change this to a secure "
@@ -244,7 +215,7 @@
#. Type: string
#. Description
-#: ../templates:7001
+#: ../templates:6001
msgid ""
"Please input the login username for one curator now. Others can be added "
"later."
@@ -252,13 +223,13 @@
#. Type: string
#. Description
-#: ../templates:8001
+#: ../templates:7001
msgid "Surname of database curator:"
msgstr ""
#. Type: string
#. Description
-#: ../templates:8001
+#: ../templates:7001
msgid ""
"Please input the surname of the person which should work as a curator for "
"agdbnet."
@@ -266,13 +237,13 @@
#. Type: string
#. Description
-#: ../templates:9001
+#: ../templates:8001
msgid "First name of database curator:"
msgstr ""
#. Type: string
#. Description
-#: ../templates:9001
+#: ../templates:8001
msgid ""
"Please input the first name of the person which should work as a curator for "
"agdbnet."
@@ -280,13 +251,13 @@
#. Type: string
#. Description
-#: ../templates:10001
+#: ../templates:9001
msgid "E-mail address of database curator:"
msgstr ""
#. Type: string
#. Description
-#: ../templates:10001
+#: ../templates:9001
msgid ""
"Please input the e-mail address of the person which should work as a curator "
"for agdbnet. Please not that your input is not verified now for a valid e-"
Modified: trunk/packages/agdbnet/trunk/debian/postinst
===================================================================
--- trunk/packages/agdbnet/trunk/debian/postinst 2008-09-30 08:15:03 UTC (rev 2559)
+++ trunk/packages/agdbnet/trunk/debian/postinst 2008-09-30 08:22:03 UTC (rev 2560)
@@ -21,8 +21,9 @@
db_get ${pkg}/description
DESCRIPTION=${RET}
-db_get ${pkg}/pathogen
-PATHOGEN=${RET}
+## According to upstream pathogen is not used any more
+## db_get ${pkg}/pathogen
+## PATHOGEN=${RET}
db_get ${pkg}/locusfullname
LOCUSFULLNAME=${RET}
@@ -38,7 +39,6 @@
if [ ! -e "$XMLOUT" ] ; then
sed -e "s/##database##/${XMLNAME}/g" \
-e "s/##Description##/${DESCRIPTION}/g" \
- -e "s/##Pathogen##/${PATHOGEN}/g" \
-e "s/##LocusFullName##/${LOCUSFULLNAME}/g" \
-e "s/##Locus##/${LOCUS}/g" \
/usr/share/${pkg}/template/${pkg}.xml > \
@@ -48,7 +48,6 @@
sed -i \
-e "s/longcode=\"[^\"]\+\"/longcode=\"${XMLNAME}\"/g" \
-e "s/description=\"[^\"]\+\"/description=\"${DESCRIPTION}\"/g" \
- -e "s?[^>]\+</system>?${PATHOGEN}</system>?g" \
-e "s/<locus fullname=\"[^\"]*\">[^<]\+/<locus fullname=\"${LOCUSFULLNAME}\">${LOCUS}/" \
"$XMLOUT"
fi
@@ -65,7 +64,6 @@
if [ "$confstyle" = "index.html" ] ; then
sed -e "s/##database##/${XMLNAME}/g" \
-e "s/##Description##/${DESCRIPTION}/g" \
- -e "s/##Pathogen##/${PATHOGEN}/g" \
-e "s/##LocusFullName##/${LOCUSFULLNAME}/g" \
-e "s/##Locus##/${LOCUS}/g" \
"$style" > "$STYLEDIR/$confstyle"
Modified: trunk/packages/agdbnet/trunk/debian/template/agdbnet.xml
===================================================================
--- trunk/packages/agdbnet/trunk/debian/template/agdbnet.xml 2008-09-30 08:15:03 UTC (rev 2559)
+++ trunk/packages/agdbnet/trunk/debian/template/agdbnet.xml 2008-09-30 08:22:03 UTC (rev 2560)
@@ -15,7 +15,7 @@
description="##Description##"
downloadFASTAonly="yes"
>
-##Pathogen##</system>
+</system>
<!-- LOCI -->
<locus fullname="##LocusFullName##">##Locus##
Modified: trunk/packages/agdbnet/trunk/debian/template/index.html
===================================================================
--- trunk/packages/agdbnet/trunk/debian/template/index.html 2008-09-30 08:15:03 UTC (rev 2559)
+++ trunk/packages/agdbnet/trunk/debian/template/index.html 2008-09-30 08:22:03 UTC (rev 2560)
@@ -11,8 +11,7 @@
</head>
<body>
-##Pathogen##: <a href="http://localhost/cgi-bin/agdbnet.pl?file=##database##.xml">##database##</a><br />
-##Description##<br />
+##Description##: <a href="http://localhost/cgi-bin/agdbnet.pl?file=##database##.xml">##database##</a><br />
##LocusFullName##
</body>
Modified: trunk/packages/agdbnet/trunk/debian/templates
===================================================================
--- trunk/packages/agdbnet/trunk/debian/templates 2008-09-30 08:15:03 UTC (rev 2559)
+++ trunk/packages/agdbnet/trunk/debian/templates 2008-09-30 08:22:03 UTC (rev 2560)
@@ -16,19 +16,6 @@
See the description of the attribute "longcode" for the
"<system>" element.
-Template: agdbnet/pathogen
-Type: string
-_Description: Systematic name of pathogen:
- The name of the pathogen that should be analysed.
- .
- Reasonable values for pathogen are things like: Campylobacter,
- Neisseria, Streptococcus, etc.
- .
- More information is provided online at
- http://pubmlst.org/software/database/agdbnet/attributes.shtml .
- The value here corresponds to the man attribute of the "<system>"
- element.
-
Template: agdbnet/description
Type: string
_Description: Database description:
More information about the debian-med-commit
mailing list