[med-svn] r6503 - in trunk/packages/gbrowse/trunk/debian: . patches

[Charles Plessy]

Author: plessy
Date: 2011-04-10 09:39:49 +0000 (Sun, 10 Apr 2011)
New Revision: 6503

Modified:
   trunk/packages/gbrowse/trunk/debian/patches/debian-packaging-patch
   trunk/packages/gbrowse/trunk/debian/rules
Log:
Configure to skip registration.

This allows to build gbrowse in the debian/rules build target, and
renders unnecessary to override dh_auto_build.


Modified: trunk/packages/gbrowse/trunk/debian/patches/debian-packaging-patch
===================================================================
--- trunk/packages/gbrowse/trunk/debian/patches/debian-packaging-patch	2011-04-10 09:13:35 UTC (rev 6502)
+++ trunk/packages/gbrowse/trunk/debian/patches/debian-packaging-patch	2011-04-10 09:39:49 UTC (rev 6503)
@@ -1,16 +1,23 @@
 Patch to fit debian packaging - Olivier Sallou - February 2011
 Index: gbrowse-2.26~dfsg.orig/install_util/GBrowseInstall.pm
 ===================================================================
---- gbrowse-2.26~dfsg.orig.orig/install_util/GBrowseInstall.pm	2011-04-10 18:12:23.000000000 +0900
-+++ gbrowse-2.26~dfsg.orig/install_util/GBrowseInstall.pm	2011-04-10 18:12:26.000000000 +0900
-@@ -403,6 +403,85 @@
+--- gbrowse-2.26~dfsg.orig.orig/install_util/GBrowseInstall.pm  2011-04-10 18:12:34.000000000 +0900
++++ gbrowse-2.26~dfsg.orig/install_util/GBrowseInstall.pm       2011-04-10 18:25:03.000000000 +0900
+@@ -28,6 +28,7 @@
+ 		wwwuser       => 'User account under which Apache daemon runs?',
+ 		installconf   => 'Automatically update Apache config files to run GBrowse?',
+ 		installetc    => 'Automatically update system config files to run gbrowse-slave?',
++		registration_done	=> 'Set to 1 to skip registration.',
+     );
+ my %OK_PROPS = @OK_PROPS;
+ 
+@@ -403,6 +404,84 @@
  END
  }
  
 +sub ACTION_debianinstall {
 +    my $self = shift;
 +    my $prefix = $self->install_base || $self->prefix || 'debian/libgbrowse-perl';
-+    $self->registration_done(1);
 +    GBrowseGuessDirectories->prefix($prefix);
 +
 +    $self->depends_on('config_data');

Modified: trunk/packages/gbrowse/trunk/debian/rules
===================================================================
--- trunk/packages/gbrowse/trunk/debian/rules	2011-04-10 09:13:35 UTC (rev 6502)
+++ trunk/packages/gbrowse/trunk/debian/rules	2011-04-10 09:39:49 UTC (rev 6503)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-GBROWSE_BUILD_OPTIONS = --conf=/etc/gbrowse --htdocs=/usr/share/gbrowse/htdocs --tmp=/var/cache/gbrowse --databases=/usr/share/gbrowse/databases --cgibin=/usr/lib/cgi-bin/gbrowse --www-user=www-data
+GBROWSE_BUILD_OPTIONS = --conf=/etc/gbrowse --htdocs=/usr/share/gbrowse/htdocs --tmp=/var/cache/gbrowse --databases=/usr/share/gbrowse/databases --cgibin=/usr/lib/cgi-bin/gbrowse --www-user=www-data --registration_done=1
 
 %: 
 	dh $@
@@ -8,8 +8,6 @@
 override_dh_auto_configure:
 	dh_auto_configure -- $(GBROWSE_BUILD_OPTIONS)
 
-override_dh_auto_build:
-
 override_dh_auto_install:
 	./Build  --install_base=debian/gbrowse debianinstall
 	./Build   apache_conf > debian/gbrowse/etc/gbrowse/apache2.conf