X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=trunk%2FR%2Fdebcontrol.R;h=2293c61530e72a1073c1d0777e791e0dd19734e2;hb=277a5365b0b1e66cd42df4a553401d1f8f46e6b8;hp=4b7b4f905bfd8cf478fce2fe4848ce8be944f605;hpb=104ff67383868f720b67141c96522f6b8bb2154d;p=cran2deb.git

diff --git a/trunk/R/debcontrol.R b/trunk/R/debcontrol.R
index 4b7b4f9..2293c61 100644
--- a/trunk/R/debcontrol.R
+++ b/trunk/R/debcontrol.R
@@ -80,6 +80,10 @@ sysreqs_as_debian <- function(sysreq_text) {
         sysreq = gsub('(ht|f)tps?://[[:alnum:]!?*"\'(),%$_@.&+/=-]*','',sysreq)
         # squish out space
         sysreq = chomp(gsub('[[:space:]]+',' ',sysreq))
+        if (nchar(sysreq) == 0) {
+            notice('part of the SystemRequirement became nothing')
+            next
+        }
         alias <- db_sysreq_override(sysreq)
         if (is.null(alias)) {
             error('do not know what to do with SystemRequirement:',sysreq)
@@ -113,11 +117,11 @@ generate_control <- function(pkg) {
     # construct control file
     control = data.frame()
     control[1,'Source'] = pkg$srcname
-    control[1,'Section'] = 'math'  ## to be changed to 'gnu-r' once lintian groks it
+    control[1,'Section'] = 'gnu-r'
     control[1,'Priority'] = 'optional'
     control[1,'Maintainer'] = maintainer
     control[1,'Build-Depends'] = paste(pkg$depends$build,collapse=', ')
-    control[1,'Standards-Version'] = '3.8.0'
+    control[1,'Standards-Version'] = '3.8.3'
 
     control[2,'Package'] = pkg$debname
     control[2,'Architecture'] = 'all'
@@ -149,7 +153,7 @@ generate_control <- function(pkg) {
         long_descr <- pkg$description[1,'Description']
     }
 
-    if (length(long_descr) < 1) {
+    if (length(long_descr) < 1 || long_descr == "") {
         # bypass lintian extended-description-is-empty for which we care not.
         long_descr <- paste('The author/maintainer of this package'
                            ,'did not care to enter a longer description.')
@@ -159,8 +163,11 @@ generate_control <- function(pkg) {
     # the longer description does not begin on the synopsis line --- R's
     # write.dcf does not appear to have a nicer way of doing this.
     descr = paste(descr,'"\n\n', long_descr, sep='')
-    if ('URL' %in% colnames(pkg$description)) {
-        descr = paste(descr,'\n\nURL: ',pkg$description[1,'URL'],sep='')
+    # add some extra nice info about the original R package
+    for (r_info in c('Author','Maintainer','URL')) {
+        if (r_info %in% colnames(pkg$description)) {
+            descr = paste(descr,'\n\n',r_info,': ',pkg$description[1,r_info],sep='')
+        }
     }
     control[2,'Description'] = descr