[pkg-bioc] svn commit r323 r323 - in /trunk/tools-ng: CRAN2DEB.pm CowBuilder.pm PBuilder.pm debtag.pm pkgbioc.pm r_pkg_ordering.pl r_pkg_update.pl
psychedelys-guest at users.alioth.debian.org
psychedelys-guest at users.alioth.debian.org
Wed Sep 26 13:41:01 UTC 2007
Author: psychedelys-guest
Date: Wed Sep 26 13:41:01 2007
New Revision: 323
URL: http://svn.debian.org/wsvn/pkg-bioc/?sc=1&rev=323
Log:
updated the VERSION get from the svn revision stuff
Modified:
trunk/tools-ng/CRAN2DEB.pm
trunk/tools-ng/CowBuilder.pm
trunk/tools-ng/PBuilder.pm
trunk/tools-ng/debtag.pm
trunk/tools-ng/pkgbioc.pm
trunk/tools-ng/r_pkg_ordering.pl (contents, props changed)
trunk/tools-ng/r_pkg_update.pl (contents, props changed)
Modified: trunk/tools-ng/CRAN2DEB.pm
URL: http://svn.debian.org/wsvn/pkg-bioc/trunk/tools-ng/CRAN2DEB.pm?rev=323&op=diff
==============================================================================
--- trunk/tools-ng/CRAN2DEB.pm (original)
+++ trunk/tools-ng/CRAN2DEB.pm Wed Sep 26 13:41:01 2007
@@ -40,8 +40,6 @@ our @EXPORT = qw(lowerCase
our @EXPORT_OK = qw( );
our %EXPORT_TAGS = ( all => [@EXPORT_OK] );
-my $VERSION = sprintf( "%d.%d", q$Revision: 1.39 $ =~ /(\d+)\.(\d+)/ );
-
my $DEBVERPREPEND = "0.r2d.";
# function for lowcasing package names:
@@ -137,7 +135,7 @@ sub writeRules($$$) {
print FILE "# debian/rules file for the Debian/GNU Linux package \'r-$repository-$name\'\n";
print FILE "# Copyright 2004-2007 by $maintainer\n";
print FILE "#\n";
- print FILE "# automatically generated on $now by CRAN2DEB $VERSION\n";
+ print FILE "# automatically generated on $now by CRAN2DEB $main::VERSION\n";
print FILE "\n";
print FILE "debRreposname=$repository\n";
print FILE "include /usr/share/R/debian/r-cran.mk\n";
@@ -312,7 +310,7 @@ This is the Debian GNU/Linux r-$reposito
It was written by $pkg->{Author}.
This package was created by $maintainer
-using the automated build script cran2deb version $VERSION. Cran2deb
+using the automated build script cran2deb version $main::VERSION. Cran2deb
is a modified and extended version of Albrecht Gebhardt's build script
http://www.math.uni-klu.ac.at/~agebhard/build-R-contrib-debs.pl
The package sources were downloaded from
@@ -393,6 +391,11 @@ sub getDebianVersion($$$) {
return $debversion;
}
+ # TODO rewrite the next block !
+ # As we are now using SVN CRAN2DEB.pm and cran2deb.pl have the same revision
+ # number. so CRAN2DEB.pm do not have a version anymore.
+ # Should be store in the DB!
+ #
# check if the versions of CRAN2DEB.pm and cran2deb.pl have
# changed
# First get the versions used for the last build
@@ -416,14 +419,14 @@ sub getDebianVersion($$$) {
if ( $line =~ /CRAN2DEB.pm\s*(\d\.\d*)/ ) {
$clPMversion = $1;
print "PM: $clPMversion\n" if $main::verbose;
- print " need: $VERSION\n" if $main::verbose;
+ print " need: $main::VERSION\n" if $main::verbose;
}
if ( $clPMversion ne "" && $clPLversion ne "" ) {
print "CL: OK, I know enough...\n" if $main::verbose;
$done = 1;
}
}
- if ( $clPMversion eq $VERSION && $clPLversion eq $c2bplVersion ) {
+ if ( $clPMversion eq $main::VERSION && $clPLversion eq $c2bplVersion ) {
# OK, versions have not changed! So no new package needed.
print "CL: OK, works!\n" if $main::verbose;
@@ -477,7 +480,7 @@ sub writeChangelog($$$$) {
print FILE <<EOT
$pkg->{DebName} ($pkg->{DebRelease}) unstable; urgency=low
- * mechanically generated using cran2deb.pl $perlscriptversion and CRAN2DEB.pm $VERSION
+ * mechanically generated using cran2deb.pl $perlscriptversion and CRAN2DEB.pm $main::VERSION
-- $maintainer $date
Modified: trunk/tools-ng/CowBuilder.pm
URL: http://svn.debian.org/wsvn/pkg-bioc/trunk/tools-ng/CowBuilder.pm?rev=323&op=diff
==============================================================================
--- trunk/tools-ng/CowBuilder.pm (original)
+++ trunk/tools-ng/CowBuilder.pm Wed Sep 26 13:41:01 2007
@@ -15,9 +15,6 @@ our @EXPORT = qw(
our @EXPORT_OK = qw( );
our %EXPORT_TAGS = ( all => [@EXPORT_OK] );
-# TODO update it to make it working with SVN....
-my $VERSION = sprintf( "%d.%d", q$Revision: 1.2 $ =~ /(\d+)\.(\d+)/ );
-
my $name = "CowBuilder";
# Create|update the cowpuilder image used for the build
Modified: trunk/tools-ng/PBuilder.pm
URL: http://svn.debian.org/wsvn/pkg-bioc/trunk/tools-ng/PBuilder.pm?rev=323&op=diff
==============================================================================
--- trunk/tools-ng/PBuilder.pm (original)
+++ trunk/tools-ng/PBuilder.pm Wed Sep 26 13:41:01 2007
@@ -15,9 +15,6 @@ our @EXPORT = qw(
our @EXPORT_OK = qw( );
our %EXPORT_TAGS = ( all => [@EXPORT_OK] );
-# TODO update it to make it working with SVN....
-my $VERSION = sprintf( "%d.%d", q$Revision: 1.2 $ =~ /(\d+)\.(\d+)/ );
-
my $name = "PBuilder";
# Create|update the puilder image used for the build
Modified: trunk/tools-ng/debtag.pm
URL: http://svn.debian.org/wsvn/pkg-bioc/trunk/tools-ng/debtag.pm?rev=323&op=diff
==============================================================================
--- trunk/tools-ng/debtag.pm (original)
+++ trunk/tools-ng/debtag.pm Wed Sep 26 13:41:01 2007
@@ -32,9 +32,6 @@ our @EXPORT = qw(
our @EXPORT_OK = qw( );
our %EXPORT_TAGS = ( all => [@EXPORT_OK] );
-# TODO update it to make it working with SVN....
-my $VERSION = sprintf( "%d.%d", q$Revision: 1.2 $ =~ /(\d+)\.(\d+)/ );
-
sub tagentryarrayintohash {
my @tags = @_;
foreach my $t (@tags) {
Modified: trunk/tools-ng/pkgbioc.pm
URL: http://svn.debian.org/wsvn/pkg-bioc/trunk/tools-ng/pkgbioc.pm?rev=323&op=diff
==============================================================================
--- trunk/tools-ng/pkgbioc.pm (original)
+++ trunk/tools-ng/pkgbioc.pm Wed Sep 26 13:41:01 2007
@@ -47,8 +47,6 @@ our @EXPORT = qw(check_requierment
our @EXPORT_OK = qw( );
our %EXPORT_TAGS = ( all => [@EXPORT_OK] );
-my $VERSION = sprintf( "%d.%d", q$Revision: 1.2 $ =~ /(\d+)\.(\d+)/ );
-
sub installation_methods($$) {
my ( $installMethods, $what ) = @_;
my $function = $installMethods . "_" . $what;
@@ -978,7 +976,7 @@ sub loadDescriptionsForPackage($$$$$$$)
# ok, find a good debian subversion number
$packagehashref->{DebRelease} = $packagehashref->{DebVersion} . "-"
. getDebianVersion( $packagehashref, "../" . $directory . "/changelogdb",
- $VERSION );
+ $main::VERSION );
# TODO Those path are may be not enough,...
my $packagepath = $lcpackage . "-" . $packagehashref->{DebVersion};
Modified: trunk/tools-ng/r_pkg_ordering.pl
URL: http://svn.debian.org/wsvn/pkg-bioc/trunk/tools-ng/r_pkg_ordering.pl?rev=323&op=diff
==============================================================================
--- trunk/tools-ng/r_pkg_ordering.pl (original)
+++ trunk/tools-ng/r_pkg_ordering.pl Wed Sep 26 13:41:01 2007
@@ -104,7 +104,7 @@ use warnings;
use Cwd;
# the commom variables
-use vars qw($help $man $debug $verbose $dryrun);
+use vars qw($help $man $debug $verbose $dryrun $VERSION);
#the specific variables
use vars qw($rebuildall $noQAcheck $builddebian);
@@ -152,7 +152,12 @@ use debtag;
$| = 1;
# TODO update it to make it working with SVN....
-my $VERSION = sprintf( "%d.%d", q$Revision: 1.28 $ =~ /(\d+)\.(\d+)/ );
+my $revision = ' $Rev$ ';
+my $name;
+$revision =~ / ([\d\.]*) /;
+$VERSION = $1;
+($name = $0) =~ s|.*/||;
+print("$name $VERSION\n");
my %options = (
"help" => \$help,
Propchange: trunk/tools-ng/r_pkg_ordering.pl
------------------------------------------------------------------------------
svn:keywords = Rev
Modified: trunk/tools-ng/r_pkg_update.pl
URL: http://svn.debian.org/wsvn/pkg-bioc/trunk/tools-ng/r_pkg_update.pl?rev=323&op=diff
==============================================================================
--- trunk/tools-ng/r_pkg_update.pl (original)
+++ trunk/tools-ng/r_pkg_update.pl Wed Sep 26 13:41:01 2007
@@ -105,7 +105,7 @@ use warnings;
use Cwd;
# the commom variables
-use vars qw($help $man $debug $verbose $dryrun);
+use vars qw($help $man $debug $verbose $dryrun $VERSION);
#the specific variables
use vars qw($doupdate $dotagupdate $dobuilderupdate);
@@ -153,7 +153,12 @@ use debtag;
$| = 1;
# TODO update it to make it working with SVN....
-my $VERSION = sprintf( "%d.%d", q$Revision: 1.28 $ =~ /(\d+)\.(\d+)/ );
+my $revision = ' $Rev$ ';
+my $name;
+$revision =~ / ([\d\.]*) /;
+$VERSION = $1;
+($name = $0) =~ s|.*/||;
+print("$name $VERSION\n");
my %options = (
"help" => \$help,
Propchange: trunk/tools-ng/r_pkg_update.pl
------------------------------------------------------------------------------
svn:keywords = Rev
More information about the pkg-bioc-devel
mailing list