build: do not compare deb_revision numbers when deciding whether to rebuild or not...

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

diff --git a/pkg/trunk/R/build.R b/pkg/trunk/R/build.R
index 320e9535acf34e72bc9de1c6a6181af73c5a54ad..d5b0437ef0ad553a5119bad58fed270641b93e41 100644 (file)
--- a/pkg/trunk/R/build.R
+++ b/pkg/trunk/R/build.R
@@ -87,7 +87,8 @@ needs_build <- function(name,version) {
     if (!is.null(build) && build$success) {
         # then something must have changed for us to attempt this
         # build
-        if (db_latest_build_version(name) == version &&
+        if (build$r_version == version_upstream(version) &&
+            build$deb_epoch == version_epoch(version) &&
             build$db_version == db_get_version()) {
             return(F)
         }

diff --git a/pkg/trunk/R/debcontrol.R b/pkg/trunk/R/debcontrol.R
index ac163defdde83dab7f2076758fd62493f61ed4da..1e748e6fdc069bb314f7c12fde37413f6688a085 100644 (file)
--- a/pkg/trunk/R/debcontrol.R
+++ b/pkg/trunk/R/debcontrol.R
@@ -118,14 +118,15 @@ generate_control <- function(pkg) {
     }
     control[2,'Depends'] = paste(pkg$depends$bin,collapse=', ')
 
-    # bundles provide virtual packages of their contents
-    if (pkg$is_bundle) {
-        control[2,'Provides'] = paste(
-                    lapply(r_bundle_contains(pkg$name)
-                          ,function(name) return(pkgname_as_debian(paste(name)
-                                                                  ,repopref=pkg$repo)))
-                          ,collapse=', ')
-    }
+#   # bundles provide virtual packages of their contents
+#   # unnecessary for now; cran2deb converts R bundles itself
+#    if (pkg$is_bundle) {
+#        control[2,'Provides'] = paste(
+#                    lapply(r_bundle_contains(pkg$name)
+#                          ,function(name) return(pkgname_as_debian(paste(name)
+#                                                                  ,repopref=pkg$repo)))
+#                          ,collapse=', ')
+#    }
 
     # generate the description
     descr = 'GNU R package "'
@@ -150,6 +151,5 @@ generate_control <- function(pkg) {
 
     # Debian policy says 72 char width; indent minimally
     write.dcf(control,file=pkg$debfile('control.in'),indent=1,width=72)
-    write.dcf(control,indent=1,width=72)
 }