[med-svn] r8049 - in trunk/packages/gmod/chado/trunk/debian: . patches

[olivier sallou]

Author: osallou-guest
Date: 2011-10-03 16:05:37 +0000 (Mon, 03 Oct 2011)
New Revision: 8049

Added:
   trunk/packages/gmod/chado/trunk/debian/patches/error_message
Modified:
   trunk/packages/gmod/chado/trunk/debian/changelog
   trunk/packages/gmod/chado/trunk/debian/patches/error_message.patch
   trunk/packages/gmod/chado/trunk/debian/patches/series
   trunk/packages/gmod/chado/trunk/debian/postinst
Log:
prepare for v1.2 first package

Modified: trunk/packages/gmod/chado/trunk/debian/changelog
===================================================================
--- trunk/packages/gmod/chado/trunk/debian/changelog	2011-10-03 11:36:25 UTC (rev 8048)
+++ trunk/packages/gmod/chado/trunk/debian/changelog	2011-10-03 16:05:37 UTC (rev 8049)
@@ -1,7 +1,5 @@
-libchado-perl (1.11-1) unstable; urgency=low
+libchado-perl (1.2-1) unstable; urgency=low
 
   * Initial Release (Closes: #639868).
-    TODO update for 1.12, fix some path issues
-    add SQL install step in postinst
 
  -- Olivier Sallou <olivier.sallou at irisa.fr>  Thu, 14 Jul 2011 12:44:56 +0200

Added: trunk/packages/gmod/chado/trunk/debian/patches/error_message
===================================================================
--- trunk/packages/gmod/chado/trunk/debian/patches/error_message	                        (rev 0)
+++ trunk/packages/gmod/chado/trunk/debian/patches/error_message	2011-10-03 16:05:37 UTC (rev 8049)
@@ -0,0 +1,18 @@
+--- a/install_util/conf_install.PLS
++++ b/install_util/conf_install.PLS
+@@ -64,13 +64,13 @@
+ my $defaultconf = "$confdir/default.conf";
+ my $dbconf      = "$confdir/$confitems{DBNAME}.conf";
+ 
+-open GMODCONF, ">$gmodconf" or die "unable to open $gmodconf: $!";
++open GMODCONF, ">$gmodconf" or die "unable to open $gmodconf for writing: $!";
+ print GMODCONF "CONF=$gmod_root/conf\n";
+ print GMODCONF "TMP=$gmod_root/tmp\n";
+ print GMODCONF "VERSION=$version\n";
+ close GMODCONF;
+ 
+-open DBCONF,  ">$dbconf" or die "unable to open $dbconf: $!";
++open DBCONF,  ">$dbconf" or die "unable to open $dbconf for writing: $!";
+ foreach my $key (keys %confitems) {
+     print DBCONF  "$key=$confitems{$key}\n";
+ }

Modified: trunk/packages/gmod/chado/trunk/debian/patches/error_message.patch
===================================================================
--- trunk/packages/gmod/chado/trunk/debian/patches/error_message.patch	2011-10-03 11:36:25 UTC (rev 8048)
+++ trunk/packages/gmod/chado/trunk/debian/patches/error_message.patch	2011-10-03 16:05:37 UTC (rev 8049)
@@ -1,7 +1,5 @@
-Index: chado-1.11/install_util/conf_install.pl
-===================================================================
---- chado-1.11.orig/install_util/conf_install.pl	2011-07-14 14:53:38.768356998 +0200
-+++ chado-1.11/install_util/conf_install.pl	2011-07-14 14:54:20.884565859 +0200
+--- a/install_util/conf_install.PLS	2011-07-14 14:53:38.768356998 +0200
++++ b/install_util/conf_install.PLS	2011-07-14 14:54:20.884565859 +0200
 @@ -47,12 +47,12 @@
  my $defaultconf = "$confdir/default.conf";
  my $dbconf      = "$confdir/$confitems{DBNAME}.conf";

Modified: trunk/packages/gmod/chado/trunk/debian/patches/series
===================================================================
--- trunk/packages/gmod/chado/trunk/debian/patches/series	2011-10-03 11:36:25 UTC (rev 8048)
+++ trunk/packages/gmod/chado/trunk/debian/patches/series	2011-10-03 16:05:37 UTC (rev 8049)
@@ -1,6 +1,5 @@
-error_message.patch
-no_tests.patch
-fix_log4perl_location
+error_message
+no_tests
 force_SIMPLE
 fix_conf_path
 no_chaos.patch

Modified: trunk/packages/gmod/chado/trunk/debian/postinst
===================================================================
--- trunk/packages/gmod/chado/trunk/debian/postinst	2011-10-03 11:36:25 UTC (rev 8048)
+++ trunk/packages/gmod/chado/trunk/debian/postinst	2011-10-03 16:05:37 UTC (rev 8049)
@@ -4,6 +4,15 @@
 
 case "$1" in
     configure)
+        if [ -e /etc/gmod/gmod-chado.conf ]; then
+	perl /usr/share/gmod/chado/Makefile.PL update
+        else
+           echo "Application is not yet configured."
+	   echo "To install or upgrade the database:"
+	   echo " - create a user in the database"
+	   echo " - configure the application"
+	   echo " - perl /usr/share/gmod/chado/Makefile.PL update"
+        fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)