X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=branch%2Fmultisys%2FR%2Fdebianpkg.R;fp=branch%2Fmultisys%2FR%2Fdebianpkg.R;h=cd4cd0313b988d33d9a57e0118b89364b8551eb4;hb=498762e48d0f10a759c6994c4fafa27dd0963f05;hp=f2aa1153497a3674d33410d4f7dc7f82ca8de4b4;hpb=0928b1636bb5383a901e9b96e1a0f0dec586baeb;p=cran2deb.git diff --git a/branch/multisys/R/debianpkg.R b/branch/multisys/R/debianpkg.R index f2aa115..cd4cd03 100644 --- a/branch/multisys/R/debianpkg.R +++ b/branch/multisys/R/debianpkg.R @@ -6,7 +6,7 @@ append_build_from_pkg <- function(pkg, builds) { ,deb_revision = version_revision(pkg$debversion) ,db_version = db_get_version() ,date_stamp = pkg$date_stamp - ,git_revision = scm_revision + ,scm_revision = scm_revision ,success = 1 # never used ,log = '' # never used ) @@ -24,7 +24,7 @@ generate_changelog_entry <- function(build, changelog) { # TODO: should say 'New upstream release' when necessary debversion <- version_new(build$r_version, build$deb_revision, build$deb_epoch) cat(paste(paste(build$srcname,' (',debversion,') unstable; urgency=low',sep='') - ,'' ,paste(' * cran2deb ',build$git_revision + ,'' ,paste(' * cran2deb ',build$scm_revision ,' with DB version ',as.integer(build$db_version),'.',sep='') ,'',paste(' --',maintainer,'',build$date_stamp) ,'','','',sep='\n'),file=changelog, append=TRUE)