[med-svn] r12283 - trunk/packages/gmod/gbrowse/trunk/debian/patches

[Olivier Sallou]

Author: osallou
Date: 2012-09-25 07:30:17 +0000 (Tue, 25 Sep 2012)
New Revision: 12283

Modified:
   trunk/packages/gmod/gbrowse/trunk/debian/patches/debian-packaging-patch
   trunk/packages/gmod/gbrowse/trunk/debian/patches/skip_check_installed_test.patch
Log:
fix patch error

Modified: trunk/packages/gmod/gbrowse/trunk/debian/patches/debian-packaging-patch
===================================================================
--- trunk/packages/gmod/gbrowse/trunk/debian/patches/debian-packaging-patch	2012-09-25 07:14:16 UTC (rev 12282)
+++ trunk/packages/gmod/gbrowse/trunk/debian/patches/debian-packaging-patch	2012-09-25 07:30:17 UTC (rev 12283)
@@ -1,4 +1,9 @@
-Patch to fit debian packaging - Olivier Sallou - February 2011
+Subject: fix directories for debian policy
+Description: Fix install directories to match
+ Debian Policy
+Author: Olivier Sallou <osallou at debian.org>
+Last-Updated: 2012-09-25
+Forwarded: not-needed
 --- a/etc/init.d/gbrowse-slave
 +++ b/etc/init.d/gbrowse-slave
 @@ -1,10 +1,10 @@
@@ -118,7 +123,7 @@
      );
  my %OK_PROPS = @OK_PROPS;
  
-@@ -422,6 +423,83 @@
+@@ -422,6 +423,82 @@
  END
  }
  
@@ -201,7 +206,7 @@
  sub ACTION_install {
      my $self = shift;
      my $prefix = $self->install_base || $self->prefix || '';
-@@ -773,8 +851,9 @@
+@@ -773,8 +850,9 @@
  sub guess_user_account_db {
      my $self = shift;
      if (eval "require DBD::SQLite; 1") {

Modified: trunk/packages/gmod/gbrowse/trunk/debian/patches/skip_check_installed_test.patch
===================================================================
--- trunk/packages/gmod/gbrowse/trunk/debian/patches/skip_check_installed_test.patch	2012-09-25 07:14:16 UTC (rev 12282)
+++ trunk/packages/gmod/gbrowse/trunk/debian/patches/skip_check_installed_test.patch	2012-09-25 07:30:17 UTC (rev 12283)
@@ -6,7 +6,7 @@
 Forwarded: not-needed
 --- a/install_util/GBrowseInstall.pm
 +++ b/install_util/GBrowseInstall.pm
-@@ -634,7 +634,7 @@
+@@ -633,7 +633,7 @@
  	my $copied = $self->copy_if_modified($_=>'blib');
  	if ($copied || !$self->up_to_date('_build/config_data',"blib/$_")) {
  	    $self->substitute_in_place("blib/$_");
@@ -15,7 +15,7 @@
  	}
      }
  
-@@ -696,7 +696,7 @@
+@@ -695,7 +695,7 @@
  	my $copied = $self->copy_if_modified($base=>'blib');
  	if ($copied or !$self->up_to_date('_build/config_data',"blib/$base")) {
  	    $self->substitute_in_place("blib/$base");
@@ -24,7 +24,7 @@
  	}
      }
  }
-@@ -734,7 +734,7 @@
+@@ -733,7 +733,7 @@
  	    my $copied = $self->copy_if_modified($_=>'blib');
  	    if ($copied or !$self->up_to_date('_build/config_data',"blib/$_")) {
  		$self->substitute_in_place("blib/$_");