X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=trunk%2FR%2Fzzz.R;h=6a939b50636d7eb496c0a230e933ce119030fa6a;hb=834dba810756e036eb6e58b5613a18ead36da0b0;hp=5644b96cd8a67bc3277fcaf13f7b1250bb4fb4ef;hpb=1ceafcdbe51787ad9f8f34f605820c217142f6a8;p=cran2deb.git

diff --git a/trunk/R/zzz.R b/trunk/R/zzz.R
index 5644b96..6a939b5 100644
--- a/trunk/R/zzz.R
+++ b/trunk/R/zzz.R
@@ -5,22 +5,27 @@
         stop('Invalid system specification: must be of the form name-arch')
     }
     global("host_arch", gsub('^[a-z]+-','',which_system))
-    global("maintainer", 'cran2deb autobuild <cran2deb@example.org>')
+    global("maintainer", 'cran2deb autobuild <don+debian-r@donarmstrong.com>')
     global("root", system.file(package='cran2deb'))
-    global("cache_root", '/var/cache/cran2deb')
-    global("pbuilder_results",  file.path('/var/cache/cran2deb/results',which_system))
-    global("pbuilder_config",   file.path('/etc/cran2deb/sys',which_system,'pbuilderrc'))
-    global("dput_config",       file.path('/etc/cran2deb/sys',which_system,'dput.cf'))
-    global("dinstall_config",   file.path('/etc/cran2deb/sys',which_system,'mini-dinstall.conf'))
-    global("dinstall_archive",  file.path('/etc/cran2deb/archive',which_system))
+    global("cache_root", Sys.getenv('CRAN2DEB_CACHE','/var/cache/cran2deb'))
+    global("config_dir", Sys.getenv('CRAN2DEB_CONFDIR','/etc/cran2deb'))
+    global("pbuilder_results",  file.path(cache_root,which_system))
+    global("pbuilder_config",   file.path(config_dir,'sys',which_system,'pbuilderrc'))
+    global("dput_config",       file.path(config_dir,'sys',which_system,'dput.cf'))
+    global("dinstall_config",   file.path(config_dir,'sys',which_system,'mini-dinstall.conf'))
+    global("dinstall_archive",  file.path(config_dir,'archive',which_system))
     global("r_depend_fields", c('Depends','Imports')) # Suggests, Enhances
-    global("scm_revision", paste("svn revision", svnversion(), sep=""))
-    global("patch_dir", '/etc/cran2deb/patches')
+    global("scm_revision", paste("svn:", svnversion()))
+    global("patch_dir", file.path(config_dir,'patches'))
+    global("lintian_dir", file.path(config_dir,'lintian'))
     global("changesfile", function(srcname,version='*') {
         return(file.path(pbuilder_results
                         ,paste(srcname,'_',version,'_'
                               ,host_arch,'.changes',sep='')))
     })
+    global("version_suffix","~debianr+")
+    # perhaps db_cur_version() should be used instead?
+    global("version_suffix_step",1)
 
     cache <- file.path(cache_root,'cache.rda')
     if (file.exists(cache)) {