[med-svn] r6402 - trunk/packages/biomaj/trunk/debian
olivier sallou
osallou-guest at alioth.debian.org
Wed Mar 30 11:38:45 UTC 2011
Author: osallou-guest
Date: 2011-03-30 11:38:44 +0000 (Wed, 30 Mar 2011)
New Revision: 6402
Modified:
trunk/packages/biomaj/trunk/debian/copyright
trunk/packages/biomaj/trunk/debian/postinst
trunk/packages/biomaj/trunk/debian/postrm
trunk/packages/biomaj/trunk/debian/prerm
Log:
update copyright, update pre/post scripts to manage arguments
Modified: trunk/packages/biomaj/trunk/debian/copyright
===================================================================
--- trunk/packages/biomaj/trunk/debian/copyright 2011-03-30 11:02:55 UTC (rev 6401)
+++ trunk/packages/biomaj/trunk/debian/copyright 2011-03-30 11:38:44 UTC (rev 6402)
@@ -2,18 +2,14 @@
Upstream-Name: BioMAJ
Source: svn://scm.gforge.inria.fr/svn/biomaj/
-Files: *
-Copyright: 2011 GenOuest Platform <support at genouest.org>
-Licence: CeCILL
+Files: debian/*
+Copyright: 2011 Olivier Sallou, <olivier.sallou at irisa.fr>
+License: GPL3
Files: usr/share/biomaj/lib/vendor/commons-cli2
Copyright: 2002-2006 The Apache Software Foundation
License: Apache License, Version 2.0
-Files: usr/share/biomaj/workflows/*
-Copyright: 2011 INRIA/INRA
-Licence: CeCILL-B
-
Files: usr/share/biomaj/workflows/mirror.xml
usr/share/biomaj/src/org/gmod/biomaj/ant/conditions/DirectoryHasFilesCondition.java
usr/share/biomaj/src/org/gmod/biomaj/ant/task/SymlinkList.java
@@ -22,10 +18,35 @@
usr/share/biomaj/src/org/gmod/ant/selectors/FilenamePatternSelector.java
usr/share/biomaj/build.xml
Copyright: Copyright (c) 2004, Indiana University
-License: citrina
+License:
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
-License: CeCILL
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ * Neither the name of Indiana University, Bloomington nor the names
+ of its contributors may be used to endorse or promote products
+ derived from this software without specific prior written
+ permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Files: *
+Copyright: 2011 GenOuest Platform <support at genouest.org>
+Licence: CeCILL
+
Notice
This Agreement is a Free Software license agreement that is the result
@@ -529,6 +550,8 @@
Version 2.0 dated 2006-09-05.
+Files: usr/share/biomaj/workflows/*
+Copyright: 2011 INRIA/INRA
License: CeCILL-B
Notice
@@ -1042,29 +1065,3 @@
Version 1.0 dated 2006-09-05.
-
-License: citrina
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- * Neither the name of Indiana University, Bloomington nor the names
- of its contributors may be used to endorse or promote products
- derived from this software without specific prior written
- permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Modified: trunk/packages/biomaj/trunk/debian/postinst
===================================================================
--- trunk/packages/biomaj/trunk/debian/postinst 2011-03-30 11:02:55 UTC (rev 6401)
+++ trunk/packages/biomaj/trunk/debian/postinst 2011-03-30 11:38:44 UTC (rev 6402)
@@ -5,30 +5,14 @@
# Source debconf library.
. /usr/share/debconf/confmodule
-#DEBHELPER#
+case "$1" in
+ configure)
-
ant_home="/usr/share/ant"
biomaj_root="/usr/share/biomaj"
db_get biomaj/jdk_home
jdk_home="$RET"
-
-#db_get biomaj/login
-#app_login="$RET"
-#db_get biomaj/password
-#app_passwd="$RET"
-
-#db_get biomaj/ldap
-#use_ldap="$RET"
-#db_get biomaj/ldap_server
-#ldap_host="$RET"
-#db_get biomaj/ldap_dn
-#ldap_dn="$RET"
-#db_get biomaj/ldap_filter
-#opt_filer="$RET"
-
-#db_get biomaj/db_type
db_type="MySQL"
db_get biomaj/mysql_host
db_url="jdbc:mysql://$RET/biomaj_log"
@@ -37,7 +21,6 @@
db_get biomaj/mysql_passwd
db_passwd="$RET"
-#db_get biomaj/tomcat_port
tomcat_port="0"
# Link general.conf
@@ -48,11 +31,23 @@
java -cp $biomaj_root/bin Configurator java_home:=$jdk_home ant_home:=$ant_home biomaj_root:=$biomaj_root use_ldap:=$use_ldap ldap_host:=$ldap_host ldap_dn:=$ldap_dn opt_filter:=$opt_filter db_type:=$db_type db_url:=$db_url db_login:=$db_login db_passwd:=$db_passwd app_login:=$app_login app_passwd:=$app_passwd tomcat_port:=$tomcat_port
-#ln -s $biomaj_root/lib/biomaj.jar $biomaj_root/apache-tomcat-6.0.24/lib/biomaj.jar
-
if [ $db_type = "MySQL" ]; then
echo "Installation Complete."
echo "You now need to create the biomaj_log database on your MySQL server."
echo "The creation script is provided at /usr/share/biomaj/sql/mysql.sql."
fi
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+
+
+#DEBHELPER#
Modified: trunk/packages/biomaj/trunk/debian/postrm
===================================================================
--- trunk/packages/biomaj/trunk/debian/postrm 2011-03-30 11:02:55 UTC (rev 6401)
+++ trunk/packages/biomaj/trunk/debian/postrm 2011-03-30 11:38:44 UTC (rev 6402)
@@ -5,11 +5,22 @@
# Source debconf library.
. /usr/share/debconf/confmodule
+case "$1" in
+ purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+ # Remove all
+ if [ -e /usr/share/biomaj ]; then
+ rm -rf /usr/share/biomaj
+ fi
+ echo "Warning, BioMAJ database for MySQL is not deleted by process removal."
+ ;;
+
+ *)
+ echo "postrm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+
+
#DEBHELPER#
-# Remove all
-if [ -e /usr/share/biomaj ]; then
- rm -rf /usr/share/biomaj
-fi
-
-echo "Warning, BioMAJ database for MySQL is not deleted by process removal."
Modified: trunk/packages/biomaj/trunk/debian/prerm
===================================================================
--- trunk/packages/biomaj/trunk/debian/prerm 2011-03-30 11:02:55 UTC (rev 6401)
+++ trunk/packages/biomaj/trunk/debian/prerm 2011-03-30 11:38:44 UTC (rev 6402)
@@ -5,15 +5,9 @@
# Source debconf library.
. /usr/share/debconf/confmodule
-# Shutdown hsqldb server
-#db_get biomaj/db_type
-#if [ $RET = "HSQLDB" ]; then
-# bash /usr/share/biomaj/bin/shutdown_dbserver.sh
-#fi
-# Shutdown tomcat server
-#sh /usr/share/biomaj/apache-tomcat-6.0.24/bin/shutdown.sh >/dev/null 2>&1
-
+case "$1" in
+ remove|upgrade|deconfigure)
# Remove post installation created files
# Remove admin credentials
@@ -53,4 +47,16 @@
rm /usr/share/biomaj/apache-tomcat-6.0.24/lib/biomaj.jar
fi
+ ;;
+
+ failed-upgrade)
+ ;;
+
+ *)
+ echo "prerm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+
#DEBHELPER#
More information about the debian-med-commit
mailing list