version: use base epoch

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@92 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

diff --git a/pkg/trunk/R/db.R b/pkg/trunk/R/db.R
index baad105024dbaf0684fb994151ad5ae15ab41718..a4dedd021e8f7e3e6de6e29eb8300900d91a933f 100644 (file)
--- a/pkg/trunk/R/db.R
+++ b/pkg/trunk/R/db.R
@@ -91,6 +91,13 @@ db_base_epoch <- function(con) {
              ,'WHERE version IN (SELECT max(version) FROM database_versions)'))[[1]]))
 }
 
+db_get_base_epoch <- function() {
+    con <- db_start()
+    v <- db_base_epoch(con)
+    db_stop(con)
+    return(v)
+}
+
 db_add_version <- function(con, version, epoch) {
     dbGetQuery(con,paste('INSERT INTO database_versions (version,version_date,base_epoch)'
               ,'VALUES (',as.integer(version),',',db_now(),',',as.integer(epoch),')'))

diff --git a/pkg/trunk/R/version.R b/pkg/trunk/R/version.R
index 6ac7601bd575a3d2e11251df7f3956ee43fc96c2..4ea13336c8d4ecfcbb5d886cda8479b478fa1419 100644 (file)
--- a/pkg/trunk/R/version.R
+++ b/pkg/trunk/R/version.R
@@ -1,4 +1,4 @@
-version_new <- function(rver,debian_revision=1, debian_epoch=0) {
+version_new <- function(rver,debian_revision=1, debian_epoch=db_get_base_epoch()) {
     # generate a string representation of the Debian version of an
     # R version of a package
     pkgver = rver
@@ -36,7 +36,7 @@ version_epoch <- function(pkgver) {
     return(as.integer(sub('^([0-9]+):.*','\\1',pkgver)))
 }
 # version_epoch . version_new(x,y) = id
-# version_epoch(version_new(x,y)) = 0
+# version_epoch(version_new(x,y)) = base_epoch
 
 version_revision <- function(pkgver) {
     # return the Debian revision of a Debian package version