[med-svn] r3022 - in trunk/packages: agdbnet/trunk/debian mlstdbnet/trunk/debian mlstdbnet/trunk/debian/patches
tille at alioth.debian.org
tille at alioth.debian.org
Mon Jan 19 09:23:21 UTC 2009
Author: tille
Date: 2009-01-19 09:23:20 +0000 (Mon, 19 Jan 2009)
New Revision: 3022
Modified:
trunk/packages/agdbnet/trunk/debian/postinst
trunk/packages/mlstdbnet/trunk/debian/README.Debian
trunk/packages/mlstdbnet/trunk/debian/control
trunk/packages/mlstdbnet/trunk/debian/patches/10_preconf.patch
trunk/packages/mlstdbnet/trunk/debian/postinst
Log:
Added dependencies if possible, postinst verifies existence of scripts which should be called
Modified: trunk/packages/agdbnet/trunk/debian/postinst
===================================================================
--- trunk/packages/agdbnet/trunk/debian/postinst 2009-01-19 00:29:49 UTC (rev 3021)
+++ trunk/packages/agdbnet/trunk/debian/postinst 2009-01-19 09:23:20 UTC (rev 3022)
@@ -1,5 +1,5 @@
#!/bin/sh
-# postinst script for agdbnet
+# postinst script for agdbdnnet/mlstdbnet
set -e
@@ -73,7 +73,7 @@
fi
done
-# Finally a link is put into place to enable agdbnet to find these files.
+# Finally a link is put into place to enable agdbdnnet/mlstdbnet to find these files.
mkdir -p /var/www/${pkg}
if [ ! -L "/var/www/${pkg}/$XMLNAME" -a ! -d "/var/www/${pkg}/$XMLNAME" ] ; then
ln -s "$STYLEDIR" "/var/www/${pkg}/$XMLNAME"
@@ -100,7 +100,7 @@
CURATORCONF=/etc/${pkg}/agcurator.conf
if [ ! -s "$CURATORCONF" ] ; then
cat > "$CURATORCONF" <<EOT
-# This file is used when creating the agdbnet database to add an initial curator
+# This file is used when creating the agdbdnnet/mlstdbnet database to add an initial curator
# Please read /usr/share/${pkg}/README.Debian for further information.
USERNAME=${USERNAME}
SURNAME=${SURNAME}
@@ -124,15 +124,23 @@
chgrp www-data ${TMPDIR}
chmod g+w ${TMPDIR}
- # create SQL script from config file
- mkdir -p $SQLDIR
- # Here the SQL code which is created by xml2sql.pl from config
- # file is stored. It is world writable because a normal user
- # with proper postgresql permissions should be enabled to create the
- # database.
- chmod 777 ${SQLDIR}
- /usr/share/${pkg}/xml2sql.pl -u '"www-data"' "$XMLOUT" > "$SQLDIR"/"$XMLNAME".sql
- chmod 666 "$SQLDIR"/"$XMLNAME".sql
+ if [ -x /usr/share/${pkg}/xml2sql.pl ] ; then
+ # agdbnet came with a script which generated the SQL code to
+ # bootstrap the database which is not contained in mlstdbnet.
+ # Just verifying the existence of the script enables using
+ # nearly the same postinst script (module package name) for
+ # both projects.
+ #
+ # create SQL script from config file
+ mkdir -p $SQLDIR
+ # Here the SQL code which is created by xml2sql.pl from config
+ # file is stored. It is world writable because a normal user
+ # with proper postgresql permissions should be enabled to create the
+ # database.
+ chmod 777 ${SQLDIR}
+ /usr/share/${pkg}/xml2sql.pl -u '"www-data"' "$XMLOUT" > "$SQLDIR"/"$XMLNAME".sql
+ chmod 666 "$SQLDIR"/"$XMLNAME".sql
+ fi
# Enable Apache anonymous authentication for agcurate.pl
# script
Modified: trunk/packages/mlstdbnet/trunk/debian/README.Debian
===================================================================
--- trunk/packages/mlstdbnet/trunk/debian/README.Debian 2009-01-19 00:29:49 UTC (rev 3021)
+++ trunk/packages/mlstdbnet/trunk/debian/README.Debian 2009-01-19 09:23:20 UTC (rev 3022)
@@ -4,5 +4,13 @@
Creating the database for MlstDbNet
-----------------------------------
+Creating graphs using Cahrtdirector
+-----------------------------------
+Chartdirektor is not available under Debian GNU/Linux because
+this is non-free software which can be bought at
+ http://www.advsofteng.com/
+If you have installed this software please edit the file
+/etc/mlstdbnet/mlstdbnet.conf accordingly.
+
-- Andreas Tille <tille at debian.org>, Wed, 24 Sep 2008 14:23:04 +0200
Modified: trunk/packages/mlstdbnet/trunk/debian/control
===================================================================
--- trunk/packages/mlstdbnet/trunk/debian/control 2009-01-19 00:29:49 UTC (rev 3021)
+++ trunk/packages/mlstdbnet/trunk/debian/control 2009-01-19 09:23:20 UTC (rev 3022)
@@ -14,7 +14,7 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, emboss, blast2, postgresql-8.3,
libcgi-pm-perl, libdbd-pg-perl, libxml-perl, dbconfig-common, apache2,
- imagemagick | graphicsmagick, bioperl
+ imagemagick | graphicsmagick, bioperl, libmail-sender-perl
Recommends: libapache2-mod-perl2
Description: mlst typing database
mlstdbNet is the software that drives the majority of publicly available
Modified: trunk/packages/mlstdbnet/trunk/debian/patches/10_preconf.patch
===================================================================
--- trunk/packages/mlstdbnet/trunk/debian/patches/10_preconf.patch 2009-01-19 00:29:49 UTC (rev 3021)
+++ trunk/packages/mlstdbnet/trunk/debian/patches/10_preconf.patch 2009-01-19 09:23:20 UTC (rev 3022)
@@ -23,7 +23,20 @@
##REFERENCE DB#
#Set to 1 if you have set up a local reference database.
-@@ -77,4 +77,4 @@
+@@ -60,7 +60,11 @@
+ #Set other values to 1 if functionality is available in
+ #the version of CD installed (some are only available in later
+ #versions)
+-chartdirector=1
++# Chartdirektor is not available under Debian GNU/Linux because
++# this is non-free software which can be bought at
++# http://www.advsofteng.com/
++# If you have installed this software set the value below to 1
++chartdirector=0
+ doughnut=1
+ transparent=1
+ mintick=0
+@@ -77,4 +81,4 @@
#suggest a bug and should be reported.
debug=0
#BENCHMARKING#
Modified: trunk/packages/mlstdbnet/trunk/debian/postinst
===================================================================
--- trunk/packages/mlstdbnet/trunk/debian/postinst 2009-01-19 00:29:49 UTC (rev 3021)
+++ trunk/packages/mlstdbnet/trunk/debian/postinst 2009-01-19 09:23:20 UTC (rev 3022)
@@ -1,5 +1,5 @@
#!/bin/sh
-# postinst script for mlstdbnet
+# postinst script for agdbdnnet/mlstdbnet
set -e
@@ -73,7 +73,7 @@
fi
done
-# Finally a link is put into place to enable mlstdbnet to find these files.
+# Finally a link is put into place to enable agdbdnnet/mlstdbnet to find these files.
mkdir -p /var/www/${pkg}
if [ ! -L "/var/www/${pkg}/$XMLNAME" -a ! -d "/var/www/${pkg}/$XMLNAME" ] ; then
ln -s "$STYLEDIR" "/var/www/${pkg}/$XMLNAME"
@@ -100,7 +100,7 @@
CURATORCONF=/etc/${pkg}/agcurator.conf
if [ ! -s "$CURATORCONF" ] ; then
cat > "$CURATORCONF" <<EOT
-# This file is used when creating the mlstdbnet database to add an initial curator
+# This file is used when creating the agdbdnnet/mlstdbnet database to add an initial curator
# Please read /usr/share/${pkg}/README.Debian for further information.
USERNAME=${USERNAME}
SURNAME=${SURNAME}
@@ -124,15 +124,23 @@
chgrp www-data ${TMPDIR}
chmod g+w ${TMPDIR}
- # create SQL script from config file
- mkdir -p $SQLDIR
- # Here the SQL code which is created by xml2sql.pl from config
- # file is stored. It is world writable because a normal user
- # with proper postgresql permissions should be enabled to create the
- # database.
- chmod 777 ${SQLDIR}
- /usr/share/${pkg}/xml2sql.pl -u '"www-data"' "$XMLOUT" > "$SQLDIR"/"$XMLNAME".sql
- chmod 666 "$SQLDIR"/"$XMLNAME".sql
+ if [ -x /usr/share/${pkg}/xml2sql.pl ] ; then
+ # agdbnet came with a script which generated the SQL code to
+ # bootstrap the database which is not contained in mlstdbnet.
+ # Just verifying the existence of the script enables using
+ # nearly the same postinst script (module package name) for
+ # both projects.
+ #
+ # create SQL script from config file
+ mkdir -p $SQLDIR
+ # Here the SQL code which is created by xml2sql.pl from config
+ # file is stored. It is world writable because a normal user
+ # with proper postgresql permissions should be enabled to create the
+ # database.
+ chmod 777 ${SQLDIR}
+ /usr/share/${pkg}/xml2sql.pl -u '"www-data"' "$XMLOUT" > "$SQLDIR"/"$XMLNAME".sql
+ chmod 666 "$SQLDIR"/"$XMLNAME".sql
+ fi
# Enable Apache anonymous authentication for agcurate.pl
# script
More information about the debian-med-commit
mailing list