Author: osallou-guest
Date: 2011-03-30 14:48:28 +0000 (Wed, 30 Mar 2011)
New Revision: 6407
Modified:
trunk/packages/gbrowse/trunk/debian/patches/debian-packaging-patch
trunk/packages/gbrowse/trunk/debian/rules
Log:
updates to keep user database in debian package
Modified: trunk/packages/gbrowse/trunk/debian/patches/debian-packaging-patch
===================================================================
--- trunk/packages/gbrowse/trunk/debian/patches/debian-packaging-patch
2011-03-30 14:13:06 UTC (rev 6406)
+++ trunk/packages/gbrowse/trunk/debian/patches/debian-packaging-patch
2011-03-30 14:48:28 UTC (rev 6407)
@@ -118,7 +118,7 @@
+ my $metadb_script = File::Spec->catfile("bin",
"gbrowse_metadb_config.pl");
+ my $perl = $self->perl;
+ my @inc = map{"-I$_"} split ':',$self->added_to_INC;
-+ system $perl,@inc,$metadb_script;
++ system
$perl,@inc,$metadb_script,"--dsn=DBI:SQLite:debian/gbrowse/usr/share/gbrowse2/databases/users.sqlite";
+
+}
+
@@ -350,3 +350,29 @@
=head1 SYNOPSIS
+--- a/bin/gbrowse_metadb_config.pl
++++ b/bin/gbrowse_metadb_config.pl
+@@ -21,7 +21,10 @@
+ my @argv = @ARGV;
+
+ my ($dsn, $admin);
++my $new=0;
++
+ GetOptions('dsn=s' => \$dsn,
++ 'new' => \$new,
+ 'admin=s' => \$admin) or die <<EOF;
+ Usage: $0 [options] <optional path to GBrowse.conf>
+
+@@ -169,10 +172,12 @@
+ check_table("uploads", $uploads_columns);
+ check_table("sharing", $sharing_columns);
+
++if($new==0) {
+ check_sessions();
+ check_uploads_ids();
+ check_all_files();
+ check_data_sources();
++}
+ fix_sqlite_permissions() if $type =~ /sqlite/i;
+
+ $database->disconnect;
Modified: trunk/packages/gbrowse/trunk/debian/rules
===================================================================
--- trunk/packages/gbrowse/trunk/debian/rules 2011-03-30 14:13:06 UTC (rev
6406)
+++ trunk/packages/gbrowse/trunk/debian/rules 2011-03-30 14:48:28 UTC (rev
6407)
@@ -33,7 +33,9 @@
rename 's/\.pl//' debian/gbrowse/bin/*.pl
mv debian/gbrowse/bin debian/gbrowse/usr/bin
# Remove databases, keep it as additional package
+ cp debian/gbrowse/usr/share/gbrowse2/databases/users.sqlite
debian/gbrowse/usr/share/gbrowse2/
rm -rf debian/gbrowse/usr/share/gbrowse2/databases/*
+ mv debian/gbrowse/usr/share/gbrowse2/users.sqlite
debian/gbrowse/usr/share/gbrowse2/databases/
override_dh_installman:
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
