X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=trunk%2FR%2Fdebianpkg.R;h=a4568bd39e21f3007ef34a79bee24e7a9d919e41;hb=204d1744ce9b2032eb26823889375646829cb384;hp=e3656d31e8ae284133600aef506fe2db0a9ac618;hpb=d8a2e28b2f013a8624cb587f09f90120f46f1ce8;p=cran2deb.git

diff --git a/trunk/R/debianpkg.R b/trunk/R/debianpkg.R
index e3656d3..a4568bd 100644
--- a/trunk/R/debianpkg.R
+++ b/trunk/R/debianpkg.R
@@ -23,8 +23,8 @@ generate_changelog <- function(pkg) {
 
 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,') testing; urgency=low',sep='')
+    debversion <- version_new(build$r_version, pkgname=build$package, build$deb_revision, build$deb_epoch)
+    cat(paste(paste(build$srcname,' (',debversion,') unstable; urgency=low',sep='')
              ,'' ,paste('  * cran2deb ',build$scm_revision
                        ,' with DB version ',as.integer(build$db_version),'.',sep='')
              ,'',paste(' --',maintainer,'',format(build$date_stamp,'%a, %d %b %Y %H:%M:%S %z'))
@@ -37,6 +37,9 @@ generate_rules <- function(pkg) {
              ,'include /usr/share/R/debian/r-cran.mk'
              ,'',sep='\n')
        ,file=pkg$debfile('rules'))
+    if (pkg$name %in% c("Rmpi", "npRmpi", "doMPI")) {
+        cat("extraInstallFlags=\"--no-test-load\"\n", file=pkg$debfile('rules'), append=TRUE)
+    }      
     Sys.chmod(pkg$debfile('rules'),'0700')
 }
 
@@ -116,9 +119,13 @@ prepare_new_debian <- function(pkg,extra_deps) {
     }
 
     pkg$license <- accept_license(pkg)
+    notice('getting dependencies')
     pkg$depends <- get_dependencies(pkg,extra_deps)
+    notice('applying patches')
     apply_patches(pkg)
+    notice('applying lintian fixes')
     generate_lintian(pkg)
+    notice('generating changelog, rules, copyright, and control')
     generate_changelog(pkg)
     generate_rules(pkg)
     generate_copyright(pkg)